@@ -819,13 +819,13 @@ bool QgsVectorLayer::draw(QgsRenderContext& renderContext)
819
819
sel = FALSE ;
820
820
}
821
821
822
- // QgsDebugMsg(QString("markerScale before renderFeature(): %1").arg(markerScaleFactor));
823
- // markerScalerFactore reflects the wanted scaling of the marker
822
+ // QgsDebugMsg(QString("markerScale before renderFeature(): %1").arg(markerScaleFactor));
823
+ // markerScalerFactore reflects the wanted scaling of the marker
824
824
mRenderer ->renderFeature (renderContext.painter (), fet, &marker, sel, renderContext.scaleFactor (), renderContext.rasterScaleFactor ());
825
- // markerScalerFactore now reflects the actual scaling of the marker that the render performed.
826
- // QgsDebugMsg(QString("markerScale after renderFeature(): %1").arg(markerScaleFactor));
825
+ // markerScalerFactore now reflects the actual scaling of the marker that the render performed.
826
+ // QgsDebugMsg(QString("markerScale after renderFeature(): %1").arg(markerScaleFactor));
827
827
828
- double scale = renderContext.scaleFactor () / markerScaleFactor;
828
+ // double scale = renderContext.scaleFactor() / markerScaleFactor;
829
829
drawFeature (renderContext.painter () , fet, &(renderContext.mapToPixel ()), renderContext.coordTransform (), &marker, renderContext.scaleFactor (), renderContext.rasterScaleFactor (), renderContext.drawEditingInformation ());
830
830
831
831
++featureCount;
@@ -838,12 +838,11 @@ bool QgsVectorLayer::draw(QgsRenderContext& renderContext)
838
838
for (; it != mAddedFeatures .end (); ++it)
839
839
{
840
840
bool sel = mSelectedFeatureIds .contains ((*it).featureId ());
841
- QgsDebugMsg (QString (" markerScale before renderFeature(): %1" ).arg (markerScaleFactor));
842
- // markerScalerFactore reflects the wanted scaling of the marker
843
- mRenderer ->renderFeature (renderContext.painter (), *it, &marker, &markerScaleFactor,
844
- sel, renderContext.scaleFactor ());
845
- // markerScalerFactore now reflects the actual scaling of the marker that the render performed.
846
- QgsDebugMsg (QString (" markerScale after renderFeature(): %1" ).arg (markerScaleFactor));
841
+ // QgsDebugMsg(QString("markerScale before renderFeature(): %1").arg(markerScaleFactor));
842
+ // markerScalerFactore reflects the wanted scaling of the marker
843
+ mRenderer ->renderFeature (renderContext.painter (), *it, &marker, sel, renderContext.scaleFactor (), renderContext.rasterScaleFactor ());
844
+ // markerScalerFactore now reflects the actual scaling of the marker that the render performed.
845
+ // QgsDebugMsg(QString("markerScale after renderFeature(): %1").arg(markerScaleFactor));
847
846
848
847
// double scale = renderContext.scaleFactor() / markerScaleFactor;
849
848
@@ -2797,7 +2796,7 @@ bool QgsVectorLayer::snapPoint(QgsPoint& point, double tolerance)
2797
2796
}
2798
2797
2799
2798
2800
- int QgsVectorLayer::snapWithContext (const QgsPoint& startPoint, double snappingTolerance, QMultiMap<double , QgsSnappingResult>& snappingResults, \
2799
+ int QgsVectorLayer::snapWithContext (const QgsPoint& startPoint, double snappingTolerance, QMultiMap<double , QgsSnappingResult>& snappingResults,
2801
2800
QgsSnapper::SNAP_TO snap_to)
2802
2801
{
2803
2802
if (snappingTolerance<=0 || !mDataProvider )
@@ -2806,7 +2805,7 @@ int QgsVectorLayer::snapWithContext(const QgsPoint& startPoint, double snappingT
2806
2805
}
2807
2806
2808
2807
QList<QgsFeature> featureList;
2809
- QgsRect searchRect (startPoint.x ()-snappingTolerance, startPoint.y ()-snappingTolerance, \
2808
+ QgsRect searchRect (startPoint.x ()-snappingTolerance, startPoint.y ()-snappingTolerance,
2810
2809
startPoint.x ()+snappingTolerance, startPoint.y ()+snappingTolerance);
2811
2810
double sqrSnappingTolerance = snappingTolerance * snappingTolerance;
2812
2811
@@ -2824,7 +2823,7 @@ int QgsVectorLayer::snapWithContext(const QgsPoint& startPoint, double snappingT
2824
2823
return 0 ;
2825
2824
}
2826
2825
2827
- void QgsVectorLayer::snapToGeometry (const QgsPoint& startPoint, int featureId, QgsGeometry* geom, double sqrSnappingTolerance, \
2826
+ void QgsVectorLayer::snapToGeometry (const QgsPoint& startPoint, int featureId, QgsGeometry* geom, double sqrSnappingTolerance,
2828
2827
QMultiMap<double , QgsSnappingResult>& snappingResults, QgsSnapper::SNAP_TO snap_to) const
2829
2828
{
2830
2829
if (!geom)
0 commit comments