sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Formatting changes only

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@8751 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
timlinux 2008-07-11 10:06:37 +00:00
parent 3009c0b96d
commit ea0608338a
1 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
src/app/qgsmaptooladdvertex.cpp
View File

@ -26,7 +26,7 @@ QgsMapToolAddVertex::QgsMapToolAddVertex(QgsMapCanvas* canvas): QgsMapToolVertex
{ {
} }
QgsMapToolAddVertex::~QgsMapToolAddVertex() QgsMapToolAddVertex::~QgsMapToolAddVertex()
{ {
delete mRubberBand; delete mRubberBand;
@ -35,42 +35,42 @@ QgsMapToolAddVertex::~QgsMapToolAddVertex()
void QgsMapToolAddVertex::canvasMoveEvent(QMouseEvent * e) void QgsMapToolAddVertex::canvasMoveEvent(QMouseEvent * e)
{ {
if(mRubberBand) if(mRubberBand)
{
QList<QgsSnappingResult> snapResults;
if(mSnapper.snapToBackgroundLayers(e->pos(), snapResults) == 0)
{ {
QList<QgsSnappingResult> snapResults; QgsPoint posMapCoord = snapPointFromResults(snapResults, e->pos());
if(mSnapper.snapToBackgroundLayers(e->pos(), snapResults) == 0) 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) void QgsMapToolAddVertex::canvasPressEvent(QMouseEvent * e)
{ {
delete mRubberBand; delete mRubberBand;
mRubberBand = 0; mRubberBand = 0;
//snap to segments of the current layer //snap to segments of the current layer
if(mSnapper.snapToCurrentLayer(e->pos(), mRecentSnappingResults, QgsSnapper::SNAP_TO_SEGMENT) != 0) if(mSnapper.snapToCurrentLayer(e->pos(), mRecentSnappingResults, QgsSnapper::SNAP_TO_SEGMENT) != 0)
{ {
//error //error
} }
if(mRecentSnappingResults.size() > 0) if(mRecentSnappingResults.size() > 0)
{ {
mRubberBand = createRubberBand(); mRubberBand = createRubberBand();
//take first snapping result and create the rubber band //take first snapping result and create the rubber band
QgsSnappingResult firstResult = *(mRecentSnappingResults.begin()); QgsSnappingResult firstResult = *(mRecentSnappingResults.begin());
mRubberBand->addPoint(firstResult.beforeVertex, false); mRubberBand->addPoint(firstResult.beforeVertex, false);
mRubberBand->addPoint(firstResult.snappedVertex, false); mRubberBand->addPoint(firstResult.snappedVertex, false);
mRubberBand->addPoint(firstResult.afterVertex, true); mRubberBand->addPoint(firstResult.afterVertex, true);
} }
else else
{ {
displaySnapToleranceWarning(); displaySnapToleranceWarning();
} }
} }
void QgsMapToolAddVertex::canvasReleaseEvent(QMouseEvent * e) void QgsMapToolAddVertex::canvasReleaseEvent(QMouseEvent * e)
@ -78,36 +78,36 @@ void QgsMapToolAddVertex::canvasReleaseEvent(QMouseEvent * e)
QgsMapLayer* currentLayer = mCanvas->currentLayer(); QgsMapLayer* currentLayer = mCanvas->currentLayer();
QgsVectorLayer* vlayer = 0; QgsVectorLayer* vlayer = 0;
if(currentLayer) if(currentLayer)
{ {
vlayer = dynamic_cast<QgsVectorLayer*>(currentLayer); vlayer = dynamic_cast<QgsVectorLayer*>(currentLayer);
} }
if(vlayer && mRecentSnappingResults.size() > 0) if(vlayer && mRecentSnappingResults.size() > 0)
{ {
//snap point to background layers //snap point to background layers
QgsPoint snappedPointMapCoord; QgsPoint snappedPointMapCoord;
QgsPoint snappedPointLayerCoord; QgsPoint snappedPointLayerCoord;
QList<QgsSnappingResult> snapResults; QList<QgsSnappingResult> snapResults;
if(mSnapper.snapToBackgroundLayers(e->pos(), snapResults) == 0)
{
snappedPointMapCoord = snapPointFromResults(snapResults, e->pos());
snappedPointLayerCoord = toLayerCoords(vlayer, snappedPointMapCoord);
int topologicalEditing = QgsProject::instance()->readNumEntry("Digitizing", "/TopologicalEditing", 0); if(mSnapper.snapToBackgroundLayers(e->pos(), snapResults) == 0)
if(topologicalEditing) {
{ snappedPointMapCoord = snapPointFromResults(snapResults, e->pos());
insertSegmentVerticesForSnap(snapResults, vlayer); snappedPointLayerCoord = toLayerCoords(vlayer, snappedPointMapCoord);
}
int topologicalEditing = QgsProject::instance()->readNumEntry("Digitizing", "/TopologicalEditing", 0);
//and change the feature points if(topologicalEditing)
QList<QgsSnappingResult>::iterator sr_it = mRecentSnappingResults.begin(); {
for(; sr_it != mRecentSnappingResults.end(); ++sr_it) insertSegmentVerticesForSnap(snapResults, vlayer);
{ }
vlayer->insertVertexBefore(snappedPointLayerCoord.x(), snappedPointLayerCoord.y(), sr_it->snappedAtGeometry, sr_it->afterVertexNr);
} //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; delete mRubberBand;
mRubberBand = 0; mRubberBand = 0;