diff --git a/python/core/auto_generated/processing/qgsprocessingparametermeshdataset.sip.in b/python/core/auto_generated/processing/qgsprocessingparametermeshdataset.sip.in index 215c0764c82..c80d75f1a8c 100644 --- a/python/core/auto_generated/processing/qgsprocessingparametermeshdataset.sip.in +++ b/python/core/auto_generated/processing/qgsprocessingparametermeshdataset.sip.in @@ -55,6 +55,10 @@ Constructor virtual QStringList dependsOnOtherParameters() const; + virtual QVariantMap toVariantMap() const; + + virtual bool fromVariantMap( const QVariantMap &map ); + static QString typeName(); %Docstring @@ -128,6 +132,10 @@ Constructor virtual QStringList dependsOnOtherParameters() const; + virtual QVariantMap toVariantMap() const; + + virtual bool fromVariantMap( const QVariantMap &map ); + static QString typeName(); %Docstring diff --git a/src/core/processing/qgsprocessingparametermeshdataset.cpp b/src/core/processing/qgsprocessingparametermeshdataset.cpp index f0768a34c1e..67e01d8c49a 100644 --- a/src/core/processing/qgsprocessingparametermeshdataset.cpp +++ b/src/core/processing/qgsprocessingparametermeshdataset.cpp @@ -26,7 +26,6 @@ QgsProcessingParameterMeshDatasetGroups::QgsProcessingParameterMeshDatasetGroups mMeshLayerParameterName( meshLayerParameterName ), mSupportedDataType( supportedDataType ) { - int a = 1; } QgsProcessingParameterDefinition *QgsProcessingParameterMeshDatasetGroups::clone() const @@ -147,7 +146,7 @@ QVariantMap QgsProcessingParameterMeshDatasetGroups::toVariantMap() const QVariantList dataType; for ( int v : mSupportedDataType ) dataType.append( v ); - map.insert( QStringLiteral( "suppoted_data_type" ), dataType ); + map.insert( QStringLiteral( "supported_data_type" ), dataType ); return map; } @@ -155,7 +154,7 @@ bool QgsProcessingParameterMeshDatasetGroups::fromVariantMap( const QVariantMap { QgsProcessingParameterDefinition::fromVariantMap( map ); mMeshLayerParameterName = map.value( QStringLiteral( "mesh_layer" ) ).toString(); - const QVariantList dataType = map.value( QStringLiteral( "suppoted_data_type" ) ).toList(); + const QVariantList dataType = map.value( QStringLiteral( "supported_data_type" ) ).toList(); mSupportedDataType.clear(); for ( const QVariant &var : dataType ) mSupportedDataType.insert( var.toInt() ); diff --git a/src/gui/processing/qgsprocessingmeshdatasetwidget.cpp b/src/gui/processing/qgsprocessingmeshdatasetwidget.cpp index 98172d26681..b37fe149034 100644 --- a/src/gui/processing/qgsprocessingmeshdatasetwidget.cpp +++ b/src/gui/processing/qgsprocessingmeshdatasetwidget.cpp @@ -383,7 +383,7 @@ void QgsProcessingMeshDatasetTimeWidgetWrapper::postInitialize( const QList param = std::make_unique( name, description, mMeshLayerParameterName, mParentDatasetComboBox->currentData().toString() ); @@ -867,3 +864,6 @@ QgsProcessingParameterDefinition *QgsProcessingMeshDatasetDatasetTimeParameterDe param->setFlags( flags ); return param.release(); } + +///@endcond + diff --git a/src/gui/processing/qgsprocessingmeshdatasetwidget.h b/src/gui/processing/qgsprocessingmeshdatasetwidget.h index ac5c6516868..c0b59d6ffbc 100644 --- a/src/gui/processing/qgsprocessingmeshdatasetwidget.h +++ b/src/gui/processing/qgsprocessingmeshdatasetwidget.h @@ -97,7 +97,6 @@ class GUI_EXPORT QgsProcessingMeshDatasetGroupsWidgetWrapper : public QgsAbstra private: QgsProcessingMeshDatasetGroupsWidget *mWidget = nullptr; - std::unique_ptr mTemporarytMeshLayer; friend class TestProcessingGui; }; @@ -202,10 +201,10 @@ class GUI_EXPORT QgsProcessingMeshDatasetTimeWidgetWrapper : public QgsAbstract friend class TestProcessingGui; }; -class GUI_EXPORT QgsProcessingMeshDatasetDatasetTimeParameterDefinitionWidget : public QgsProcessingAbstractParameterDefinitionWidget +class GUI_EXPORT QgsProcessingMeshDatasetTimeParameterDefinitionWidget : public QgsProcessingAbstractParameterDefinitionWidget { public: - QgsProcessingMeshDatasetDatasetTimeParameterDefinitionWidget( QgsProcessingContext &context, + QgsProcessingMeshDatasetTimeParameterDefinitionWidget( QgsProcessingContext &context, const QgsProcessingParameterWidgetContext &widgetContext, const QgsProcessingParameterDefinition *definition = nullptr, const QgsProcessingAlgorithm *algorithm = nullptr, QWidget *parent SIP_TRANSFERTHIS = nullptr ); diff --git a/tests/src/gui/testprocessinggui.cpp b/tests/src/gui/testprocessinggui.cpp index f84eca12d84..60fa1904203 100644 --- a/tests/src/gui/testprocessinggui.cpp +++ b/tests/src/gui/testprocessinggui.cpp @@ -10049,6 +10049,22 @@ void TestProcessingGui::testMeshDatasetWrapperLayerInProject() timeWrapper.setWidgetValue( QVariant::fromValue( QDateTime( QDate( 2020, 02, 01 ), QTime( 3, 2, 1 ) ) ).toString(), context ); pythonString = timeDefinition.valueAsPythonString( timeWrapper.widgetValue(), context ); QCOMPARE( pythonString, QStringLiteral( "{'type': 'defined-date-time','value': QDateTime(QDate(2020, 2, 1), QTime(3, 2, 1))}" ) ); + + // parameter definition widget + std::unique_ptr paramWidgetGroup( groupsWrapper.createParameterDefinitionWidget( context, widgetContext, &groupsDefinition, nullptr ) ); + QgsProcessingParameterDefinition::Flags flags; + std::unique_ptr paramDefGroup( paramWidgetGroup->createParameter( QStringLiteral( "my_param_name" ), QStringLiteral( "my_param_descr" ), flags ) ); + QVERIFY( paramDefGroup ); + QCOMPARE( paramDefGroup->name(), QStringLiteral( "my_param_name" ) ); + QCOMPARE( paramDefGroup->description(), QStringLiteral( "my_param_descr" ) ); + QCOMPARE( paramDefGroup->type(), QgsProcessingParameterMeshDatasetGroups::typeName() ); + + std::unique_ptr paramWidgetTime( timeWrapper.createParameterDefinitionWidget( context, widgetContext, &timeDefinition, nullptr ) ); + std::unique_ptr paramDefTime( paramWidgetTime->createParameter( QStringLiteral( "my_param_name" ), QStringLiteral( "my_param_descr" ), flags ) ); + QVERIFY( paramDefTime ); + QCOMPARE( paramDefTime->name(), QStringLiteral( "my_param_name" ) ); + QCOMPARE( paramDefTime->description(), QStringLiteral( "my_param_descr" ) ); + QCOMPARE( paramDefTime->type(), QgsProcessingParameterMeshDatasetTime::typeName() ); } void TestProcessingGui::testMeshDatasetWrapperLayerOutsideProject()