IPAL9150

[modules/smesh.git] / src / OBJECT / SMESH_ActorDef.h

diff --git a/src/OBJECT/SMESH_ActorDef.h b/src/OBJECT/SMESH_ActorDef.h
index ea3f8d02963f86c0f3517e12a551d10002b99dd3..1928f65185d363a497f36e8f32a1aa30ac85531e 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();


@@ -186,6 +186,7 @@ class SMESH_ActorDef : public SMESH_Actor{
   virtual long GetControlsPrecision() const { return myControlsPrecision; }
 
  protected:
   virtual long GetControlsPrecision() const { return myControlsPrecision; }
 
  protected:

+  void SetControlMode(eControl theMode, bool theCheckEntityMode);

   void SetImplicitFunctionUsed(bool theIsImplicitFunctionUsed);
   bool IsImplicitFunctionUsed() const;
 
   void SetImplicitFunctionUsed(bool theIsImplicitFunctionUsed);
   bool IsImplicitFunctionUsed() const;
 


@@ -207,7 +208,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 +220,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;