sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Flip Transparency property type to Opacity

Browse Source
This commit is contained in:
Nyall Dawson 2017-05-29 20:31:06 +10:00
parent 07b45cdcc9
commit b7352bb2b5
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/core/qgsproperty.sip
View File

@ -37,7 +37,7 @@ class QgsPropertyDefinition
Double0To1, Double0To1,
Rotation, Rotation,
String, String,
Transparency, Opacity,
RenderUnits, RenderUnits,
ColorWithAlpha, ColorWithAlpha,
ColorNoAlpha, ColorNoAlpha,

4
src/core/composer/qgscomposerobject.cpp
View File

@ -50,8 +50,8 @@ void QgsComposerObject::initPropertyDefinitions()
{ QgsComposerObject::ItemWidth, QgsPropertyDefinition( "dataDefinedWidth", QObject::tr( "Width" ), QgsPropertyDefinition::DoublePositive ) }, { QgsComposerObject::ItemWidth, QgsPropertyDefinition( "dataDefinedWidth", QObject::tr( "Width" ), QgsPropertyDefinition::DoublePositive ) },
{ QgsComposerObject::ItemHeight, QgsPropertyDefinition( "dataDefinedHeight", QObject::tr( "Height" ), QgsPropertyDefinition::DoublePositive ) }, { QgsComposerObject::ItemHeight, QgsPropertyDefinition( "dataDefinedHeight", QObject::tr( "Height" ), QgsPropertyDefinition::DoublePositive ) },
{ QgsComposerObject::ItemRotation, QgsPropertyDefinition( "dataDefinedRotation", QObject::tr( "Rotation angle" ), QgsPropertyDefinition::Rotation ) }, { QgsComposerObject::ItemRotation, QgsPropertyDefinition( "dataDefinedRotation", QObject::tr( "Rotation angle" ), QgsPropertyDefinition::Rotation ) },
{ QgsComposerObject::Transparency, QgsPropertyDefinition( "dataDefinedTransparency", QObject::tr( "Transparency" ), QgsPropertyDefinition::Transparency ) }, { QgsComposerObject::Transparency, QgsPropertyDefinition( "dataDefinedTransparency", QObject::tr( "Transparency" ), QgsPropertyDefinition::Opacity ) },
{ QgsComposerObject::Opacity, QgsPropertyDefinition( "dataDefinedOpacity", QObject::tr( "Opacity" ), QgsPropertyDefinition::Transparency ) }, { QgsComposerObject::Opacity, QgsPropertyDefinition( "dataDefinedOpacity", QObject::tr( "Opacity" ), QgsPropertyDefinition::Opacity ) },
{ QgsComposerObject::BlendMode, QgsPropertyDefinition( "dataDefinedBlendMode", QObject::tr( "Blend mode" ), QgsPropertyDefinition::BlendMode ) }, { QgsComposerObject::BlendMode, QgsPropertyDefinition( "dataDefinedBlendMode", QObject::tr( "Blend mode" ), QgsPropertyDefinition::BlendMode ) },
{ QgsComposerObject::ExcludeFromExports, QgsPropertyDefinition( "dataDefinedExcludeExports", QObject::tr( "Exclude item from exports" ), QgsPropertyDefinition::Boolean ) }, { QgsComposerObject::ExcludeFromExports, QgsPropertyDefinition( "dataDefinedExcludeExports", QObject::tr( "Exclude item from exports" ), QgsPropertyDefinition::Boolean ) },
{ QgsComposerObject::FrameColor, QgsPropertyDefinition( "dataDefinedFrameColor", QObject::tr( "Frame color" ), QgsPropertyDefinition::ColorWithAlpha ) }, { QgsComposerObject::FrameColor, QgsPropertyDefinition( "dataDefinedFrameColor", QObject::tr( "Frame color" ), QgsPropertyDefinition::ColorWithAlpha ) },

2
src/core/qgsproperty.cpp
View File

@ -79,7 +79,7 @@ QgsPropertyDefinition::QgsPropertyDefinition( const QString &name, const QString
mHelpText = QObject::tr( "string of variable length" ); mHelpText = QObject::tr( "string of variable length" );
break; break;
case Transparency: case Opacity:
mTypes = DataTypeNumeric; mTypes = DataTypeNumeric;
mHelpText = QObject::tr( "int [0-100]" ); mHelpText = QObject::tr( "int [0-100]" );
break; break;

2
src/core/qgsproperty.h
View File

@ -59,7 +59,7 @@ class CORE_EXPORT QgsPropertyDefinition
Double0To1, //!< Double value between 0-1 (inclusive) Double0To1, //!< Double value between 0-1 (inclusive)
Rotation, //!< Rotation (value between 0-360 degrees) Rotation, //!< Rotation (value between 0-360 degrees)
String, //!< Any string value String, //!< Any string value
Transparency, //!< Transparency (0-100) Opacity, //!< Opacity (0-100)
RenderUnits, //!< Render units (eg mm/pixels/map units) RenderUnits, //!< Render units (eg mm/pixels/map units)
ColorWithAlpha, //!< Color with alpha channel ColorWithAlpha, //!< Color with alpha channel
ColorNoAlpha, //!< Color with no alpha channel ColorNoAlpha, //!< Color with no alpha channel