Salome HOME
projects
/
modules
/
visu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from OCC_development_generic_2006
[modules/visu.git]
/
src
/
VISUGUI
/
VisuGUI_ScalarBarDlg.h
diff --git
a/src/VISUGUI/VisuGUI_ScalarBarDlg.h
b/src/VISUGUI/VisuGUI_ScalarBarDlg.h
index 33c55f963a00f7f129da10b59560dd424e653b63..4f53a39bdc4e221c2cb076d7ff432af730d5795b 100644
(file)
--- a/
src/VISUGUI/VisuGUI_ScalarBarDlg.h
+++ b/
src/VISUGUI/VisuGUI_ScalarBarDlg.h
@@
-60,7
+60,7
@@
class QToolButton;
class QtxDblSpinBox;
class SalomeApp_Module;
class QtxDblSpinBox;
class SalomeApp_Module;
-class
VisuGUI_FontWg
;
+class
SVTK_FontWidget
;
class VISU_ScalarMapAct;
class VisuGUI_TextPrefDlg: public QDialog
class VISU_ScalarMapAct;
class VisuGUI_TextPrefDlg: public QDialog
@@
-78,8
+78,8
@@
class VisuGUI_TextPrefDlg: public QDialog
{ (isVisible)? myTitleEdt->show() : myTitleEdt->hide(); }
public:
{ (isVisible)? myTitleEdt->show() : myTitleEdt->hide(); }
public:
-
VisuGUI_FontWg
* myTitleFont;
-
VisuGUI_FontWg
* myLabelFont;
+
SVTK_FontWidget
* myTitleFont;
+
SVTK_FontWidget
* myLabelFont;
private:
QLineEdit* myTitleEdt;
private:
QLineEdit* myTitleEdt;
@@
-95,6
+95,7
@@
class VisuGUI_ScalarBarPane : public QVBox
~VisuGUI_ScalarBarPane() {};
void setRange( double imin, double imax, /*double fmin, double fmax,*/ bool sbRange );
~VisuGUI_ScalarBarPane() {};
void setRange( double imin, double imax, /*double fmin, double fmax,*/ bool sbRange );
+ void setDefaultRange(double imin, double imax);
bool isIRange() {return RBIrange->isChecked();}
double getMin() {return MinEdit->text().toDouble();}
double getMax() {return MaxEdit->text().toDouble();}
bool isIRange() {return RBIrange->isChecked();}
double getMin() {return MinEdit->text().toDouble();}
double getMax() {return MaxEdit->text().toDouble();}
@@
-156,6
+157,7
@@
class VisuGUI_ScalarBarPane : public QVBox
void changeDefaults( int );
void changeRange( int );
void XYChanged( double );
void changeDefaults( int );
void changeRange( int );
void XYChanged( double );
+ void changeScalarMode( int );
void onTextPref();
void onPreviewCheck(bool thePreview);
void updatePreview();
void onTextPref();
void onPreviewCheck(bool thePreview);
void updatePreview();
@@
-167,6
+169,8
@@
class VisuGUI_ScalarBarPane : public QVBox
QCheckBox* myPreviewCheck;
VISU_ScalarMapAct* myPreviewActor;
VISU::ScalarMap_i* myScalarMap;
QCheckBox* myPreviewCheck;
VISU_ScalarMapAct* myPreviewActor;
VISU::ScalarMap_i* myScalarMap;
+
+ bool myBusy;
};
};