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 V7_3_1_BR
[modules/smesh.git]
/
src
/
OBJECT
/
SMESH_ActorDef.h
diff --git
a/src/OBJECT/SMESH_ActorDef.h
b/src/OBJECT/SMESH_ActorDef.h
index ee715548c2e45f036177d2004deba8bc6c219044..add4fb6bee5d1a9706d5c14541710ae304c52863 100644
(file)
--- a/
src/OBJECT/SMESH_ActorDef.h
+++ b/
src/OBJECT/SMESH_ActorDef.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
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
@@
-65,6
+65,7
@@
class vtkLookupTable;
class vtkPlane;
class vtkImplicitBoolean;
class vtkTimeStamp;
class vtkPlane;
class vtkImplicitBoolean;
class vtkTimeStamp;
+class vtkPlaneCollection;
class SMESH_DeviceActor;
class SMESH_NodeLabelActor;
class SMESH_DeviceActor;
class SMESH_NodeLabelActor;
@@
-143,6
+144,9
@@
class SMESH_ActorDef : public SMESH_Actor
virtual void SetBallSize(double size);
virtual double GetBallSize();
virtual void SetBallSize(double size);
virtual double GetBallSize();
+ virtual void SetBallScale(double size);
+ virtual double GetBallScale();
+
virtual int GetNodeObjId(int theVtkID);
virtual double* GetNodeCoord(int theObjID);
virtual int GetNodeObjId(int theVtkID);
virtual double* GetNodeCoord(int theObjID);
@@
-212,6
+216,8
@@
class SMESH_ActorDef : public SMESH_Actor
virtual vtkIdType GetNumberOfClippingPlanes();
virtual vtkPlane* GetClippingPlane(vtkIdType theID);
virtual vtkIdType AddClippingPlane(vtkPlane* thePlane);
virtual vtkIdType GetNumberOfClippingPlanes();
virtual vtkPlane* GetClippingPlane(vtkIdType theID);
virtual vtkIdType AddClippingPlane(vtkPlane* thePlane);
+ virtual void AddOpenGLClippingPlane(vtkPlane* thePlane);
+ virtual void SetOpenGLClippingPlane();
virtual TVisualObjPtr GetObject() { return myVisualObj;}
virtual TVisualObjPtr GetObject() { return myVisualObj;}
@@
-259,9
+265,6
@@
class SMESH_ActorDef : public SMESH_Actor
vtkProperty* myOutLineProp;
vtkProperty* myPreselectProp;
vtkProperty* myOutLineProp;
vtkProperty* myPreselectProp;
- vtkProperty* myBallHighlightProp;
- vtkProperty* myBallPreselectProp;
-
SMESH_DeviceActor* myHighlitableActor;
eControl myControlMode;
SMESH_DeviceActor* myHighlitableActor;
eControl myControlMode;
@@
-299,6
+302,7
@@
class SMESH_ActorDef : public SMESH_Actor
bool myIsShrunk;
vtkImplicitBoolean* myImplicitBoolean;
bool myIsShrunk;
vtkImplicitBoolean* myImplicitBoolean;
+ vtkPlaneCollection* myPlaneCollection;
typedef TVTKSmartPtr<vtkPlane> TPlanePtr;
typedef std::vector<TPlanePtr> TCippingPlaneCont;
TCippingPlaneCont myCippingPlaneCont;
typedef TVTKSmartPtr<vtkPlane> TPlanePtr;
typedef std::vector<TPlanePtr> TCippingPlaneCont;
TCippingPlaneCont myCippingPlaneCont;