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
bos #20256: [CEA 18523] Porting SMESH to int 64 bits
[modules/smesh.git]
/
src
/
OBJECT
/
SMESH_ActorDef.h
diff --git
a/src/OBJECT/SMESH_ActorDef.h
b/src/OBJECT/SMESH_ActorDef.h
index 3488f4401ed620c8b3dcf0724bfe31cd3cd6675b..0d3051c54f032a5590c4eee4dbe8899e6a3d3ebe 100644
(file)
--- a/
src/OBJECT/SMESH_ActorDef.h
+++ b/
src/OBJECT/SMESH_ActorDef.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
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
@@
-83,7
+83,7
@@
class SMESH_ActorDef : public SMESH_Actor
friend class SMESH_Actor;
public:
friend class SMESH_Actor;
public:
- vtkTypeMacro(SMESH_ActorDef,SMESH_Actor)
;
+ vtkTypeMacro(SMESH_ActorDef,SMESH_Actor)
virtual void Delete();
virtual void Delete();
@@
-144,14
+144,14
@@
class SMESH_ActorDef : public SMESH_Actor
virtual void SetBallScale(double size);
virtual double GetBallScale();
virtual void SetBallScale(double size);
virtual double GetBallScale();
- virtual
int GetNodeObjId(int
theVtkID);
- virtual double* GetNodeCoord(
int
theObjID);
- virtual
int GetNodeVtkId(int
theObjID);
+ virtual
vtkIdType GetNodeObjId(vtkIdType
theVtkID);
+ virtual double* GetNodeCoord(
vtkIdType
theObjID);
+ virtual
vtkIdType GetNodeVtkId(vtkIdType
theObjID);
- virtual
int GetElemObjId(int
theVtkID);
- virtual vtkCell* GetElemCell(
int
theObjID);
+ virtual
vtkIdType GetElemObjId(vtkIdType
theVtkID);
+ virtual vtkCell* GetElemCell(
vtkIdType
theObjID);
- virtual int GetObjDimension( const
int theObjId )
;
+ virtual int GetObjDimension( const
vtkIdType theObjId ) override
;
virtual void SetVisibility(int theMode);
void SetVisibility(int theMode, bool theIsUpdateRepersentation);
virtual void SetVisibility(int theMode);
void SetVisibility(int theMode, bool theIsUpdateRepersentation);
@@
-206,7
+206,7
@@
class SMESH_ActorDef : public SMESH_Actor
virtual void SetControlMode(eControl theMode);
virtual void SetControl(SMESH::Controls::FunctorPtr theFunctor);
virtual void SetControlMode(eControl theMode);
virtual void SetControl(SMESH::Controls::FunctorPtr theFunctor);
- virtual
int
GetNumberControlEntities();
+ virtual
smIdType
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; }
@@
-239,6
+239,8
@@
class SMESH_ActorDef : public SMESH_Actor
virtual void SetMarkerStd( VTK::MarkerType, VTK::MarkerScale );
virtual void SetMarkerTexture( int, VTK::MarkerTexture );
virtual void SetMarkerStd( VTK::MarkerType, VTK::MarkerScale );
virtual void SetMarkerTexture( int, VTK::MarkerTexture );
+ virtual void UpdateFilter();
+
protected:
void SetControlMode(eControl theMode, bool theCheckEntityMode);
void SetImplicitFunctionUsed(bool theIsImplicitFunctionUsed);
protected:
void SetControlMode(eControl theMode, bool theCheckEntityMode);
void SetImplicitFunctionUsed(bool theIsImplicitFunctionUsed);