Show size assistant for stroke width properties

Author: nyalldawson

python/core/qgsproperty.sip

@@ -25,6 +25,7 @@ class QgsPropertyDefinition
       Size,
       Size2D,
       LineStyle,
+      StrokeWidth,
       FillStyle,
       CapStyle,
       HorizontalAnchor,

src/core/composer/qgscomposerobject.cpp

@@ -66,13 +66,13 @@ void QgsComposerObject::initPropertyDefinitions()
     { QgsComposerObject::SourceUrl, QgsPropertyDefinition( "dataDefinedSourceUrl" , QObject::tr( "Source URL" ), QgsPropertyDefinition::String ) },
     { QgsComposerObject::PictureSvgBackgroundColor, QgsPropertyDefinition( "dataDefinedSvgBackgroundColor" , QObject::tr( "SVG background color" ), QgsPropertyDefinition::ColorWithAlpha ) },
     { QgsComposerObject::PictureSvgOutlineColor, QgsPropertyDefinition( "dataDefinedSvgOutlineColor" , QObject::tr( "SVG outline color" ), QgsPropertyDefinition::ColorWithAlpha ) },
-    { QgsComposerObject::PictureSvgOutlineWidth, QgsPropertyDefinition( "dataDefinedSvgOutlineWidth" , QObject::tr( "SVG outline width" ), QgsPropertyDefinition::DoublePositive ) },
+    { QgsComposerObject::PictureSvgOutlineWidth, QgsPropertyDefinition( "dataDefinedSvgOutlineWidth" , QObject::tr( "SVG outline width" ), QgsPropertyDefinition::StrokeWidth ) },
     { QgsComposerObject::LegendTitle, QgsPropertyDefinition( "dataDefinedLegendTitle" , QObject::tr( "Legend title" ), QgsPropertyDefinition::String ) },
     { QgsComposerObject::LegendColumnCount, QgsPropertyDefinition( "dataDefinedLegendColumns" , QObject::tr( "Number of columns" ), QgsPropertyDefinition::IntegerPositiveGreaterZero ) },
     { QgsComposerObject::ScalebarFillColor, QgsPropertyDefinition( "dataDefinedScalebarFill" , QObject::tr( "Fill color" ), QgsPropertyDefinition::ColorWithAlpha ) },
     { QgsComposerObject::ScalebarFillColor2, QgsPropertyDefinition( "dataDefinedScalebarFill2" , QObject::tr( "Secondary fill color" ), QgsPropertyDefinition::ColorWithAlpha ) },
     { QgsComposerObject::ScalebarLineColor, QgsPropertyDefinition( "dataDefinedScalebarLineColor" , QObject::tr( "Line color" ), QgsPropertyDefinition::ColorWithAlpha ) },
-    { QgsComposerObject::ScalebarLineWidth, QgsPropertyDefinition( "dataDefinedScalebarLineWidth" , QObject::tr( "Line width" ), QgsPropertyDefinition::DoublePositive ) },
+    { QgsComposerObject::ScalebarLineWidth, QgsPropertyDefinition( "dataDefinedScalebarLineWidth" , QObject::tr( "Line width" ), QgsPropertyDefinition::StrokeWidth ) },
   };
 }
 

src/core/qgsdiagramrenderer.cpp

@@ -36,7 +36,7 @@ void QgsDiagramLayerSettings::initPropertyDefinitions()
   {
     { QgsDiagramLayerSettings::BackgroundColor, QgsPropertyDefinition( "backgroundColor", QObject::tr( "Background color" ), QgsPropertyDefinition::ColorWithAlpha ) },
     { QgsDiagramLayerSettings::OutlineColor, QgsPropertyDefinition( "outlineColor", QObject::tr( "Outline color" ), QgsPropertyDefinition::ColorWithAlpha ) },
-    { QgsDiagramLayerSettings::OutlineWidth, QgsPropertyDefinition( "outlineWidth", QObject::tr( "Outline width" ), QgsPropertyDefinition::DoublePositive ) },
+    { QgsDiagramLayerSettings::OutlineWidth, QgsPropertyDefinition( "outlineWidth", QObject::tr( "Outline width" ), QgsPropertyDefinition::StrokeWidth ) },
     { QgsDiagramLayerSettings::PositionX, QgsPropertyDefinition( "positionX", QObject::tr( "Position (X)" ), QgsPropertyDefinition::Double ) },
     { QgsDiagramLayerSettings::PositionY, QgsPropertyDefinition( "positionY", QObject::tr( "Position (Y)" ), QgsPropertyDefinition::Double ) },
     { QgsDiagramLayerSettings::Distance, QgsPropertyDefinition( "distance", QObject::tr( "Placement distance" ), QgsPropertyDefinition::DoublePositive ) },

src/core/qgspallabeling.cpp

@@ -151,7 +151,7 @@ void QgsPalLayerSettings::initPropertyDefinitions()
     { QgsPalLayerSettings::ShapeBlendMode, QgsPropertyDefinition( "ShapeBlendMode", QObject::tr( "Shape blend mode" ), QgsPropertyDefinition::BlendMode ) },
     { QgsPalLayerSettings::ShapeFillColor, QgsPropertyDefinition( "ShapeFillColor", QObject::tr( "Shape fill color" ), QgsPropertyDefinition::ColorWithAlpha ) },
     { QgsPalLayerSettings::ShapeBorderColor, QgsPropertyDefinition( "ShapeBorderColor", QObject::tr( "Shape border color" ), QgsPropertyDefinition::ColorWithAlpha ) },
-    { QgsPalLayerSettings::ShapeBorderWidth, QgsPropertyDefinition( "ShapeBorderWidth", QObject::tr( "Shape border width" ), QgsPropertyDefinition::DoublePositive ) },
+    { QgsPalLayerSettings::ShapeBorderWidth, QgsPropertyDefinition( "ShapeBorderWidth", QObject::tr( "Shape border width" ), QgsPropertyDefinition::StrokeWidth ) },
     { QgsPalLayerSettings::ShapeBorderWidthUnits, QgsPropertyDefinition( "ShapeBorderWidthUnits", QObject::tr( "Shape border width units" ), QgsPropertyDefinition::RenderUnits ) },
     { QgsPalLayerSettings::ShapeJoinStyle, QgsPropertyDefinition( "ShapeJoinStyle", QObject::tr( "Shape join style" ), QgsPropertyDefinition::PenJoinStyle ) },
     { QgsPalLayerSettings::ShadowDraw, QgsPropertyDefinition( "ShadowDraw", QObject::tr( "Draw shadow" ), QgsPropertyDefinition::Boolean ) },

src/core/qgsproperty.cpp

@@ -126,6 +126,11 @@ QgsPropertyDefinition::QgsPropertyDefinition( const QString& name, const QString
       mHelpText = trString() + QLatin1String( "[<b>no</b>|<b>solid</b>|<b>dash</b>|<b>dot</b>|<b>dash dot</b>|<b>dash dot dot</b>]" );
       break;
 
+    case StrokeWidth:
+      mTypes = DataTypeNumeric;
+      mHelpText = QObject::tr( "double [&gt;= 0.0]" );
+      break;
+
     case FillStyle:
       mTypes = DataTypeString;
       mHelpText = trString() + QLatin1String( "[<b>solid</b>|<b>horizontal</b>|<b>vertical</b>|<b>cross</b>|<b>b_diagonal</b>|<b>f_diagonal"

src/core/qgsproperty.h

@@ -67,6 +67,7 @@ class CORE_EXPORT QgsPropertyDefinition
       Size, //!< 1D size (eg marker radius, or square marker height/width)
       Size2D, //!< 2D size (width/height different)
       LineStyle, //!< Line style (eg solid/dashed)
+      StrokeWidth, //!< Line stroke width
       FillStyle, //!< Fill style (eg solid, lines)
       CapStyle, //!< Line cap style (eg round)
       HorizontalAnchor, //!< Horizontal anchor point

src/core/symbology-ng/qgssymbollayer.cpp

@@ -45,7 +45,7 @@ void QgsSymbolLayer::initPropertyDefinitions()
     { QgsSymbolLayer::PropertyName, QgsPropertyDefinition( "name", QObject::tr( "Symbol name" ), QgsPropertyDefinition::String ) },
     { QgsSymbolLayer::PropertyFillColor, QgsPropertyDefinition( "fillColor", QObject::tr( "Symbol fill color" ), QgsPropertyDefinition::ColorWithAlpha ) },
     { QgsSymbolLayer::PropertyOutlineColor, QgsPropertyDefinition( "outlineColor", QObject::tr( "Symbol outline color" ), QgsPropertyDefinition::ColorWithAlpha ) },
-    { QgsSymbolLayer::PropertyOutlineWidth, QgsPropertyDefinition( "outlineWidth", QObject::tr( "Symbol outline width" ), QgsPropertyDefinition::DoublePositive ) },
+    { QgsSymbolLayer::PropertyOutlineWidth, QgsPropertyDefinition( "outlineWidth", QObject::tr( "Symbol outline width" ), QgsPropertyDefinition::StrokeWidth ) },
     { QgsSymbolLayer::PropertyOutlineStyle, QgsPropertyDefinition( "outlineStyle", QObject::tr( "Symbol outline style" ), QgsPropertyDefinition::LineStyle )},
     { QgsSymbolLayer::PropertyOffset, QgsPropertyDefinition( "offset", QObject::tr( "Symbol offset" ), QgsPropertyDefinition::Offset )},
     { QgsSymbolLayer::PropertyCharacter, QgsPropertyDefinition( "char", QObject::tr( "Marker character(s)" ), QgsPropertyDefinition::String )},

src/gui/qgspropertyassistantwidget.cpp

@@ -68,6 +68,7 @@ QgsPropertyAssistantWidget::QgsPropertyAssistantWidget( QWidget* parent ,
   switch ( definition.standardTemplate() )
   {
     case QgsPropertyDefinition::Size:
+    case QgsPropertyDefinition::StrokeWidth:
     {
       mTransformerWidget = new QgsPropertySizeAssistantWidget( this, mDefinition, initialState );
     }
@@ -266,10 +267,18 @@ QgsPropertySizeAssistantWidget::QgsPropertySizeAssistantWidget( QWidget* parent,
   layout()->setContentsMargins( 0, 0, 0, 0 );
   layout()->setMargin( 0 );
 
-  scaleMethodComboBox->addItem( tr( "Flannery" ), QgsSizeScaleTransformer::Flannery );
-  scaleMethodComboBox->addItem( tr( "Surface" ), QgsSizeScaleTransformer::Area );
-  scaleMethodComboBox->addItem( tr( "Radius" ), QgsSizeScaleTransformer::Linear );
-  scaleMethodComboBox->addItem( tr( "Exponential" ), QgsSizeScaleTransformer::Exponential );
+  if ( definition.standardTemplate() == QgsPropertyDefinition::Size )
+  {
+    scaleMethodComboBox->addItem( tr( "Flannery" ), QgsSizeScaleTransformer::Flannery );
+    scaleMethodComboBox->addItem( tr( "Surface" ), QgsSizeScaleTransformer::Area );
+    scaleMethodComboBox->addItem( tr( "Radius" ), QgsSizeScaleTransformer::Linear );
+    scaleMethodComboBox->addItem( tr( "Exponential" ), QgsSizeScaleTransformer::Exponential );
+  }
+  else if ( definition.standardTemplate() == QgsPropertyDefinition::StrokeWidth )
+  {
+    scaleMethodComboBox->addItem( tr( "Exponential" ), QgsSizeScaleTransformer::Exponential );
+    scaleMethodComboBox->addItem( tr( "Linear" ), QgsSizeScaleTransformer::Linear );
+  }
 
   minSizeSpinBox->setShowClearButton( false );
   maxSizeSpinBox->setShowClearButton( false );

src/gui/symbology-ng/qgssymbollayerwidget.cpp

@@ -151,12 +151,10 @@ QgsSimpleLineSymbolLayerWidget::QgsSimpleLineSymbolLayerWidget( const QgsVectorL
   }
 
   //make a temporary symbol for the size assistant preview
-  mAssistantPreviewSymbol = new QgsLineSymbol();
+  mAssistantPreviewSymbol.reset( new QgsLineSymbol() );
 
-#if 0
   if ( vectorLayer() )
-    mPenWidthDDBtn->setAssistant( tr( "Width Assistant..." ), new QgsSizeScaleWidget( vectorLayer(), mAssistantPreviewSymbol ) );
-#endif
+    mPenWidthDDBtn->setSymbol( mAssistantPreviewSymbol );
 
   connect( spinWidth, SIGNAL( valueChanged( double ) ), this, SLOT( penWidthChanged() ) );
   connect( btnChangeColor, SIGNAL( colorChanged( const QColor& ) ), this, SLOT( colorChanged( const QColor& ) ) );
@@ -170,11 +168,6 @@ QgsSimpleLineSymbolLayerWidget::QgsSimpleLineSymbolLayerWidget( const QgsVectorL
   connect( this, SIGNAL( changed() ), this, SLOT( updateAssistantSymbol() ) );
 }
 
-QgsSimpleLineSymbolLayerWidget::~QgsSimpleLineSymbolLayerWidget()
-{
-  delete mAssistantPreviewSymbol;
-}
-
 void QgsSimpleLineSymbolLayerWidget::updateAssistantSymbol()
 {
   for ( int i = mAssistantPreviewSymbol->symbolLayerCount() - 1 ; i >= 0; --i )

src/gui/symbology-ng/qgssymbollayerwidget.h

@@ -117,8 +117,6 @@ class GUI_EXPORT QgsSimpleLineSymbolLayerWidget : public QgsSymbolLayerWidget, p
   public:
     QgsSimpleLineSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent = nullptr );
 
-    ~QgsSimpleLineSymbolLayerWidget();
-
     static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) { return new QgsSimpleLineSymbolLayerWidget( vl ); }
 
     // from base class
@@ -149,7 +147,7 @@ class GUI_EXPORT QgsSimpleLineSymbolLayerWidget : public QgsSymbolLayerWidget, p
 
   private:
 
-    QgsLineSymbol* mAssistantPreviewSymbol;
+    std::shared_ptr< QgsLineSymbol > mAssistantPreviewSymbol;
 
 };
 

src/gui/symbology-ng/qgssymbolslistwidget.cpp

@@ -371,10 +371,8 @@ void QgsSymbolsListWidget::updateAssistantSymbol()
   mAssistantSymbol.reset( mSymbol->clone() );
   if ( mSymbol->type() == QgsSymbol::Marker )
     mSizeDDBtn->setSymbol( mAssistantSymbol );
-#if 0
   else if ( mSymbol->type() == QgsSymbol::Line && mLayer )
-    mWidthDDBtn->setAssistant( tr( "Width Assistant..." ), new QgsSizeScaleWidget( mLayer, mSymbol ) );
-#endif
+    mWidthDDBtn->setSymbol( mAssistantSymbol );
 }
 
 void QgsSymbolsListWidget::symbolAddedToStyle( const QString& name, QgsSymbol* symbol )