Merge pull request #2863 from pvalsecc/minMaxScale

m-kuhn · m-kuhn · commit bd3fd748f1e1 · 2016-03-20T10:53:43.000+01:00
Add check to make sure minScale&lt;=maxScale.
diff --git a/python/gui/qgsscalecombobox.sip b/python/gui/qgsscalecombobox.sip
@@ -17,9 +17,11 @@ class QgsScaleComboBox : QComboBox
     //! Function to set the selected scale from text
     bool setScaleString( const QString& scaleTxt );
     //! Function to read the selected scale as double
-    double scale();
+    double scale() const;
     //! Function to set the selected scale from double
     void setScale( double scale );
+    //! Function to read the min scale
+    double minScale() const;
 
     //! Helper function to convert a double to scale string
     // Performs rounding, so an exact representation is not to
@@ -30,10 +32,12 @@ class QgsScaleComboBox : QComboBox
 
   signals:
     //! Signal is emitted when *user* has finished editing/selecting a new scale.
-    void scaleChanged();
+    void scaleChanged( double scale );
 
   public slots:
     void updateScales( const QStringList &scales = QStringList() );
+    //! Function to set the min scale
+    void setMinScale( double scale );
 
   protected:
     void showPopup();
diff --git a/python/gui/qgsscalewidget.sip b/python/gui/qgsscalewidget.sip
@@ -26,9 +26,11 @@ class QgsScaleWidget : QWidget
     //! Function to set the selected scale from text
     bool setScaleString( const QString& scaleTxt );
     //! Function to read the selected scale as double
-    double scale();
+    double scale() const;
     //! Function to set the selected scale from double
     void setScale( double scale );
+    //! Function to read the min scale
+    double minScale() const;
 
     //! Helper function to convert a double to scale string
     // Performs rounding, so an exact representation is not to
@@ -43,9 +45,12 @@ class QgsScaleWidget : QWidget
     //! assign the current scale from the map canvas
     void setScaleFromCanvas();
 
+    //! Function to set the min scale
+    void setMinScale( double scale );
+
   signals:
     //! Signal is emitted when *user* has finished editing/selecting a new scale.
-    void scaleChanged();
+    void scaleChanged( double scale );
 
 
 };
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2057,7 +2057,7 @@ void QgisApp::createStatusBar()
   mScaleEdit->setToolTip( tr( "Current map scale (formatted as x:y)" ) );
 
   statusBar()->addPermanentWidget( mScaleEdit, 0 );
-  connect( mScaleEdit, SIGNAL( scaleChanged() ), this, SLOT( userScale() ) );
+  connect( mScaleEdit, SIGNAL( scaleChanged( double ) ), this, SLOT( userScale() ) );
 
   if ( QgsMapCanvas::rotationEnabled() )
   {
diff --git a/src/gui/qgsscalecombobox.cpp b/src/gui/qgsscalecombobox.cpp
@@ -24,7 +24,7 @@
 #include <QSettings>
 #include <QLineEdit>
 
-QgsScaleComboBox::QgsScaleComboBox( QWidget* parent ) : QComboBox( parent ), mScale( 1.0 )
+QgsScaleComboBox::QgsScaleComboBox( QWidget* parent ) : QComboBox( parent ), mScale( 1.0 ), mMinScale( 0.0 )
 {
   updateScales();
 
@@ -126,6 +126,11 @@ bool QgsScaleComboBox::setScaleString( const QString& scaleTxt )
 {
   bool ok;
   double newScale = toDouble( scaleTxt, &ok );
+  double oldScale = mScale;
+  if ( newScale < mMinScale )
+  {
+    newScale = mMinScale;
+  }
   if ( ! ok )
   {
     return false;
@@ -135,12 +140,16 @@ bool QgsScaleComboBox::setScaleString( const QString& scaleTxt )
     mScale = newScale;
     setEditText( toString( mScale ) );
     clearFocus();
+    if ( mScale != oldScale )
+    {
+      emit scaleChanged( mScale );
+    }
     return true;
   }
 }
 
 //! Function to read the selected scale as double
-double QgsScaleComboBox::scale()
+double QgsScaleComboBox::scale() const
 {
   return mScale;
 }
@@ -154,34 +163,24 @@ void QgsScaleComboBox::setScale( double scale )
 //! Slot called when QComboBox has changed
 void QgsScaleComboBox::fixupScale()
 {
-  double newScale;
-  double oldScale = mScale;
-  bool ok, userSetScale;
   QStringList txtList = currentText().split( ':' );
-  userSetScale = txtList.size() != 2;
+  bool userSetScale = txtList.size() != 2;
 
-  // QgsDebugMsg( QString( "entered with oldScale: %1" ).arg( oldScale ) );
-  newScale = toDouble( currentText(), &ok );
+  bool ok;
+  double newScale = toDouble( currentText(), &ok );
 
   // Valid string representation
-  if ( ok && ( newScale != oldScale ) )
+  if ( ok )
   {
     // if a user types scale = 2345, we transform to 1:2345
     if ( userSetScale && newScale >= 1.0 )
     {
-      mScale = 1 / newScale;
+      newScale = 1 / newScale;
     }
-    else
-    {
-      mScale = newScale;
-    }
-    setScale( mScale );
-    emit scaleChanged();
+    setScale( newScale );
   }
   else
   {
-    // Invalid string representation or same scale
-    // Reset to the old
     setScale( mScale );
   }
 }
@@ -241,4 +240,11 @@ double QgsScaleComboBox::toDouble( const QString& scaleString, bool * returnOk )
   return scale;
 }
 
-
+void QgsScaleComboBox::setMinScale( double scale )
+{
+  mMinScale = scale;
+  if ( mScale < scale )
+  {
+    setScale( scale );
+  }
+}
diff --git a/src/gui/qgsscalecombobox.h b/src/gui/qgsscalecombobox.h
@@ -36,9 +36,11 @@ class GUI_EXPORT QgsScaleComboBox : public QComboBox
     //! Function to set the selected scale from text
     bool setScaleString( const QString& scaleTxt );
     //! Function to read the selected scale as double
-    double scale();
+    double scale() const;
     //! Function to set the selected scale from double
     void setScale( double scale );
+    //! Function to read the min scale
+    double minScale() const { return mMinScale; }
 
     //! Helper function to convert a double to scale string
     // Performs rounding, so an exact representation is not to
@@ -49,10 +51,12 @@ class GUI_EXPORT QgsScaleComboBox : public QComboBox
 
   signals:
     //! Signal is emitted when *user* has finished editing/selecting a new scale.
-    void scaleChanged();
+    void scaleChanged( double scale );
 
   public slots:
     void updateScales( const QStringList &scales = QStringList() );
+    //! Function to set the min scale
+    void setMinScale( double scale );
 
   protected:
     void showPopup() override;
@@ -62,6 +66,7 @@ class GUI_EXPORT QgsScaleComboBox : public QComboBox
 
   private:
     double mScale;
+    double mMinScale;
 };
 
 #endif // QGSSCALECOMBOBOX_H
diff --git a/src/gui/qgsscalerangewidget.cpp b/src/gui/qgsscalerangewidget.cpp
@@ -43,6 +43,7 @@ QgsScaleRangeWidget::QgsScaleRangeWidget( QWidget *parent )
 
   mMinimumScaleWidget = new QgsScaleWidget( this );
   mMaximumScaleWidget = new QgsScaleWidget( this );
+  connect( mMinimumScaleWidget, SIGNAL( scaleChanged( double ) ), mMaximumScaleWidget, SLOT( setMinScale( double ) ) );
   mMinimumScaleWidget->setShowCurrentScaleButton( true );
   mMaximumScaleWidget->setShowCurrentScaleButton( true );
   reloadProjectScales();
diff --git a/src/gui/qgsscalewidget.cpp b/src/gui/qgsscalewidget.cpp
@@ -37,7 +37,7 @@ QgsScaleWidget::QgsScaleWidget( QWidget *parent )
   layout->addWidget( mCurrentScaleButton );
   mCurrentScaleButton->hide();
 
-  connect( mScaleComboBox, SIGNAL( scaleChanged() ), this, SIGNAL( scaleChanged() ) );
+  connect( mScaleComboBox, SIGNAL( scaleChanged( double ) ), this, SIGNAL( scaleChanged( double ) ) );
   connect( mCurrentScaleButton, SIGNAL( clicked() ), this, SLOT( setScaleFromCanvas() ) );
 }
 
diff --git a/src/gui/qgsscalewidget.h b/src/gui/qgsscalewidget.h
@@ -32,6 +32,8 @@ class GUI_EXPORT QgsScaleWidget : public QWidget
 {
     Q_OBJECT
     Q_PROPERTY( bool showCurrentScaleButton READ showCurrentScaleButton WRITE setShowCurrentScaleButton )
+    Q_PROPERTY( bool scale READ scale WRITE setScale NOTIFY scaleChanged )
+    Q_PROPERTY( bool minScale READ minScale WRITE setMinScale )
 
   public:
     explicit QgsScaleWidget( QWidget *parent = nullptr );
@@ -51,9 +53,11 @@ class GUI_EXPORT QgsScaleWidget : public QWidget
     //! Function to set the selected scale from text
     bool setScaleString( const QString& scaleTxt ) { return mScaleComboBox->setScaleString( scaleTxt ); }
     //! Function to read the selected scale as double
-    double scale() { return mScaleComboBox->scale();}
+    double scale() const { return mScaleComboBox->scale();}
     //! Function to set the selected scale from double
     void setScale( double scale ) { return mScaleComboBox->setScale( scale ); }
+    //! Function to read the min scale
+    double minScale() const { return mScaleComboBox->minScale(); }
 
     //! Helper function to convert a double to scale string
     // Performs rounding, so an exact representation is not to
@@ -68,9 +72,12 @@ class GUI_EXPORT QgsScaleWidget : public QWidget
     //! assign the current scale from the map canvas
     void setScaleFromCanvas();
 
+    //! Function to set the min scale
+    void setMinScale( double scale ) { mScaleComboBox->setMinScale( scale ); }
+
   signals:
     //! Signal is emitted when *user* has finished editing/selecting a new scale.
-    void scaleChanged();
+    void scaleChanged( double scale );
 
   private:
     QgsScaleComboBox* mScaleComboBox;
diff --git a/src/gui/qgsunitselectionwidget.cpp b/src/gui/qgsunitselectionwidget.cpp
@@ -28,8 +28,9 @@ QgsMapUnitScaleDialog::QgsMapUnitScaleDialog( QWidget* parent )
   mSpinBoxMaxSize->setShowClearButton( false );
   connect( mCheckBoxMinScale, SIGNAL( toggled( bool ) ), this, SLOT( configureMinComboBox() ) );
   connect( mCheckBoxMaxScale, SIGNAL( toggled( bool ) ), this, SLOT( configureMaxComboBox() ) );
-  connect( mComboBoxMinScale, SIGNAL( scaleChanged() ), this, SLOT( configureMaxComboBox() ) );
-  connect( mComboBoxMaxScale, SIGNAL( scaleChanged() ), this, SLOT( configureMinComboBox() ) );
+  connect( mComboBoxMinScale, SIGNAL( scaleChanged( double ) ), this, SLOT( configureMaxComboBox() ) );
+  connect( mComboBoxMinScale, SIGNAL( scaleChanged( double ) ), mComboBoxMaxScale, SLOT( setMinScale( double ) ) );
+  connect( mComboBoxMaxScale, SIGNAL( scaleChanged( double ) ), this, SLOT( configureMinComboBox() ) );
 
   connect( mCheckBoxMinSize, SIGNAL( toggled( bool ) ), mSpinBoxMinSize, SLOT( setEnabled( bool ) ) );
   connect( mCheckBoxMaxSize, SIGNAL( toggled( bool ) ), mSpinBoxMaxSize, SLOT( setEnabled( bool ) ) );
diff --git a/tests/src/gui/testqgsscalecombobox.cpp b/tests/src/gui/testqgsscalecombobox.cpp

Original file line number	Diff line number	Diff line change
`@@ -2057,7 +2057,7 @@ void QgisApp::createStatusBar()`
`2057`	`2057`	`mScaleEdit->setToolTip( tr( "Current map scale (formatted as x:y)" ) );`
`2058`	`2058`
`2059`	`2059`	`statusBar()->addPermanentWidget( mScaleEdit, 0 );`
`2060`		`- connect( mScaleEdit, SIGNAL( scaleChanged() ), this, SLOT( userScale() ) );`
	`2060`	`+ connect( mScaleEdit, SIGNAL( scaleChanged( double ) ), this, SLOT( userScale() ) );`
`2061`	`2061`
`2062`	`2062`	`if ( QgsMapCanvas::rotationEnabled() )`
`2063`	`2063`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`#include <QSettings>`
`25`	`25`	`#include <QLineEdit>`
`26`	`26`
`27`		`-QgsScaleComboBox::QgsScaleComboBox( QWidget* parent ) : QComboBox( parent ), mScale( 1.0 )`
	`27`	`+QgsScaleComboBox::QgsScaleComboBox( QWidget* parent ) : QComboBox( parent ), mScale( 1.0 ), mMinScale( 0.0 )`
`28`	`28`	`{`
`29`	`29`	`updateScales();`
`30`	`30`
`@@ -126,6 +126,11 @@ bool QgsScaleComboBox::setScaleString( const QString& scaleTxt )`
`126`	`126`	`{`
`127`	`127`	`bool ok;`
`128`	`128`	`double newScale = toDouble( scaleTxt, &ok );`
	`129`	`+ double oldScale = mScale;`
	`130`	`+ if ( newScale < mMinScale )`
	`131`	`+ {`
	`132`	`+ newScale = mMinScale;`
	`133`	`+ }`
`129`	`134`	`if ( ! ok )`
`130`	`135`	`{`
`131`	`136`	`return false;`
`@@ -135,12 +140,16 @@ bool QgsScaleComboBox::setScaleString( const QString& scaleTxt )`
`135`	`140`	`mScale = newScale;`
`136`	`141`	`setEditText( toString( mScale ) );`
`137`	`142`	`clearFocus();`
	`143`	`+ if ( mScale != oldScale )`
	`144`	`+ {`
	`145`	`+ emit scaleChanged( mScale );`
	`146`	`+ }`
`138`	`147`	`return true;`
`139`	`148`	`}`
`140`	`149`	`}`
`141`	`150`
`142`	`151`	`//! Function to read the selected scale as double`
`143`		`-double QgsScaleComboBox::scale()`
	`152`	`+double QgsScaleComboBox::scale() const`
`144`	`153`	`{`
`145`	`154`	`return mScale;`
`146`	`155`	`}`
`@@ -154,34 +163,24 @@ void QgsScaleComboBox::setScale( double scale )`
`154`	`163`	`//! Slot called when QComboBox has changed`
`155`	`164`	`void QgsScaleComboBox::fixupScale()`
`156`	`165`	`{`
`157`		`- double newScale;`
`158`		`- double oldScale = mScale;`
`159`		`- bool ok, userSetScale;`
`160`	`166`	`QStringList txtList = currentText().split( ':' );`
`161`		`- userSetScale = txtList.size() != 2;`
	`167`	`+ bool userSetScale = txtList.size() != 2;`
`162`	`168`
`163`		`- // QgsDebugMsg( QString( "entered with oldScale: %1" ).arg( oldScale ) );`
`164`		`- newScale = toDouble( currentText(), &ok );`
	`169`	`+ bool ok;`
	`170`	`+ double newScale = toDouble( currentText(), &ok );`
`165`	`171`
`166`	`172`	`// Valid string representation`
`167`		`- if ( ok && ( newScale != oldScale ) )`
	`173`	`+ if ( ok )`
`168`	`174`	`{`
`169`	`175`	`// if a user types scale = 2345, we transform to 1:2345`
`170`	`176`	`if ( userSetScale && newScale >= 1.0 )`
`171`	`177`	`{`
`172`		`- mScale = 1 / newScale;`
	`178`	`+ newScale = 1 / newScale;`
`173`	`179`	`}`
`174`		`- else`
`175`		`- {`
`176`		`- mScale = newScale;`
`177`		`- }`
`178`		`- setScale( mScale );`
`179`		`- emit scaleChanged();`
	`180`	`+ setScale( newScale );`
`180`	`181`	`}`
`181`	`182`	`else`
`182`	`183`	`{`
`183`		`- // Invalid string representation or same scale`
`184`		`- // Reset to the old`
`185`	`184`	`setScale( mScale );`
`186`	`185`	`}`
`187`	`186`	`}`
`@@ -241,4 +240,11 @@ double QgsScaleComboBox::toDouble( const QString& scaleString, bool * returnOk )`
`241`	`240`	`return scale;`
`242`	`241`	`}`
`243`	`242`
`244`		`-`
	`243`	`+void QgsScaleComboBox::setMinScale( double scale )`
	`244`	`+{`
	`245`	`+ mMinScale = scale;`
	`246`	`+ if ( mScale < scale )`
	`247`	`+ {`
	`248`	`+ setScale( scale );`
	`249`	`+ }`
	`250`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ QgsScaleWidget::QgsScaleWidget( QWidget *parent )`
`37`	`37`	`layout->addWidget( mCurrentScaleButton );`
`38`	`38`	`mCurrentScaleButton->hide();`
`39`	`39`
`40`		`- connect( mScaleComboBox, SIGNAL( scaleChanged() ), this, SIGNAL( scaleChanged() ) );`
	`40`	`+ connect( mScaleComboBox, SIGNAL( scaleChanged( double ) ), this, SIGNAL( scaleChanged( double ) ) );`
`41`	`41`	`connect( mCurrentScaleButton, SIGNAL( clicked() ), this, SLOT( setScaleFromCanvas() ) );`
`42`	`42`	`}`
`43`	`43`