- aTempShapes.Add(theShape->impl<TopoDS_Shape>());
-
- for(ListOfMakeShape::iterator aBuilderIt = myMakeShapeList.begin(); aBuilderIt != myMakeShapeList.end(); aBuilderIt++) {
- BRepBuilderAPI_MakeShape* aBuilder = (*aBuilderIt)->implPtr<BRepBuilderAPI_MakeShape>();
- for(NCollection_Map<TopoDS_Shape>::Iterator aShapeIt(aTempShapes); aShapeIt.More(); aShapeIt.Next()) {
- const TopoDS_Shape& aShape = aShapeIt.Value();
- const TopTools_ListOfShape& aList = theOperationType == GeomAlgoAPI_MakeShapeList::Generated ?
- aBuilder->Generated(aShape) : aBuilder->Modified(aShape);
- bool prevResRemoved = false;
- for(TopTools_ListIteratorOfListOfShape anIt(aList); anIt.More(); anIt.Next()) {
- aTempShapes.Add(anIt.Value());
- aResultShapes.Add(anIt.Value());
- if(!prevResRemoved) {
- aResultShapes.Remove(aShape);
- prevResRemoved = true;
- }
+ anAlgoShapes.Add(theShape->impl<TopoDS_Shape>());
+ aResultShapes.Add(theShape->impl<TopoDS_Shape>());
+
+ for(ListOfMakeShape::iterator aBuilderIt = myListOfMakeShape.begin(); aBuilderIt != myListOfMakeShape.end(); aBuilderIt++) {
+ std::shared_ptr<GeomAlgoAPI_MakeShape> aMakeShape = *aBuilderIt;
+ NCollection_Map<TopoDS_Shape> aTempShapes;
+ bool hasResults = false;
+ for(NCollection_Map<TopoDS_Shape>::Iterator aShapeIt(anAlgoShapes); aShapeIt.More(); aShapeIt.Next()) {
+ std::shared_ptr<GeomAPI_Shape> aShape(new GeomAPI_Shape);
+ aShape->setImpl(new TopoDS_Shape(aShapeIt.Value()));
+ ListOfShape aGeneratedShapes;
+ aMakeShape->generated(aShape, aGeneratedShapes);
+ for(ListOfShape::const_iterator anIt = aGeneratedShapes.cbegin(); anIt != aGeneratedShapes.cend(); anIt++) {
+ aTempShapes.Add((*anIt)->impl<TopoDS_Shape>());
+ aResultShapes.Add((*anIt)->impl<TopoDS_Shape>());
+ hasResults = true;
+ }
+ ListOfShape aModifiedShapes;
+ aMakeShape->modified(aShape, aModifiedShapes);
+ for(ListOfShape::const_iterator anIt = aModifiedShapes.cbegin(); anIt != aModifiedShapes.cend(); anIt++) {
+ aTempShapes.Add((*anIt)->impl<TopoDS_Shape>());
+ aResultShapes.Add((*anIt)->impl<TopoDS_Shape>());
+ hasResults = true;
+ }
+ if(hasResults) {
+ aResultShapes.Remove(aShape->impl<TopoDS_Shape>());