Join modifications from branch BR_DEBUG_3_2_0b1

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_Preferences_ScalarBarDlg.h

diff --git a/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h b/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h
index bde914a36757a143eca20a8c1d41e559c2fb66d3..1e4c8cbe263749151ace7309a395c48decf37ef6 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h
+++ b/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h
@@ -17,7 +17,7 @@
 //  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 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -41,8 +41,12 @@ class QPushButton;
 class QToolButton;
 class QRadioButton;
 class QSpinBox;
-class QAD_SpinBoxDbl;
-class SALOME_Selection;
+class SMESHGUI;
+
+class QtxDblSpinBox;
+
+class LightApp_SelectionMgr;
+
 class SMESH_Actor;
 
 class SMESHGUI_Preferences_ScalarBarDlg : public QDialog
@@ -51,14 +55,15 @@ class SMESHGUI_Preferences_ScalarBarDlg : public QDialog
 
 public:
   ~SMESHGUI_Preferences_ScalarBarDlg();
-  static void ScalarBarPreferences( QWidget* parent );
-  static void ScalarBarProperties ( QWidget* parent, SALOME_Selection* Sel );
+  static void ScalarBarPreferences( SMESHGUI* );
+  static void ScalarBarProperties ( SMESHGUI* );
 
 protected:
-  SMESHGUI_Preferences_ScalarBarDlg( QWidget* parent = 0, SALOME_Selection* Sel = 0, bool modal = FALSE );
+  SMESHGUI_Preferences_ScalarBarDlg( SMESHGUI*, bool, bool modal = FALSE );
   static SMESHGUI_Preferences_ScalarBarDlg* myDlg;
   void closeEvent( QCloseEvent* e );
   void setOriginAndSize( const double x, const double y, const double w, const double h );
+  void initScalarBarFromResources();
 
 protected slots:
   void onOk();
@@ -71,10 +76,13 @@ protected slots:
   void onOrientationChanged();
 
 private:
-  SALOME_Selection*  mySelection;
-  SMESH_Actor*       myActor;
-  double             myIniX, myIniY, myIniW, myIniH;
-  int                myIniOrientation;
+  SMESHGUI*                mySMESHGUI;
+  LightApp_SelectionMgr*   mySelectionMgr;
+  SMESH_Actor*             myActor;
+  double                   myIniX, myIniY, myIniW, myIniH;
+  int                      myIniOrientation;
+  double DEF_VER_X,DEF_VER_Y,DEF_VER_H,DEF_VER_W;
+  double DEF_HOR_X,DEF_HOR_Y,DEF_HOR_H,DEF_HOR_W;
 
   QGroupBox*         myRangeGrp;
   QLineEdit*         myMinEdit;
@@ -101,10 +109,10 @@ private:
   QRadioButton*      myHorizRadioBtn;
 
   QGroupBox*         myOriginDimGrp;
-  QAD_SpinBoxDbl*    myXSpin;
-  QAD_SpinBoxDbl*    myYSpin;
-  QAD_SpinBoxDbl*    myWidthSpin;
-  QAD_SpinBoxDbl*    myHeightSpin;
+  QtxDblSpinBox*     myXSpin;
+  QtxDblSpinBox*     myYSpin;
+  QtxDblSpinBox*     myWidthSpin;
+  QtxDblSpinBox*     myHeightSpin;
 
   QGroupBox*         myButtonGrp;
   QPushButton*       myOkBtn;