partial fix for label size + label tweaks

etiennesky · etiennesky · commit 52d9f3a3a48d · 2012-06-23T23:03:14.000-03:00
diff --git a/src/app/qgsdecorationgrid.cpp b/src/app/qgsdecorationgrid.cpp
@@ -111,9 +111,19 @@ void QgsDecorationGrid::projectRead()
                             "/AnnotationPosition", 0 );
   mGridAnnotationDirection = ( GridAnnotationDirection ) QgsProject::instance()->readNumEntry( mNameConfig,
                              "/AnnotationDirection", 0 );
-  mGridAnnotationFont.fromString( QgsProject::instance()->readEntry( mNameConfig, "/AnnotationFont", "" ) );
+  QString fontStr = QgsProject::instance()->readEntry( mNameConfig, "/AnnotationFont", "" );
+  if ( fontStr != "" )
+  {
+    mGridAnnotationFont.fromString( fontStr );
+  }
+  else
+  {
+    mGridAnnotationFont = QFont();
+    // TODO fix font scaling problem - put a slightly large font for now
+    mGridAnnotationFont.setPointSize( 16 );
+  }
   mAnnotationFrameDistance = QgsProject::instance()->readDoubleEntry( mNameConfig, "/AnnotationFrameDistance", 0 );
-  mGridAnnotationPrecision = QgsProject::instance()->readNumEntry( mNameConfig, "/AnnotationPrecision", 3 );
+  mGridAnnotationPrecision = QgsProject::instance()->readNumEntry( mNameConfig, "/AnnotationPrecision", 0 );
 
   // read symbol info from xml
   QDomDocument doc;
@@ -715,7 +725,9 @@ double QgsDecorationGrid::fontAscentMillimeters( const QFont& font ) const
 
 double QgsDecorationGrid::pixelFontSize( double pointSize ) const
 {
-  return ( pointSize * 0.3527 );
+  // return ( pointSize * 0.3527 );
+  // TODO fix font scaling problem - this seems to help, but text seems still a bit too small (about 5/6)
+  return pointSize;
 }
 
 QFont QgsDecorationGrid::scaledFontPixelSize( const QFont& font ) const
diff --git a/src/app/qgsdecorationgriddialog.cpp b/src/app/qgsdecorationgriddialog.cpp
@@ -284,6 +284,10 @@ void QgsDecorationGridDialog::on_mPbtnUpdateFromLayer_clicked()
     mIntervalYSpinBox->setValue( values[1] );
     mOffsetXSpinBox->setValue( values[2] );
     mOffsetYSpinBox->setValue( values[3] );
+    if ( values[0] >= 1 )
+      mCoordinatePrecisionSpinBox->setValue( 0 );
+    else
+      mCoordinatePrecisionSpinBox->setValue( 3 );
   }
 }
 
@@ -313,6 +317,13 @@ void QgsDecorationGridDialog::updateInterval( bool force )
       mIntervalYSpinBox->setValue( values[1] );
       mOffsetXSpinBox->setValue( values[2] );
       mOffsetYSpinBox->setValue( values[3] );
+      // also update coord. precision
+      // if interval >= 1, set precision=0 because we have a rounded value
+      // else set it to previous default of 3
+      if ( values[0] >= 1 )
+        mCoordinatePrecisionSpinBox->setValue( 0 );
+      else
+        mCoordinatePrecisionSpinBox->setValue( 3 );
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -284,6 +284,10 @@ void QgsDecorationGridDialog::on_mPbtnUpdateFromLayer_clicked()`
`284`	`284`	`mIntervalYSpinBox->setValue( values[1] );`
`285`	`285`	`mOffsetXSpinBox->setValue( values[2] );`
`286`	`286`	`mOffsetYSpinBox->setValue( values[3] );`
	`287`	`+ if ( values[0] >= 1 )`
	`288`	`+ mCoordinatePrecisionSpinBox->setValue( 0 );`
	`289`	`+ else`
	`290`	`+ mCoordinatePrecisionSpinBox->setValue( 3 );`
`287`	`291`	`}`
`288`	`292`	`}`
`289`	`293`
`@@ -313,6 +317,13 @@ void QgsDecorationGridDialog::updateInterval( bool force )`
`313`	`317`	`mIntervalYSpinBox->setValue( values[1] );`
`314`	`318`	`mOffsetXSpinBox->setValue( values[2] );`
`315`	`319`	`mOffsetYSpinBox->setValue( values[3] );`
	`320`	`+ // also update coord. precision`
	`321`	`+ // if interval >= 1, set precision=0 because we have a rounded value`
	`322`	`+ // else set it to previous default of 3`
	`323`	`+ if ( values[0] >= 1 )`
	`324`	`+ mCoordinatePrecisionSpinBox->setValue( 0 );`
	`325`	`+ else`
	`326`	`+ mCoordinatePrecisionSpinBox->setValue( 3 );`
`316`	`327`	`}`
`317`	`328`	`}`
`318`	`329`	`}`