Add method to convert double precision device coordinates to map coords (important for print composer). Change pallabeling to use FontMetricsF and toMapCoordinatesF. Fixes bug #3065

mhugent · mhugent · commit 51a365726a19 · 2010-10-23T09:50:23.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14430 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/python/core/qgsmaptopixel.sip b/python/core/qgsmaptopixel.sip
@@ -53,6 +53,11 @@ class QgsMapToPixel
 		//	  std::vector<double>& y);
 
     QgsPoint toMapCoordinates(int x, int y);
+
+     /*! Transform device coordinates to map (world) coordinates
+      @note: this method was added in version 1.6*/
+    QgsPoint toMapCoordinatesF( double x, double y ) const;
+
      /*! Tranform device coordinates to map (world)  coordinates
     * @param p Point to be converted to map cooordinates
     * @return QgsPoint in map coorndiates
diff --git a/src/core/qgsmaptopixel.cpp b/src/core/qgsmaptopixel.cpp
@@ -36,7 +36,7 @@ QgsMapToPixel::~QgsMapToPixel()
 {
 }
 
-QgsPoint QgsMapToPixel::toMapPoint( int x, int y ) const
+QgsPoint QgsMapToPixel::toMapPoint( double x, double y ) const
 {
   double mx = x * mMapUnitsPerPixel + xMin;
   double my = -1 * (( y - yMax ) * mMapUnitsPerPixel - yMin );
@@ -54,6 +54,11 @@ QgsPoint QgsMapToPixel::toMapCoordinates( int x, int y ) const
   return toMapPoint( x, y );
 }
 
+QgsPoint QgsMapToPixel::toMapCoordinatesF( double x, double y ) const
+{
+  return toMapPoint( x, y );
+}
+
 void QgsMapToPixel::setMapUnitsPerPixel( double mapUnitsPerPixel )
 {
   mMapUnitsPerPixel = mapUnitsPerPixel;
diff --git a/src/core/qgsmaptopixel.h b/src/core/qgsmaptopixel.h
@@ -75,13 +75,18 @@ class CORE_EXPORT QgsMapToPixel
                            std::vector<double>& y ) const;
 
     QgsPoint toMapCoordinates( int x, int y ) const;
+
+    /*! Transform device coordinates to map (world) coordinates
+      @note: this method was added in version 1.6*/
+    QgsPoint toMapCoordinatesF( double x, double y ) const;
+
     /*! Tranform device coordinates to map (world)  coordinates
     * @param p Point to be converted to map cooordinates
     * @return QgsPoint in map coorndiates
     */
     QgsPoint toMapCoordinates( QPoint p ) const;
 
-    QgsPoint toMapPoint( int x, int y ) const;
+    QgsPoint toMapPoint( double x, double y ) const;
     /*! Set map units per pixel
     * @param mapUnitsPerPixel Map units per pixel
     */
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -78,19 +78,19 @@ class QgsPalGeometry : public PalGeometry
     const char* strId() { return mStrId.data(); }
     QString text() { return mText; }
 
-    pal::LabelInfo* info( QFontMetrics* fm, const QgsMapToPixel* xform, double fontScale )
+    pal::LabelInfo* info( QFontMetricsF* fm, const QgsMapToPixel* xform, double fontScale )
     {
       if ( mInfo ) return mInfo;
 
       // create label info!
       QgsPoint ptZero = xform->toMapCoordinates( 0, 0 );
-      QgsPoint ptSize = xform->toMapCoordinates( 0, ( int )( -fm->height() / fontScale ) );
+      QgsPoint ptSize = xform->toMapCoordinatesF( 0.0, -fm->height() / fontScale );
 
       mInfo = new pal::LabelInfo( mText.count(), ptSize.y() - ptZero.y() );
       for ( int i = 0; i < mText.count(); i++ )
       {
         mInfo->char_info[i].chr = mText[i].unicode();
-        ptSize = xform->toMapCoordinates(( int )( fm->width( mText[i] ) / fontScale ) , 0 );
+        ptSize = xform->toMapCoordinatesF( fm->width( mText[i] ) / fontScale , 0.0 );
         mInfo->char_info[i].width = ptSize.x() - ptZero.x();
       }
       return mInfo;
@@ -365,7 +365,7 @@ bool QgsPalLayerSettings::checkMinimumSizeMM( const QgsRenderContext& ct, QgsGeo
   return true; //should never be reached. Return true in this case to label such geometries anyway.
 }
 
-void QgsPalLayerSettings::calculateLabelSize( const QFontMetrics* fm, QString text, double& labelX, double& labelY )
+void QgsPalLayerSettings::calculateLabelSize( const QFontMetricsF* fm, QString text, double& labelX, double& labelY )
 {
   if ( !fm )
   {
@@ -426,7 +426,7 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext
       }
       labelFont.setPixelSize( sizeToPixel( sizeDouble, context ) );
     }
-    QFontMetrics labelFontMetrics( labelFont );
+    QFontMetricsF labelFontMetrics( labelFont );
     calculateLabelSize( &labelFontMetrics, labelText, labelX, labelY );
   }
   else
@@ -704,7 +704,7 @@ int QgsPalLabeling::prepareLayer( QgsVectorLayer* layer, QSet<int>& attrIndices,
   // save the pal layer to our layer context (with some additional info)
   lyr.palLayer = l;
   lyr.fieldIndex = fldIndex;
-  lyr.fontMetrics = new QFontMetrics( lyr.textFont );
+  lyr.fontMetrics = new QFontMetricsF( lyr.textFont );
 
   lyr.xform = mMapRenderer->coordinateTransform();
   if ( mMapRenderer->hasCrsTransformEnabled() )
diff --git a/src/core/qgspallabeling.h b/src/core/qgspallabeling.h
@@ -21,6 +21,7 @@
 #ifndef QGSPALLABELING_H
 #define QGSPALLABELING_H
 
+class QFontMetricsF;
 class QPainter;
 class QgsMapRenderer;
 class QgsRectangle;
@@ -115,7 +116,7 @@ class CORE_EXPORT QgsPalLayerSettings
     bool fontSizeInMapUnits; //true if font size is in map units (otherwise in points)
 
     // called from register feature hook
-    void calculateLabelSize( const QFontMetrics* fm, QString text, double& labelX, double& labelY );
+    void calculateLabelSize( const QFontMetricsF* fm, QString text, double& labelX, double& labelY );
 
     // implementation of register feature hook
     void registerFeature( QgsFeature& f, const QgsRenderContext& context );
@@ -131,7 +132,7 @@ class CORE_EXPORT QgsPalLayerSettings
     // temporary stuff: set when layer gets prepared
     pal::Layer* palLayer;
     int fieldIndex;
-    QFontMetrics* fontMetrics;
+    QFontMetricsF* fontMetrics;
     const QgsMapToPixel* xform;
     const QgsCoordinateTransform* ct;
     QgsPoint ptZero, ptOne;

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ QgsMapToPixel::~QgsMapToPixel()`
`36`	`36`	`{`
`37`	`37`	`}`
`38`	`38`
`39`		`-QgsPoint QgsMapToPixel::toMapPoint( int x, int y ) const`
	`39`	`+QgsPoint QgsMapToPixel::toMapPoint( double x, double y ) const`
`40`	`40`	`{`
`41`	`41`	`double mx = x * mMapUnitsPerPixel + xMin;`
`42`	`42`	`double my = -1 * (( y - yMax ) * mMapUnitsPerPixel - yMin );`
`@@ -54,6 +54,11 @@ QgsPoint QgsMapToPixel::toMapCoordinates( int x, int y ) const`
`54`	`54`	`return toMapPoint( x, y );`
`55`	`55`	`}`
`56`	`56`
	`57`	`+QgsPoint QgsMapToPixel::toMapCoordinatesF( double x, double y ) const`
	`58`	`+{`
	`59`	`+ return toMapPoint( x, y );`
	`60`	`+}`
	`61`	`+`
`57`	`62`	`void QgsMapToPixel::setMapUnitsPerPixel( double mapUnitsPerPixel )`
`58`	`63`	`{`
`59`	`64`	`mMapUnitsPerPixel = mapUnitsPerPixel;`
Original file line number	Diff line number	Diff line change
`@@ -78,19 +78,19 @@ class QgsPalGeometry : public PalGeometry`
`78`	`78`	`const char* strId() { return mStrId.data(); }`
`79`	`79`	`QString text() { return mText; }`
`80`	`80`
`81`		`- pal::LabelInfo* info( QFontMetrics* fm, const QgsMapToPixel* xform, double fontScale )`
	`81`	`+ pal::LabelInfo* info( QFontMetricsF* fm, const QgsMapToPixel* xform, double fontScale )`
`82`	`82`	`{`
`83`	`83`	`if ( mInfo ) return mInfo;`
`84`	`84`
`85`	`85`	`// create label info!`
`86`	`86`	`QgsPoint ptZero = xform->toMapCoordinates( 0, 0 );`
`87`		`- QgsPoint ptSize = xform->toMapCoordinates( 0, ( int )( -fm->height() / fontScale ) );`
	`87`	`+ QgsPoint ptSize = xform->toMapCoordinatesF( 0.0, -fm->height() / fontScale );`
`88`	`88`
`89`	`89`	`mInfo = new pal::LabelInfo( mText.count(), ptSize.y() - ptZero.y() );`
`90`	`90`	`for ( int i = 0; i < mText.count(); i++ )`
`91`	`91`	`{`
`92`	`92`	`mInfo->char_info[i].chr = mText[i].unicode();`
`93`		`- ptSize = xform->toMapCoordinates(( int )( fm->width( mText[i] ) / fontScale ) , 0 );`
	`93`	`+ ptSize = xform->toMapCoordinatesF( fm->width( mText[i] ) / fontScale , 0.0 );`
`94`	`94`	`mInfo->char_info[i].width = ptSize.x() - ptZero.x();`
`95`	`95`	`}`
`96`	`96`	`return mInfo;`
`@@ -365,7 +365,7 @@ bool QgsPalLayerSettings::checkMinimumSizeMM( const QgsRenderContext& ct, QgsGeo`
`365`	`365`	`return true; //should never be reached. Return true in this case to label such geometries anyway.`
`366`	`366`	`}`
`367`	`367`
`368`		`-void QgsPalLayerSettings::calculateLabelSize( const QFontMetrics* fm, QString text, double& labelX, double& labelY )`
	`368`	`+void QgsPalLayerSettings::calculateLabelSize( const QFontMetricsF* fm, QString text, double& labelX, double& labelY )`
`369`	`369`	`{`
`370`	`370`	`if ( !fm )`
`371`	`371`	`{`
`@@ -426,7 +426,7 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext`
`426`	`426`	`}`
`427`	`427`	`labelFont.setPixelSize( sizeToPixel( sizeDouble, context ) );`
`428`	`428`	`}`
`429`		`- QFontMetrics labelFontMetrics( labelFont );`
	`429`	`+ QFontMetricsF labelFontMetrics( labelFont );`
`430`	`430`	`calculateLabelSize( &labelFontMetrics, labelText, labelX, labelY );`
`431`	`431`	`}`
`432`	`432`	`else`
`@@ -704,7 +704,7 @@ int QgsPalLabeling::prepareLayer( QgsVectorLayer* layer, QSet<int>& attrIndices,`
`704`	`704`	`// save the pal layer to our layer context (with some additional info)`
`705`	`705`	`lyr.palLayer = l;`
`706`	`706`	`lyr.fieldIndex = fldIndex;`
`707`		`- lyr.fontMetrics = new QFontMetrics( lyr.textFont );`
	`707`	`+ lyr.fontMetrics = new QFontMetricsF( lyr.textFont );`
`708`	`708`
`709`	`709`	`lyr.xform = mMapRenderer->coordinateTransform();`
`710`	`710`	`if ( mMapRenderer->hasCrsTransformEnabled() )`