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 branch 'V9_7_BR'
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_PropertiesDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_PropertiesDlg.h
b/src/SMESHGUI/SMESHGUI_PropertiesDlg.h
index eb3e551fc71c84670e285f23668759528e16c841..25c406fe8aeaa5193b3b2dd46a1522d7e18488a1 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_PropertiesDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_PropertiesDlg.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
14
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
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
@@
-38,6
+38,7
@@
class QGroupBox;
class QtxColorButton;
class QtxBiColorTool;
class QtxIntSpinBox;
class QtxColorButton;
class QtxBiColorTool;
class QtxIntSpinBox;
+class QtxDoubleSpinBox;
class VTKViewer_MarkerWidget;
class SMESHGUI_EXPORT SMESHGUI_PropertiesDlg : public SMESHGUI_Dialog
class VTKViewer_MarkerWidget;
class SMESHGUI_EXPORT SMESHGUI_PropertiesDlg : public SMESHGUI_Dialog
@@
-81,10
+82,10
@@
public:
void setBallColor( const QColor& );
QColor ballColor() const;
void setBallColor( const QColor& );
QColor ballColor() const;
-
void
setBallSize( int );
-
int
ballSize() const;
- void setBallScale(
int
);
-
int
ballScale() const;
+
// void
setBallSize( int );
+
// int
ballSize() const;
+ void setBallScale(
double
);
+
double
ballScale() const;
void setOrientationColor( const QColor& );
QColor orientationColor() const;
void setOrientationColor( const QColor& );
QColor orientationColor() const;
@@
-133,8
+134,8
@@
private:
QtxIntSpinBox* myElem0dSize;
// - balls
QtxColorButton* myBallColor;
QtxIntSpinBox* myElem0dSize;
// - balls
QtxColorButton* myBallColor;
-
QtxIntSpinBox*
myBallSize;
- Qtx
IntSpinBox*
myBallScale;
+
// QtxIntSpinBox*
myBallSize;
+ Qtx
DoubleSpinBox*
myBallScale;
// - orientation vectors
QtxColorButton* myOrientationColor;
QtxIntSpinBox* myOrientationSize;
// - orientation vectors
QtxColorButton* myOrientationColor;
QtxIntSpinBox* myOrientationSize;