Differentiate between field scale and raster scale factor such that field scaled point symbols all have the same outline width

mhugent · mhugent · commit 153e9b4ee39c · 2008-05-17T12:24:15.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8449 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/renderer/qgscontinuouscolorrenderer.cpp b/src/core/renderer/qgscontinuouscolorrenderer.cpp
@@ -140,8 +140,8 @@ void QgsContinuousColorRenderer::renderFeature(QPainter * p, QgsFeature & f, QIm
       }
       brush.setStyle ( Qt::SolidPattern );
 
-      *img = QgsMarkerCatalogue::instance()->imageMarker ( mMinimumSymbol->pointSymbolName(), mMinimumSymbol->pointSize() *widthScale * rasterScaleFactor,
-          pen, brush);
+      *img = QgsMarkerCatalogue::instance()->imageMarker ( mMinimumSymbol->pointSymbolName(), \
+							   mMinimumSymbol->pointSize() * widthScale * rasterScaleFactor, pen, brush);
     } 
     else if ( mVectorType == QGis::Line )
     {
diff --git a/src/core/renderer/qgsgraduatedsymbolrenderer.cpp b/src/core/renderer/qgsgraduatedsymbolrenderer.cpp
@@ -130,8 +130,7 @@ void QgsGraduatedSymbolRenderer::renderFeature(QPainter * p, QgsFeature & f, QIm
       rotation = attrs[theSymbol->rotationClassificationField()].toDouble();
       QgsDebugMsg(QString("Feature has rotation factor %1").arg(rotation));
     }
-    *img = theSymbol->getPointSymbolAsImage( widthScale, selected, mSelectionColor,
-                                            rasterScaleFactor * fieldScale, rotation);
+    *img = theSymbol->getPointSymbolAsImage( widthScale, selected, mSelectionColor, fieldScale, rotation, rasterScaleFactor);
   } 
 
   // Line, polygon
diff --git a/src/core/renderer/qgssinglesymbolrenderer.cpp b/src/core/renderer/qgssinglesymbolrenderer.cpp
@@ -112,8 +112,7 @@ void QgsSingleSymbolRenderer::renderFeature(QPainter * p, QgsFeature & f, QImage
       QgsDebugMsg(QString("Feature has rotation factor %1").arg(rotation));
     }
 
-    *img = mSymbol->getPointSymbolAsImage( widthScale, selected, mSelectionColor,
-                                            rasterScaleFactor * fieldScale, rotation);
+    *img = mSymbol->getPointSymbolAsImage( widthScale, selected, mSelectionColor, fieldScale, rotation, rasterScaleFactor);
   }
 
 
diff --git a/src/core/renderer/qgsuniquevaluerenderer.cpp b/src/core/renderer/qgsuniquevaluerenderer.cpp
@@ -140,7 +140,7 @@ void QgsUniqueValueRenderer::renderFeature(QPainter* p, QgsFeature& f,QImage* im
       QgsDebugMsg(QString("Feature has rotation factor %1").arg(rotation));
     }
     *img = symbol->getPointSymbolAsImage( widthScale, selected, mSelectionColor,
-                                            rasterScaleFactor * fieldScale, rotation);
+					  fieldScale, rotation, rasterScaleFactor);
 }  
   // Line, polygon
   else if ( mVectorType != QGis::Point )
diff --git a/src/core/symbology/qgssymbol.cpp b/src/core/symbology/qgssymbol.cpp
@@ -324,31 +324,31 @@ QImage QgsSymbol::getCachedPointSymbolAsImage(  double widthScale,
   }
 }
 
-QImage QgsSymbol::getPointSymbolAsImage(  double widthScale,
-               bool selected, QColor selectionColor, double scale, double rotation )
+QImage QgsSymbol::getPointSymbolAsImage(  double widthScale, bool selected, QColor selectionColor, double scale, \
+					  double rotation, double rasterScaleFactor)
 {
   //QgsDebugMsg(QString("Symbol scale = %1, and rotation = %2").arg(scale).arg(rotation));
-  if ( 1.0 == scale && 0 == rotation )
+  if ( 1.0 == (scale * rasterScaleFactor) && 0 == rotation )
   {
     // If scale is 1.0 and rotation 0.0, use cached image.
     return getCachedPointSymbolAsImage( widthScale, selected, selectionColor );
   }
 
   QImage preRotateImage;
   QPen pen = mPen;
-  double newWidth = mPen.widthF() * widthScale * scale;
+  double newWidth = mPen.widthF() * widthScale * rasterScaleFactor;
   pen.setWidth(newWidth);
 
   if ( selected )
   {
     pen.setColor ( selectionColor ); 
     QBrush brush = mBrush;
-    preRotateImage = QgsMarkerCatalogue::instance()->imageMarker ( mPointSymbolName, (int)(mPointSize * scale * widthScale),
+    preRotateImage = QgsMarkerCatalogue::instance()->imageMarker ( mPointSymbolName, (int)(mPointSize * scale * widthScale * rasterScaleFactor),
                                                                    pen, mBrush );
   }
   else 
   {
-    preRotateImage = QgsMarkerCatalogue::instance()->imageMarker ( mPointSymbolName, (int)(mPointSize * scale * widthScale),
+    preRotateImage = QgsMarkerCatalogue::instance()->imageMarker ( mPointSymbolName, (int)(mPointSize * scale * widthScale * rasterScaleFactor),
                                                                    pen, mBrush );
   }
 
diff --git a/src/core/symbology/qgssymbol.h b/src/core/symbology/qgssymbol.h
@@ -105,9 +105,10 @@ class CORE_EXPORT QgsSymbol{
      */
     virtual QImage getPointSymbolAsImage( double widthScale = 1., 
         bool selected = false,
-        QColor selectionColor = Qt::yellow,
+        QColor selectionColor = Qt::yellow,				  
         double scale = 1.0,
-        double rotation = 0.0);
+	double rotation = 0.0,
+	double rasterScaleFactor = 1.0);
 
     /**Writes the contents of the symbol to a configuration file
       @ return true in case of success*/

Original file line number	Diff line number	Diff line change
`@@ -140,8 +140,8 @@ void QgsContinuousColorRenderer::renderFeature(QPainter * p, QgsFeature & f, QIm`
`140`	`140`	`}`
`141`	`141`	`brush.setStyle ( Qt::SolidPattern );`
`142`	`142`
`143`		`- img = QgsMarkerCatalogue::instance()->imageMarker ( mMinimumSymbol->pointSymbolName(), mMinimumSymbol->pointSize() widthScale * rasterScaleFactor,`
`144`		`- pen, brush);`
	`143`	`+ *img = QgsMarkerCatalogue::instance()->imageMarker ( mMinimumSymbol->pointSymbolName(), \`
	`144`	`+ mMinimumSymbol->pointSize() * widthScale * rasterScaleFactor, pen, brush);`
`145`	`145`	`}`
`146`	`146`	`else if ( mVectorType == QGis::Line )`
`147`	`147`	`{`
Original file line number	Diff line number	Diff line change
`@@ -130,8 +130,7 @@ void QgsGraduatedSymbolRenderer::renderFeature(QPainter * p, QgsFeature & f, QIm`
`130`	`130`	`rotation = attrs[theSymbol->rotationClassificationField()].toDouble();`
`131`	`131`	`QgsDebugMsg(QString("Feature has rotation factor %1").arg(rotation));`
`132`	`132`	`}`
`133`		`- *img = theSymbol->getPointSymbolAsImage( widthScale, selected, mSelectionColor,`
`134`		`- rasterScaleFactor * fieldScale, rotation);`
	`133`	`+ *img = theSymbol->getPointSymbolAsImage( widthScale, selected, mSelectionColor, fieldScale, rotation, rasterScaleFactor);`
`135`	`134`	`}`
`136`	`135`
`137`	`136`	`// Line, polygon`
Original file line number	Diff line number	Diff line change
`@@ -112,8 +112,7 @@ void QgsSingleSymbolRenderer::renderFeature(QPainter * p, QgsFeature & f, QImage`
`112`	`112`	`QgsDebugMsg(QString("Feature has rotation factor %1").arg(rotation));`
`113`	`113`	`}`
`114`	`114`
`115`		`- *img = mSymbol->getPointSymbolAsImage( widthScale, selected, mSelectionColor,`
`116`		`- rasterScaleFactor * fieldScale, rotation);`
	`115`	`+ *img = mSymbol->getPointSymbolAsImage( widthScale, selected, mSelectionColor, fieldScale, rotation, rasterScaleFactor);`
`117`	`116`	`}`
`118`	`117`
`119`	`118`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ void QgsUniqueValueRenderer::renderFeature(QPainter* p, QgsFeature& f,QImage* im`
`140`	`140`	`QgsDebugMsg(QString("Feature has rotation factor %1").arg(rotation));`
`141`	`141`	`}`
`142`	`142`	`*img = symbol->getPointSymbolAsImage( widthScale, selected, mSelectionColor,`
`143`		`- rasterScaleFactor * fieldScale, rotation);`
	`143`	`+ fieldScale, rotation, rasterScaleFactor);`
`144`	`144`	`}`
`145`	`145`	`// Line, polygon`
`146`	`146`	`else if ( mVectorType != QGis::Point )`
Original file line number	Diff line number	Diff line change
`@@ -324,31 +324,31 @@ QImage QgsSymbol::getCachedPointSymbolAsImage( double widthScale,`
`324`	`324`	`}`
`325`	`325`	`}`
`326`	`326`
`327`		`-QImage QgsSymbol::getPointSymbolAsImage( double widthScale,`
`328`		`- bool selected, QColor selectionColor, double scale, double rotation )`
	`327`	`+QImage QgsSymbol::getPointSymbolAsImage( double widthScale, bool selected, QColor selectionColor, double scale, \`
	`328`	`+ double rotation, double rasterScaleFactor)`
`329`	`329`	`{`
`330`	`330`	`//QgsDebugMsg(QString("Symbol scale = %1, and rotation = %2").arg(scale).arg(rotation));`
`331`		`- if ( 1.0 == scale && 0 == rotation )`
	`331`	`+ if ( 1.0 == (scale * rasterScaleFactor) && 0 == rotation )`
`332`	`332`	`{`
`333`	`333`	`// If scale is 1.0 and rotation 0.0, use cached image.`
`334`	`334`	`return getCachedPointSymbolAsImage( widthScale, selected, selectionColor );`
`335`	`335`	`}`
`336`	`336`
`337`	`337`	`QImage preRotateImage;`
`338`	`338`	`QPen pen = mPen;`
`339`		`- double newWidth = mPen.widthF() * widthScale * scale;`
	`339`	`+ double newWidth = mPen.widthF() * widthScale * rasterScaleFactor;`
`340`	`340`	`pen.setWidth(newWidth);`
`341`	`341`
`342`	`342`	`if ( selected )`
`343`	`343`	`{`
`344`	`344`	`pen.setColor ( selectionColor );`
`345`	`345`	`QBrush brush = mBrush;`
`346`		`- preRotateImage = QgsMarkerCatalogue::instance()->imageMarker ( mPointSymbolName, (int)(mPointSize * scale * widthScale),`
	`346`	`+ preRotateImage = QgsMarkerCatalogue::instance()->imageMarker ( mPointSymbolName, (int)(mPointSize * scale * widthScale * rasterScaleFactor),`
`347`	`347`	`pen, mBrush );`
`348`	`348`	`}`
`349`	`349`	`else`
`350`	`350`	`{`
`351`		`- preRotateImage = QgsMarkerCatalogue::instance()->imageMarker ( mPointSymbolName, (int)(mPointSize * scale * widthScale),`
	`351`	`+ preRotateImage = QgsMarkerCatalogue::instance()->imageMarker ( mPointSymbolName, (int)(mPointSize * scale * widthScale * rasterScaleFactor),`
`352`	`352`	`pen, mBrush );`
`353`	`353`	`}`
`354`	`354`