Skip to content

Commit 80cacae

Browse files

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed
 

‎src/core/qgsvectorlayer.cpp

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -819,13 +819,13 @@ bool QgsVectorLayer::draw(QgsRenderContext& renderContext)
819819
sel = FALSE;
820820
}
821821

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
824824
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));
827827

828-
double scale = renderContext.scaleFactor() / markerScaleFactor;
828+
//double scale = renderContext.scaleFactor() / markerScaleFactor;
829829
drawFeature(renderContext.painter() , fet, &(renderContext.mapToPixel()), renderContext.coordTransform(), &marker, renderContext.scaleFactor(), renderContext.rasterScaleFactor(), renderContext.drawEditingInformation());
830830

831831
++featureCount;
@@ -838,12 +838,11 @@ bool QgsVectorLayer::draw(QgsRenderContext& renderContext)
838838
for(; it != mAddedFeatures.end(); ++it)
839839
{
840840
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));
847846

848847
//double scale = renderContext.scaleFactor() / markerScaleFactor;
849848

@@ -2797,7 +2796,7 @@ bool QgsVectorLayer::snapPoint(QgsPoint& point, double tolerance)
27972796
}
27982797

27992798

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,
28012800
QgsSnapper::SNAP_TO snap_to)
28022801
{
28032802
if (snappingTolerance<=0 || !mDataProvider)
@@ -2806,7 +2805,7 @@ int QgsVectorLayer::snapWithContext(const QgsPoint& startPoint, double snappingT
28062805
}
28072806

28082807
QList<QgsFeature> featureList;
2809-
QgsRect searchRect(startPoint.x()-snappingTolerance, startPoint.y()-snappingTolerance, \
2808+
QgsRect searchRect(startPoint.x()-snappingTolerance, startPoint.y()-snappingTolerance,
28102809
startPoint.x()+snappingTolerance, startPoint.y()+snappingTolerance);
28112810
double sqrSnappingTolerance = snappingTolerance * snappingTolerance;
28122811

@@ -2824,7 +2823,7 @@ int QgsVectorLayer::snapWithContext(const QgsPoint& startPoint, double snappingT
28242823
return 0;
28252824
}
28262825

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,
28282827
QMultiMap<double, QgsSnappingResult>& snappingResults, QgsSnapper::SNAP_TO snap_to) const
28292828
{
28302829
if(!geom)

0 commit comments

Comments
 (0)
Please sign in to comment.