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
From NewGEOM: activation of SMESH after any module without object browser crashes...
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_PropertiesDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_PropertiesDlg.h
b/src/SMESHGUI/SMESHGUI_PropertiesDlg.h
index bcdcc72877e9390ac3281e937d94241d1ec7dbad..c2f964653351fe655f2226db5a96e04eabae0675 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_PropertiesDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_PropertiesDlg.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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
@@
-81,8
+82,10
@@
public:
void setBallColor( const QColor& );
QColor ballColor() const;
void setBallColor( const QColor& );
QColor ballColor() const;
- void setBallSize( int );
- int ballSize() 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;
@@
-131,7
+134,8
@@
private:
QtxIntSpinBox* myElem0dSize;
// - balls
QtxColorButton* myBallColor;
QtxIntSpinBox* myElem0dSize;
// - balls
QtxColorButton* myBallColor;
- QtxIntSpinBox* myBallSize;
+ // QtxIntSpinBox* myBallSize;
+ QtxDoubleSpinBox* myBallScale;
// - orientation vectors
QtxColorButton* myOrientationColor;
QtxIntSpinBox* myOrientationSize;
// - orientation vectors
QtxColorButton* myOrientationColor;
QtxIntSpinBox* myOrientationSize;