sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-09 00:08:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

SIP, typo, cleaning and more tests

Browse Source
This commit is contained in:
vcloarec 2022-06-07 22:56:53 -04:00 committed by Vincent Cloarec
parent 6afefda8dc
commit f898dcd0eb
5 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python/core/auto_generated/processing/qgsprocessingparametermeshdataset.sip.in
View File

@ -55,6 +55,10 @@ Constructor
virtual QStringList dependsOnOtherParameters() const; virtual QStringList dependsOnOtherParameters() const;
virtual QVariantMap toVariantMap() const;
virtual bool fromVariantMap( const QVariantMap &map );
static QString typeName(); static QString typeName();
%Docstring %Docstring
@ -128,6 +132,10 @@ Constructor
virtual QStringList dependsOnOtherParameters() const; virtual QStringList dependsOnOtherParameters() const;
virtual QVariantMap toVariantMap() const;
virtual bool fromVariantMap( const QVariantMap &map );
static QString typeName(); static QString typeName();
%Docstring %Docstring

5
src/core/processing/qgsprocessingparametermeshdataset.cpp
View File

@ -26,7 +26,6 @@ QgsProcessingParameterMeshDatasetGroups::QgsProcessingParameterMeshDatasetGroups
mMeshLayerParameterName( meshLayerParameterName ), mMeshLayerParameterName( meshLayerParameterName ),
mSupportedDataType( supportedDataType ) mSupportedDataType( supportedDataType )
{ {
int a = 1;
} }
QgsProcessingParameterDefinition *QgsProcessingParameterMeshDatasetGroups::clone() const QgsProcessingParameterDefinition *QgsProcessingParameterMeshDatasetGroups::clone() const
@ -147,7 +146,7 @@ QVariantMap QgsProcessingParameterMeshDatasetGroups::toVariantMap() const
QVariantList dataType; QVariantList dataType;
for ( int v : mSupportedDataType ) for ( int v : mSupportedDataType )
dataType.append( v ); dataType.append( v );
map.insert( QStringLiteral( "suppoted_data_type" ), dataType ); map.insert( QStringLiteral( "supported_data_type" ), dataType );
return map; return map;
} }
@ -155,7 +154,7 @@ bool QgsProcessingParameterMeshDatasetGroups::fromVariantMap( const QVariantMap
{ {
QgsProcessingParameterDefinition::fromVariantMap( map ); QgsProcessingParameterDefinition::fromVariantMap( map );
mMeshLayerParameterName = map.value( QStringLiteral( "mesh_layer" ) ).toString(); 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(); mSupportedDataType.clear();
for ( const QVariant &var : dataType ) for ( const QVariant &var : dataType )
mSupportedDataType.insert( var.toInt() ); mSupportedDataType.insert( var.toInt() );

12
src/gui/processing/qgsprocessingmeshdatasetwidget.cpp
View File

@ -383,7 +383,7 @@ void QgsProcessingMeshDatasetTimeWidgetWrapper::postInitialize( const QList<QgsA
QgsProcessingAbstractParameterDefinitionWidget *QgsProcessingMeshDatasetTimeWidgetWrapper::createParameterDefinitionWidget( QgsProcessingContext &context, const QgsProcessingParameterWidgetContext &widgetContext, const QgsProcessingParameterDefinition *definition, const QgsProcessingAlgorithm *algorithm ) QgsProcessingAbstractParameterDefinitionWidget *QgsProcessingMeshDatasetTimeWidgetWrapper::createParameterDefinitionWidget( QgsProcessingContext &context, const QgsProcessingParameterWidgetContext &widgetContext, const QgsProcessingParameterDefinition *definition, const QgsProcessingAlgorithm *algorithm )
{ {
return new QgsProcessingMeshDatasetDatasetTimeParameterDefinitionWidget( context, widgetContext, definition, algorithm ); return new QgsProcessingMeshDatasetTimeParameterDefinitionWidget( context, widgetContext, definition, algorithm );
} }
void QgsProcessingMeshDatasetTimeWidgetWrapper::setMeshLayerWrapperValue( const QgsAbstractProcessingParameterWidgetWrapper *wrapper ) void QgsProcessingMeshDatasetTimeWidgetWrapper::setMeshLayerWrapperValue( const QgsAbstractProcessingParameterWidgetWrapper *wrapper )
@ -805,10 +805,7 @@ QgsProcessingParameterDefinition *QgsProcessingMeshDatasetGroupsParameterDefinit
return param.release(); return param.release();
} }
QgsProcessingMeshDatasetTimeParameterDefinitionWidget::QgsProcessingMeshDatasetTimeParameterDefinitionWidget(
///@endcond
QgsProcessingMeshDatasetDatasetTimeParameterDefinitionWidget::QgsProcessingMeshDatasetDatasetTimeParameterDefinitionWidget(
QgsProcessingContext &context, QgsProcessingContext &context,
const QgsProcessingParameterWidgetContext &widgetContext, const QgsProcessingParameterWidgetContext &widgetContext,
const QgsProcessingParameterDefinition *definition, const QgsProcessingParameterDefinition *definition,
@ -859,7 +856,7 @@ QgsProcessingMeshDatasetDatasetTimeParameterDefinitionWidget::QgsProcessingMeshD
setLayout( vlayout ); setLayout( vlayout );
} }
QgsProcessingParameterDefinition *QgsProcessingMeshDatasetDatasetTimeParameterDefinitionWidget::createParameter( const QString &name, const QString &description, QgsProcessingParameterDefinition::Flags flags ) const QgsProcessingParameterDefinition *QgsProcessingMeshDatasetTimeParameterDefinitionWidget::createParameter( const QString &name, const QString &description, QgsProcessingParameterDefinition::Flags flags ) const
{ {
std::unique_ptr<QgsProcessingParameterMeshDatasetTime> param = std::make_unique<QgsProcessingParameterMeshDatasetTime>( std::unique_ptr<QgsProcessingParameterMeshDatasetTime> param = std::make_unique<QgsProcessingParameterMeshDatasetTime>(
name, description, mMeshLayerParameterName, mParentDatasetComboBox->currentData().toString() ); name, description, mMeshLayerParameterName, mParentDatasetComboBox->currentData().toString() );
@ -867,3 +864,6 @@ QgsProcessingParameterDefinition *QgsProcessingMeshDatasetDatasetTimeParameterDe
param->setFlags( flags ); param->setFlags( flags );
return param.release(); return param.release();
} }
///@endcond

5
src/gui/processing/qgsprocessingmeshdatasetwidget.h
View File

@ -97,7 +97,6 @@ class GUI_EXPORT QgsProcessingMeshDatasetGroupsWidgetWrapper : public QgsAbstra
private: private:
QgsProcessingMeshDatasetGroupsWidget *mWidget = nullptr; QgsProcessingMeshDatasetGroupsWidget *mWidget = nullptr;
std::unique_ptr<QgsMeshLayer> mTemporarytMeshLayer;
friend class TestProcessingGui; friend class TestProcessingGui;
}; };
@ -202,10 +201,10 @@ class GUI_EXPORT QgsProcessingMeshDatasetTimeWidgetWrapper : public QgsAbstract
friend class TestProcessingGui; friend class TestProcessingGui;
}; };
class GUI_EXPORT QgsProcessingMeshDatasetDatasetTimeParameterDefinitionWidget : public QgsProcessingAbstractParameterDefinitionWidget class GUI_EXPORT QgsProcessingMeshDatasetTimeParameterDefinitionWidget : public QgsProcessingAbstractParameterDefinitionWidget
{ {
public: public:
QgsProcessingMeshDatasetDatasetTimeParameterDefinitionWidget( QgsProcessingContext &context, QgsProcessingMeshDatasetTimeParameterDefinitionWidget( QgsProcessingContext &context,
const QgsProcessingParameterWidgetContext &widgetContext, const QgsProcessingParameterWidgetContext &widgetContext,
const QgsProcessingParameterDefinition *definition = nullptr, const QgsProcessingParameterDefinition *definition = nullptr,
const QgsProcessingAlgorithm *algorithm = nullptr, QWidget *parent SIP_TRANSFERTHIS = nullptr ); const QgsProcessingAlgorithm *algorithm = nullptr, QWidget *parent SIP_TRANSFERTHIS = nullptr );

16
tests/src/gui/testprocessinggui.cpp
View File

@ -10049,6 +10049,22 @@ void TestProcessingGui::testMeshDatasetWrapperLayerInProject()
timeWrapper.setWidgetValue( QVariant::fromValue( QDateTime( QDate( 2020, 02, 01 ), QTime( 3, 2, 1 ) ) ).toString(), context ); timeWrapper.setWidgetValue( QVariant::fromValue( QDateTime( QDate( 2020, 02, 01 ), QTime( 3, 2, 1 ) ) ).toString(), context );
pythonString = timeDefinition.valueAsPythonString( timeWrapper.widgetValue(), context ); pythonString = timeDefinition.valueAsPythonString( timeWrapper.widgetValue(), context );
QCOMPARE( pythonString, QStringLiteral( "{'type': 'defined-date-time','value': QDateTime(QDate(2020, 2, 1), QTime(3, 2, 1))}" ) ); QCOMPARE( pythonString, QStringLiteral( "{'type': 'defined-date-time','value': QDateTime(QDate(2020, 2, 1), QTime(3, 2, 1))}" ) );
// parameter definition widget
std::unique_ptr<QgsProcessingAbstractParameterDefinitionWidget> paramWidgetGroup( groupsWrapper.createParameterDefinitionWidget( context, widgetContext, &groupsDefinition, nullptr ) );
QgsProcessingParameterDefinition::Flags flags;
std::unique_ptr<QgsProcessingParameterDefinition> 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<QgsProcessingAbstractParameterDefinitionWidget> paramWidgetTime( timeWrapper.createParameterDefinitionWidget( context, widgetContext, &timeDefinition, nullptr ) );
std::unique_ptr<QgsProcessingParameterDefinition> 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() void TestProcessingGui::testMeshDatasetWrapperLayerOutsideProject()