0021031: EDF 1646 GEOM: Modify Location leads to Position driver failed

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

diff --git a/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx b/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx
index 64619ee30a59b8427a232046dd3a7c64532d4e40..2de6d2a941a0df152d95dfc83a490381579cfa9a 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx
@@ -1,3 +1,24 @@
+//  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>
 
@@ -59,12 +80,30 @@ Standard_Integer GEOMImpl_PolylineDriver::Execute(TFunction_Logbook& log) const
     {
       Handle(GEOM_Function) aRefPoint = aCI.GetPoint(ind);
       TopoDS_Shape aShapePnt = aRefPoint->GetValue();
+      if (aShapePnt.ShapeType() != TopAbs_VERTEX) {
+        Standard_TypeMismatch::Raise
+          ("Polyline creation aborted : arguments are not a vertexes");
+        return 0;
+      }
       if (aShapePnt.ShapeType() == TopAbs_VERTEX) {
         aMakePoly.Add(TopoDS::Vertex(aShapePnt));
 //        if (!aMakePoly.Added()) return 0;
       }
     }
-    if (false) aMakePoly.Close();
+    // Compare first and last point coordinates and close polyline if it's the same.
+    if ( aLen > 2 ) {
+      Handle(GEOM_Function) aFPoint = aCI.GetPoint(1);
+      TopoDS_Shape aFirstPnt = aFPoint->GetValue();
+      TopoDS_Vertex aV1 = TopoDS::Vertex(aFirstPnt);
+
+      Handle(GEOM_Function) aLPoint = aCI.GetPoint(aLen);
+      TopoDS_Shape aLastPnt = aLPoint->GetValue();
+      TopoDS_Vertex aV2 = TopoDS::Vertex(aLastPnt);
+
+      if ( !aV1.IsNull() && !aV2.IsNull() && aV1.IsSame(aV2) )
+        aMakePoly.Close();
+    }
+
     if (aMakePoly.IsDone()) {
       aShape = aMakePoly.Wire();
     }
@@ -99,10 +138,10 @@ Standard_EXPORT Handle_Standard_Type& GEOMImpl_PolylineDriver_Type_()
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
   static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_PolylineDriver",
-                                                        sizeof(GEOMImpl_PolylineDriver),
-                                                        1,
-                                                        (Standard_Address)_Ancestors,
-                                                        (Standard_Address)NULL);
+                                                         sizeof(GEOMImpl_PolylineDriver),
+                                                         1,
+                                                         (Standard_Address)_Ancestors,
+                                                         (Standard_Address)NULL);
 
   return _aType;
 }