Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from V5_1_main 14/05/2010
[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 cc41262020870dceaf32ddcbea92377521d6fe36..c71c43cda4d14dc0896306547a58948e8b48b372 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
08
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
10
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-19,6
+19,7
@@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// SMESH SMESHGUI : GUI for SMESH component
// File : SMESHGUI_Preferences_ScalarBarDlg.h
// Author : Nicolas REJNERI, Open CASCADE S.A.S.
// SMESH SMESHGUI : GUI for SMESH component
// File : SMESHGUI_Preferences_ScalarBarDlg.h
// Author : Nicolas REJNERI, Open CASCADE S.A.S.
@@
-39,11
+40,11
@@
class QLineEdit;
class QPushButton;
class QToolButton;
class QRadioButton;
class QPushButton;
class QToolButton;
class QRadioButton;
-class QSpinBox;
class SMESHGUI;
class SMESH_Actor;
class SMESHGUI;
class SMESH_Actor;
-class QtxDoubleSpinBox;
+class SMESHGUI_SpinBox;
+class SalomeApp_IntSpinBox;
class QtxColorButton;
class LightApp_SelectionMgr;
class QtxColorButton;
class LightApp_SelectionMgr;
@@
-103,18
+104,18
@@
private:
QCheckBox* myLabelsShadowCheck;
QGroupBox* myLabColorGrp;
QCheckBox* myLabelsShadowCheck;
QGroupBox* myLabColorGrp;
-
QSpinBox*
myColorsSpin;
-
QSpinBox*
myLabelsSpin;
+
SalomeApp_IntSpinBox*
myColorsSpin;
+
SalomeApp_IntSpinBox*
myLabelsSpin;
QGroupBox* myOrientationGrp;
QRadioButton* myVertRadioBtn;
QRadioButton* myHorizRadioBtn;
QGroupBox* myOriginDimGrp;
QGroupBox* myOrientationGrp;
QRadioButton* myVertRadioBtn;
QRadioButton* myHorizRadioBtn;
QGroupBox* myOriginDimGrp;
-
QtxDouble
SpinBox* myXSpin;
-
QtxDouble
SpinBox* myYSpin;
-
QtxDouble
SpinBox* myWidthSpin;
-
QtxDouble
SpinBox* myHeightSpin;
+
SMESHGUI_
SpinBox* myXSpin;
+
SMESHGUI_
SpinBox* myYSpin;
+
SMESHGUI_
SpinBox* myWidthSpin;
+
SMESHGUI_
SpinBox* myHeightSpin;
QGroupBox* myButtonGrp;
QPushButton* myOkBtn;
QGroupBox* myButtonGrp;
QPushButton* myOkBtn;