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 5d4dce8a91be309103cbebeb11139ff23116bbc3..11fb1a9bde5ddc00974365b2bf369fef44e99694 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h
@@
-63,6
+63,7
@@
protected:
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();
@@
-80,6
+81,8
@@
private:
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;