X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FOBJECT%2FSMESH_DeviceActor.h;h=88da39f94b4a9ab9ce5ee42b917ea98df39457f3;hp=90cd7894355db897a2153ce9d93d5b754c88e36f;hb=78d606fbc61d6104a31e4fb2799e90a6b0a66f30;hpb=090aff07266d376ae028ae43434bdea7c0a0f9bb

diff --git a/src/OBJECT/SMESH_DeviceActor.h b/src/OBJECT/SMESH_DeviceActor.h
index 90cd78943..88da39f94 100644
--- a/src/OBJECT/SMESH_DeviceActor.h
+++ b/src/OBJECT/SMESH_DeviceActor.h
@@ -21,7 +21,7 @@
 //
 //
 //
-//  File   : SMESH_Actor.h
+//  File   : SMESH_DeviceActor.h
 //  Author : Nicolas REJNERI
 //  Module : SMESH
 //  $Header$
@@ -29,7 +29,7 @@
 #ifndef SMESH_DEVICE_ACTOR_H
 #define SMESH_DEVICE_ACTOR_H
 
-#include "SALOME_GeometryFilter.h"
+#include <VTKViewer_GeometryFilter.h>
 #include "SMESH_Controls.hxx"
 #include "SMESH_Object.h"
 
@@ -46,10 +46,10 @@ class vtkScalarBarActor;
 class vtkLookupTable;
 class vtkImplicitBoolean;
 
-class SALOME_Transform;
-class SALOME_TransformFilter;
-class SALOME_PassThroughFilter;
-class SALOME_ExtractUnstructuredGrid;
+class VTKViewer_Transform;
+class VTKViewer_TransformFilter;
+class VTKViewer_PassThroughFilter;
+class VTKViewer_ExtractUnstructuredGrid;
 
 class SMESH_ExtractGeometry;
 
@@ -61,8 +61,9 @@ class SMESH_DeviceActor: public vtkLODActor{
   vtkTypeMacro(SMESH_DeviceActor,vtkLODActor);
   static SMESH_DeviceActor* New();
 
-  void SetStoreMapping(int theStoreMapping);
-  int GetStoreMapping(){ return myStoreMapping;}
+  void SetStoreClippingMapping(bool theStoreMapping);
+  void SetStoreGemetryMapping(bool theStoreMapping);
+  void SetStoreIDMapping(bool theStoreMapping);
 
   virtual int GetNodeObjId(int theVtkID);
   virtual float* GetNodeCoord(int theObjID);
@@ -70,7 +71,7 @@ class SMESH_DeviceActor: public vtkLODActor{
   virtual int GetElemObjId(int theVtkID);
   virtual vtkCell* GetElemCell(int theObjID);
 
-  virtual void SetTransform(SALOME_Transform* theTransform); 
+  virtual void SetTransform(VTKViewer_Transform* theTransform); 
   virtual unsigned long int GetMTime();
 
   float GetShrinkFactor();
@@ -88,24 +89,25 @@ class SMESH_DeviceActor: public vtkLODActor{
   virtual void SetVisibility(int theMode);
   virtual int GetVisibility();
 
-  SALOME_ExtractUnstructuredGrid* GetExtractUnstructuredGrid();
+  VTKViewer_ExtractUnstructuredGrid* GetExtractUnstructuredGrid();
   vtkUnstructuredGrid* GetUnstructuredGrid();
 
   void SetControlMode(SMESH::Controls::FunctorPtr theFunctor,
 		      vtkScalarBarActor* theScalarBarActor,
 		      vtkLookupTable* theLookupTable);
   void SetExtControlMode(SMESH::Controls::FunctorPtr theFunctor,
-			 SMESH_DeviceActor* theDeviceActor,
 			 vtkScalarBarActor* theScalarBarActor,
 			 vtkLookupTable* theLookupTable);
-  void SetExtControlMode(SMESH::Controls::FunctorPtr theFunctor,
-			 SMESH_DeviceActor* theDeviceActor);
+  void SetExtControlMode(SMESH::Controls::FunctorPtr theFunctor);
 
   bool IsHighlited() { return myIsHighlited;}
   void SetHighlited(bool theIsHighlited);
 
   virtual void Render(vtkRenderer *, vtkMapper *);
 
+  void SetImplicitFunctionUsed(bool theIsImplicitFunctionUsed);
+  bool IsImplicitFunctionUsed() const{ return myIsImplicitFunctionUsed;}
+
  protected:
   void Init(TVisualObjPtr theVisualObj, vtkImplicitBoolean* theImplicitBoolean);
   void SetUnstructuredGrid(vtkUnstructuredGrid* theGrid);
@@ -117,14 +119,15 @@ class SMESH_DeviceActor: public vtkLODActor{
   EReperesent myRepresentation;
 
   SMESH_ExtractGeometry* myExtractGeometry;
+  bool myIsImplicitFunctionUsed;
 
   vtkMergeFilter* myMergeFilter;
-  SALOME_ExtractUnstructuredGrid* myExtractUnstructuredGrid;
+  VTKViewer_ExtractUnstructuredGrid* myExtractUnstructuredGrid;
 
-  bool myStoreMapping;
-  SALOME_GeometryFilter *myGeomFilter;
-  SALOME_TransformFilter *myTransformFilter;
-  std::vector<SALOME_PassThroughFilter*> myPassFilter;
+  bool myStoreClippingMapping;
+  VTKViewer_GeometryFilter *myGeomFilter;
+  VTKViewer_TransformFilter *myTransformFilter;
+  std::vector<VTKViewer_PassThroughFilter*> myPassFilter;
 
   vtkShrinkFilter* myShrinkFilter;
   bool myIsShrinkable;
@@ -149,4 +152,4 @@ class SMESH_DeviceActor: public vtkLODActor{
 };
 
 
-#endif //SMESH_ACTOR_H
+#endif //SMESH_DEVICE_ACTOR_H