X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_SpinBox.cxx;h=b1817d584585dde86b11f836745315ace1ce1e09;hp=6b0d19ca12f3debfb864f3fc1d7ba153350e91b8;hb=ea8a0289f14641c23d515de68aa4fdc24a6208ba;hpb=4791f5b30ea7a9c1247aa551750dc71cb83b99aa

diff --git a/src/SMESHGUI/SMESHGUI_SpinBox.cxx b/src/SMESHGUI/SMESHGUI_SpinBox.cxx
index 6b0d19ca1..b1817d584 100644
--- a/src/SMESHGUI/SMESHGUI_SpinBox.cxx
+++ b/src/SMESHGUI/SMESHGUI_SpinBox.cxx
@@ -1,61 +1,63 @@
-//  SMESH SMESHGUI : GUI for SMESH component
+// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
 //
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-//  File   : SMESHGUI_SpinBox.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : SMESH
-//  $Header$
 
-using namespace std;
+// SMESH SMESHGUI : GUI for SMESH component
+// File   : SMESHGUI_SpinBox.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+// SMESH includes
+//
 #include "SMESHGUI_SpinBox.h"
-#include "SMESHGUI.h"
-#include <qvalidator.h>
+
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+
+// Qt includes
+#include <QLineEdit>
+#include <QVariant>
 
 //=================================================================================
 // class    : SMESHGUI_SpinBox()
 // purpose  : constructor of specific widget accepting floats in double precision.
 //=================================================================================
-SMESHGUI_SpinBox::SMESHGUI_SpinBox( QWidget* parent, const char* name )
-: QAD_SpinBoxDbl( parent, name)
+SMESHGUI_SpinBox::SMESHGUI_SpinBox( QWidget* parent )
+  : SalomeApp_DoubleSpinBox( parent )
 {
 }
 
-
 //=================================================================================
-// function : SetStep()  [SLOT]
-// purpose  :
+// function : ~SMESHGUI_SpinBox()
+// purpose  : destructor
 //=================================================================================
-void SMESHGUI_SpinBox::SetStep( double newStep )
+SMESHGUI_SpinBox::~SMESHGUI_SpinBox()
 {
-  setLineStep( newStep );
 }
 
 //=================================================================================
-// function : ~SMESHGUI_SpinBox()
-// purpose  : destructor
+// function : SetStep()  [SLOT]
+// purpose  :
 //=================================================================================
-SMESHGUI_SpinBox::~SMESHGUI_SpinBox()
+void SMESHGUI_SpinBox::SetStep( double newStep )
 {
+  setSingleStep( newStep );
 }
 
 //=================================================================================
@@ -64,14 +66,15 @@ SMESHGUI_SpinBox::~SMESHGUI_SpinBox()
 //=================================================================================
 void SMESHGUI_SpinBox::SetValue( double v )
 {
-  setValue( v );
+  setValue(valueFromText(textFromValue(v)));
+  editor()->setCursorPosition( 0 );
 }
 
 //=================================================================================
 // function : GetValue()
 // purpose  : returns a double
 //=================================================================================
-double SMESHGUI_SpinBox::GetValue( )
+double SMESHGUI_SpinBox::GetValue() const
 {
   return value();
 }
@@ -80,18 +83,43 @@ double SMESHGUI_SpinBox::GetValue( )
 // function : GetString()
 // purpose  : returns a QString
 //=================================================================================
-QString SMESHGUI_SpinBox::GetString( )
+QString SMESHGUI_SpinBox::GetString() const
 {
   return cleanText();
 }
 
+//=================================================================================
+// function : editor()
+// purpose  : returns editor
+//=================================================================================
+QLineEdit* SMESHGUI_SpinBox::editor() const
+{
+  return SalomeApp_DoubleSpinBox::lineEdit();
+} 
+
 //=================================================================================
 // function : RangeStepAndValidator()
 // purpose  :
 //=================================================================================
-void SMESHGUI_SpinBox::RangeStepAndValidator( double min, double max, double step, unsigned short decimals )
+void SMESHGUI_SpinBox::RangeStepAndValidator( double min,
+                                              double max,
+                                              double step,
+                                              const char* quantity )
 {
-  setRange( min, max );
-  setLineStep( step );
-  ( ( QDoubleValidator* )validator() )->setRange( min, max, decimals ) ;
+  // Obtain precision from preferences
+  SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
+  int precision = resMgr->integerValue( "SMESH", quantity, -3 );
+  
+  setPrecision(precision); // PAL8769. Minus is for using 'g' double->string conversion specifier,
+  //                          see QtxDoubleSpinBox::mapValueToText( double v )
+  //                          san: this can be achieved using preferences
+  setDecimals( 20 ); // qAbs(precision)
+  setRange(min, max);
+  setSingleStep( step );
+  setDefaultValue( min );
+  
+  // Add a hint for the user saying how to tune precision
+  QString userPropName = QObject::tr( QString( "SMESH_PREF_%1" ).arg( quantity ).toLatin1().constData() );
+  setProperty( "validity_tune_hint", 
+               QVariant( QObject::tr( "SMESH_PRECISION_HINT" ).arg( userPropName ) ) );  
 }