kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

fix #17497

Browse Source
This commit is contained in:
Eric Price
2024-10-27 22:16:14 +01:00
parent 27c9c9d0ac
commit 648bb8f5e4
2 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/Mod/Part/App/FCBRepAlgoAPI_BooleanOperation.cpp
View File

@@ -83,13 +83,19 @@ void FCBRepAlgoAPIHelper::setAutoFuzzy(BRepAlgoAPI_BuilderAlgo* op) {
void FCBRepAlgoAPI_BooleanOperation::Build(const Message_ProgressRange& theRange) {
if (myOperation==BOPAlgo_CUT && myArguments.Size()==1 && myArguments.First().ShapeType() == TopAbs_COMPOUND) {
myOriginalArguments = myArguments;
if (myOperation==BOPAlgo_CUT && myArguments.Size()==1 && myTools.Size()==1 && myTools.First().ShapeType() == TopAbs_COMPOUND) {
TopTools_ListOfShape myOriginalTools = myTools;
TopTools_ListOfShape myOriginalArguments = myArguments;
myShape = RecursiveCutByCompound(myOriginalArguments.First(), myOriginalTools.First(), theRange);
myArguments = myOriginalArguments;
myTools = myOriginalTools;
} else if (myOperation==BOPAlgo_CUT && myArguments.Size()==1 && myArguments.First().ShapeType() == TopAbs_COMPOUND) {
TopTools_ListOfShape myOriginalArguments = myArguments;
myShape = RecursiveCutCompound(myOriginalArguments.First(), theRange);
myArguments = myOriginalArguments;
} else {
return BRepAlgoAPI_BooleanOperation::Build(theRange);
BRepAlgoAPI_BooleanOperation::Build(theRange);
}
}
const TopoDS_Shape FCBRepAlgoAPI_BooleanOperation::RecursiveCutCompound(const TopoDS_Shape& theArgument, const Message_ProgressRange& theRange) {
@@ -110,3 +116,24 @@ const TopoDS_Shape FCBRepAlgoAPI_BooleanOperation::RecursiveCutCompound(const To
}
return comp;
}
const TopoDS_Shape FCBRepAlgoAPI_BooleanOperation::RecursiveCutByCompound(const TopoDS_Shape& theArgument, const TopoDS_Shape& theTool, const Message_ProgressRange& theRange) {
TopoDS_Shape result = theArgument;
TopoDS_Iterator it(theTool);
for (; it.More(); it.Next()) {
TopTools_ListOfShape currentArguments;
TopTools_ListOfShape currentTools;
currentArguments.Append(result);
currentTools.Append(it.Value());
myArguments = currentArguments;
myTools = currentTools;
Build(theRange);
if (IsDone()) {
result = myShape;
} else {
return TopoDS_Shape();
}
}
return result;
}

3
src/Mod/Part/App/FCBRepAlgoAPI_BooleanOperation.h
View File

@@ -61,8 +61,7 @@ protected: //! @name Constructors
private:
TopTools_ListOfShape myOriginalArguments;
Standard_EXPORT const TopoDS_Shape RecursiveCutCompound(const TopoDS_Shape& theArgument, const Message_ProgressRange& theRange);
Standard_EXPORT const TopoDS_Shape RecursiveCutByCompound(const TopoDS_Shape& theArgument, const TopoDS_Shape& theTool, const Message_ProgressRange& theRange);
};
#endif