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 remote-tracking branch 'origin/master'
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_PropertiesDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_PropertiesDlg.h
b/src/SMESHGUI/SMESHGUI_PropertiesDlg.h
index 390b5a12656dee541baebff86837a4892a22574b..5ec3ce6200065554c3d89e53dd4ebe5c40106223 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_PropertiesDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_PropertiesDlg.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
4
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
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-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
@@
-83,6
+84,8
@@
public:
QColor ballColor() const;
void setBallSize( int );
int ballSize() const;
QColor ballColor() 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;
@@
-132,6
+135,7
@@
private:
// - balls
QtxColorButton* myBallColor;
QtxIntSpinBox* myBallSize;
// - balls
QtxColorButton* myBallColor;
QtxIntSpinBox* myBallSize;
+ QtxDoubleSpinBox* myBallScale;
// - orientation vectors
QtxColorButton* myOrientationColor;
QtxIntSpinBox* myOrientationSize;
// - orientation vectors
QtxColorButton* myOrientationColor;
QtxIntSpinBox* myOrientationSize;