Merge branch 'mantis-1385' into develop

Modules/Visualization/MonteverdiGui/include/mvdStatusBarWidget.h

@@ -161,6 +161,11 @@ private:
    */
   Ui::StatusBarWidget * m_UI;
 
+  /**
+   * \brief Change the scale when scaleLineEdit is pressed or editing is finished with change.
+   */
+  void ChangeScale();
+
   /*-[ PRIVATE SLOTS SECTION ]-----------------------------------------------*/
 
 //
@@ -175,6 +180,9 @@ private slots:
   /**
    */
   void on_pixelIndexLineEdit_returnPressed();
+  /**
+   */
+  void on_scaleLineEdit_returnPressed();
 };
 
 } // end namespace 'mvd'

Modules/Visualization/MonteverdiGui/src/mvdStatusBarWidget.cxx

@@ -217,9 +217,26 @@ StatusBarWidget
 }
 
 /*****************************************************************************/
+void
+StatusBarWidget
+::on_scaleLineEdit_returnPressed()
+{
+  ChangeScale();
+}
+
 void
 StatusBarWidget
 ::on_scaleLineEdit_editingFinished()
+{
+  if(m_UI->scaleLineEdit->isModified())
+    {
+      ChangeScale();
+    }
+}
+
+void
+StatusBarWidget
+::ChangeScale()
 {
   //
   // Cancel if scale text is empty.