sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing map units in vector field widget

Browse Source
This commit is contained in:
Nyall Dawson 2015-05-07 22:43:39 +10:00
parent 45bdae461d
commit c9897ab29f
3 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp
View File

@ -19,6 +19,9 @@
QgsVectorFieldSymbolLayerWidget::QgsVectorFieldSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent ): QgsSymbolLayerV2Widget( parent, vl ), mLayer( 0 ) QgsVectorFieldSymbolLayerWidget::QgsVectorFieldSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent ): QgsSymbolLayerV2Widget( parent, vl ), mLayer( 0 )
{ {
setupUi( this ); setupUi( this );
mDistanceUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit );
if ( mVectorLayer ) if ( mVectorLayer )
{ {
const QgsFields& fm = mVectorLayer->pendingFields(); const QgsFields& fm = mVectorLayer->pendingFields();
@ -201,13 +204,17 @@ 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 ); return;
emit changed();
} }
mLayer->setDistanceUnit( mDistanceUnitWidget->unit() );
mLayer->setDistanceMapUnitScale( mDistanceUnitWidget->getMapUnitScale() );
emit changed();
} }

2
src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.h
View File

@ -47,7 +47,7 @@ class GUI_EXPORT QgsVectorFieldSymbolLayerWidget: public QgsSymbolLayerV2Widget,
void on_mRadiansRadioButton_toggled( bool checked ); void on_mRadiansRadioButton_toggled( bool checked );
void on_mClockwiseFromNorthRadioButton_toggled( bool checked ); void on_mClockwiseFromNorthRadioButton_toggled( bool checked );
void on_mCounterclockwiseFromEastRadioButton_toggled( bool checked ); void on_mCounterclockwiseFromEastRadioButton_toggled( bool checked );
void on_mDistanceUnitComboBox_currentIndexChanged( int index ); void on_mDistanceUnitWidget_changed();
}; };
#endif // QGSVECTORFIELDSYMBOLLAYERWIDGET_H #endif // QGSVECTORFIELDSYMBOLLAYERWIDGET_H

22
src/ui/symbollayer/widget_vectorfield.ui
View File

@ -14,7 +14,16 @@
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <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> <number>1</number>
</property> </property>
<item> <item>
@ -108,10 +117,19 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="decimals">
<number>2</number>
</property>
<property name="maximum">
<double>9999999.000000000000000</double>
</property>
<property name="singleStep"> <property name="singleStep">
<double>0.200000000000000</double> <double>0.200000000000000</double>
</property> </property>
<property name="showClearButton"> <property name="value">
<double>1.000000000000000</double>
</property>
<property name="showClearButton" stdset="0">
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>