[processing] changed how toolbox is updated after adding/removing pro…

…vider
qgis · Jun 13, 2014 · a5e5a0e · a5e5a0e
1 parent 9868334
commit a5e5a0e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git a/python/plugins/processing/ProcessingPlugin.py b/python/plugins/processing/ProcessingPlugin.py
@@ -56,7 +56,7 @@ def initGui(self):
         self.toolbox = ProcessingToolbox()
         self.iface.addDockWidget(Qt.RightDockWidgetArea, self.toolbox)
         self.toolbox.hide()
-        #Processing.addAlgListListener(self.toolbox)
+        Processing.addAlgListListener(self.toolbox)
 
         self.menu = QMenu(self.iface.mainWindow().menuBar())
         self.menu.setObjectName( 'processing' )

diff --git a/python/plugins/processing/core/Processing.py b/python/plugins/processing/core/Processing.py
@@ -65,8 +65,6 @@ class Processing:
     listeners = []
     providers = []
 
-    toolbox = None
-
     # A dictionary of algorithms. Keys are names of providers
     # and values are list with all algorithms from that provider
     algs = {}
@@ -79,10 +77,6 @@ class Processing:
 
     modeler = ModelerAlgorithmProvider()
 
-    @staticmethod
-    def setToolbox(toolbox):
-        Processing.toolbox = toolbox
-
     @staticmethod
     def addProvider(provider, updateList=False):
         """Use this method to add algorithms from external providers.
@@ -95,8 +89,8 @@ def addProvider(provider, updateList=False):
             provider.initializeSettings()
             Processing.providers.append(provider)
             ProcessingConfig.readSettings()
-            if updateList and Processing.toolbox:
-                Processing.toolbox.updateTree()
+            if updateList:
+                Processing.updateAlgsList()
         except:
             ProcessingLog.addToLog(ProcessingLog.LOG_ERROR,
                                    'Could not load provider:'
@@ -115,8 +109,7 @@ def removeProvider(provider):
             provider.unload()
             Processing.providers.remove(provider)
             ProcessingConfig.readSettings()
-            if Processing.toolbox:
-                Processing.toolbox.updateTree()
+            Processing.updateAlgsList()
         except:
             # This try catch block is here to avoid problems if the
             # plugin with a provider is unloaded after the Processing

diff --git a/python/plugins/processing/gui/ConfigDialog.py b/python/plugins/processing/gui/ConfigDialog.py
@@ -31,7 +31,7 @@
 from PyQt4.QtGui import *
 
 from processing.core.ProcessingConfig import ProcessingConfig
-
+from processing.core.Processing import Processing
 from processing.ui.ui_DlgConfig import Ui_DlgConfig
 
 import processing.resources_rc
@@ -146,9 +146,7 @@ def accept(self):
             else:
                 setting.value = unicode(self.items[setting].text())
             setting.save()
-            #ProcessingConfig.addSetting(setting)
-        #ProcessingConfig.saveSettings()
-        self.toolbox.updateTree()
+        Processing.updateAlgsList()
 
         QDialog.accept(self)
 

diff --git a/python/plugins/processing/gui/ProcessingToolbox.py b/python/plugins/processing/gui/ProcessingToolbox.py
@@ -72,7 +72,6 @@ def __init__(self):
         if hasattr(self.searchBox, 'setPlaceholderText'):
             self.searchBox.setPlaceholderText(self.tr('Search...'))
 
-        Processing.setToolbox(self)
         self.fillTree()
 
     def textChanged(self):
@@ -113,9 +112,7 @@ def modeHasChanged(self):
 
         self.fillTree()
 
-
-    def updateTree(self):
-        Processing.updateAlgsList()
+    def algsListHasChanged(self):
         self.fillTree()
 
     def updateProvider(self, providerName, updateAlgsList = True):