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
Fix bug 10955: Collisions with 'Ctrl+I' and 'Ctrl+M' hot keys.
[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 f436c649cafb9010fafcfd2beaadde817eda7623..11fb1a9bde5ddc00974365b2bf369fef44e99694 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h
@@
-41,10
+41,11
@@
class QPushButton;
class QToolButton;
class QRadioButton;
class QSpinBox;
class QToolButton;
class QRadioButton;
class QSpinBox;
+class SMESHGUI;
class QtxDblSpinBox;
class QtxDblSpinBox;
-class
Salome
App_SelectionMgr;
+class
Light
App_SelectionMgr;
class SMESH_Actor;
class SMESH_Actor;
@@
-54,14
+55,15
@@
class SMESHGUI_Preferences_ScalarBarDlg : public QDialog
public:
~SMESHGUI_Preferences_ScalarBarDlg();
public:
~SMESHGUI_Preferences_ScalarBarDlg();
- static void ScalarBarPreferences(
QWidget* parent
);
- static void ScalarBarProperties (
QWidget* parent, SalomeApp_SelectionMgr* Sel
);
+ static void ScalarBarPreferences(
SMESHGUI*
);
+ static void ScalarBarProperties (
SMESHGUI*
);
protected:
protected:
- SMESHGUI_Preferences_ScalarBarDlg(
QWidget* parent = 0, SalomeApp_SelectionMgr* 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 );
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();
protected slots:
void onOk();
@@
-74,10
+76,13
@@
protected slots:
void onOrientationChanged();
private:
void onOrientationChanged();
private:
- SalomeApp_SelectionMgr* mySelectionMgr;
+ SMESHGUI* mySMESHGUI;
+ LightApp_SelectionMgr* mySelectionMgr;
SMESH_Actor* myActor;
double myIniX, myIniY, myIniW, myIniH;
int myIniOrientation;
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;
QGroupBox* myRangeGrp;
QLineEdit* myMinEdit;