Merge branch 'master' into cgt/devCEA

[modules/shaper.git] / src / FeaturesPlugin / FeaturesPlugin_Intersection.cpp

diff --git a/src/FeaturesPlugin/FeaturesPlugin_Intersection.cpp b/src/FeaturesPlugin/FeaturesPlugin_Intersection.cpp
index 55a254d73e067a24bc19145ee542533300e423b6..e1af55e63406f098786ba22e07e195ec7a845c26 100644 (file)
--- a/src/FeaturesPlugin/FeaturesPlugin_Intersection.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_Intersection.cpp
@@ -13,6 +13,7 @@
 #include <ModelAPI_AttributeSelectionList.h>
 
 #include <GeomAlgoAPI_Intersection.h>
+#include <GeomAPI_ShapeExplorer.h>
 
 #include <sstream>
 
@@ -24,9 +25,9 @@ FeaturesPlugin_Intersection::FeaturesPlugin_Intersection()
 //=================================================================================================
 void FeaturesPlugin_Intersection::initAttributes()
 {
-  data()->addAttribute(FeaturesPlugin_Intersection::OBJECT_LIST_ID(), 
+  data()->addAttribute(FeaturesPlugin_Intersection::OBJECT_LIST_ID(),
                        ModelAPI_AttributeSelectionList::typeId());
-  data()->addAttribute(FeaturesPlugin_Intersection::TOOL_LIST_ID(), 
+  data()->addAttribute(FeaturesPlugin_Intersection::TOOL_LIST_ID(),
                        ModelAPI_AttributeSelectionList::typeId());
 }
 
@@ -36,10 +37,10 @@ void FeaturesPlugin_Intersection::execute()
   ListOfShape anObjects, aTools;
 
   // Getting objects.
-  AttributeSelectionListPtr anObjectsSelList = 
+  AttributeSelectionListPtr anObjectsSelList =
     selectionList(FeaturesPlugin_Intersection::OBJECT_LIST_ID());
   for (int anObjectsIndex = 0; anObjectsIndex < anObjectsSelList->size(); anObjectsIndex++) {
-    std::shared_ptr<ModelAPI_AttributeSelection> anObjectAttr = 
+    std::shared_ptr<ModelAPI_AttributeSelection> anObjectAttr =
       anObjectsSelList->value(anObjectsIndex);
     std::shared_ptr<GeomAPI_Shape> anObject = anObjectAttr->value();
     if (!anObject.get()) {
@@ -49,7 +50,7 @@ void FeaturesPlugin_Intersection::execute()
   }
 
   // Getting tools.
-  AttributeSelectionListPtr aToolsSelList = 
+  AttributeSelectionListPtr aToolsSelList =
     selectionList(FeaturesPlugin_Intersection::TOOL_LIST_ID());
   for (int aToolsIndex = 0; aToolsIndex < aToolsSelList->size(); aToolsIndex++) {
     std::shared_ptr<ModelAPI_AttributeSelection> aToolAttr = aToolsSelList->value(aToolsIndex);
@@ -68,7 +69,7 @@ void FeaturesPlugin_Intersection::execute()
   int aResultIndex = 0;
 
   // Create result for each object.
-  for (ListOfShape::iterator 
+  for (ListOfShape::iterator
        anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end(); anObjectsIt++) {
     std::shared_ptr<GeomAPI_Shape> anObject = *anObjectsIt;
     ListOfShape aListWithObject; aListWithObject.push_back(anObject);
@@ -107,35 +108,81 @@ void FeaturesPlugin_Intersection::loadNamingDS(std::shared_ptr<ModelAPI_ResultBo
                                                const ListOfShape& theTools,
                                                GeomAlgoAPI_MakeShape& theMakeShape)
 {
-  //load result
   std::shared_ptr<GeomAPI_Shape> aResultShape = theMakeShape.shape();
-  std::shared_ptr<GeomAPI_DataMapOfShapeShape> aMapOfShapes = theMakeShape.mapOfSubShapes();
-  const int aDeletedTag = 1;
-  /// sub solids will be placed at labels 3, 4, etc. if result is compound of solids
-  const int aSubsolidsTag = 2; 
-  const int aModifyTag = 100000;
-  int aModifyToolsTag = 200000;
-  std::ostringstream aStream;
-
-  theResultBody->storeModified(theBaseShape, aResultShape, aSubsolidsTag);
-
-  std::string aModName = "Modified";
-  theResultBody->loadAndOrientModifiedShapes(&theMakeShape, theBaseShape, GeomAPI_Shape::VERTEX,
-                                             aModifyTag, aModName, *aMapOfShapes.get(), true);
-  theResultBody->loadAndOrientModifiedShapes(&theMakeShape, theBaseShape, GeomAPI_Shape::EDGE,
-                                             aModifyTag, aModName, *aMapOfShapes.get(), true);
-  theResultBody->loadDeletedShapes(&theMakeShape, theBaseShape, GeomAPI_Shape::FACE, aDeletedTag);
-
-  int anIndex = 1;
-  for(ListOfShape::const_iterator anIter = theTools.begin(); anIter != theTools.end(); anIter++) {
-    aStream.str(std::string());
-    aStream.clear();
-    aStream << aModName << "_" << anIndex++;
-    theResultBody->loadAndOrientModifiedShapes(&theMakeShape, *anIter, GeomAPI_Shape::VERTEX,
-                                   aModifyToolsTag, aStream.str(), *aMapOfShapes.get(), true);
-    theResultBody->loadAndOrientModifiedShapes(&theMakeShape, *anIter, GeomAPI_Shape::EDGE,
-                                 aModifyToolsTag, aStream.str(), *aMapOfShapes.get(), true);
-    theResultBody->loadDeletedShapes(&theMakeShape, *anIter, GeomAPI_Shape::FACE, aDeletedTag);
-    aModifyToolsTag += 10000;
+  theResultBody->storeModified(theBaseShape, aResultShape);
+
+  const int aDeletedVertexTag = 1;
+  const int aDeletedEdgeTag   = 2;
+  const int aDeletedFaceTag   = 3;
+
+  theResultBody->loadDeletedShapes(&theMakeShape,
+                                   theBaseShape,
+                                   GeomAPI_Shape::VERTEX,
+                                   aDeletedVertexTag);
+  theResultBody->loadDeletedShapes(&theMakeShape,
+                                   theBaseShape,
+                                   GeomAPI_Shape::EDGE,
+                                   aDeletedEdgeTag);
+  theResultBody->loadDeletedShapes(&theMakeShape,
+                                   theBaseShape,
+                                   GeomAPI_Shape::FACE,
+                                   aDeletedFaceTag);
+
+  ListOfShape aShapes = theTools;
+  aShapes.push_back(theBaseShape);
+  GeomAPI_DataMapOfShapeShape aShapesMap; // Map to store {result_shape, original_shape}
+  const int aShapeTypesNb = 2;
+  const GeomAPI_Shape::ShapeType aShapeTypes[aShapeTypesNb] =
+    {GeomAPI_Shape::VERTEX, GeomAPI_Shape::EDGE};
+  for(ListOfShape::const_iterator anIt = aShapes.cbegin(); anIt != aShapes.cend(); ++anIt) {
+    const GeomShapePtr aShape = *anIt;
+    for(int anIndex = 0; anIndex < aShapeTypesNb; ++anIndex) {
+      for(GeomAPI_ShapeExplorer anOrigShapeExp(aShape, aShapeTypes[anIndex]);
+          anOrigShapeExp.more();
+          anOrigShapeExp.next()) {
+        ListOfShape aHistory;
+        const GeomShapePtr aSubShape = anOrigShapeExp.current();
+        theMakeShape.modified(aSubShape, aHistory);
+        for(ListOfShape::const_iterator aHistoryIt = aHistory.cbegin();
+            aHistoryIt != aHistory.cend();
+            ++aHistoryIt) {
+          aShapesMap.bind(*aHistoryIt, aSubShape);
+        }
+      }
+    }
+  }
+
+  int aModifiedVertexIndex(1),
+      aGeneratedVertexIndex(1),
+      aModifiedEdgeIndex(1),
+      aGeneratedEdgeIndex(1);
+  int aTag = 4;
+  GeomAPI_DataMapOfShapeShape aStoredShapes;
+  for(int anIndex = 0; anIndex < aShapeTypesNb; ++anIndex) {
+    for(GeomAPI_ShapeExplorer aShapeExp(aResultShape, aShapeTypes[anIndex]);
+        aShapeExp.more();
+        aShapeExp.next()) {
+      const GeomShapePtr aSubShape = aShapeExp.current();
+      if(aStoredShapes.isBound(aSubShape)) {
+        continue;
+      }
+      if(aShapesMap.isBound(aSubShape)) {
+        theResultBody->modified(aShapesMap.find(aSubShape),
+          aSubShape,
+          std::string("Modified_")
+            + (anIndex == 0 ? "Vertex_" : "Edge_")
+            + std::to_string((long long)(anIndex == 0 ? aModifiedVertexIndex++
+                                                      : aModifiedEdgeIndex++)),
+          aTag++);
+      } else {
+        theResultBody->generated(aSubShape,
+          std::string("Generated_")
+            + (anIndex == 0 ? "Vertex_" : "Edge_")
+            + std::to_string((long long)(anIndex == 0 ? aGeneratedVertexIndex++
+                                                      : aGeneratedEdgeIndex++)),
+          aTag++);
+      }
+      aStoredShapes.bind(aSubShape, aSubShape);
+    }
   }
 }