diff --git a/python/PyQt6/core/auto_additions/qgsprocessingoutputs.py b/python/PyQt6/core/auto_additions/qgsprocessingoutputs.py index 3c94b6543aa..cfc5f5a345f 100644 --- a/python/PyQt6/core/auto_additions/qgsprocessingoutputs.py +++ b/python/PyQt6/core/auto_additions/qgsprocessingoutputs.py @@ -1,7 +1,7 @@ # The following has been generated automatically from src/core/processing/qgsprocessingoutputs.h try: QgsProcessingOutputMapLayer.typeName = staticmethod(QgsProcessingOutputMapLayer.typeName) - QgsProcessingOutputMapLayer.__overridden_methods__ = ['type'] + QgsProcessingOutputMapLayer.__overridden_methods__ = ['getColor', 'type'] QgsProcessingOutputMapLayer.__group__ = ['processing'] except (NameError, AttributeError): pass @@ -37,7 +37,7 @@ except (NameError, AttributeError): pass try: QgsProcessingOutputVariant.typeName = staticmethod(QgsProcessingOutputVariant.typeName) - QgsProcessingOutputVariant.__overridden_methods__ = ['getColor', 'type', 'valueAsString'] + QgsProcessingOutputVariant.__overridden_methods__ = ['type', 'valueAsString'] QgsProcessingOutputVariant.__group__ = ['processing'] except (NameError, AttributeError): pass diff --git a/python/PyQt6/core/auto_generated/processing/qgsprocessingoutputs.sip.in b/python/PyQt6/core/auto_generated/processing/qgsprocessingoutputs.sip.in index fb9d9aa96f4..7effbc85743 100644 --- a/python/PyQt6/core/auto_generated/processing/qgsprocessingoutputs.sip.in +++ b/python/PyQt6/core/auto_generated/processing/qgsprocessingoutputs.sip.in @@ -192,6 +192,12 @@ raster), use :py:class:`QgsProcessingOutputVectorLayer` or QgsProcessingOutputMapLayer( const QString &name, const QString &description = QString() ); %Docstring Constructor for QgsProcessingOutputMapLayer. +%End + + virtual QColor getColor() const; + +%Docstring +A color to represent a map layer ouput %End static QString typeName(); @@ -397,12 +403,6 @@ Constructor for QgsProcessingOutputVariant. static QString typeName(); %Docstring Returns the type name for the output class. -%End - - virtual QColor getColor() const; - -%Docstring -A color to represent a range parameter %End virtual QString type() const; diff --git a/python/core/auto_additions/qgsprocessingoutputs.py b/python/core/auto_additions/qgsprocessingoutputs.py index 3c94b6543aa..cfc5f5a345f 100644 --- a/python/core/auto_additions/qgsprocessingoutputs.py +++ b/python/core/auto_additions/qgsprocessingoutputs.py @@ -1,7 +1,7 @@ # The following has been generated automatically from src/core/processing/qgsprocessingoutputs.h try: QgsProcessingOutputMapLayer.typeName = staticmethod(QgsProcessingOutputMapLayer.typeName) - QgsProcessingOutputMapLayer.__overridden_methods__ = ['type'] + QgsProcessingOutputMapLayer.__overridden_methods__ = ['getColor', 'type'] QgsProcessingOutputMapLayer.__group__ = ['processing'] except (NameError, AttributeError): pass @@ -37,7 +37,7 @@ except (NameError, AttributeError): pass try: QgsProcessingOutputVariant.typeName = staticmethod(QgsProcessingOutputVariant.typeName) - QgsProcessingOutputVariant.__overridden_methods__ = ['getColor', 'type', 'valueAsString'] + QgsProcessingOutputVariant.__overridden_methods__ = ['type', 'valueAsString'] QgsProcessingOutputVariant.__group__ = ['processing'] except (NameError, AttributeError): pass diff --git a/python/core/auto_generated/processing/qgsprocessingoutputs.sip.in b/python/core/auto_generated/processing/qgsprocessingoutputs.sip.in index fb9d9aa96f4..7effbc85743 100644 --- a/python/core/auto_generated/processing/qgsprocessingoutputs.sip.in +++ b/python/core/auto_generated/processing/qgsprocessingoutputs.sip.in @@ -192,6 +192,12 @@ raster), use :py:class:`QgsProcessingOutputVectorLayer` or QgsProcessingOutputMapLayer( const QString &name, const QString &description = QString() ); %Docstring Constructor for QgsProcessingOutputMapLayer. +%End + + virtual QColor getColor() const; + +%Docstring +A color to represent a map layer ouput %End static QString typeName(); @@ -397,12 +403,6 @@ Constructor for QgsProcessingOutputVariant. static QString typeName(); %Docstring Returns the type name for the output class. -%End - - virtual QColor getColor() const; - -%Docstring -A color to represent a range parameter %End virtual QString type() const; diff --git a/src/core/processing/qgsprocessingoutputs.cpp b/src/core/processing/qgsprocessingoutputs.cpp index bd3c2ef0a1a..3ac4cda3999 100644 --- a/src/core/processing/qgsprocessingoutputs.cpp +++ b/src/core/processing/qgsprocessingoutputs.cpp @@ -70,7 +70,7 @@ void QgsProcessingOutputVectorLayer::setDataType( Qgis::ProcessingSourceType typ QColor QgsProcessingOutputVectorLayer::getColor() const { - return QColor( 180, 180, 0 ); /* greenish yellow */ + return QColor( 122, 0, 47 ); /* burgundy */ } QgsProcessingOutputRasterLayer::QgsProcessingOutputRasterLayer( const QString &name, const QString &description ) @@ -92,7 +92,7 @@ QgsProcessingOutputVectorTileLayer::QgsProcessingOutputVectorTileLayer( const QS QColor QgsProcessingOutputVectorTileLayer::getColor() const { - return QColor( 180, 180, 0 ); /* greenish yellow */ + return QColor( 137, 150, 171 ); /* cold gray */ } QgsProcessingOutputHtml::QgsProcessingOutputHtml( const QString &name, const QString &description ) @@ -112,7 +112,7 @@ QString QgsProcessingOutputHtml::valueAsFormattedString( const QVariant &value, QColor QgsProcessingOutputHtml::getColor() const { - return QColor( 100, 100, 255 ); /* slate blueish */ + return QColor( 120, 100, 255 ); /* lavender blue */ } QgsProcessingOutputNumber::QgsProcessingOutputNumber( const QString &name, const QString &description ) @@ -148,7 +148,7 @@ QgsProcessingOutputString::QgsProcessingOutputString( const QString &name, const QColor QgsProcessingOutputString::getColor() const { - return QColor( 100, 100, 255 ); /* slate blueish */ + return QColor( 120, 100, 255 ); /* lavender blue */ } QgsProcessingOutputBoolean::QgsProcessingOutputBoolean( const QString &name, const QString &description ) @@ -220,6 +220,11 @@ QString QgsProcessingOutputMapLayer::type() const return typeName(); } +QColor QgsProcessingOutputMapLayer::getColor() const +{ + return QColor( 137, 150, 171 ); /* cold gray */ +} + QgsProcessingOutputMultipleLayers::QgsProcessingOutputMultipleLayers( const QString &name, const QString &description ) : QgsProcessingOutputDefinition( name, description ) {} @@ -262,7 +267,7 @@ QString QgsProcessingOutputMultipleLayers::valueAsString( const QVariant &value, QColor QgsProcessingOutputMultipleLayers::getColor() const { - return QColor( 237, 142, 0 ); /* orange */ + return QColor( 137, 150, 171 ); /* cold gray */ } QgsProcessingOutputConditionalBranch::QgsProcessingOutputConditionalBranch( const QString &name, const QString &description ) @@ -322,7 +327,3 @@ QString QgsProcessingOutputVariant::valueAsString( const QVariant &value, QgsPro return QgsProcessingOutputDefinition::valueAsString( value, context, ok ); } -QColor QgsProcessingOutputVariant::getColor() const -{ - return QColor( 34, 157, 214 ); /* blue */ -} diff --git a/src/core/processing/qgsprocessingoutputs.h b/src/core/processing/qgsprocessingoutputs.h index d0bb1aa3218..1a33bacc234 100644 --- a/src/core/processing/qgsprocessingoutputs.h +++ b/src/core/processing/qgsprocessingoutputs.h @@ -201,6 +201,11 @@ class CORE_EXPORT QgsProcessingOutputMapLayer : public QgsProcessingOutputDefini */ QgsProcessingOutputMapLayer( const QString &name, const QString &description = QString() ); + /** + * A color to represent a map layer ouput + */ + QColor getColor() const override; + /** * Returns the type name for the output class. */ @@ -382,11 +387,6 @@ class CORE_EXPORT QgsProcessingOutputVariant : public QgsProcessingOutputDefinit */ static QString typeName() { return QStringLiteral( "outputVariant" ); } - /** - * A color to represent a range parameter - */ - QColor getColor() const override; - QString type() const override; QString valueAsString( const QVariant &value, QgsProcessingContext &context, bool &ok SIP_OUT ) const override; diff --git a/src/core/processing/qgsprocessingparameters.h b/src/core/processing/qgsprocessingparameters.h index ecd9c009435..dfa0e536656 100644 --- a/src/core/processing/qgsprocessingparameters.h +++ b/src/core/processing/qgsprocessingparameters.h @@ -1832,7 +1832,7 @@ class CORE_EXPORT QgsProcessingParameterCrs : public QgsProcessingParameterDefin /** * A color to represent a crs parameter */ - QColor getColor() const override { return QColor( 100, 100, 255 ); /* slate blueish */ }; + QColor getColor() const override { return QColor( 120, 100, 255 ); /* lavender blue */ }; /** * Get a user friendly string representation of the provided parameter value. @@ -1875,7 +1875,7 @@ class CORE_EXPORT QgsProcessingParameterExtent : public QgsProcessingParameterDe /** * A color to represent an extent parameter */ - QColor getColor() const override { return QColor( 180, 180, 0 ); /* greenish yellow */ }; + QColor getColor() const override { return QColor( 34, 157, 214 ); /* blue */ }; /** * Returns the type name for the parameter class. @@ -1923,7 +1923,7 @@ class CORE_EXPORT QgsProcessingParameterPoint : public QgsProcessingParameterDef /** * A color to represent a point parameter */ - QColor getColor() const override { return QColor( 180, 180, 0 ); /* greenish yellow */ }; + QColor getColor() const override { return QColor( 122, 0, 47 ); /* burgundy */ }; /** @@ -1964,7 +1964,7 @@ class CORE_EXPORT QgsProcessingParameterGeometry : public QgsProcessingParameter /** * A color to represent a geometry parameter */ - QColor getColor() const override { return QColor( 180, 180, 0 ); /* greenish yellow */ }; + QColor getColor() const override { return QColor( 122, 0, 47 ); /* burgundy */ }; /** * Returns the type name for the parameter class. @@ -2228,7 +2228,7 @@ class CORE_EXPORT QgsProcessingParameterMultipleLayers : public QgsProcessingPar /** * A color to represent a multiple layer parameter */ - QColor getColor() const override { return QColor( 237, 142, 0 ); /* orange */ }; + QColor getColor() const override { return QColor( 137, 150, 171 ); /* cold gray */ }; /** * Returns the type name for the parameter class. @@ -2875,7 +2875,7 @@ class CORE_EXPORT QgsProcessingParameterEnum : public QgsProcessingParameterDefi /** * A color to represent an enum parameter */ - QColor getColor() const override { return QColor( 128, 68, 201 ); /* purple */ }; + QColor getColor() const override { return QColor( 152, 68, 201 ); /* purple */ }; /** * Get a user friendly string representation of the provided parameter value. @@ -2989,7 +2989,7 @@ class CORE_EXPORT QgsProcessingParameterString : public QgsProcessingParameterDe /** * A color to represent a string parameter */ - QColor getColor() const override { return QColor( 100, 100, 255 ); /* slate blueish */ }; + QColor getColor() const override { return QColor( 120, 100, 255 ); /* lavender blue */ }; /** * Returns the type name for the parameter class. @@ -3085,7 +3085,7 @@ class CORE_EXPORT QgsProcessingParameterExpression : public QgsProcessingParamet /** * A color to represent an expression parameter */ - QColor getColor() const override { return QColor( 176, 76, 158 ); /* dark pink */ }; + QColor getColor() const override { return QColor( 120, 100, 255 ); /* lavender blue */ }; /** * Returns the type name for the parameter class. @@ -3195,7 +3195,7 @@ class CORE_EXPORT QgsProcessingParameterVectorLayer : public QgsProcessingParame /** * A color to represent a vector layer parameter */ - QColor getColor() const override { return QColor( 180, 180, 0 ); /* greenish yellow */ }; + QColor getColor() const override { return QColor( 122, 0, 47 ); /* burgundy */ }; /** @@ -3242,7 +3242,7 @@ class CORE_EXPORT QgsProcessingParameterMeshLayer : public QgsProcessingParamete /** * A color to represent a mesh layer parameter */ - QColor getColor() const override { return QColor( 180, 180, 0 ); /* greenish yellow */ }; + QColor getColor() const override { return QColor( 137, 150, 171 ); /* cold gray */ }; /** * Returns the type name for the parameter class. @@ -3281,7 +3281,7 @@ class CORE_EXPORT QgsProcessingParameterMapLayer : public QgsProcessingParameter /** * A color to represent a map layer parameter */ - QColor getColor() const override { return QColor( 237, 142, 0 ); /* orange */ }; + QColor getColor() const override { return QColor( 137, 150, 171 ); /* cold gray */ }; /** * Returns the type name for the parameter class. @@ -3433,7 +3433,7 @@ class CORE_EXPORT QgsProcessingParameterFeatureSource : public QgsProcessingPara /** * A color to represent a feature source parameter */ - QColor getColor() const override { return QColor( 180, 180, 0 ); /* greenish yellow */ }; + QColor getColor() const override { return QColor( 122, 0, 47 ); /* burgundy */ }; /** * Returns the type name for the parameter class. @@ -3602,7 +3602,7 @@ class CORE_EXPORT QgsProcessingParameterFeatureSink : public QgsProcessingDestin /** * A color to represent a feature sink parameter */ - QColor getColor() const override { return QColor( 80, 80, 80 ); /* dark gray */ }; + QColor getColor() const override { return QColor( 122, 0, 47 ); /* burgundy */ }; /** * Returns the type name for the parameter class. @@ -3704,7 +3704,7 @@ class CORE_EXPORT QgsProcessingParameterVectorDestination : public QgsProcessing /** * A color to represent a vector destination parameter */ - QColor getColor() const override { return QColor( 180, 180, 0 ); /* greenish yellow */ }; + QColor getColor() const override { return QColor( 122, 0, 47 ); /* burgundy */ }; /** * Returns the type name for the parameter class. @@ -3783,7 +3783,7 @@ class CORE_EXPORT QgsProcessingParameterRasterDestination : public QgsProcessing /** * A color to represent a raster destination parameter */ - QColor getColor() const override { return QColor( 80, 80, 80 ); /* dark gray */ }; + QColor getColor() const override { return QColor( 0, 180, 180 ); /* turquoise */ }; /** * Returns the type name for the parameter class. @@ -4362,7 +4362,7 @@ class CORE_EXPORT QgsProcessingParameterDateTime : public QgsProcessingParameter /** * A color to represent a datetime parameter */ - QColor getColor() const override { return QColor( 100, 100, 255 ); /* slate blueish */ }; + QColor getColor() const override { return QColor( 120, 100, 255 ); /* lavender blue */ }; /** * Returns the type name for the parameter class. @@ -4686,7 +4686,7 @@ class CORE_EXPORT QgsProcessingParameterPointCloudLayer : public QgsProcessingPa /** * A color to represent a point cloud layer parameter */ - QColor getColor() const override { return QColor( 180, 180, 0 ); /* greenish yellow */ }; + QColor getColor() const override { return QColor( 137, 150, 171 ); /* cold gray */ }; /** * Returns the type name for the parameter class. @@ -4726,7 +4726,7 @@ class CORE_EXPORT QgsProcessingParameterAnnotationLayer : public QgsProcessingPa /** * A color to represent an annotation layer parameter */ - QColor getColor() const override { return QColor( 237, 142, 0 ); /* orange */ }; + QColor getColor() const override { return QColor( 137, 150, 171 ); /* cold gray */ }; /** * Returns the type name for the parameter class. @@ -4770,7 +4770,7 @@ class CORE_EXPORT QgsProcessingParameterPointCloudDestination : public QgsProces /** * A color to represent a point cloud destination parameter */ - QColor getColor() const override { return QColor( 180, 180, 0 ); /* greenish yellow */ }; + QColor getColor() const override { return QColor( 80, 80, 80 ); /* dark gray */ }; /** * Returns the type name for the parameter class. @@ -4911,7 +4911,7 @@ class CORE_EXPORT QgsProcessingParameterVectorTileDestination : public QgsProces /** * A color to represent a vector tile destination parameter */ - QColor getColor() const override { return QColor( 180, 180, 0 ); /* greenish yellow */ }; + QColor getColor() const override { return QColor( 80, 80, 80 ); /* dark gray */ }; /** * Returns the type name for the parameter class.