Fix svg fills losing fill and border color and border width settings …

…when loading symbol dialog (fix #9945)
qgis · May 4, 2014 · c1d3958 · c1d3958
1 parent 639d4c4
commit c1d3958
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 10 deletions.
diff --git a/python/gui/symbology-ng/qgssymbollayerv2widget.sip b/python/gui/symbology-ng/qgssymbollayerv2widget.sip
@@ -270,7 +270,13 @@ class QgsSVGFillSymbolLayerWidget : QgsSymbolLayerV2Widget
 
   protected:
     void insertIcons();
-    void updateParamGui();
+
+    /**Enables or disables svg fill color, border color and border width based on whether the
+     * svg file supports custom parameters.
+     * @param resetValues set to true to overwrite existing layer fill color, border color and border width
+     * with default values from svg file
+    */
+    void updateParamGui( bool resetValues = true );
 };
 
 //////////

diff --git a/src/core/symbology-ng/qgsfillsymbollayerv2.cpp b/src/core/symbology-ng/qgsfillsymbollayerv2.cpp
@@ -1559,11 +1559,11 @@ QgsSymbolLayerV2* QgsSVGFillSymbolLayer::create( const QgsStringMap& properties
   //svg parameters
   if ( properties.contains( "svgFillColor" ) )
   {
-    symbolLayer->setSvgFillColor( QColor( properties["svgFillColor"] ) );
+    symbolLayer->setSvgFillColor( QgsSymbolLayerV2Utils::decodeColor( properties["svgFillColor"] ) );
   }
   if ( properties.contains( "svgOutlineColor" ) )
   {
-    symbolLayer->setSvgOutlineColor( QColor( properties["svgOutlineColor"] ) );
+    symbolLayer->setSvgOutlineColor( QgsSymbolLayerV2Utils::decodeColor( properties["svgOutlineColor"] ) );
   }
   if ( properties.contains( "svgOutlineWidth" ) )
   {
@@ -1698,8 +1698,8 @@ QgsStringMap QgsSVGFillSymbolLayer::properties() const
   map.insert( "angle", QString::number( mAngle ) );
 
   //svg parameters
-  map.insert( "svgFillColor", mSvgFillColor.name() );
+  map.insert( "svgFillColor", QgsSymbolLayerV2Utils::encodeColor( mSvgFillColor ) );
-  map.insert( "svgOutlineColor", mSvgOutlineColor.name() );
+  map.insert( "svgOutlineColor", QgsSymbolLayerV2Utils::encodeColor( mSvgOutlineColor ) );
   map.insert( "svgOutlineWidth", QString::number( mSvgOutlineWidth ) );
 
   //units

diff --git a/src/gui/symbology-ng/qgssymbollayerv2widget.cpp b/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
@@ -1999,8 +1999,17 @@ void QgsSVGFillSymbolLayerWidget::setSymbolLayer( QgsSymbolLayerV2* layer )
     mSvgOutlineWidthUnitComboBox->blockSignals( true );
     mSvgOutlineWidthUnitComboBox->setCurrentIndex( mLayer->svgOutlineWidthUnit() );
     mSvgOutlineWidthUnitComboBox->blockSignals( false );
+    mChangeColorButton->blockSignals( true );
+    mChangeColorButton->setColor( mLayer->svgFillColor() );
+    mChangeColorButton->blockSignals( false );
+    mChangeBorderColorButton->blockSignals( true );
+    mChangeBorderColorButton->setColor( mLayer->svgOutlineColor() );
+    mChangeBorderColorButton->blockSignals( false );
+    mBorderWidthSpinBox->blockSignals( true );
+    mBorderWidthSpinBox->setValue( mLayer->svgOutlineWidth() );
+    mBorderWidthSpinBox->blockSignals( false );
   }
-  updateParamGui();
+  updateParamGui( false );
 }
 
 QgsSymbolLayerV2* QgsSVGFillSymbolLayerWidget::symbolLayer()
@@ -2115,19 +2124,27 @@ void QgsSVGFillSymbolLayerWidget::on_mRotationSpinBox_valueChanged( double d )
   }
 }
 
-void QgsSVGFillSymbolLayerWidget::updateParamGui()
+void QgsSVGFillSymbolLayerWidget::updateParamGui( bool resetValues )
 {
   //activate gui for svg parameters only if supported by the svg file
   bool hasFillParam, hasOutlineParam, hasOutlineWidthParam;
   QColor defaultFill, defaultOutline;
   double defaultOutlineWidth;
   QgsSvgCache::instance()->containsParams( mSVGLineEdit->text(), hasFillParam, defaultFill, hasOutlineParam, defaultOutline, hasOutlineWidthParam, defaultOutlineWidth );
-  if ( hasFillParam )
+  if ( hasFillParam && resetValues )
+  {
     mChangeColorButton->setColor( defaultFill );
+  }
   mChangeColorButton->setEnabled( hasFillParam );
-  if ( hasOutlineParam )
+  if ( hasOutlineParam && resetValues )
+  {
     mChangeBorderColorButton->setColor( defaultOutline );
+  }
   mChangeBorderColorButton->setEnabled( hasOutlineParam );
+  if ( hasOutlineWidthParam && resetValues )
+  {
+    mBorderWidthSpinBox->setValue( defaultOutlineWidth );
+  }
   mBorderWidthSpinBox->setEnabled( hasOutlineWidthParam );
 }
 

diff --git a/src/gui/symbology-ng/qgssymbollayerv2widget.h b/src/gui/symbology-ng/qgssymbollayerv2widget.h
@@ -340,7 +340,12 @@ class GUI_EXPORT QgsSVGFillSymbolLayerWidget : public QgsSymbolLayerV2Widget, pr
   protected:
     QgsSVGFillSymbolLayer* mLayer;
     void insertIcons();
-    void updateParamGui();
+    /**Enables or disables svg fill color, border color and border width based on whether the
+     * svg file supports custom parameters.
+     * @param resetValues set to true to overwrite existing layer fill color, border color and border width
+     * with default values from svg file
+    */
+    void updateParamGui( bool resetValues = true );
 
   private slots:
     void on_mBrowseToolButton_clicked();