sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-06 00:05:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix for bug #3143, apply double values for label sizes

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@14446 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
mhugent 2010-10-29 12:38:34 +00:00
parent d1fe144899
commit 030f658ccd
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/qgslabelinggui.cpp
View File

@ -406,7 +406,7 @@ void QgsLabelingGui::updateFont( QFont font )
{ {
fontSizeUnitString = tr( "map units" ); fontSizeUnitString = tr( "map units" );
} }
lblFontName->setText( QString( "%1, %2 %3" ).arg( font.family() ).arg( font.pointSize() ).arg( fontSizeUnitString ) ); lblFontName->setText( QString( "%1, %2 %3" ).arg( font.family() ).arg( font.pointSizeF() ).arg( fontSizeUnitString ) );
lblFontPreview->setFont( font ); lblFontPreview->setFont( font );
updatePreview(); updatePreview();
} }

5
src/core/qgspallabeling.cpp
View File

@ -263,10 +263,11 @@ void QgsPalLayerSettings::readFromLayer( QgsVectorLayer* layer )
placement = ( Placement ) layer->customProperty( "labeling/placement" ).toInt(); placement = ( Placement ) layer->customProperty( "labeling/placement" ).toInt();
placementFlags = layer->customProperty( "labeling/placementFlags" ).toUInt(); placementFlags = layer->customProperty( "labeling/placementFlags" ).toUInt();
QString fontFamily = layer->customProperty( "labeling/fontFamily" ).toString(); QString fontFamily = layer->customProperty( "labeling/fontFamily" ).toString();
int fontSize = layer->customProperty( "labeling/fontSize" ).toInt(); double fontSize = layer->customProperty( "labeling/fontSize" ).toDouble();
int fontWeight = layer->customProperty( "labeling/fontWeight" ).toInt(); int fontWeight = layer->customProperty( "labeling/fontWeight" ).toInt();
bool fontItalic = layer->customProperty( "labeling/fontItalic" ).toBool(); bool fontItalic = layer->customProperty( "labeling/fontItalic" ).toBool();
textFont = QFont( fontFamily, fontSize, fontWeight, fontItalic ); textFont = QFont( fontFamily, fontSize, fontWeight, fontItalic );
textFont.setPointSizeF( fontSize ); //double precision needed because of map units
textColor = _readColor( layer, "labeling/textColor" ); textColor = _readColor( layer, "labeling/textColor" );
enabled = layer->customProperty( "labeling/enabled" ).toBool(); enabled = layer->customProperty( "labeling/enabled" ).toBool();
priority = layer->customProperty( "labeling/priority" ).toInt(); priority = layer->customProperty( "labeling/priority" ).toInt();
@ -295,7 +296,7 @@ void QgsPalLayerSettings::writeToLayer( QgsVectorLayer* layer )
layer->setCustomProperty( "labeling/placementFlags", ( unsigned int )placementFlags ); layer->setCustomProperty( "labeling/placementFlags", ( unsigned int )placementFlags );
layer->setCustomProperty( "labeling/fontFamily", textFont.family() ); layer->setCustomProperty( "labeling/fontFamily", textFont.family() );
layer->setCustomProperty( "labeling/fontSize", textFont.pointSize() ); layer->setCustomProperty( "labeling/fontSize", textFont.pointSizeF() );
layer->setCustomProperty( "labeling/fontWeight", textFont.weight() ); layer->setCustomProperty( "labeling/fontWeight", textFont.weight() );
layer->setCustomProperty( "labeling/fontItalic", textFont.italic() ); layer->setCustomProperty( "labeling/fontItalic", textFont.italic() );

7
src/ui/qgslabelingguibase.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>504</width> <width>515</width>
<height>686</height> <height>692</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -568,6 +568,9 @@
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QDoubleSpinBox" name="mFontSizeSpinBox"> <widget class="QDoubleSpinBox" name="mFontSizeSpinBox">
<property name="decimals">
<number>4</number>
</property>
<property name="maximum"> <property name="maximum">
<double>999999999.000000000000000</double> <double>999999999.000000000000000</double>
</property> </property>