X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_SpinBox.cxx;h=1b30cb08a33e0ede5f9b3e82e26a9a84c0bd187a;hp=772a6d1663132048b3a016d05bcfe4d339a7c121;hb=0635c9fc80f67d1e5dc0e94ec85f487286a92070;hpb=c63ee099ad2b149bd70136839c973e8910137bc5

diff --git a/src/SMESHGUI/SMESHGUI_SpinBox.cxx b/src/SMESHGUI/SMESHGUI_SpinBox.cxx
index 772a6d166..1b30cb08a 100644
--- a/src/SMESHGUI/SMESHGUI_SpinBox.cxx
+++ b/src/SMESHGUI/SMESHGUI_SpinBox.cxx
@@ -1,70 +1,66 @@
-//  SMESH SMESHGUI : GUI for SMESH component
+//  Copyright (C) 2007-2008  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  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.
 //
+//  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
+//
+// SMESH SMESHGUI : GUI for SMESH component
+// File   : SMESHGUI_SpinBox.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+// SMESH includes
 //
-//  File   : SMESHGUI_SpinBox.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : SMESH
-//  $Header$
-
 #include "SMESHGUI_SpinBox.h"
-#include "SMESHGUI.h"
-
-#include <qvalidator.h>
-#include <qlineedit.h>
 
-using namespace std;
+// Qt includes
+#include <QDoubleValidator>
+#include <QLineEdit>
 
 //=================================================================================
 // class    : SMESHGUI_SpinBox()
 // purpose  : constructor of specific widget accepting floats in double precision.
 //=================================================================================
-SMESHGUI_SpinBox::SMESHGUI_SpinBox (QWidget* parent, const char* name)
-     : QtxDblSpinBox(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 );
 }
 
 //=================================================================================
 // function : SetValue()
 // purpose  :
 //=================================================================================
-void SMESHGUI_SpinBox::SetValue (double v)
+void SMESHGUI_SpinBox::SetValue( double v )
 {
   setValue(v);
   editor()->setCursorPosition( 0 );
@@ -74,7 +70,7 @@ void SMESHGUI_SpinBox::SetValue (double v)
 // function : GetValue()
 // purpose  : returns a double
 //=================================================================================
-double SMESHGUI_SpinBox::GetValue()
+double SMESHGUI_SpinBox::GetValue() const
 {
   return value();
 }
@@ -83,19 +79,42 @@ 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 : validator()
+// purpose  : returns validator
+//=================================================================================
+QDoubleValidator* SMESHGUI_SpinBox::validator() const
+{
+  return (QDoubleValidator*)editor()->validator();
+}
+
 //=================================================================================
 // 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,
+					      unsigned short precision )
 {
+  setPrecision(precision*(-1)); // PAL8769. Minus is for using 'g' double->string conversion specifier,
+  //                               see QtxDoubleSpinBox::mapValueToText( double v )
+  setDecimals(32);
   setRange(min, max);
-  setLineStep(step);
-  ((QDoubleValidator*)validator())->setRange(min, max, decimals);
+  setSingleStep( step );
+  setDefaultValue( min );
 }