Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix missing map units in vector field widget
  • Loading branch information
nyalldawson committed May 10, 2015
1 parent 1b929ef commit c424307
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 7 deletions.
16 changes: 12 additions & 4 deletions src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp
Expand Up @@ -19,6 +19,9 @@
QgsVectorFieldSymbolLayerWidget::QgsVectorFieldSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent ): QgsSymbolLayerV2Widget( parent, vl ), mLayer( 0 )
{
setupUi( this );

mDistanceUnitWidget->setUnits( QStringList() << tr( "Millimeter" ) << tr( "Map unit" ), 1 );

if ( mVectorLayer )
{
const QgsFields& fm = mVectorLayer->pendingFields();
Expand Down Expand Up @@ -201,13 +204,18 @@ void QgsVectorFieldSymbolLayerWidget::on_mCounterclockwiseFromEastRadioButton_to
}
}

void QgsVectorFieldSymbolLayerWidget::on_mDistanceUnitComboBox_currentIndexChanged( int index )
void QgsVectorFieldSymbolLayerWidget::on_mDistanceUnitWidget_changed()
{
if ( mLayer )
if ( !mLayer )
{
mLayer->setDistanceUnit(( QgsSymbolV2::OutputUnit ) index );
emit changed();
return;
}

QgsSymbolV2::OutputUnit unit = static_cast<QgsSymbolV2::OutputUnit>( mDistanceUnitWidget->getUnit() );
mLayer->setDistanceUnit( unit );
mLayer->setDistanceMapUnitScale( mDistanceUnitWidget->getMapUnitScale() );
emit changed();
}



2 changes: 1 addition & 1 deletion src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.h
Expand Up @@ -47,7 +47,7 @@ class GUI_EXPORT QgsVectorFieldSymbolLayerWidget: public QgsSymbolLayerV2Widget,
void on_mRadiansRadioButton_toggled( bool checked );
void on_mClockwiseFromNorthRadioButton_toggled( bool checked );
void on_mCounterclockwiseFromEastRadioButton_toggled( bool checked );
void on_mDistanceUnitComboBox_currentIndexChanged( int index );
void on_mDistanceUnitWidget_changed();
};

#endif // QGSVECTORFIELDSYMBOLLAYERWIDGET_H
22 changes: 20 additions & 2 deletions src/ui/symbollayer/widget_vectorfield.ui
Expand Up @@ -14,7 +14,16 @@
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<property name="leftMargin">
<number>1</number>
</property>
<property name="topMargin">
<number>1</number>
</property>
<property name="rightMargin">
<number>1</number>
</property>
<property name="bottomMargin">
<number>1</number>
</property>
<item>
Expand Down Expand Up @@ -108,10 +117,19 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="decimals">
<number>2</number>
</property>
<property name="maximum">
<double>9999999.000000000000000</double>
</property>
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="showClearButton">
<property name="value">
<double>1.000000000000000</double>
</property>
<property name="showClearButton" stdset="0">
<bool>false</bool>
</property>
</widget>
Expand Down

0 comments on commit c424307

Please sign in to comment.