Make densify interval parameter dynamic

m-kuhn · m-kuhn · commit 9fec8edf2343 · 2019-01-21T10:41:29.000+01:00
diff --git a/src/analysis/processing/qgsalgorithmdensifygeometriesbyinterval.cpp b/src/analysis/processing/qgsalgorithmdensifygeometriesbyinterval.cpp
@@ -69,9 +69,13 @@ QList<int> QgsDensifyGeometriesByIntervalAlgorithm::inputLayerTypes() const
 void QgsDensifyGeometriesByIntervalAlgorithm::initParameters( const QVariantMap &configuration )
 {
   Q_UNUSED( configuration )
-  addParameter( new QgsProcessingParameterDistance( QStringLiteral( "INTERVAL" ),
-                QObject::tr( "Interval between vertices to add" ),
-                1, QStringLiteral( "INPUT" ), false, 0, 10000000 ) );
+  std::unique_ptr<QgsProcessingParameterDistance> interval = qgis::make_unique<QgsProcessingParameterDistance>( QStringLiteral( "INTERVAL" ),
+      QObject::tr( "Interval between vertices to add" ),
+      1, QStringLiteral( "INPUT" ), false, 0, 10000000 );
+  interval->setIsDynamic( true );
+  interval->setDynamicPropertyDefinition( QgsPropertyDefinition( QStringLiteral( "Interval" ), QObject::tr( "Interval" ), QgsPropertyDefinition::DoublePositive ) );
+  interval->setDynamicLayerParameterName( QStringLiteral( "INPUT" ) );
+  addParameter( interval.release() );
 }
 
 QString QgsDensifyGeometriesByIntervalAlgorithm::outputName() const
@@ -84,6 +88,11 @@ QgsFeatureList QgsDensifyGeometriesByIntervalAlgorithm::processFeature( const Qg
   Q_UNUSED( context );
   Q_UNUSED( feedback );
   QgsFeature modifiedFeature = feature;
+
+  double interval = mInterval;
+  if ( mDynamicInterval )
+    interval = mIntervalProperty.valueAsDouble( context.expressionContext(), interval );
+
   if ( feature.hasGeometry() )
     modifiedFeature.setGeometry( feature.geometry().densifyByDistance( mInterval ) );
 
@@ -94,5 +103,10 @@ bool QgsDensifyGeometriesByIntervalAlgorithm::prepareAlgorithm( const QVariantMa
 {
   Q_UNUSED( feedback );
   mInterval = parameterAsDouble( parameters, QStringLiteral( "INTERVAL" ), context );
+
+  mDynamicInterval = QgsProcessingParameters::isDynamic( parameters, QStringLiteral( "INTERVAL" ) );
+  if ( mDynamicInterval )
+    mIntervalProperty = parameters.value( QStringLiteral( "INTERVAL" ) ).value< QgsProperty >();
+
   return true;
 }
diff --git a/src/analysis/processing/qgsalgorithmdensifygeometriesbyinterval.h b/src/analysis/processing/qgsalgorithmdensifygeometriesbyinterval.h
@@ -49,6 +49,8 @@ class QgsDensifyGeometriesByIntervalAlgorithm : public QgsProcessingFeatureBased
 
   private:
     double mInterval = 0.0;
+    bool mDynamicInterval = false;
+    QgsProperty mIntervalProperty;
 };
 
 ///@endcond PRIVATE
