Skip to content
Permalink
Browse files

Merge pull request #212 from homann/issue2850

Fix for issue 2850
  • Loading branch information
timlinux committed Aug 25, 2012
2 parents ae08961 + 5ba8422 commit 835f96109de3d8ae1f18c76344d945a7b443f07f
Showing with 14 additions and 1 deletion.
  1. +5 −1 src/app/qgsmeasuredialog.cpp
  2. +1 −0 src/app/qgsmeasuretool.cpp
  3. +4 −0 src/gui/qgsmapcanvas.cpp
  4. +4 −0 src/gui/qgsmapcanvas.h
@@ -57,7 +57,9 @@ QgsMeasureDialog::QgsMeasureDialog( QgsMeasureTool* tool, Qt::WFlags f )
else
mcbProjectionEnabled->setCheckState( Qt::Unchecked );

connect( mcbProjectionEnabled, SIGNAL( stateChanged( int ) ),
// Update whenever the canvas has refreshed. Maybe more often than needed,
// but at least every time any settings changes
connect( mTool->canvas(), SIGNAL( mapCanvasRefreshed() ),
this, SLOT( changeProjectionEnabledState() ) );
// Update when project wide transformation has changed
connect( mTool->canvas()->mapRenderer(), SIGNAL( hasCrsTransformEnabled( bool ) ),
@@ -297,6 +299,7 @@ void QgsMeasureDialog::convertMeasurement( double &measure, QGis::UnitType &u, b

void QgsMeasureDialog::changeProjectionEnabledState()
{
QgsDebugMsg( "Entering!" );
// store value
QSettings settings;
if ( mcbProjectionEnabled->isChecked() )
@@ -357,6 +360,7 @@ void QgsMeasureDialog::changeProjectionEnabledState()
b = false;
}
}
QgsDebugMsg( "Exiting!" );
}

void QgsMeasureDialog::configureDistanceArea()
@@ -48,6 +48,7 @@ QgsMeasureTool::QgsMeasureTool( QgsMapCanvas* canvas, bool measureArea )

QgsMeasureTool::~QgsMeasureTool()
{
delete mDialog;
delete mRubberBand;
}

@@ -427,6 +427,10 @@ void QgsMapCanvas::refresh()
}

mDrawing = false;

// Done refreshing
emit mapCanvasRefreshed();

} // refresh

void QgsMapCanvas::updateMap()
@@ -335,6 +335,10 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
*/
void renderComplete( QPainter * );

/** Emitted when canvas finished a refresh request.
\note Added in 2.0 */
void mapCanvasRefreshed();

/** Emitted when the canvas is about to be rendered.
\note Added in 1.5 */
void renderStarting();

0 comments on commit 835f961

Please sign in to comment.
You can’t perform that action at this time.