Issue #1503: Fixed naming for Build/Sub-Shapes feature

diff --git a/src/BuildPlugin/BuildPlugin_SubShapes.cpp b/src/BuildPlugin/BuildPlugin_SubShapes.cpp
index 1689fb785000ea4ce43ce1ff7857eabf7f25920d..000fb19e34cb48c77d0abdb621c4ee4416f3ae9e 100644 (file)
--- a/src/BuildPlugin/BuildPlugin_SubShapes.cpp
+++ b/src/BuildPlugin/BuildPlugin_SubShapes.cpp
@@ -108,13 +108,16 @@ void BuildPlugin_SubShapes::execute()
   }
 
   // Store result.
+  const int aModVertexTag = 1;
+  const int aModEdgeTag = 2;
   ResultBodyPtr aResultBody = document()->createBody(data());
   aResultBody->storeModified(aBaseShape, aResultShape);
-  aResultBody->loadAndOrientModifiedShapes(&aBuilder, aBaseShape, GeomAPI_Shape::EDGE, 1,
+  aResultBody->loadAndOrientModifiedShapes(&aBuilder, aBaseShape, GeomAPI_Shape::EDGE, aModEdgeTag,
                                           "Modified_Edge", *aBuilder.mapOfSubShapes().get());
   for(ListOfShape::const_iterator anIt = aShapesToAdd.cbegin(); anIt != aShapesToAdd.cend(); ++anIt) {
     GeomAPI_Shape::ShapeType aShType = (*anIt)->shapeType();
-    aResultBody->loadAndOrientModifiedShapes(&aBuilder, *anIt, aShType, 1,
+    aResultBody->loadAndOrientModifiedShapes(&aBuilder, *anIt, aShType,
+                                             aShType == GeomAPI_Shape::VERTEX ? aModVertexTag : aModEdgeTag,
                                              aShType == GeomAPI_Shape::VERTEX ? "Modified_Vertex" : "Modified_Edge",
                                              *aBuilder.mapOfSubShapes().get());
   }

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_MakeShape.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_MakeShape.cpp
index 2397dafbf472d1300a96edc933f6575dc5a46f01..87d38d2b8c12ff8ad933ecb019569e77547fd04c 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_MakeShape.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_MakeShape.cpp
@@ -154,6 +154,11 @@ void GeomAlgoAPI_MakeShape::setShape(const std::shared_ptr<GeomAPI_Shape> theSha
     }
 
     const TopoDS_Shape& aTopoDSShape = myShape->impl<TopoDS_Shape>();
+    for(TopExp_Explorer anExp(aTopoDSShape,TopAbs_EDGE); anExp.More(); anExp.Next()) {
+      std::shared_ptr<GeomAPI_Shape> aCurrentShape(new GeomAPI_Shape());
+      aCurrentShape->setImpl(new TopoDS_Shape(anExp.Current()));
+      myMap->bind(aCurrentShape, aCurrentShape);
+    }
     for(TopExp_Explorer anExp(aTopoDSShape,TopAbs_FACE); anExp.More(); anExp.Next()) {
       std::shared_ptr<GeomAPI_Shape> aCurrentShape(new GeomAPI_Shape());
       aCurrentShape->setImpl(new TopoDS_Shape(anExp.Current()));

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeBuilder.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeBuilder.cpp
index eea9ae9120de9d4ccb474dde168e8483fcc31f6e..c8a63bf911bb228059d895cb07fe11da307ead2b 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeBuilder.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeBuilder.cpp
@@ -60,31 +60,46 @@ GeomAlgoAPI_ShapeBuilder::GeomAlgoAPI_ShapeBuilder()
 //==================================================================================================
 void GeomAlgoAPI_ShapeBuilder::removeInternal(const std::shared_ptr<GeomAPI_Shape> theShape)
 {
-  GeomShapePtr aResultShape = theShape->emptyCopied();
+  GeomShapePtr aResultShape;
+
   GeomAPI_Shape::ShapeType aBaseShapeType = theShape->shapeType();
-  std::shared_ptr<GeomAlgoAPI_MakeShapeCustom> aMakeShapeCustom(new GeomAlgoAPI_MakeShapeCustom());
-  for(GeomAPI_ShapeIterator anIter(theShape); anIter.more(); anIter.next()) {
-    GeomShapePtr aSubShape = anIter.current();
-    if(aBaseShapeType == GeomAPI_Shape::WIRE) {
+  if(aBaseShapeType == GeomAPI_Shape::WIRE) {
+    aResultShape = theShape->emptyCopied();
+    std::shared_ptr<GeomAlgoAPI_MakeShapeCustom> aMakeShapeCustom(new GeomAlgoAPI_MakeShapeCustom());
+    for(GeomAPI_ShapeIterator anIter(theShape); anIter.more(); anIter.next()) {
+      GeomShapePtr aSubShape = anIter.current();
       GeomShapePtr aSubShapeCopy = aSubShape->emptyCopied();
-      aMakeShapeCustom->addModified(aSubShape, aSubShapeCopy);
       for(GeomAPI_ShapeIterator aSubIter(aSubShape); aSubIter.more(); aSubIter.next()) {
         GeomShapePtr aSubOfSubShape = aSubIter.current();
         if(aSubOfSubShape->orientation() != GeomAPI_Shape::INTERNAL) {
           GeomAlgoAPI_ShapeBuilder::add(aSubShapeCopy, aSubOfSubShape);
         }
       }
+      aMakeShapeCustom->addModified(aSubShape, aSubShapeCopy);
       GeomAlgoAPI_ShapeBuilder::add(aResultShape, aSubShapeCopy);
-    } else if(aBaseShapeType == GeomAPI_Shape::FACE) {
-      if(aSubShape->shapeType() == GeomAPI_Shape::WIRE
-          && aSubShape->orientation() != GeomAPI_Shape::INTERNAL) {
-        GeomAlgoAPI_ShapeBuilder::add(aResultShape, aSubShape);
+    }
+    this->appendAlgo(aMakeShapeCustom);
+  } else if(aBaseShapeType == GeomAPI_Shape::FACE) {
+    const TopoDS_Shape& aBaseShape = theShape->impl<TopoDS_Shape>();
+    BRepBuilderAPI_Copy* aCopyBuilder = new BRepBuilderAPI_Copy(aBaseShape);
+    this->appendAlgo(std::shared_ptr<GeomAlgoAPI_MakeShape>(new GeomAlgoAPI_MakeShape(aCopyBuilder)));
+    if(!aCopyBuilder->IsDone()) {
+      return;
+    }
+    TopoDS_Shape aShape = aCopyBuilder->Shape();
+    TopoDS_Shape aShapeCopy = aShape.EmptyCopied();
+    BRep_Builder aBuilder;
+    for(TopoDS_Iterator anIt(aShape); anIt.More(); anIt.Next()) {
+      const TopoDS_Shape& aSubShape = anIt.Value();
+      if(aSubShape.ShapeType() == TopAbs_WIRE
+          && aSubShape.Orientation() != TopAbs_INTERNAL) {
+        aBuilder.Add(aShapeCopy, aSubShape);
       }
     }
+    aResultShape.reset(new GeomAPI_Shape());
+    aResultShape->setImpl(new TopoDS_Shape(aShapeCopy));
   }
 
-  this->appendAlgo(aMakeShapeCustom);
-
   setShape(aResultShape);
   setDone(true);
 }
@@ -101,7 +116,7 @@ void GeomAlgoAPI_ShapeBuilder::add(const std::shared_ptr<GeomAPI_Shape> theShape
   TopAbs_ShapeEnum aBaseShapeType = aBaseShape.ShapeType();
 
   // Copy base shape.
-  BRepBuilderAPI_Copy* aCopyBuilder = new BRepBuilderAPI_Copy(aBaseShape, Standard_False);
+  BRepBuilderAPI_Copy* aCopyBuilder = new BRepBuilderAPI_Copy(aBaseShape);
   this->appendAlgo(std::shared_ptr<GeomAlgoAPI_MakeShape>(new GeomAlgoAPI_MakeShape(aCopyBuilder)));
   if(!aCopyBuilder->IsDone()) {
     return;
@@ -113,6 +128,8 @@ void GeomAlgoAPI_ShapeBuilder::add(const std::shared_ptr<GeomAPI_Shape> theShape
   std::shared_ptr<GeomAlgoAPI_MakeShapeCustom> aMakeShapeCustom(new GeomAlgoAPI_MakeShapeCustom());
   for(ListOfShape::const_iterator anIt = theShapesToAdd.cbegin(); anIt != theShapesToAdd.cend(); ++anIt) {
     TopoDS_Shape aShapeToAdd = (*anIt)->impl<TopoDS_Shape>();
+    TopoDS_Shape aModShapeToAdd = aShapeToAdd;
+    aModShapeToAdd.Orientation(TopAbs_INTERNAL);
     for(TopExp_Explorer aResExp(aResultShape, TopAbs_VERTEX); aResExp.More(); aResExp.Next()) {
       const TopoDS_Vertex& aVertexInRes = TopoDS::Vertex(aResExp.Current());
       const gp_Pnt aPntInRes = BRep_Tool::Pnt(aVertexInRes);
@@ -124,17 +141,18 @@ void GeomAlgoAPI_ShapeBuilder::add(const std::shared_ptr<GeomAPI_Shape> theShape
           TopoDS_Shape aVertexInResMod = aVertexInRes;
           aVertexInResMod.Orientation(aVertexInAdd.Orientation());
           aReShape.Replace(aVertexInAdd, aVertexInResMod);
-          TopoDS_Shape aModShape = aReShape.Apply(aShapeToAdd);
-
-          GeomShapePtr aGeomBaseShape(new GeomAPI_Shape());
-          GeomShapePtr aGeomModShape(new GeomAPI_Shape());
-          aGeomBaseShape->setImpl(new TopoDS_Shape(aShapeToAdd));
-          aGeomModShape->setImpl(new TopoDS_Shape(aModShape));
-          aMakeShapeCustom->addModified(aGeomBaseShape, aGeomModShape);
-          aShapeToAdd = aModShape;
+          aModShapeToAdd = aReShape.Apply(aModShapeToAdd);
         }
       }
     }
+
+    GeomShapePtr aGeomBaseShape(new GeomAPI_Shape());
+    GeomShapePtr aGeomModShape(new GeomAPI_Shape());
+    aGeomBaseShape->setImpl(new TopoDS_Shape(aShapeToAdd));
+    aGeomModShape->setImpl(new TopoDS_Shape(aModShapeToAdd));
+    aMakeShapeCustom->addModified(aGeomBaseShape, aGeomModShape);
+    aShapeToAdd = aModShapeToAdd;
+
     TopAbs_ShapeEnum aShapeToAddType = aShapeToAdd.ShapeType();
     if(aBaseShapeType == TopAbs_WIRE) {
       if(aShapeToAddType == TopAbs_VERTEX) {

diff --git a/src/Model/Model_BodyBuilder.cpp b/src/Model/Model_BodyBuilder.cpp
index fe1541286a3fe7c19cdbfb242a8fe12643b026e6..bfa8d62fe1a32d7a78b6a20dd77aa45c8e1e4172 100755 (executable)
--- a/src/Model/Model_BodyBuilder.cpp
+++ b/src/Model/Model_BodyBuilder.cpp
@@ -393,7 +393,9 @@ void Model_BodyBuilder::loadAndOrientModifiedShapes (
         std::shared_ptr<GeomAPI_Shape> aMapShape(theSubShapes.find(*anIt));
         aNewShape.Orientation(aMapShape->impl<TopoDS_Shape>().Orientation());
       }
-      if(!aRoot.IsSame(aNewShape) && aResultShape->isSubShape(*anIt)) {
+      GeomShapePtr aGeomNewShape(new GeomAPI_Shape());
+      aGeomNewShape->setImpl(new TopoDS_Shape(aNewShape));
+      if(!aRoot.IsSame(aNewShape) && aResultShape->isSubShape(aGeomNewShape)) {
         builder(aTag)->Modify(aRoot,aNewShape);
         if(isBuilt) {
           if(theIsStoreSeparate) {