Renaming the direct API high level.

[modules/shaper.git] / src / GeomAlgoAPI / GeomAlgoAPI_WireBuilder.cpp

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_WireBuilder.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_WireBuilder.cpp
index b6b9dec26fcb4e8b66694c35d84a535956e94fe5..f977184d6873e31c61bf6f8d65d9848d756beffe 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_WireBuilder.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_WireBuilder.cpp
@@ -9,21 +9,24 @@
 #include <BRepBuilderAPI_MakeWire.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Wire.hxx>
+#include <TopExp_Explorer.hxx>
 
 //=================================================================================================
 std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_WireBuilder::wire(const ListOfShape& theShapes)
 {
-  BRepBuilderAPI_MakeWire aWireBuilder;
+  TopTools_ListOfShape aListOfEdges;
 
   for(ListOfShape::const_iterator anIt = theShapes.cbegin(); anIt != theShapes.cend(); ++anIt) {
     const TopoDS_Shape& aShape = (*anIt)->impl<TopoDS_Shape>();
     switch(aShape.ShapeType()) {
       case TopAbs_EDGE: {
-        aWireBuilder.Add(TopoDS::Edge(aShape));
+        aListOfEdges.Append(aShape);
         break;
       }
       case TopAbs_WIRE: {
-        aWireBuilder.Add(TopoDS::Wire(aShape));
+        for(TopExp_Explorer anExp(aShape, TopAbs_EDGE); anExp.More(); anExp.Next()) {
+          aListOfEdges.Append(anExp.Current());
+        }
         break;
       }
       default: {
@@ -32,6 +35,8 @@ std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_WireBuilder::wire(const ListOfShape&
     }
   }
 
+  BRepBuilderAPI_MakeWire aWireBuilder;
+  aWireBuilder.Add(aListOfEdges);
   if(aWireBuilder.Error() != BRepBuilderAPI_WireDone) {
     return GeomShapePtr();
   }