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 ASERIS development.
[modules/smesh.git]
/
src
/
OBJECT
/
SMESH_ActorDef.h
diff --git
a/src/OBJECT/SMESH_ActorDef.h
b/src/OBJECT/SMESH_ActorDef.h
index cb9695c44ed206b4a646b7d6aba6e417c01d71f5..3b9d9c68f97a4de811e5531ed78b268ce4ddf815 100644
(file)
--- a/
src/OBJECT/SMESH_ActorDef.h
+++ b/
src/OBJECT/SMESH_ActorDef.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-95,6
+95,7
@@
class SMESH_ActorDef : public SMESH_Actor
virtual void AddToRender(vtkRenderer* theRenderer);
virtual void RemoveFromRender(vtkRenderer* theRenderer);
virtual void AddToRender(vtkRenderer* theRenderer);
virtual void RemoveFromRender(vtkRenderer* theRenderer);
+ virtual void EnableSelection( bool enable );
virtual bool hasHighlight() { return true; }
virtual void highlight(bool theHighlight);
virtual void SetPreSelected(bool thePreselect = false);
virtual bool hasHighlight() { return true; }
virtual void highlight(bool theHighlight);
virtual void SetPreSelected(bool thePreselect = false);
@@
-144,11
+145,12
@@
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(
int
size);
- virtual
int
GetBallScale();
+ 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);
+ virtual int GetNodeVtkId(int theObjID);
virtual int GetElemObjId(int theVtkID);
virtual vtkCell* GetElemCell(int theObjID);
virtual int GetElemObjId(int theVtkID);
virtual vtkCell* GetElemCell(int theObjID);
@@
-207,6
+209,7
@@
class SMESH_ActorDef : public SMESH_Actor
virtual bool GetFacesOrientation3DVectors();
virtual void SetControlMode(eControl theMode);
virtual bool GetFacesOrientation3DVectors();
virtual void SetControlMode(eControl theMode);
+ virtual int GetNumberControlEntities();
virtual eControl GetControlMode(){ return myControlMode;}
virtual SMESH::Controls::FunctorPtr GetFunctor() { return myFunctor; }
virtual eControl GetControlMode(){ return myControlMode;}
virtual SMESH::Controls::FunctorPtr GetFunctor() { return myFunctor; }
@@
-293,8
+296,8
@@
class SMESH_ActorDef : public SMESH_Actor
SMESH_DeviceActor* my0DExtActor;
unsigned int myEntityMode;
SMESH_DeviceActor* my0DExtActor;
unsigned int myEntityMode;
- unsigned int myEntityState;
unsigned int myEntityModeCache;
unsigned int myEntityModeCache;
+ int myRepresentationCache;
bool myIsEntityModeCache;
bool myIsPointsVisible;
bool myIsEntityModeCache;
bool myIsPointsVisible;