Fix unit choice for ellipse symbol layer type

nyalldawson · nyalldawson · commit 8224a16f11b3 · 2014-08-25T20:24:53.000+10:00
diff --git a/src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp b/src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp
@@ -23,6 +23,11 @@ QgsEllipseSymbolLayerV2Widget::QgsEllipseSymbolLayerV2Widget( const QgsVectorLay
 {
   setupUi( this );
 
+  mSymbolWidthUnitWidget->setUnits( QStringList() << tr( "Millimeter" ) << tr( "Map unit" ), 1 );
+  mSymbolHeightUnitWidget->setUnits( QStringList() << tr( "Millimeter" ) << tr( "Map unit" ), 1 );
+  mOutlineWidthUnitWidget->setUnits( QStringList() << tr( "Millimeter" ) << tr( "Map unit" ), 1 );
+  mOffsetUnitWidget->setUnits( QStringList() << tr( "Millimeter" ) << tr( "Map unit" ), 1 );
+
   btnChangeColorFill->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
   btnChangeColorFill->setColorDialogTitle( tr( "Select fill color" ) );
   btnChangeColorFill->setContext( "symbology" );
@@ -90,6 +95,8 @@ void QgsEllipseSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer )
     mOutlineWidthUnitWidget->setMapUnitScale( mLayer->outlineWidthMapUnitScale() );
     mSymbolHeightUnitWidget->setUnit( mLayer->symbolHeightUnit() );
     mSymbolHeightUnitWidget->setMapUnitScale( mLayer->symbolHeightMapUnitScale() );
+    mOffsetUnitWidget->setUnit( mLayer->offsetUnit() );
+    mOffsetUnitWidget->setMapUnitScale( mLayer->offsetMapUnitScale() );
   }
 
   QPointF offsetPt = mLayer->offset();
@@ -187,38 +194,46 @@ void QgsEllipseSymbolLayerV2Widget::on_btnChangeColorFill_colorChanged( const QC
   emit changed();
 }
 
-void QgsEllipseSymbolLayerV2Widget::on_mSymbolWidthUnitComboBox_currentIndexChanged( int index )
+void QgsEllipseSymbolLayerV2Widget::on_mSymbolWidthUnitWidget_changed()
 {
   if ( mLayer )
   {
-    mLayer->setSymbolWidthUnit(( QgsSymbolV2::OutputUnit ) index );
+    QgsSymbolV2::OutputUnit unit = static_cast<QgsSymbolV2::OutputUnit>( mSymbolWidthUnitWidget->getUnit() );
+    mLayer->setSymbolWidthUnit( unit );
+    mLayer->setSymbolWidthMapUnitScale( mSymbolWidthUnitWidget->getMapUnitScale() );
     emit changed();
   }
 }
 
-void QgsEllipseSymbolLayerV2Widget::on_mOutlineWidthUnitComboBox_currentIndexChanged( int index )
+void QgsEllipseSymbolLayerV2Widget::on_mOutlineWidthUnitWidget_changed()
 {
   if ( mLayer )
   {
-    mLayer->setOutlineWidthUnit(( QgsSymbolV2::OutputUnit ) index );
+    QgsSymbolV2::OutputUnit unit = static_cast<QgsSymbolV2::OutputUnit>( mOutlineWidthUnitWidget->getUnit() );
+    mLayer->setOutlineWidthUnit( unit );
+    mLayer->setOutlineWidthMapUnitScale( mOutlineWidthUnitWidget->getMapUnitScale() );
     emit changed();
   }
 }
 
-void QgsEllipseSymbolLayerV2Widget::on_mSymbolHeightUnitComboBox_currentIndexChanged( int index )
+void QgsEllipseSymbolLayerV2Widget::on_mSymbolHeightUnitWidget_changed()
 {
   if ( mLayer )
   {
-    mLayer->setSymbolHeightUnit(( QgsSymbolV2::OutputUnit ) index );
+    QgsSymbolV2::OutputUnit unit = static_cast<QgsSymbolV2::OutputUnit>( mSymbolHeightUnitWidget->getUnit() );
+    mLayer->setSymbolHeightUnit( unit );
+    mLayer->setSymbolHeightMapUnitScale( mSymbolHeightUnitWidget->getMapUnitScale() );
     emit changed();
   }
 }
 
-void QgsEllipseSymbolLayerV2Widget::on_mOffsetUnitComboBox_currentIndexChanged( int index )
+void QgsEllipseSymbolLayerV2Widget::on_mOffsetUnitWidget_changed()
 {
   if ( mLayer )
   {
-    mLayer->setOffsetUnit(( QgsSymbolV2::OutputUnit ) index );
+    QgsSymbolV2::OutputUnit unit = static_cast<QgsSymbolV2::OutputUnit>( mOffsetUnitWidget->getUnit() );
+    mLayer->setOffsetUnit( unit );
+    mLayer->setOffsetMapUnitScale( mOffsetUnitWidget->getMapUnitScale() );
     emit changed();
   }
 }
@@ -230,6 +245,10 @@ void QgsEllipseSymbolLayerV2Widget::blockComboSignals( bool block )
   mSymbolHeightUnitWidget->blockSignals( block );
   mHorizontalAnchorComboBox->blockSignals( block );
   mVerticalAnchorComboBox->blockSignals( block );
+  mSymbolWidthUnitWidget->blockSignals( block );
+  mOutlineWidthUnitWidget->blockSignals( block );
+  mSymbolHeightUnitWidget->blockSignals( block );
+  mOffsetUnitWidget->blockSignals( block );
 }
 
 void QgsEllipseSymbolLayerV2Widget::on_mHorizontalAnchorComboBox_currentIndexChanged( int index )
diff --git a/src/gui/symbology-ng/qgsellipsesymbollayerv2widget.h b/src/gui/symbology-ng/qgsellipsesymbollayerv2widget.h
@@ -49,10 +49,10 @@ class GUI_EXPORT QgsEllipseSymbolLayerV2Widget: public QgsSymbolLayerV2Widget, p
     void on_btnChangeColorBorder_colorChanged( const QColor& newColor );
     void on_btnChangeColorFill_colorChanged( const QColor& newColor );
 
-    void on_mSymbolWidthUnitComboBox_currentIndexChanged( int index );
-    void on_mOutlineWidthUnitComboBox_currentIndexChanged( int index );
-    void on_mSymbolHeightUnitComboBox_currentIndexChanged( int index );
-    void on_mOffsetUnitComboBox_currentIndexChanged( int index );
+    void on_mSymbolWidthUnitWidget_changed();
+    void on_mOutlineWidthUnitWidget_changed();
+    void on_mSymbolHeightUnitWidget_changed();
+    void on_mOffsetUnitWidget_changed();
     void on_mHorizontalAnchorComboBox_currentIndexChanged( int index );
     void on_mVerticalAnchorComboBox_currentIndexChanged( int index );
     void on_mDataDefinedPropertiesButton_clicked();

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,11 @@ QgsEllipseSymbolLayerV2Widget::QgsEllipseSymbolLayerV2Widget( const QgsVectorLay`
`23`	`23`	`{`
`24`	`24`	`setupUi( this );`
`25`	`25`
	`26`	`+ mSymbolWidthUnitWidget->setUnits( QStringList() << tr( "Millimeter" ) << tr( "Map unit" ), 1 );`
	`27`	`+ mSymbolHeightUnitWidget->setUnits( QStringList() << tr( "Millimeter" ) << tr( "Map unit" ), 1 );`
	`28`	`+ mOutlineWidthUnitWidget->setUnits( QStringList() << tr( "Millimeter" ) << tr( "Map unit" ), 1 );`
	`29`	`+ mOffsetUnitWidget->setUnits( QStringList() << tr( "Millimeter" ) << tr( "Map unit" ), 1 );`
	`30`	`+`
`26`	`31`	`btnChangeColorFill->setColorDialogOptions( QColorDialog::ShowAlphaChannel );`
`27`	`32`	`btnChangeColorFill->setColorDialogTitle( tr( "Select fill color" ) );`
`28`	`33`	`btnChangeColorFill->setContext( "symbology" );`
`@@ -90,6 +95,8 @@ void QgsEllipseSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer )`
`90`	`95`	`mOutlineWidthUnitWidget->setMapUnitScale( mLayer->outlineWidthMapUnitScale() );`
`91`	`96`	`mSymbolHeightUnitWidget->setUnit( mLayer->symbolHeightUnit() );`
`92`	`97`	`mSymbolHeightUnitWidget->setMapUnitScale( mLayer->symbolHeightMapUnitScale() );`
	`98`	`+ mOffsetUnitWidget->setUnit( mLayer->offsetUnit() );`
	`99`	`+ mOffsetUnitWidget->setMapUnitScale( mLayer->offsetMapUnitScale() );`
`93`	`100`	`}`
`94`	`101`
`95`	`102`	`QPointF offsetPt = mLayer->offset();`
`@@ -187,38 +194,46 @@ void QgsEllipseSymbolLayerV2Widget::on_btnChangeColorFill_colorChanged( const QC`
`187`	`194`	`emit changed();`
`188`	`195`	`}`
`189`	`196`
`190`		`-void QgsEllipseSymbolLayerV2Widget::on_mSymbolWidthUnitComboBox_currentIndexChanged( int index )`
	`197`	`+void QgsEllipseSymbolLayerV2Widget::on_mSymbolWidthUnitWidget_changed()`
`191`	`198`	`{`
`192`	`199`	`if ( mLayer )`
`193`	`200`	`{`
`194`		`- mLayer->setSymbolWidthUnit(( QgsSymbolV2::OutputUnit ) index );`
	`201`	`+ QgsSymbolV2::OutputUnit unit = static_cast<QgsSymbolV2::OutputUnit>( mSymbolWidthUnitWidget->getUnit() );`
	`202`	`+ mLayer->setSymbolWidthUnit( unit );`
	`203`	`+ mLayer->setSymbolWidthMapUnitScale( mSymbolWidthUnitWidget->getMapUnitScale() );`
`195`	`204`	`emit changed();`
`196`	`205`	`}`
`197`	`206`	`}`
`198`	`207`
`199`		`-void QgsEllipseSymbolLayerV2Widget::on_mOutlineWidthUnitComboBox_currentIndexChanged( int index )`
	`208`	`+void QgsEllipseSymbolLayerV2Widget::on_mOutlineWidthUnitWidget_changed()`
`200`	`209`	`{`
`201`	`210`	`if ( mLayer )`
`202`	`211`	`{`
`203`		`- mLayer->setOutlineWidthUnit(( QgsSymbolV2::OutputUnit ) index );`
	`212`	`+ QgsSymbolV2::OutputUnit unit = static_cast<QgsSymbolV2::OutputUnit>( mOutlineWidthUnitWidget->getUnit() );`
	`213`	`+ mLayer->setOutlineWidthUnit( unit );`
	`214`	`+ mLayer->setOutlineWidthMapUnitScale( mOutlineWidthUnitWidget->getMapUnitScale() );`
`204`	`215`	`emit changed();`
`205`	`216`	`}`
`206`	`217`	`}`
`207`	`218`
`208`		`-void QgsEllipseSymbolLayerV2Widget::on_mSymbolHeightUnitComboBox_currentIndexChanged( int index )`
	`219`	`+void QgsEllipseSymbolLayerV2Widget::on_mSymbolHeightUnitWidget_changed()`
`209`	`220`	`{`
`210`	`221`	`if ( mLayer )`
`211`	`222`	`{`
`212`		`- mLayer->setSymbolHeightUnit(( QgsSymbolV2::OutputUnit ) index );`
	`223`	`+ QgsSymbolV2::OutputUnit unit = static_cast<QgsSymbolV2::OutputUnit>( mSymbolHeightUnitWidget->getUnit() );`
	`224`	`+ mLayer->setSymbolHeightUnit( unit );`
	`225`	`+ mLayer->setSymbolHeightMapUnitScale( mSymbolHeightUnitWidget->getMapUnitScale() );`
`213`	`226`	`emit changed();`
`214`	`227`	`}`
`215`	`228`	`}`
`216`	`229`
`217`		`-void QgsEllipseSymbolLayerV2Widget::on_mOffsetUnitComboBox_currentIndexChanged( int index )`
	`230`	`+void QgsEllipseSymbolLayerV2Widget::on_mOffsetUnitWidget_changed()`
`218`	`231`	`{`
`219`	`232`	`if ( mLayer )`
`220`	`233`	`{`
`221`		`- mLayer->setOffsetUnit(( QgsSymbolV2::OutputUnit ) index );`
	`234`	`+ QgsSymbolV2::OutputUnit unit = static_cast<QgsSymbolV2::OutputUnit>( mOffsetUnitWidget->getUnit() );`
	`235`	`+ mLayer->setOffsetUnit( unit );`
	`236`	`+ mLayer->setOffsetMapUnitScale( mOffsetUnitWidget->getMapUnitScale() );`
`222`	`237`	`emit changed();`
`223`	`238`	`}`
`224`	`239`	`}`
`@@ -230,6 +245,10 @@ void QgsEllipseSymbolLayerV2Widget::blockComboSignals( bool block )`
`230`	`245`	`mSymbolHeightUnitWidget->blockSignals( block );`
`231`	`246`	`mHorizontalAnchorComboBox->blockSignals( block );`
`232`	`247`	`mVerticalAnchorComboBox->blockSignals( block );`
	`248`	`+ mSymbolWidthUnitWidget->blockSignals( block );`
	`249`	`+ mOutlineWidthUnitWidget->blockSignals( block );`
	`250`	`+ mSymbolHeightUnitWidget->blockSignals( block );`
	`251`	`+ mOffsetUnitWidget->blockSignals( block );`
`233`	`252`	`}`
`234`	`253`
`235`	`254`	`void QgsEllipseSymbolLayerV2Widget::on_mHorizontalAnchorComboBox_currentIndexChanged( int index )`