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
PAL10501. SetCurrentStudy() to SMESH_Gen in GetSMESHGen()
[modules/smesh.git]
/
src
/
OBJECT
/
SMESH_ActorDef.h
diff --git
a/src/OBJECT/SMESH_ActorDef.h
b/src/OBJECT/SMESH_ActorDef.h
index ea3f8d02963f86c0f3517e12a551d10002b99dd3..7ed5149f19300ff2563524eb0707a100b199c3f0 100644
(file)
--- a/
src/OBJECT/SMESH_ActorDef.h
+++ b/
src/OBJECT/SMESH_ActorDef.h
@@
-50,7
+50,7
@@
public:
return *this;
}
TVTKSmartPtr& operator=(T* r){ vtkSmartPointer<T>::operator=(r); return *this;}
return *this;
}
TVTKSmartPtr& operator=(T* r){ vtkSmartPointer<T>::operator=(r); return *this;}
- T* Get() const { return GetPointer();}
+ T* Get() const { return
this->
GetPointer();}
};
};
@@
-147,7
+147,7
@@
class SMESH_ActorDef : public SMESH_Actor{
virtual bool GetPointRepresentation();
virtual float* GetBounds();
virtual bool GetPointRepresentation();
virtual float* GetBounds();
- virtual void SetTransform(
SALOME
_Transform* theTransform);
+ virtual void SetTransform(
VTKViewer
_Transform* theTransform);
virtual vtkUnstructuredGrid* GetUnstructuredGrid();
virtual vtkDataSet* GetInput();
virtual vtkUnstructuredGrid* GetUnstructuredGrid();
virtual vtkDataSet* GetInput();
@@
-185,7
+185,10
@@
class SMESH_ActorDef : public SMESH_Actor{
virtual void SetControlsPrecision( const long p ) { myControlsPrecision = p; }
virtual long GetControlsPrecision() const { return myControlsPrecision; }
virtual void SetControlsPrecision( const long p ) { myControlsPrecision = p; }
virtual long GetControlsPrecision() const { return myControlsPrecision; }
+ virtual void UpdateScalarBar();
+
protected:
protected:
+ void SetControlMode(eControl theMode, bool theCheckEntityMode);
void SetImplicitFunctionUsed(bool theIsImplicitFunctionUsed);
bool IsImplicitFunctionUsed() const;
void SetImplicitFunctionUsed(bool theIsImplicitFunctionUsed);
bool IsImplicitFunctionUsed() const;
@@
-207,7
+210,6
@@
class SMESH_ActorDef : public SMESH_Actor{
vtkProperty* myHighlightProp;
vtkProperty* myPreselectProp;
SMESH_DeviceActor* myHighlitableActor;
vtkProperty* myHighlightProp;
vtkProperty* myPreselectProp;
SMESH_DeviceActor* myHighlitableActor;
- SMESH_DeviceActor* myNodeHighlitableActor;
eControl myControlMode;
SMESH_DeviceActor* my2DActor;
eControl myControlMode;
SMESH_DeviceActor* my2DActor;
@@
-220,6
+222,7
@@
class SMESH_ActorDef : public SMESH_Actor{
SMESH_DeviceActor* my1DExtActor;
unsigned int myEntityMode;
SMESH_DeviceActor* my1DExtActor;
unsigned int myEntityMode;
+ unsigned int myEntityState;
bool myIsPointsVisible;
bool myIsShrinkable;
bool myIsPointsVisible;
bool myIsShrinkable;