avoid useless canvas redraw when user interacts with scale selector

alexbruy · alexbruy · commit ddb51fe5babf · 2012-01-21T12:14:32.000+02:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -4348,6 +4348,8 @@ void QgisApp::showScale( double theScale )
   else
     mScaleEdit->setText( tr( "Invalid scale" ) );
 
+  mOldScale = mScaleEdit->text();
+
   // Set minimum necessary width
   if ( mScaleEdit->width() > mScaleEdit->minimumWidth() )
   {
@@ -4357,6 +4359,11 @@ void QgisApp::showScale( double theScale )
 
 void QgisApp::userScale()
 {
+  if ( mOldScale == mScaleEdit->text() )
+  {
+    return;
+  }
+
   QStringList parts = mScaleEdit->text().split( ':' );
   if ( parts.size() == 2 )
   {
diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -1079,6 +1079,8 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
 
     //! project changed
     void projectChanged( const QDomDocument & );
+
+    QString mOldScale;
 };
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -4348,6 +4348,8 @@ void QgisApp::showScale( double theScale )`
`4348`	`4348`	`else`
`4349`	`4349`	`mScaleEdit->setText( tr( "Invalid scale" ) );`
`4350`	`4350`
	`4351`	`+ mOldScale = mScaleEdit->text();`
	`4352`	`+`
`4351`	`4353`	`// Set minimum necessary width`
`4352`	`4354`	`if ( mScaleEdit->width() > mScaleEdit->minimumWidth() )`
`4353`	`4355`	`{`
`@@ -4357,6 +4359,11 @@ void QgisApp::showScale( double theScale )`
`4357`	`4359`
`4358`	`4360`	`void QgisApp::userScale()`
`4359`	`4361`	`{`
	`4362`	`+ if ( mOldScale == mScaleEdit->text() )`
	`4363`	`+ {`
	`4364`	`+ return;`
	`4365`	`+ }`
	`4366`	`+`
`4360`	`4367`	`QStringList parts = mScaleEdit->text().split( ':' );`
`4361`	`4368`	`if ( parts.size() == 2 )`
`4362`	`4369`	`{`