[processing] Fix executing models

qgis · May 1, 2017 · ac84326 · ac84326
1 parent dde48b5
commit ac84326
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 3 deletions.
diff --git a/python/core/processing/qgsprocessingalgorithm.sip b/python/core/processing/qgsprocessingalgorithm.sip
@@ -110,6 +110,8 @@ class QgsProcessingAlgorithm
  :rtype: QgsProcessingProvider
 %End
 
+    void setProvider( QgsProcessingProvider *provider );
+
   private:
     QgsProcessingAlgorithm( const QgsProcessingAlgorithm &other );
 };

diff --git a/python/plugins/processing/core/Processing.py b/python/plugins/processing/core/Processing.py
@@ -131,7 +131,11 @@ def runAlgorithm(algOrName, onFinish, *args, **kwargs):
             QgsMessageLog.logMessage(Processing.tr('Error: Algorithm {0} not found\n').format(algOrName),
                                      Processing.tr("Processing"))
             return
+        # hack - remove when getCopy is removed
+        provider = alg.provider()
         alg = alg.getCopy()
+        #hack pt2
+        alg.setProvider(provider)
 
         if len(args) == 1 and isinstance(args[0], dict):
             # Set params by name and try to run the alg even if not all parameter values are provided,

diff --git a/python/plugins/processing/gui/BatchAlgorithmDialog.py b/python/plugins/processing/gui/BatchAlgorithmDialog.py
@@ -73,6 +73,8 @@ def accept(self):
 
         for row in range(self.mainWidget.tblParameters.rowCount()):
             alg = self.alg.getCopy()
+            # hack - remove when getCopy is removed
+            alg.setProvider(self.alg.provider())
             col = 0
             for param in alg.parameters:
                 if param.hidden:

diff --git a/python/plugins/processing/gui/ProcessingToolbox.py b/python/plugins/processing/gui/ProcessingToolbox.py
@@ -242,7 +242,11 @@ def executeAlgorithmAsBatchProcess(self):
         item = self.algorithmTree.currentItem()
         if isinstance(item, TreeAlgorithmItem):
             alg = QgsApplication.processingRegistry().algorithmById(item.alg.id())
+            #hack - remove when getCopy is removed
+            provider = alg.provider()
             alg = alg.getCopy()
+            #hack pt 2
+            alg.setProvider(provider)
             dlg = BatchAlgorithmDialog(alg)
             dlg.show()
             dlg.exec_()
@@ -261,7 +265,12 @@ def executeAlgorithm(self):
                             'be run :-( </h3>\n{0}').format(message))
                 dlg.exec_()
                 return
+
+            # temporary hack - TODO remove this getCopy when parameters are moved from algorithm
+            provider = alg.provider()
             alg = alg.getCopy()
+            alg.setProvider(provider)
+
             if (alg.getVisibleParametersCount() + alg.getVisibleOutputsCount()) > 0:
                 dlg = alg.getCustomParametersDialog()
                 if not dlg:

diff --git a/python/plugins/processing/gui/menus.py b/python/plugins/processing/gui/menus.py
@@ -202,7 +202,13 @@ def _executeAlgorithm(alg):
                           'be run :-( </h3>\n{0}').format(message))
         dlg.exec_()
         return
+
+    # hack - remove when getCopy is removed
+    provider = alg.provider()
     alg = alg.getCopy()
+    #hack pt 2
+    alg.setProvider(provider)
+
     context = dataobjects.createContext()
     if (alg.getVisibleParametersCount() + alg.getVisibleOutputsCount()) > 0:
         dlg = alg.getCustomParametersDialog()

diff --git a/python/plugins/processing/modeler/EditModelAction.py b/python/plugins/processing/modeler/EditModelAction.py
@@ -40,7 +40,10 @@ def isEnabled(self):
         return isinstance(self.itemData, ModelerAlgorithm)
 
     def execute(self):
-        dlg = ModelerDialog(self.itemData.getCopy())
+        alg = self.itemData.getCopy()
+        #hack - remove when getCopy is removed
+        alg.setProvider(self.itemData.provider())
+        dlg = ModelerDialog(alg)
         dlg.update_model.connect(self.updateModel)
         dlg.show()
 

diff --git a/python/plugins/processing/modeler/ModelerDialog.py b/python/plugins/processing/modeler/ModelerDialog.py
@@ -282,7 +282,11 @@ def runModel(self):
             self.bar.pushMessage("", "Model doesn't contain any algorithm and/or parameter and can't be executed", level=QgsMessageBar.WARNING, duration=5)
             return
 
+        # hack - remove when above getCopy is removed
+        provider = self.alg.provider()
         alg = self.alg.getCopy()
+        # hack pt 2
+        alg.setProvider(provider)
         dlg = AlgorithmDialog(alg)
         dlg.exec_()
 

diff --git a/src/core/processing/qgsprocessingalgorithm.h b/src/core/processing/qgsprocessingalgorithm.h
@@ -118,13 +118,14 @@ class CORE_EXPORT QgsProcessingAlgorithm
      */
     QgsProcessingProvider *provider() const;
 
-  private:
-
     /**
      * Associates this algorithm with its provider. No transfer of ownership is involved.
      */
+    //TEMPORARY - remove when algorithms are no longer copied in python code
     void setProvider( QgsProcessingProvider *provider );
 
+  private:
+
     QgsProcessingProvider *mProvider = nullptr;
 
     // friend class to access setProvider() - we do not want this public!