Merge branch 'BR_internationalization'

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

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_CompoundBuilder.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_CompoundBuilder.cpp
index 934390faa84f286b04a3f95f4d2b941f55ea41ee..48d430fad38db7a0d5c34357a9170651f6f348a6 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_CompoundBuilder.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_CompoundBuilder.cpp
@@ -1,28 +1,44 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        GeomAlgoAPI_CompoundBuilder.cpp
 // Created:     24 Apr 2014
 // Author:      Natalia ERMOLAEVA
 
 #include <GeomAlgoAPI_CompoundBuilder.h>
-//#include <gp_Pln.hxx>
-//#include <BRepBuilderAPI_MakeFace.hxx>
-//#include <TopoDS_Face.hxx>
 #include <BRep_Builder.hxx>
 #include <TopoDS_Compound.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
+#include <TopExp.hxx>
 
-boost::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_CompoundBuilder::compound(
-    std::list<boost::shared_ptr<GeomAPI_Shape> > theShapes)
+std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_CompoundBuilder::compound(
+    std::list<std::shared_ptr<GeomAPI_Shape> > theShapes)
 {
   BRep_Builder aBuilder;
   TopoDS_Compound aComp;
   aBuilder.MakeCompound(aComp);
 
-  std::list<boost::shared_ptr<GeomAPI_Shape> >::const_iterator anIt = theShapes.begin(), aLast =
+  std::list<std::shared_ptr<GeomAPI_Shape> >::const_iterator anIt = theShapes.begin(), aLast =
       theShapes.end();
   for (; anIt != aLast; anIt++) {
     aBuilder.Add(aComp, (*anIt)->impl<TopoDS_Shape>());
   }
 
-  boost::shared_ptr<GeomAPI_Shape> aRes(new GeomAPI_Shape);
+  std::shared_ptr<GeomAPI_Shape> aRes(new GeomAPI_Shape);
   aRes->setImpl(new TopoDS_Shape(aComp));
   return aRes;
 }
+
+int GeomAlgoAPI_CompoundBuilder::id(
+      std::shared_ptr<GeomAPI_Shape> theContext, std::shared_ptr<GeomAPI_Shape> theSub)
+{
+  int anID = 0;
+  TopoDS_Shape aMainShape = theContext->impl<TopoDS_Shape>();
+  const TopoDS_Shape& aSubShape = theSub->impl<TopoDS_Shape>();
+  if (!aMainShape.IsNull() && !aSubShape.IsNull()) {
+    TopTools_IndexedMapOfShape aSubShapesMap;
+    TopExp::MapShapes(aMainShape, aSubShapesMap);
+    anID = aSubShapesMap.FindIndex(aSubShape);
+  }
+
+  return anID;
+}