sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

More cleaning

Browse Source
This commit is contained in:
Blottiere Paul 2018-01-23 09:55:19 +00:00
parent a948f1b84d
commit ad630094c1
5 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
python/plugins/db_manager/db_plugins/data_model.py
View File

@ -152,11 +152,8 @@ class SqlResultModelAsync(QObject):
done = pyqtSignal()
def __init__(self, db, sql, parent=None):
def __init__(self):
QObject.__init__(self)
self.db = db
self.sql = sql
self.parent = parent
self.error = BaseError('')
self.status = None
self.model = None
@ -164,7 +161,7 @@ class SqlResultModelAsync(QObject):
def cancel(self):
if self.task:
self.task.cancelQuery()
self.task.cancel()
def modelDone(self):
if self.task:

6
python/plugins/db_manager/db_plugins/postgis/data_model.py
View File

@ -97,15 +97,15 @@ class PGSqlResultModelTask(SqlResultModelTask):
return False
return True
def cancelQuery(self):
def cancel(self):
self.db.connector.cancel()
self.cancel()
SqlResultModelTask.cancel(self)
class PGSqlResultModelAsync(SqlResultModelAsync):
def __init__(self, db, sql, parent):
SqlResultModelAsync.__init__(self, db, sql, parent)
SqlResultModelAsync.__init__(self)
self.task = PGSqlResultModelTask(db, sql, parent)
self.task.taskCompleted.connect(self.modelDone)

6
python/plugins/db_manager/db_plugins/spatialite/data_model.py
View File

@ -87,16 +87,16 @@ class SLSqlResultModelTask(SqlResultModelTask):
return True
def cancelQuery(self):
def cancel(self):
if self.clone:
self.clone.connector.cancel()
self.cancel()
SqlResultModelTask.cancel(self)
class SLSqlResultModelAsync(SqlResultModelAsync):
def __init__(self, db, sql, parent):
SqlResultModelAsync.__init__(self, db, sql, parent)
SqlResultModelAsync.__init__(self)
self.task = SLSqlResultModelTask(db, sql, parent)
self.task.taskCompleted.connect(self.modelDone)

6
python/plugins/db_manager/db_plugins/vlayers/data_model.py
View File

@ -97,15 +97,15 @@ class LSqlResultModelTask(SqlResultModelTask):
return False
return True
def cancelQuery(self):
def cancel(self):
self.subtask.cancel()
self.cancel()
SqlResultModelTask.cancel(self)
class LSqlResultModelAsync(SqlResultModelAsync):
def __init__(self, db, sql, parent=None):
SqlResultModelAsync.__init__(self, db, sql, parent)
SqlResultModelAsync.__init__(self)
self.task = LSqlResultModelTask(db, sql, parent)
self.task.taskCompleted.connect(self.modelDone)

4
python/plugins/db_manager/dlg_cancel_task_query.py
View File

@ -58,8 +58,8 @@ class DlgCancelTaskQuery(QDialog, Ui_Dialog):
self.mGif.start()
self.mCancelButton.setEnabled(True)
self.mLabel.setText("Executing SQL...")
super(QDialog, self).show()
QDialog.show(self)
def hide(self):
self.mGif.stop()
super(QDialog, self).hide()
QDialog.hide(self)