Uhm... fixing compilation error, take #2.

wonder · wonder · commit a0fa23404296 · 2010-02-08T11:08:45.000Z
Hopefully also with better label size scaling in composer (labeling plugin) git-svn-id: http://svn.osgeo.org/qgis/trunk@12900 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsmaprenderer.h b/src/core/qgsmaprenderer.h
@@ -51,7 +51,7 @@ class QgsLabelingEngineInterface
     //! called to find out whether the layer is used for labeling
     virtual bool willUseLayer( QgsVectorLayer* layer ) = 0;
     //! called when starting rendering of a layer
-    virtual int prepareLayer( QgsVectorLayer* layer, int& attrIndex ) = 0;
+    virtual int prepareLayer( QgsVectorLayer* layer, int& attrIndex, QgsRenderContext& ctx ) = 0;
     //! called for every feature
     virtual void registerFeature( QgsVectorLayer* layer, QgsFeature& feat ) = 0;
     //! called when the map is drawn and labels should be placed
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -898,7 +898,7 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )
     if ( rendererContext.labelingEngine() )
     {
       int attrIndex;
-      if ( rendererContext.labelingEngine()->prepareLayer( this, attrIndex ) )
+      if ( rendererContext.labelingEngine()->prepareLayer( this, attrIndex, rendererContext ) )
       {
         if ( !attributes.contains( attrIndex ) )
           attributes << attrIndex;
@@ -958,7 +958,7 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )
     if ( rendererContext.labelingEngine() )
     {
       int attrIndex;
-      if ( rendererContext.labelingEngine()->prepareLayer( this, attrIndex ) )
+      if ( rendererContext.labelingEngine()->prepareLayer( this, attrIndex, rendererContext ) )
       {
         if ( !attributes.contains( attrIndex ) )
           attributes << attrIndex;
diff --git a/src/plugins/labeling/pallabeling.cpp b/src/plugins/labeling/pallabeling.cpp
@@ -28,6 +28,7 @@
 #include <qgsgeometry.h>
 #include <qgsmaprenderer.h>
 
+
 using namespace pal;
 
 
@@ -296,7 +297,7 @@ bool PalLabeling::willUseLayer( QgsVectorLayer* layer )
 }
 
 
-int PalLabeling::prepareLayer( QgsVectorLayer* layer, int& attrIndex )
+int PalLabeling::prepareLayer( QgsVectorLayer* layer, int& attrIndex, QgsRenderContext& ctx )
 {
   Q_ASSERT( mMapRenderer != NULL );
 
@@ -353,6 +354,10 @@ int PalLabeling::prepareLayer( QgsVectorLayer* layer, int& attrIndex )
   // set whether adjacent lines should be merged
   l->setMergeConnectedLines( lyr.mergeLines );
 
+  // set font size from points to output size
+  double size = 0.3527 * lyr.textFont.pointSizeF() * ctx.scaleFactor(); //* ctx.rasterScaleFactor();
+  lyr.textFont.setPixelSize((int)size);
+
   // save the pal layer to our layer context (with some additional info)
   lyr.palLayer = l;
   lyr.fieldIndex = fldIndex;
@@ -620,5 +625,8 @@ void PalLabeling::drawLabelBuffer( QPainter* p, QString text, const QFont& font,
 
 QgsLabelingEngineInterface* PalLabeling::clone()
 {
-  return new PalLabeling();
+  PalLabeling* lbl = new PalLabeling();
+  lbl->mShowingAllLabels = mShowingAllLabels;
+  lbl->mShowingCandidates = mShowingCandidates;
+  return lbl;
 }
diff --git a/src/plugins/labeling/pallabeling.h b/src/plugins/labeling/pallabeling.h
@@ -126,7 +126,7 @@ class PalLabeling : public QgsLabelingEngineInterface
     //! called to find out whether the layer is used for labeling
     virtual bool willUseLayer( QgsVectorLayer* layer );
     //! hook called when drawing layer before issuing select()
-    virtual int prepareLayer( QgsVectorLayer* layer, int& attrIndex );
+    virtual int prepareLayer( QgsVectorLayer* layer, int& attrIndex, QgsRenderContext& ctx );
     //! hook called when drawing for every feature in a layer
     virtual void registerFeature( QgsVectorLayer* layer, QgsFeature& feat );
     //! called when the map is drawn and labels should be placed

Original file line number	Diff line number	Diff line change
`@@ -898,7 +898,7 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )`
`898`	`898`	`if ( rendererContext.labelingEngine() )`
`899`	`899`	`{`
`900`	`900`	`int attrIndex;`
`901`		`- if ( rendererContext.labelingEngine()->prepareLayer( this, attrIndex ) )`
	`901`	`+ if ( rendererContext.labelingEngine()->prepareLayer( this, attrIndex, rendererContext ) )`
`902`	`902`	`{`
`903`	`903`	`if ( !attributes.contains( attrIndex ) )`
`904`	`904`	`attributes << attrIndex;`
`@@ -958,7 +958,7 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )`
`958`	`958`	`if ( rendererContext.labelingEngine() )`
`959`	`959`	`{`
`960`	`960`	`int attrIndex;`
`961`		`- if ( rendererContext.labelingEngine()->prepareLayer( this, attrIndex ) )`
	`961`	`+ if ( rendererContext.labelingEngine()->prepareLayer( this, attrIndex, rendererContext ) )`
`962`	`962`	`{`
`963`	`963`	`if ( !attributes.contains( attrIndex ) )`
`964`	`964`	`attributes << attrIndex;`