X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FOBJECT%2FSMESH_DeviceActor.h;h=8c5b108809623bdeb6351e6e5a76ee5230712289;hb=ba76cf6d9630185552eed5c251b05e887c28379b;hp=96dd92ce659141b586f6e19870e5225e89e485bf;hpb=83f19818fce494a77ddf10b70493abdd9f73e4e0;p=modules%2Fsmesh.git

diff --git a/src/OBJECT/SMESH_DeviceActor.h b/src/OBJECT/SMESH_DeviceActor.h
index 96dd92ce6..8c5b10880 100644
--- a/src/OBJECT/SMESH_DeviceActor.h
+++ b/src/OBJECT/SMESH_DeviceActor.h
@@ -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;
 
@@ -66,16 +66,16 @@ class SMESH_DeviceActor: public vtkLODActor{
   void SetStoreIDMapping(bool theStoreMapping);
 
   virtual int GetNodeObjId(int theVtkID);
-  virtual float* GetNodeCoord(int theObjID);
+  virtual vtkFloatingPointType* GetNodeCoord(int theObjID);
 
   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();
-  void  SetShrinkFactor(float value);
+  vtkFloatingPointType GetShrinkFactor();
+  void  SetShrinkFactor(vtkFloatingPointType value);
 
   bool IsShrunkable() { return myIsShrinkable;}
   bool IsShrunk() { return myIsShrunk;}
@@ -89,7 +89,7 @@ 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,
@@ -122,12 +122,12 @@ class SMESH_DeviceActor: public vtkLODActor{
   bool myIsImplicitFunctionUsed;
 
   vtkMergeFilter* myMergeFilter;
-  SALOME_ExtractUnstructuredGrid* myExtractUnstructuredGrid;
+  VTKViewer_ExtractUnstructuredGrid* myExtractUnstructuredGrid;
 
   bool myStoreClippingMapping;
-  SALOME_GeometryFilter *myGeomFilter;
-  SALOME_TransformFilter *myTransformFilter;
-  std::vector<SALOME_PassThroughFilter*> myPassFilter;
+  VTKViewer_GeometryFilter *myGeomFilter;
+  VTKViewer_TransformFilter *myTransformFilter;
+  std::vector<VTKViewer_PassThroughFilter*> myPassFilter;
 
   vtkShrinkFilter* myShrinkFilter;
   bool myIsShrinkable;
@@ -135,11 +135,17 @@ class SMESH_DeviceActor: public vtkLODActor{
   
   bool myIsHighlited;
 
-  float myPolygonOffsetFactor;
-  float myPolygonOffsetUnits;
+  vtkFloatingPointType myPolygonOffsetFactor;
+  vtkFloatingPointType myPolygonOffsetUnits;
 
-  void SetPolygonOffsetParameters(float factor, float units);
-  void GetPolygonOffsetParameters(float& factor, float& units){
+  void
+  SetPolygonOffsetParameters(vtkFloatingPointType factor, 
+			     vtkFloatingPointType units);
+
+  void
+  GetPolygonOffsetParameters(vtkFloatingPointType& factor, 
+			     vtkFloatingPointType& units)
+  {
     factor = myPolygonOffsetFactor;
     units = myPolygonOffsetUnits;
   }