Skip to content

Commit

Permalink
fix #5327
Browse files Browse the repository at this point in the history
  • Loading branch information
@jef-n
jef-n committed May 28, 2012
1 parent 75e95ea commit 6cff784
Show file tree
Hide file tree
Showing 6 changed files with 144 additions and 151 deletions.
207 changes: 99 additions & 108 deletions src/app/nodetool/qgsmaptoolnodetool.cpp
View file
Expand Up @@ -34,8 +34,9 @@ QgsMapToolNodeTool::QgsMapToolNodeTool( QgsMapCanvas* canvas )
, mClicked( false )
, mCtrl( false )
, mSelectAnother( false )
, mRubberBand( 0 )
, mSelectionRubberBand( 0 )
, mIsPoint( false )
, mDeselectOnRelease( -1 )
{
}

Expand Down Expand Up @@ -221,17 +222,18 @@ void QgsMapToolNodeTool::createTopologyRubberBands( QgsVectorLayer* vlayer, cons

void QgsMapToolNodeTool::canvasMoveEvent( QMouseEvent * e )
{
QgsVectorLayer* vlayer = qobject_cast<QgsVectorLayer *>( mCanvas->currentLayer() );
if ( !mSelectedFeature || !vlayer || !mClicked )
if ( !mSelectedFeature || !mClicked )
return;

QgsVectorLayer* vlayer = qobject_cast<QgsVectorLayer *>( mCanvas->currentLayer() );
if ( !vlayer )
return;

mSelectAnother = false;

if ( mMoving )
{
// create rubberband if none exists
// create rubberband, if none exists
if ( mRubberBands.empty() )
{
if ( mIsPoint )
Expand All @@ -255,18 +257,19 @@ void QgsMapToolNodeTool::canvasMoveEvent( QMouseEvent * e )
{
// move rubberband
QList<QgsSnappingResult> snapResults;
QgsPoint firstCoords = mCanvas->getCoordinateTransform()->toMapPoint( mLastCoordinates->x(), mLastCoordinates->y() );
QgsPoint firstCoords = toMapCoordinates( mPressCoordinates );
QList<QgsPoint> excludePoints;
excludePoints.append( mClosestVertex );
mSnapper.snapToBackgroundLayers( e->pos(), snapResults, excludePoints );
// get correct coordinates to move

// get correct coordinates to move to
QgsPoint posMapCoord = snapPointFromResults( snapResults, e->pos() );
if ( snapResults.size() > 0 )
{
firstCoords = toMapCoordinates( vlayer, mClosestVertex );
}

// special handling of points
// handle points
if ( mIsPoint )
{
double offsetX = posMapCoord.x() - firstCoords.x();
Expand All @@ -290,6 +293,7 @@ void QgsMapToolNodeTool::canvasMoveEvent( QMouseEvent * e )
double y = mapCoords.y() + posMapCoord.y() - firstCoords.y();

mRubberBands[vertexMap[i]->rubberBandNr()]->movePoint( vertexMap[i]->rubberBandIndex(), QgsPoint( x, y ) );

if ( vertexMap[i]->rubberBandIndex() == 0 )
{
mRubberBands[vertexMap[i]->rubberBandNr()]->movePoint( 0, QgsPoint( x, y ) );
Expand Down Expand Up @@ -319,6 +323,7 @@ void QgsMapToolNodeTool::canvasMoveEvent( QMouseEvent * e )
}
}
}

mPosMapCoordBackup = posMapCoord;
}
}
Expand All @@ -327,24 +332,25 @@ void QgsMapToolNodeTool::canvasMoveEvent( QMouseEvent * e )
if ( !mSelectionRectangle )
{
mSelectionRectangle = true;
mRubberBand = new QRubberBand( QRubberBand::Rectangle, mCanvas );
mSelectionRubberBand = new QRubberBand( QRubberBand::Rectangle, mCanvas );
mRect = new QRect();
mRect->setTopLeft( QPoint( mLastCoordinates->x(), mLastCoordinates->y() ) );
mRect->setTopLeft( mPressCoordinates );
}
mRect->setBottomRight( e->pos() );
QRect normalizedRect = mRect->normalized();
mRubberBand->setGeometry( normalizedRect );
mRubberBand->show();
mSelectionRubberBand->setGeometry( normalizedRect );
mSelectionRubberBand->show();
}
}

void QgsMapToolNodeTool::canvasPressEvent( QMouseEvent * e )
{
QgsDebugMsg( "Entering." );
QgsVectorLayer* vlayer = qobject_cast<QgsVectorLayer *>( mCanvas->currentLayer() );

QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( mCanvas->currentLayer() );

mClicked = true;
mLastCoordinates = new QgsPoint( e->pos().x(), e->pos().y() );
mPressCoordinates = e->pos();
QList<QgsSnappingResult> snapResults;
if ( !mSelectedFeature )
{
Expand All @@ -364,7 +370,7 @@ void QgsMapToolNodeTool::canvasPressEvent( QMouseEvent * e )
else
{
// some feature already selected
QgsPoint mapCoordPoint = mCanvas->getCoordinateTransform()->toMapPoint( e->pos().x(), e->pos().y() );
QgsPoint mapCoordPoint = toMapCoordinates( e->pos() );
double tol = QgsTolerance::vertexSearchRadius( vlayer, mCanvas->mapRenderer() );

// get geometry and find if snapping is near it
Expand All @@ -374,15 +380,45 @@ void QgsMapToolNodeTool::canvasPressEvent( QMouseEvent * e )
dist = sqrt( dist );

mSnapper.snapToCurrentLayer( e->pos(), snapResults, QgsSnapper::SnapToVertex, tol );
if ( dist > tol )
if ( dist <= tol )
{
// some vertex selected
mMoving = true;
QgsPoint point = toMapCoordinates( e->pos() );
mClosestVertex = closestVertex( toLayerCoordinates( vlayer, point ) );
if ( mMoving )
{
if ( mSelectedFeature->isSelected( atVertex ) )
{
mDeselectOnRelease = atVertex;
}
else if ( mCtrl )
{
mSelectedFeature->invertVertexSelection( atVertex );
}
else
{
mSelectedFeature->deselectAllVertexes();
mSelectedFeature->selectVertex( atVertex );
}
}
else
{
// select another feature
mAnother = snapResults.first().snappedAtGeometry;
mSelectAnother = true;
}
}
else
{
// for points only selecting another feature
// no vertexes found (selecting or inverting selection) if move
// or select another feature if clicked there
mSnapper.snapToCurrentLayer( e->pos(), snapResults, mIsPoint ? QgsSnapper::SnapToVertex : QgsSnapper::SnapToSegment, tol );
// no near vertex to snap
// unless point layer, try segment
if ( !mIsPoint )
mSnapper.snapToCurrentLayer( e->pos(), snapResults, QgsSnapper::SnapToSegment, tol );

if ( snapResults.size() > 0 )
{
// need to check all if there is a point in my selected feature
// need to check all if there is a point in the feature
mAnother = snapResults.first().snappedAtGeometry;
mSelectAnother = true;
QList<QgsSnappingResult>::iterator it = snapResults.begin();
Expand All @@ -401,7 +437,7 @@ void QgsMapToolNodeTool::canvasPressEvent( QMouseEvent * e )
if ( !mSelectAnother )
{
mMoving = true;
QgsPoint point = mCanvas->getCoordinateTransform()->toMapPoint( e->pos().x(), e->pos().y() );
QgsPoint point = toMapCoordinates( e->pos() );
mClosestVertex = closestVertex( toLayerCoordinates( vlayer, point ) );

if ( mIsPoint )
Expand All @@ -416,8 +452,7 @@ void QgsMapToolNodeTool::canvasPressEvent( QMouseEvent * e )
mSelectedFeature->invertVertexSelection( snapResult.snappedVertexNr );
}
}
else if ( !mSelectedFeature->isSelected( snapResult.beforeVertexNr ) ||
!mSelectedFeature->isSelected( snapResult.afterVertexNr ) )
else
{
if ( !mCtrl )
{
Expand All @@ -438,31 +473,6 @@ void QgsMapToolNodeTool::canvasPressEvent( QMouseEvent * e )
mSelectedFeature->deselectAllVertexes();
}
}
else
{
// some vertex selected
mMoving = true;
QgsPoint point = mCanvas->getCoordinateTransform()->toMapPoint( e->pos().x(), e->pos().y() );
mClosestVertex = closestVertex( toLayerCoordinates( vlayer, point ) );
if ( mMoving )
{
if ( mCtrl )
{
mSelectedFeature->invertVertexSelection( atVertex );
}
else
{
mSelectedFeature->deselectAllVertexes();
mSelectedFeature->selectVertex( atVertex );
}
}
else
{
// select another feature
mAnother = snapResults.first().snappedAtGeometry;
mSelectAnother = true;
}
}
}
QgsDebugMsg( "Leaving." );
}
Expand All @@ -476,109 +486,77 @@ void QgsMapToolNodeTool::selectedFeatureDestroyed()
void QgsMapToolNodeTool::canvasReleaseEvent( QMouseEvent * e )
{
if ( !mSelectedFeature )
{
// no feature is selected
return;
}

removeRubberBands();

QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( mCanvas->currentLayer() );

mClicked = false;
mSelectionRectangle = false;
QgsPoint coords = toMapCoordinates( e->pos() );

QgsPoint firstCoords = mCanvas->getCoordinateTransform()->toMapPoint( mLastCoordinates->x(), mLastCoordinates->y() );
if ( mRubberBand )
if ( mSelectionRubberBand )
{
mRubberBand->close();
delete mRubberBand;
mRubberBand = 0;
mSelectionRubberBand->close();
delete mSelectionRubberBand;
mSelectionRubberBand = 0;
}

if ( mLastCoordinates->x() == e->pos().x() && mLastCoordinates->y() == e->pos().y() )
if ( mPressCoordinates == e->pos() )
{
if ( mSelectAnother )
{
// select another feature (this should deselect current one ;-) )
// select another feature
mSelectedFeature->setSelectedFeature( mAnother, vlayer, mCanvas );
mIsPoint = vlayer->geometryType() == QGis::Point;
mSelectAnother = false;
}
}
else
{
// coordinates has to be coordinates from layer not canvas
QgsPoint layerCoords = toLayerCoordinates( vlayer, coords );
QgsPoint layerFirstCoords = toLayerCoordinates( vlayer, firstCoords );

// got correct coordinates
double topX, bottomX;
if ( layerCoords.x() > layerFirstCoords.x() )
{
topX = layerFirstCoords.x();
bottomX = layerCoords.x();
}
else
{
topX = layerCoords.x();
bottomX = layerFirstCoords.x();
}

double leftY, rightY;
if ( layerCoords.y() > layerFirstCoords.y() )
{
leftY = layerFirstCoords.y();
rightY = layerCoords.y();
}
else
{
leftY = layerCoords.y();
rightY = layerFirstCoords.y();
}

if ( mMoving )
{
mMoving = false;

QList<QgsSnappingResult> snapResults;
QgsPoint firstCoords = mCanvas->getCoordinateTransform()->toMapPoint( mLastCoordinates->x(), mLastCoordinates->y() );
QList<QgsPoint> excludePoints;
excludePoints.append( mClosestVertex );
mSnapper.snapToBackgroundLayers( e->pos(), snapResults, excludePoints );
coords = snapPointFromResults( snapResults, e->pos() );
// coords = mCanvas->getCoordinateTransform()->toMapPoint( e->pos().x(), e->pos().y() );
int topologicalEditing = QgsProject::instance()->readNumEntry( "Digitizing", "/TopologicalEditing", 0 );
mSnapper.snapToBackgroundLayers( e->pos(), snapResults, QList<QgsPoint>() << mClosestVertex );

QgsPoint releaseCoords = snapPointFromResults( snapResults, e->pos() );
QgsPoint pressCoords;

if ( snapResults.size() > 0 )
{
firstCoords = toMapCoordinates( vlayer, mClosestVertex );
pressCoords = toLayerCoordinates( vlayer, mClosestVertex );

int topologicalEditing = QgsProject::instance()->readNumEntry( "Digitizing", "/TopologicalEditing", 0 );
if ( topologicalEditing )
{
insertSegmentVerticesForSnap( snapResults, vlayer );
}
}
QgsPoint layerCoords = toLayerCoordinates( vlayer, coords );
QgsPoint layerFirstCoords = toLayerCoordinates( vlayer, firstCoords );
else
{
pressCoords = toLayerCoordinates( vlayer, mPressCoordinates );
}

double changeX = layerCoords.x() - layerFirstCoords.x();
double changeY = layerCoords.y() - layerFirstCoords.y();
mSelectedFeature->beginGeometryChange();
mSelectedFeature->moveSelectedVertexes( changeX, changeY );
mSelectedFeature->moveSelectedVertexes( releaseCoords - pressCoords );
mCanvas->refresh();
mSelectedFeature->endGeometryChange();
// movingVertexes
}
else // selecting vertexes by rubberband
{
// coordinates has to be coordinates from layer not canvas
QgsRectangle r( toLayerCoordinates( vlayer, mPressCoordinates ),
toLayerCoordinates( vlayer, e->pos() ) );

QList<QgsVertexEntry*> &vertexMap = mSelectedFeature->vertexMap();
if ( !mCtrl )
{
mSelectedFeature->deselectAllVertexes();
}

for ( int i = 0; i < vertexMap.size(); i++ )
{
if ( vertexMap[i]->point().x() < bottomX && vertexMap[i]->point().y() > leftY
&& vertexMap[i]->point().x() > topX && vertexMap[i]->point().y() < rightY )
if ( r.contains( vertexMap[i]->point() ) )
{
// inverting selection is enough because all were deselected if ctrl is not pressed
mSelectedFeature->invertVertexSelection( i, false );
Expand All @@ -589,7 +567,20 @@ void QgsMapToolNodeTool::canvasReleaseEvent( QMouseEvent * e )

mMoving = false;

removeRubberBands();
if ( mDeselectOnRelease != -1 )
{
if ( mCtrl )
{
mSelectedFeature->invertVertexSelection( mDeselectOnRelease );
}
else
{
mSelectedFeature->deselectAllVertexes();
mSelectedFeature->selectVertex( mDeselectOnRelease );
}

mDeselectOnRelease = -1;
}

mRecentSnappingResults.clear();
mExcludePoint.clear();
Expand All @@ -602,7 +593,7 @@ void QgsMapToolNodeTool::deactivate()
delete mSelectedFeature;
mSelectedFeature = 0;

mRubberBand = 0;
mSelectionRubberBand = 0;
mSelectAnother = false;
mCtrl = false;
mMoving = true;
Expand Down

0 comments on commit 6cff784

Please sign in to comment.