[QGIS Commit] r8751 - trunk/qgis/src/app
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Fri Jul 11 06:06:37 EDT 2008
Author: timlinux
Date: 2008-07-11 06:06:37 -0400 (Fri, 11 Jul 2008)
New Revision: 8751
Modified:
trunk/qgis/src/app/qgsmaptooladdvertex.cpp
Log:
Formatting changes only
Modified: trunk/qgis/src/app/qgsmaptooladdvertex.cpp
===================================================================
--- trunk/qgis/src/app/qgsmaptooladdvertex.cpp 2008-07-11 00:20:16 UTC (rev 8750)
+++ trunk/qgis/src/app/qgsmaptooladdvertex.cpp 2008-07-11 10:06:37 UTC (rev 8751)
@@ -26,7 +26,7 @@
{
}
-
+
QgsMapToolAddVertex::~QgsMapToolAddVertex()
{
delete mRubberBand;
@@ -35,42 +35,42 @@
void QgsMapToolAddVertex::canvasMoveEvent(QMouseEvent * e)
{
if(mRubberBand)
+ {
+ QList<QgsSnappingResult> snapResults;
+ if(mSnapper.snapToBackgroundLayers(e->pos(), snapResults) == 0)
{
- QList<QgsSnappingResult> snapResults;
- if(mSnapper.snapToBackgroundLayers(e->pos(), snapResults) == 0)
- {
- QgsPoint posMapCoord = snapPointFromResults(snapResults, e->pos());
- mRubberBand->movePoint(2, posMapCoord); //consider that the first rubber band point is added twice
- }
+ QgsPoint posMapCoord = snapPointFromResults(snapResults, e->pos());
+ mRubberBand->movePoint(2, posMapCoord); //consider that the first rubber band point is added twice
}
+ }
}
void QgsMapToolAddVertex::canvasPressEvent(QMouseEvent * e)
{
delete mRubberBand;
mRubberBand = 0;
-
+
//snap to segments of the current layer
if(mSnapper.snapToCurrentLayer(e->pos(), mRecentSnappingResults, QgsSnapper::SNAP_TO_SEGMENT) != 0)
- {
- //error
- }
+ {
+ //error
+ }
-
+
if(mRecentSnappingResults.size() > 0)
- {
- mRubberBand = createRubberBand();
- //take first snapping result and create the rubber band
- QgsSnappingResult firstResult = *(mRecentSnappingResults.begin());
- mRubberBand->addPoint(firstResult.beforeVertex, false);
- mRubberBand->addPoint(firstResult.snappedVertex, false);
- mRubberBand->addPoint(firstResult.afterVertex, true);
- }
+ {
+ mRubberBand = createRubberBand();
+ //take first snapping result and create the rubber band
+ QgsSnappingResult firstResult = *(mRecentSnappingResults.begin());
+ mRubberBand->addPoint(firstResult.beforeVertex, false);
+ mRubberBand->addPoint(firstResult.snappedVertex, false);
+ mRubberBand->addPoint(firstResult.afterVertex, true);
+ }
else
- {
- displaySnapToleranceWarning();
- }
+ {
+ displaySnapToleranceWarning();
+ }
}
void QgsMapToolAddVertex::canvasReleaseEvent(QMouseEvent * e)
@@ -78,36 +78,36 @@
QgsMapLayer* currentLayer = mCanvas->currentLayer();
QgsVectorLayer* vlayer = 0;
if(currentLayer)
- {
- vlayer = dynamic_cast<QgsVectorLayer*>(currentLayer);
- }
+ {
+ vlayer = dynamic_cast<QgsVectorLayer*>(currentLayer);
+ }
if(vlayer && mRecentSnappingResults.size() > 0)
+ {
+ //snap point to background layers
+ QgsPoint snappedPointMapCoord;
+ QgsPoint snappedPointLayerCoord;
+ QList<QgsSnappingResult> snapResults;
+
+ if(mSnapper.snapToBackgroundLayers(e->pos(), snapResults) == 0)
{
- //snap point to background layers
- QgsPoint snappedPointMapCoord;
- QgsPoint snappedPointLayerCoord;
- QList<QgsSnappingResult> snapResults;
-
- if(mSnapper.snapToBackgroundLayers(e->pos(), snapResults) == 0)
- {
- snappedPointMapCoord = snapPointFromResults(snapResults, e->pos());
- snappedPointLayerCoord = toLayerCoords(vlayer, snappedPointMapCoord);
+ snappedPointMapCoord = snapPointFromResults(snapResults, e->pos());
+ snappedPointLayerCoord = toLayerCoords(vlayer, snappedPointMapCoord);
- int topologicalEditing = QgsProject::instance()->readNumEntry("Digitizing", "/TopologicalEditing", 0);
- if(topologicalEditing)
- {
- insertSegmentVerticesForSnap(snapResults, vlayer);
- }
-
- //and change the feature points
- QList<QgsSnappingResult>::iterator sr_it = mRecentSnappingResults.begin();
- for(; sr_it != mRecentSnappingResults.end(); ++sr_it)
- {
- vlayer->insertVertexBefore(snappedPointLayerCoord.x(), snappedPointLayerCoord.y(), sr_it->snappedAtGeometry, sr_it->afterVertexNr);
- }
- }
+ int topologicalEditing = QgsProject::instance()->readNumEntry("Digitizing", "/TopologicalEditing", 0);
+ if(topologicalEditing)
+ {
+ insertSegmentVerticesForSnap(snapResults, vlayer);
+ }
+
+ //and change the feature points
+ QList<QgsSnappingResult>::iterator sr_it = mRecentSnappingResults.begin();
+ for(; sr_it != mRecentSnappingResults.end(); ++sr_it)
+ {
+ vlayer->insertVertexBefore(snappedPointLayerCoord.x(), snappedPointLayerCoord.y(), sr_it->snappedAtGeometry, sr_it->afterVertexNr);
+ }
}
+ }
delete mRubberBand;
mRubberBand = 0;
More information about the QGIS-commit
mailing list