0020956: [CEA 421] Problem with ChangeOrientation.

[modules/geom.git] / src / GEOMImpl / GEOMImpl_SplineDriver.cxx

diff --git a/src/GEOMImpl/GEOMImpl_SplineDriver.cxx b/src/GEOMImpl/GEOMImpl_SplineDriver.cxx
index f63021373e9d2fcab9a415ac737f9937675132f8..c9d603cd55e1c552d0cc9852e833696c4e1f54dd 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_SplineDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_SplineDriver.cxx
@@ -1,9 +1,31 @@
-
-using namespace std;
-#include "GEOMImpl_SplineDriver.hxx"
-#include "GEOMImpl_ISpline.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
+//  Copyright (C) 2007-2010  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
+//
+//  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.
+//
+//  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
+//
+
+#include <Standard_Stream.hxx>
+
+#include <GEOMImpl_SplineDriver.hxx>
+#include <GEOMImpl_ISpline.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
 
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRep_Tool.hxx>
@@ -75,7 +97,7 @@ Standard_Integer GEOMImpl_SplineDriver::Execute(TFunction_Logbook& log) const
             isSeveral = Standard_True;
           }
         }
-       CurvePoints.SetValue(ind, aP);
+        CurvePoints.SetValue(ind, aP);
         aPrevP = aP;
       }
     }
@@ -86,16 +108,17 @@ Standard_Integer GEOMImpl_SplineDriver::Execute(TFunction_Logbook& log) const
       Handle(Geom_BezierCurve) GBC = new Geom_BezierCurve(CurvePoints);
       aShape = BRepBuilderAPI_MakeEdge(GBC).Edge();
     } else {
-//      GeomAPI_PointsToBSpline GBC (CurvePoints);
-//      aShape = BRepBuilderAPI_MakeEdge(GBC).Edge();
+      //GeomAPI_PointsToBSpline GBC (CurvePoints);
+      //aShape = BRepBuilderAPI_MakeEdge(GBC).Edge();
       Handle(TColgp_HArray1OfPnt) aHCurvePoints = new TColgp_HArray1OfPnt(1, aLen);
       for (ind = 1; ind <= aLen; ind++) {
-       aHCurvePoints->SetValue(ind, CurvePoints.Value(ind));
+        aHCurvePoints->SetValue(ind, CurvePoints.Value(ind));
       }
-      GeomAPI_Interpolate GBC (aHCurvePoints, Standard_False, gp::Resolution());
+      int isClosed = aCI.GetIsClosed();
+      GeomAPI_Interpolate GBC (aHCurvePoints, isClosed, gp::Resolution());
       GBC.Perform();
       if (GBC.IsDone())
-        aShape = BRepBuilderAPI_MakeEdge(GBC).Edge();
+        aShape = BRepBuilderAPI_MakeEdge(GBC.Curve()).Edge();
       else
         return 0;
     }
@@ -130,10 +153,10 @@ Standard_EXPORT Handle_Standard_Type& GEOMImpl_SplineDriver_Type_()
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
   static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_SplineDriver",
-                                                        sizeof(GEOMImpl_SplineDriver),
-                                                        1,
-                                                        (Standard_Address)_Ancestors,
-                                                        (Standard_Address)NULL);
+                                                         sizeof(GEOMImpl_SplineDriver),
+                                                         1,
+                                                         (Standard_Address)_Ancestors,
+                                                         (Standard_Address)NULL);
 
   return _aType;
 }