Fix for double point size in font named-style lookups

dakcarto · dakcarto · commit d2f08c60d923 · 2012-09-03T03:48:33.000-06:00
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
@@ -221,7 +221,7 @@ QgsLabelingGui::QgsLabelingGui( QgsPalLabeling* lbl, QgsVectorLayer* layer, QgsM
   }
 
   mRefFont = lyr.textFont;
-  mFontSizeSpinBox->setValue( mRefFont.pointSizeF() );
+  mFontSizeSpinBox->setValue( lyr.textFont.pointSizeF() );
   btnTextColor->setColor( lyr.textColor );
   mFontTranspSpinBox->setValue( lyr.textTransp );
 
@@ -583,9 +583,11 @@ void QgsLabelingGui::updateFontViaStyle( const QString & fontstyle )
 {
   QFont styledfont;
   bool foundmatch = false;
+  int fontSize = 12; // QFontDatabase::font() needs an integer for size
   if ( !fontstyle.isEmpty() )
   {
-    styledfont = mFontDB.font( mRefFont.family(), fontstyle, mRefFont.pointSizeF() );
+    styledfont = mFontDB.font( mRefFont.family(), fontstyle, fontSize );
+    styledfont.setPointSizeF( mRefFont.pointSizeF() );
     if ( QApplication::font().toString() != styledfont.toString() )
     {
       foundmatch = true;
@@ -595,7 +597,8 @@ void QgsLabelingGui::updateFontViaStyle( const QString & fontstyle )
   {
     foreach ( const QString &style, mFontDB.styles( mRefFont.family() ) )
     {
-      styledfont = mFontDB.font( mRefFont.family(), style, mRefFont.pointSizeF() );
+      styledfont = mFontDB.font( mRefFont.family(), style, fontSize );
+      styledfont.setPointSizeF( mRefFont.pointSizeF() );
       styledfont = styledfont.resolve( mRefFont );
       if ( mRefFont.toString() == styledfont.toString() )
       {
@@ -606,6 +609,7 @@ void QgsLabelingGui::updateFontViaStyle( const QString & fontstyle )
   }
   if ( foundmatch )
   {
+//    styledfont.setPointSizeF( mRefFont.pointSizeF() );
     styledfont.setCapitalization( mRefFont.capitalization() );
     styledfont.setUnderline( mRefFont.underline() );
     styledfont.setStrikeOut( mRefFont.strikeOut() );
@@ -629,7 +633,7 @@ void QgsLabelingGui::updateFont( QFont font )
   bool missing = false;
   if ( QApplication::font().toString() != mRefFont.toString() )
   {
-    QFont testfont = mFontDB.font( mRefFont.family(), mFontDB.styleString( mRefFont ), mRefFont.pointSizeF() );
+    QFont testfont = mFontDB.font( mRefFont.family(), mFontDB.styleString( mRefFont ), 12 );
     if ( QApplication::font().toString() == testfont.toString() )
     {
       missing = true;
@@ -667,8 +671,11 @@ void QgsLabelingGui::updateFont( QFont font )
 void QgsLabelingGui::blockFontChangeSignals( bool blk )
 {
   mFontStyleComboBox->blockSignals( blk );
+  mFontCapitalsComboBox->blockSignals( blk );
   mFontUnderlineBtn->blockSignals( blk );
   mFontStrikethroughBtn->blockSignals( blk );
+  mFontWordSpacingSpinBox->blockSignals( blk );
+  mFontLetterSpacingSpinBox->blockSignals( blk );
 }
 
 void QgsLabelingGui::updatePreview()
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -338,7 +338,8 @@ void QgsPalLayerSettings::updateFontViaStyle( const QString & fontstyle )
 {
   if ( !fontstyle.isEmpty() )
   {
-    QFont styledfont = mFontDB.font( textFont.family(), fontstyle, textFont.pointSizeF() );
+    QFont styledfont = mFontDB.font( textFont.family(), fontstyle, 12 );
+    styledfont.setPointSizeF( textFont.pointSizeF() );
     if ( QApplication::font().toString() != styledfont.toString() )
     {
       textFont = styledfont;
@@ -367,7 +368,7 @@ void QgsPalLayerSettings::readFromLayer( QgsVectorLayer* layer )
   textFont = QFont( fontFamily, fontSize, fontWeight, fontItalic );
   textFont.setPointSizeF( fontSize ); //double precision needed because of map units
   textNamedStyle = layer->customProperty( "labeling/namedStyle", QVariant( "" ) ).toString();
-  updateFontViaStyle( textNamedStyle );
+  updateFontViaStyle( textNamedStyle ); // must come after textFont.setPointSizeF()
   textFont.setCapitalization(( QFont::Capitalization ) layer->customProperty( "labeling/fontCapitals", QVariant( 0 ) ).toUInt() );
   textFont.setUnderline( layer->customProperty( "labeling/fontUnderline" ).toBool() );
   textFont.setStrikeOut( layer->customProperty( "labeling/fontStrikeout" ).toBool() );

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ QgsLabelingGui::QgsLabelingGui( QgsPalLabeling* lbl, QgsVectorLayer* layer, QgsM`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`mRefFont = lyr.textFont;`
`224`		`- mFontSizeSpinBox->setValue( mRefFont.pointSizeF() );`
	`224`	`+ mFontSizeSpinBox->setValue( lyr.textFont.pointSizeF() );`
`225`	`225`	`btnTextColor->setColor( lyr.textColor );`
`226`	`226`	`mFontTranspSpinBox->setValue( lyr.textTransp );`
`227`	`227`
`@@ -583,9 +583,11 @@ void QgsLabelingGui::updateFontViaStyle( const QString & fontstyle )`
`583`	`583`	`{`
`584`	`584`	`QFont styledfont;`
`585`	`585`	`bool foundmatch = false;`
	`586`	`+ int fontSize = 12; // QFontDatabase::font() needs an integer for size`
`586`	`587`	`if ( !fontstyle.isEmpty() )`
`587`	`588`	`{`
`588`		`- styledfont = mFontDB.font( mRefFont.family(), fontstyle, mRefFont.pointSizeF() );`
	`589`	`+ styledfont = mFontDB.font( mRefFont.family(), fontstyle, fontSize );`
	`590`	`+ styledfont.setPointSizeF( mRefFont.pointSizeF() );`
`589`	`591`	`if ( QApplication::font().toString() != styledfont.toString() )`
`590`	`592`	`{`
`591`	`593`	`foundmatch = true;`
`@@ -595,7 +597,8 @@ void QgsLabelingGui::updateFontViaStyle( const QString & fontstyle )`
`595`	`597`	`{`
`596`	`598`	`foreach ( const QString &style, mFontDB.styles( mRefFont.family() ) )`
`597`	`599`	`{`
`598`		`- styledfont = mFontDB.font( mRefFont.family(), style, mRefFont.pointSizeF() );`
	`600`	`+ styledfont = mFontDB.font( mRefFont.family(), style, fontSize );`
	`601`	`+ styledfont.setPointSizeF( mRefFont.pointSizeF() );`
`599`	`602`	`styledfont = styledfont.resolve( mRefFont );`
`600`	`603`	`if ( mRefFont.toString() == styledfont.toString() )`
`601`	`604`	`{`
`@@ -606,6 +609,7 @@ void QgsLabelingGui::updateFontViaStyle( const QString & fontstyle )`
`606`	`609`	`}`
`607`	`610`	`if ( foundmatch )`
`608`	`611`	`{`
	`612`	`+// styledfont.setPointSizeF( mRefFont.pointSizeF() );`
`609`	`613`	`styledfont.setCapitalization( mRefFont.capitalization() );`
`610`	`614`	`styledfont.setUnderline( mRefFont.underline() );`
`611`	`615`	`styledfont.setStrikeOut( mRefFont.strikeOut() );`
`@@ -629,7 +633,7 @@ void QgsLabelingGui::updateFont( QFont font )`
`629`	`633`	`bool missing = false;`
`630`	`634`	`if ( QApplication::font().toString() != mRefFont.toString() )`
`631`	`635`	`{`
`632`		`- QFont testfont = mFontDB.font( mRefFont.family(), mFontDB.styleString( mRefFont ), mRefFont.pointSizeF() );`
	`636`	`+ QFont testfont = mFontDB.font( mRefFont.family(), mFontDB.styleString( mRefFont ), 12 );`
`633`	`637`	`if ( QApplication::font().toString() == testfont.toString() )`
`634`	`638`	`{`
`635`	`639`	`missing = true;`
`@@ -667,8 +671,11 @@ void QgsLabelingGui::updateFont( QFont font )`
`667`	`671`	`void QgsLabelingGui::blockFontChangeSignals( bool blk )`
`668`	`672`	`{`
`669`	`673`	`mFontStyleComboBox->blockSignals( blk );`
	`674`	`+ mFontCapitalsComboBox->blockSignals( blk );`
`670`	`675`	`mFontUnderlineBtn->blockSignals( blk );`
`671`	`676`	`mFontStrikethroughBtn->blockSignals( blk );`
	`677`	`+ mFontWordSpacingSpinBox->blockSignals( blk );`
	`678`	`+ mFontLetterSpacingSpinBox->blockSignals( blk );`
`672`	`679`	`}`
`673`	`680`
`674`	`681`	`void QgsLabelingGui::updatePreview()`
Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,8 @@ void QgsPalLayerSettings::updateFontViaStyle( const QString & fontstyle )`
`338`	`338`	`{`
`339`	`339`	`if ( !fontstyle.isEmpty() )`
`340`	`340`	`{`
`341`		`- QFont styledfont = mFontDB.font( textFont.family(), fontstyle, textFont.pointSizeF() );`
	`341`	`+ QFont styledfont = mFontDB.font( textFont.family(), fontstyle, 12 );`
	`342`	`+ styledfont.setPointSizeF( textFont.pointSizeF() );`
`342`	`343`	`if ( QApplication::font().toString() != styledfont.toString() )`
`343`	`344`	`{`
`344`	`345`	`textFont = styledfont;`
`@@ -367,7 +368,7 @@ void QgsPalLayerSettings::readFromLayer( QgsVectorLayer* layer )`
`367`	`368`	`textFont = QFont( fontFamily, fontSize, fontWeight, fontItalic );`
`368`	`369`	`textFont.setPointSizeF( fontSize ); //double precision needed because of map units`
`369`	`370`	`textNamedStyle = layer->customProperty( "labeling/namedStyle", QVariant( "" ) ).toString();`
`370`		`- updateFontViaStyle( textNamedStyle );`
	`371`	`+ updateFontViaStyle( textNamedStyle ); // must come after textFont.setPointSizeF()`
`371`	`372`	`textFont.setCapitalization(( QFont::Capitalization ) layer->customProperty( "labeling/fontCapitals", QVariant( 0 ) ).toUInt() );`
`372`	`373`	`textFont.setUnderline( layer->customProperty( "labeling/fontUnderline" ).toBool() );`
`373`	`374`	`textFont.setStrikeOut( layer->customProperty( "labeling/fontStrikeout" ).toBool() );`