Merge from BR_PORTING_VTK6 01/03/2013

[modules/geom.git] / src / OBJECT / GEOM_VTKTrihedron.hxx

diff --git a/src/OBJECT/GEOM_VTKTrihedron.hxx b/src/OBJECT/GEOM_VTKTrihedron.hxx
index 99a3ab60c53f70e77e00ea72adc0bdcc53ad6277..34b97d17ceb07769314c1c367704d87f47ef7a32 100644 (file)
--- a/src/OBJECT/GEOM_VTKTrihedron.hxx
+++ b/src/OBJECT/GEOM_VTKTrihedron.hxx
@@ -24,7 +24,6 @@
 //  File   : GEOM_VTKTrihedron.h
 //  Author : Sergey LITONIN
 //  Module : SALOME
-//  $Header: 
 //
 #ifndef GEOM_VTKTrihedron_H
 #define GEOM_VTKTrihedron_H
@@ -56,7 +55,7 @@ public:
                                     vtkTypeMacro( GEOM_VTKTrihedron, SALOME_Actor );
   static GEOM_VTKTrihedron*         New();
 
-  virtual vtkFloatingPointType      GetSize() { return mySize;}
+  virtual double      GetSize() { return mySize;}
 
   virtual void                      SetVisibility( int theVisibility );
   virtual void                      SetVisibility( VTKViewer_Trihedron::TVisibility theVis );
@@ -75,11 +74,11 @@ public:
   virtual void                      Render(vtkRenderer *, vtkMapper *);
   virtual bool                      IsSetCamera() const;
   virtual bool                      IsResizable() const;
-  virtual void                      SetSize( vtkFloatingPointType );
+  virtual void                      SetSize( double );
   virtual void                      SetCamera( vtkCamera* );
 
-  void                              SetColor( vtkFloatingPointType r, vtkFloatingPointType g, vtkFloatingPointType b );
-  void                              GetColor( vtkFloatingPointType& r, vtkFloatingPointType& g, vtkFloatingPointType& b );
+  void                              SetColor( double r, double g, double b );
+  void                              GetColor( double& r, double& g, double& b );
 
   virtual bool                      hasHighlight() { return true; } 
 
@@ -90,18 +89,18 @@ public:
 
 protected:
   virtual void                      ResetAxesColors();
-  virtual void                      SetAxesColors( vtkFloatingPointType theColor[3], bool theIsDiffuse = false );
+  virtual void                      SetAxesColors( double theColor[3], bool theIsDiffuse = false );
 
 protected:
   VTKViewer_Axis*                   myAxis[3];
   vtkPolyDataMapper*                myMapper;
-  vtkFloatingPointType              mySize;
+  double              mySize;
   gp_Pnt                            myLocation;
   gp_Dir                            myDirX, myDirY, myDirZ;
-  vtkFloatingPointType              myColor[ 3 ];
-  vtkFloatingPointType              myDefaultColor[ 3 ];
-  vtkFloatingPointType              myPreHighlightColor[ 3 ];
-  vtkFloatingPointType              myHighlightColor[ 3 ];
+  double              myColor[ 3 ];
+  double              myDefaultColor[ 3 ];
+  double              myPreHighlightColor[ 3 ];
+  double              myHighlightColor[ 3 ];
 };
 
 #endif