Port another member to c++

qgis · Jun 23, 2017 · a8b364e · a8b364e
1 parent 3249015
commit a8b364e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/python/core/processing/qgsprocessingmodelalgorithm.sip b/python/core/processing/qgsprocessingmodelalgorithm.sip
@@ -573,6 +573,8 @@ Copies are protected to avoid slicing
 
     virtual bool canExecute( QString *errorMessage /Out/ = 0 ) const;
 
+    virtual QString asPythonCommand( const QVariantMap &parameters, QgsProcessingContext &context ) const;
+
 
     void setName( const QString &name );
 %Docstring

diff --git a/python/plugins/processing/modeler/ModelerAlgorithm.py b/python/plugins/processing/modeler/ModelerAlgorithm.py
@@ -224,12 +224,6 @@ def resolveValue(self, value, param):
             v = value
         return param.evaluateForModeler(v, self)
 
-    def asPythonCommand(self, parameters, context):
-        if self.sourceFilePath():
-            return QgsProcessingAlgorithm.asPythonCommand(self, parameters, context)
-        else:
-            return None
-
     def toPython(self):
         s = ['##%s=name' % self.name()]
         for param in list(self.parameterComponents().values()):

diff --git a/src/core/processing/qgsprocessingmodelalgorithm.cpp b/src/core/processing/qgsprocessingmodelalgorithm.cpp
@@ -915,6 +915,14 @@ bool QgsProcessingModelAlgorithm::canExecute( QString *errorMessage ) const
   return true;
 }
 
+QString QgsProcessingModelAlgorithm::asPythonCommand( const QVariantMap &parameters, QgsProcessingContext &context ) const
+{
+  if ( mSourceFile.isEmpty() )
+    return QString(); // temporary model - can't run as python command
+
+  return QgsProcessingAlgorithm::asPythonCommand( parameters, context );
+}
+
 
 bool QgsProcessingModelAlgorithm::ChildParameterSource::operator==( const QgsProcessingModelAlgorithm::ChildParameterSource &other ) const
 {

diff --git a/src/core/processing/qgsprocessingmodelalgorithm.h b/src/core/processing/qgsprocessingmodelalgorithm.h
@@ -573,6 +573,7 @@ class CORE_EXPORT QgsProcessingModelAlgorithm : public QgsProcessingAlgorithm
     QString helpUrl() const override;
 
     bool canExecute( QString *errorMessage SIP_OUT = nullptr ) const override;
+    QString asPythonCommand( const QVariantMap &parameters, QgsProcessingContext &context ) const override;
 
     /**
      * Sets the model \a name.