sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-12 00:02:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refine behavior of obstacle weight slider to match feature weight slider

Browse Source
This commit is contained in:
Nyall Dawson 2019-12-03 09:45:52 +10:00
parent 435287260c
commit 9904fe8621
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/qgslabelinggui.cpp
View File

@ -288,7 +288,7 @@ void QgsLabelingGui::setLayer( QgsMapLayer *mapLayer )
mPrioritySlider->setValue( mSettings.priority );
mChkNoObstacle->setChecked( mSettings.obstacle );
mObstacleFactorSlider->setValue( mSettings.obstacleFactor * 50 );
mObstacleFactorSlider->setValue( mSettings.obstacleFactor * 5 );
mObstacleTypeComboBox->setCurrentIndex( mObstacleTypeComboBox->findData( mSettings.obstacleType ) );
mPolygonObstacleTypeFrame->setEnabled( mSettings.obstacle );
mObstaclePriorityFrame->setEnabled( mSettings.obstacle );
@ -489,7 +489,7 @@ QgsPalLayerSettings QgsLabelingGui::layerSettings()
lyr.priority = mPrioritySlider->value();
lyr.obstacle = mChkNoObstacle->isChecked() || mMode == ObstaclesOnly;
lyr.obstacleFactor = mObstacleFactorSlider->value() / 50.0;
lyr.obstacleFactor = mObstacleFactorSlider->value() / 5.0;
lyr.obstacleType = ( QgsPalLayerSettings::ObstacleType )mObstacleTypeComboBox->currentData().toInt();
lyr.labelPerPart = chkLabelPerFeaturePart->isChecked();
lyr.displayAll = mPalShowAllLabelsForLayerChkBx->isChecked();

6
src/ui/qgstextformatwidgetbase.ui
View File

@ -6706,10 +6706,10 @@ font-style: italic;</string>
<number>0</number>
</property>
<property name="maximum">
<number>100</number>
<number>10</number>
</property>
<property name="value">
<number>50</number>
<number>5</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
@ -6718,7 +6718,7 @@ font-style: italic;</string>
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>10</number>
<number>1</number>
</property>
</widget>
</item>