[processing] some refactoring. Removed old-style signals connection

qgis · Oct 6, 2013 · acbd165 · acbd165
1 parent 17f3f79
commit acbd165
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 27 deletions.
diff --git a/python/plugins/processing/gui/EditScriptAction.py b/python/plugins/processing/gui/EditScriptAction.py
@@ -27,7 +27,6 @@
 
 from processing.gui.ContextAction import ContextAction
 from processing.gui.ScriptEditorDialog import ScriptEditorDialog
-
 from processing.r.RAlgorithm import RAlgorithm
 from processing.script.ScriptAlgorithm import ScriptAlgorithm
 

diff --git a/python/plugins/processing/gui/ExtentSelectionPanel.py b/python/plugins/processing/gui/ExtentSelectionPanel.py
@@ -62,7 +62,7 @@ def __init__(self, dialog, alg, default):
         canvas = interface.iface.mapCanvas()
         self.prevMapTool = canvas.mapTool()
         self.tool = RectangleMapTool(canvas)
-        self.connect(self.tool, SIGNAL('rectangleCreated()'), self.fillCoords)
+        self.tool.rectangleCreated.connect(self.fillCoords)
 
     def canUseAutoExtent(self):
         for param in self.params:

diff --git a/python/plugins/processing/gui/FixedTableDialog.py b/python/plugins/processing/gui/FixedTableDialog.py
@@ -75,14 +75,10 @@ def setupUi(self):
         self.horizontalLayout.addWidget(self.table)
         self.horizontalLayout.addWidget(self.buttonBox)
         self.setLayout(self.horizontalLayout)
-        QObject.connect(self.buttonBox, QtCore.SIGNAL('accepted()'),
+        self.buttonBox.accepted.connect(self.okPressed)
-                        self.okPressed)
+        self.buttonBox.rejected.connect(self.cancelPressed)
-        QObject.connect(self.buttonBox, QtCore.SIGNAL('rejected()'),
+        self.addRowButton.clicked.connect(self.addRow)
-                        self.cancelPressed)
+        self.removeRowButton.clicked.connect(self.removeRow)
-        QObject.connect(self.addRowButton, QtCore.SIGNAL('clicked()'),
-                        self.addRow)
-        QObject.connect(self.removeRowButton, QtCore.SIGNAL('clicked()'),
-                        self.removeRow)
         QtCore.QMetaObject.connectSlotsByName(self)
 
     def setTableContent(self):
@@ -112,4 +108,4 @@ def addRow(self):
         self.table.setRowHeight(self.table.rowCount() - 1, 22)
         for i in range(self.table.columnCount()):
             self.table.setItem(self.table.rowCount() - 1, i,
-                               QtGui.QTableWidgetItem('0'))
+                               QtGui.QTableWidgetItem('0'))
diff --git a/python/plugins/processing/gui/FixedTablePanel.py b/python/plugins/processing/gui/FixedTablePanel.py
@@ -25,7 +25,7 @@
 
 __revision__ = '$Format:%H$'
 
-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtGui
 from processing.gui.FixedTableDialog import FixedTableDialog
 
 

diff --git a/python/plugins/processing/gui/MultipleInputDialog.py b/python/plugins/processing/gui/MultipleInputDialog.py
@@ -79,4 +79,4 @@ def toggleSelection(self):
                 break
         for i in range(len(self.options)):
             widget = self.tblLayers.cellWidget(i, 0)
-            widget.setChecked(checked)
+            widget.setChecked(checked)
diff --git a/python/plugins/processing/gui/MultipleInputPanel.py b/python/plugins/processing/gui/MultipleInputPanel.py
@@ -57,20 +57,7 @@ def setSelectedItems(self, selected):
                            + ' elements selected')
 
     def showSelectionDialog(self):
-        # =====================================================================
+
-        # #If there is a datatype, we use it to create the list of options
-        # if self.datatype is not None:
-        #    if self.datatype == ParameterMultipleInput.TYPE_RASTER:
-        #        options = dataobjects.getRasterLayers()
-        #    elif self.datatype == ParameterMultipleInput.TYPE_VECTOR_ANY:
-        #        options = dataobjects.getVectorLayers()
-        #    else:
-        #        options = dataobjects.getVectorLayers(self.datatype)
-        #    opts = []
-        #    for opt in options:
-        #        opts.append(opt.name())
-        #    self.options = opts
-        # =====================================================================
         dlg = MultipleInputDialog(self.options, self.selectedoptions)
         dlg.exec_()
         if dlg.selectedoptions is not None: