Skip to content
Permalink
Browse files
Followup fixes for data defined values for label repeat functions
  • Loading branch information
dakcarto committed Jun 27, 2014
1 parent 50e0703 commit 2575dca4b5f262087329cf7245df955a7da54916
Showing with 4 additions and 2 deletions.
  1. +1 −1 src/app/qgslabelinggui.cpp
  2. +2 −0 src/core/qgspallabeling.cpp
  3. +1 −1 src/core/qgspallabeling.h
@@ -1019,7 +1019,7 @@ void QgsLabelingGui::populateDataDefinedButtons( QgsPalLayerSettings& s )
QgsDataDefinedButton::AnyType, tr( "double coord [<b>in,out</b> as 20.0-60.0,20.0-95.0]" ) );
mRepeatDistanceDDBtn->init( mLayer, s.dataDefinedProperty( QgsPalLayerSettings::RepeatDistance ),
QgsDataDefinedButton::AnyType, QgsDataDefinedButton::doublePosDesc() );
mRepeatDistanceUnitDDBtn->init( mLayer, s.dataDefinedProperty( QgsPalLayerSettings::DistanceUnits ),
mRepeatDistanceUnitDDBtn->init( mLayer, s.dataDefinedProperty( QgsPalLayerSettings::RepeatDistanceUnit ),
QgsDataDefinedButton::String, QgsDataDefinedButton::unitsMmMuDesc() );

// data defined-only
@@ -432,6 +432,8 @@ QgsPalLayerSettings::QgsPalLayerSettings()
mDataDefinedNames.insert( DistanceUnits, QPair<QString, int>( "DistanceUnits", -1 ) );
mDataDefinedNames.insert( OffsetRotation, QPair<QString, int>( "OffsetRotation", -1 ) );
mDataDefinedNames.insert( CurvedCharAngleInOut, QPair<QString, int>( "CurvedCharAngleInOut", -1 ) );
mDataDefinedNames.insert( RepeatDistance, QPair<QString, int>( "RepeatDistance", -1 ) );
mDataDefinedNames.insert( RepeatDistanceUnit, QPair<QString, int>( "RepeatDistanceUnit", -1 ) );
// (data defined only)
mDataDefinedNames.insert( PositionX, QPair<QString, int>( "PositionX", 9 ) );
mDataDefinedNames.insert( PositionY, QPair<QString, int>( "PositionY", 10 ) );
@@ -255,7 +255,7 @@ class CORE_EXPORT QgsPalLayerSettings
Vali = 12, //vertical alignment for data defined label position (Bottom, Base, Half, Cap, Top)
Rotation = 14, //data defined rotation
RepeatDistance = 84,
RepeatDistanceUnit = 85,
RepeatDistanceUnit = 86,

// rendering
ScaleVisibility = 23,

0 comments on commit 2575dca

Please sign in to comment.