Merge from V6_main_20120808 08Aug12

[modules/geom.git] / src / OBJECT / GEOM_OCCReader.h

diff --git a/src/OBJECT/GEOM_OCCReader.h b/src/OBJECT/GEOM_OCCReader.h
index 869ec4f29effc935c7075c784af016a9d325b691..3be818b3632264f9bdf6dfdfa12710cae4c08074 100644 (file)
--- a/src/OBJECT/GEOM_OCCReader.h
+++ b/src/OBJECT/GEOM_OCCReader.h
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  GEOM OBJECT : interactive object for Geometry entities visualization
 //  File   : GEOM_OCCReader.h
 //  Author : Christophe ATTANASIO
@@ -48,9 +49,9 @@ class vtkCellArray;
 
 class GEOM_OBJECT_EXPORT GEOM_OCCReader : public vtkPolyDataSource {
 
-  // methods   
+  // methods    
 
- public:       
+ public:        
 
   static GEOM_OCCReader* New();
 
@@ -67,59 +68,59 @@ class GEOM_OBJECT_EXPORT GEOM_OCCReader : public vtkPolyDataSource {
 
   GEOM_OCCReader();
   ~GEOM_OCCReader();
-  void Execute();      
+  void Execute();       
 
   void ComputeShading(vtkPoints* Pts,vtkCellArray* Cells);
   void ComputeWireframe(vtkPoints* Pts,vtkCellArray* Cells);
 
   void TransferFaceSData(const TopoDS_Face& aFace,
-                        vtkPoints* Pts,
-                        vtkCellArray* Cells);
+                         vtkPoints* Pts,
+                         vtkCellArray* Cells);
 
   void TransferFaceWData(const TopoDS_Face& aFace,
-                        vtkPoints* Pts,
-                        vtkCellArray* Cells);
+                         vtkPoints* Pts,
+                         vtkCellArray* Cells);
 
   void TransferEdgeSData(const TopoDS_Edge& aEdge,
-                        vtkPoints* Pts,
-                        vtkCellArray* Cells);
+                         vtkPoints* Pts,
+                         vtkCellArray* Cells);
 
   void TransferEdgeWData(const TopoDS_Edge& aEdge,
-                        vtkPoints* Pts,
-                        vtkCellArray* Cells);
+                         vtkPoints* Pts,
+                         vtkCellArray* Cells);
 
   void TransferVertexWData(const TopoDS_Vertex& aVertex,
-                          vtkPoints* Pts,
-                          vtkCellArray* Cells);
+                           vtkPoints* Pts,
+                           vtkCellArray* Cells);
 
   void createISO(const TopoDS_Face &, 
-                double, int,
-                vtkPoints* Pts,
-                vtkCellArray* Cells);
+                 double, int,
+                 vtkPoints* Pts,
+                 vtkCellArray* Cells);
   
   void DrawIso(GeomAbs_IsoType aType,
-              Standard_Real PParm,
-              Standard_Real p1,
-              Standard_Real p2,
-              vtkPoints* Pts,
-              vtkCellArray* Cells,
-              Standard_Integer& startidx);
+               Standard_Real PParm,
+               Standard_Real p1,
+               Standard_Real p2,
+               vtkPoints* Pts,
+               vtkCellArray* Cells,
+               Standard_Integer& startidx);
   
   void MoveTo(gp_Pnt P,
-             vtkPoints* Pts);
+              vtkPoints* Pts);
 
   void DrawTo(gp_Pnt P,
-             vtkPoints* Pts,
-             vtkCellArray* Cells);
+              vtkPoints* Pts,
+              vtkCellArray* Cells);
 
   void PlotIso(BRepAdaptor_Surface& S, 
-              GeomAbs_IsoType T,
-              Standard_Real& U, 
-              Standard_Real& V, 
-              Standard_Real Step, 
-              Standard_Boolean& halt,
-              vtkPoints* Pts,
-              vtkCellArray* Cells);
+               GeomAbs_IsoType T,
+               Standard_Real& U, 
+               Standard_Real& V, 
+               Standard_Real Step, 
+               Standard_Boolean& halt,
+               vtkPoints* Pts,
+               vtkCellArray* Cells);
 
   // fields
 
@@ -127,7 +128,7 @@ class GEOM_OBJECT_EXPORT GEOM_OCCReader : public vtkPolyDataSource {
 
   Standard_Boolean       forced;
   int                    discretiso;
-  int                   amode;
+  int                    amode;
   int                    nbisos;
   TopoDS_Shape           myShape;
   bool                   myIsVector;