Improve vector field widget

mhugent · mhugent · commit 68f7d57d3afa · 2011-11-01T15:26:36.000+01:00
diff --git a/src/core/symbology-ng/qgsvectorfieldsymbollayer.cpp b/src/core/symbology-ng/qgsvectorfieldsymbollayer.cpp
@@ -109,9 +109,11 @@ void QgsVectorFieldSymbolLayer::renderPoint( const QPointF& point, QgsSymbolV2Re
       convertPolarToCartesian( xVal, yVal, xComponent, yComponent );
       xComponent = context.outputLineWidth( xComponent );
       yComponent = context.outputLineWidth( yComponent );
+      break;
     case Height:
       xComponent = 0;
       yComponent = context.outputLineWidth( yVal );
+      break;
     default:
       break;
   }
diff --git a/src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp b/src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp
@@ -140,6 +140,10 @@ void QgsVectorFieldSymbolLayerWidget::on_mCartesianRadioButton_toggled( bool che
   if ( mLayer && checked )
   {
     mLayer->setVectorFieldType( QgsVectorFieldSymbolLayer::Cartesian );
+    mXAttributeComboBox->setEnabled( true );
+    mYAttributeComboBox->setEnabled( true );
+    mXAttributeLabel->setText( tr( "X attribute" ) );
+    mYAttributeLabel->setText( tr( "Y attribute" ) );
     emit changed();
   }
 }
@@ -149,6 +153,10 @@ void QgsVectorFieldSymbolLayerWidget::on_mPolarRadioButton_toggled( bool checked
   if ( mLayer && checked )
   {
     mLayer->setVectorFieldType( QgsVectorFieldSymbolLayer::Polar );
+    mXAttributeComboBox->setEnabled( true );
+    mYAttributeComboBox->setEnabled( true );
+    mXAttributeLabel->setText( tr( "Length attribute" ) );
+    mYAttributeLabel->setText( tr( "Angle attribute" ) );
     emit changed();
   }
 }
@@ -158,6 +166,9 @@ void QgsVectorFieldSymbolLayerWidget::on_mHeightRadioButton_toggled( bool checke
   if ( mLayer && checked )
   {
     mLayer->setVectorFieldType( QgsVectorFieldSymbolLayer::Height );
+    mXAttributeLabel->setText( "" );
+    mXAttributeComboBox->setEnabled( false );
+    mYAttributeLabel->setText( tr( "Height attribute" ) );
     emit changed();
   }
 }
diff --git a/src/ui/symbollayer/widget_vectorfield.ui b/src/ui/symbollayer/widget_vectorfield.ui
@@ -27,7 +27,7 @@
    <item row="1" column="0">
     <widget class="QLabel" name="mYAttributeLabel">
      <property name="text">
-      <string>Y Attribute</string>
+      <string>Y attribute</string>
      </property>
     </widget>
    </item>

Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,10 @@ void QgsVectorFieldSymbolLayerWidget::on_mCartesianRadioButton_toggled( bool che`
`140`	`140`	`if ( mLayer && checked )`
`141`	`141`	`{`
`142`	`142`	`mLayer->setVectorFieldType( QgsVectorFieldSymbolLayer::Cartesian );`
	`143`	`+ mXAttributeComboBox->setEnabled( true );`
	`144`	`+ mYAttributeComboBox->setEnabled( true );`
	`145`	`+ mXAttributeLabel->setText( tr( "X attribute" ) );`
	`146`	`+ mYAttributeLabel->setText( tr( "Y attribute" ) );`
`143`	`147`	`emit changed();`
`144`	`148`	`}`
`145`	`149`	`}`
`@@ -149,6 +153,10 @@ void QgsVectorFieldSymbolLayerWidget::on_mPolarRadioButton_toggled( bool checked`
`149`	`153`	`if ( mLayer && checked )`
`150`	`154`	`{`
`151`	`155`	`mLayer->setVectorFieldType( QgsVectorFieldSymbolLayer::Polar );`
	`156`	`+ mXAttributeComboBox->setEnabled( true );`
	`157`	`+ mYAttributeComboBox->setEnabled( true );`
	`158`	`+ mXAttributeLabel->setText( tr( "Length attribute" ) );`
	`159`	`+ mYAttributeLabel->setText( tr( "Angle attribute" ) );`
`152`	`160`	`emit changed();`
`153`	`161`	`}`
`154`	`162`	`}`
`@@ -158,6 +166,9 @@ void QgsVectorFieldSymbolLayerWidget::on_mHeightRadioButton_toggled( bool checke`
`158`	`166`	`if ( mLayer && checked )`
`159`	`167`	`{`
`160`	`168`	`mLayer->setVectorFieldType( QgsVectorFieldSymbolLayer::Height );`
	`169`	`+ mXAttributeLabel->setText( "" );`
	`170`	`+ mXAttributeComboBox->setEnabled( false );`
	`171`	`+ mYAttributeLabel->setText( tr( "Height attribute" ) );`
`161`	`172`	`emit changed();`
`162`	`173`	`}`
`163`	`174`	`}`