sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

do not add new point if zoom is stoped, reset measure by right mouse button

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3235 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
rabla 2005-04-27 09:27:24 +00:00
parent 7f0a65d4cd
commit c0e965389f
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/qgsmapcanvas.cpp
View File

@ -1199,7 +1199,7 @@ void QgsMapCanvas::mousePressEvent(QMouseEvent * e)
( mCanvasProperties->mapTool == QGis::ZoomIn || mCanvasProperties->mapTool == QGis::ZoomOut
|| mCanvasProperties->mapTool == QGis::Pan ) )
{
emit stopZoom();
//emit stopZoom();
return;
}
@ -1232,6 +1232,16 @@ void QgsMapCanvas::mouseReleaseEvent(QMouseEvent * e)
{
if (!mUserInteractionAllowed)
return;
// right button was pressed in zoom tool, return to previous non zoom tool
if ( e->button() == Qt::RightButton &&
( mCanvasProperties->mapTool == QGis::ZoomIn || mCanvasProperties->mapTool == QGis::ZoomOut
|| mCanvasProperties->mapTool == QGis::Pan ) )
{
emit stopZoom();
return;
}
QPainter paint;
QPen pen(Qt::gray);
QgsPoint ll, ur;
@ -1630,11 +1640,20 @@ void QgsMapCanvas::mouseReleaseEvent(QMouseEvent * e)
{
QgsPoint point = mCanvasProperties->coordXForm->toMapCoordinates(e->x(), e->y());
if(e->button()==Qt::RightButton) // restart
{
if ( mMeasure ) {
mMeasure->restart();
}
}
else
{
if ( !mMeasure ) {
mMeasure = new QgsMeasure(this, topLevelWidget() );
}
mMeasure->addPoint(point);
mMeasure->show();
}
break;
}
}