OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0028562: Replacement of old Boolean operations (BRepAlgo) with new ones (BRepAlgoAPI) in BRepAlgo_NormalProjection

Browse Source 
The usage of the old Boolean operations (implemented in the class BRepAlgo_BooleanOperations) in the
BRepAlgo_NormalProjection algorithm has been replaced with the usage of new Boolean operations
(implemented in the class BRepAlgoAPI_BooleanOperations).
This commit is contained in:
emv 2017-03-17 11:34:21 +03:00 committed by bugmaster
parent f80842e34c
commit 8b956afe8e
1 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/BRepAlgo/BRepAlgo_NormalProjection.cxx
View File

@ -22,9 +22,9 @@
#include <BRepAdaptor_HCurve.hxx> #include <BRepAdaptor_HCurve.hxx>
#include <BRepAdaptor_HSurface.hxx> #include <BRepAdaptor_HSurface.hxx>
#include <BRepAdaptor_Surface.hxx> #include <BRepAdaptor_Surface.hxx>
#include <BRepAlgo_BooleanOperations.hxx>
#include <BRepAlgo_NormalProjection.hxx> #include <BRepAlgo_NormalProjection.hxx>
#include <BRepAlgo_SequenceOfSequenceOfInteger.hxx> #include <BRepAlgo_SequenceOfSequenceOfInteger.hxx>
#include <BRepAlgoAPI_Common.hxx>
#include <BRepLib_MakeEdge.hxx> #include <BRepLib_MakeEdge.hxx>
#include <BRepLib_MakeVertex.hxx> #include <BRepLib_MakeVertex.hxx>
#include <BRepLib_MakeWire.hxx> #include <BRepLib_MakeWire.hxx>
@ -51,7 +51,6 @@
#include <TopoDS.hxx> #include <TopoDS.hxx>
#include <TopoDS_Edge.hxx> #include <TopoDS_Edge.hxx>
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
#include <TopOpeBRepBuild_HBuilder.hxx>
#include <TopTools_HSequenceOfShape.hxx> #include <TopTools_HSequenceOfShape.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx> #include <TopTools_ListIteratorOfListOfShape.hxx>
@ -479,31 +478,23 @@ void BRepAlgo_NormalProjection::SetDefaultParams()
#ifdef OCCT_DEBUG_CHRONO #ifdef OCCT_DEBUG_CHRONO
InitChron(chr_booltool); InitChron(chr_booltool);
#endif #endif
if(!Degenerated){ if (!Degenerated) {
BRepAlgo_BooleanOperations BoolTool; // Perform Boolean COMMON operation to get parts of projected edge
BoolTool.Shapes2d(Faces->Value(j),prj); // inside the face
BoolTool.Common(); BRepAlgoAPI_Common aCommon(Faces->Value(j), prj);
Handle(TopOpeBRepBuild_HBuilder) HB; if (aCommon.IsDone()) {
TopTools_ListOfShape LS; const TopoDS_Shape& aRC = aCommon.Shape();
TopTools_ListIteratorOfListOfShape Iter; //
HB = BoolTool.Builder(); TopExp_Explorer aExpE(aRC, TopAbs_EDGE);
LS.Clear(); for (; aExpE.More(); aExpE.Next()) {
if (HB->IsSplit(prj, TopAbs_IN)) const TopoDS_Shape& aE = aExpE.Current();
LS = HB->Splits(prj, TopAbs_IN); BB.Add(myRes, aE);
Iter.Initialize(LS); myAncestorMap.Bind(aE, Edges->Value(i));
if(Iter.More()) { myCorresp.Bind(aE, Faces->Value(j));
#ifdef OCCT_DEBUG }
cout << " BooleanOperations :" << Iter.More()<<" solutions " << endl; }
#endif else {
for(; Iter.More(); Iter.Next()) { // if the common operation has failed, try to classify the part
BB.Add(myRes, Iter.Value());
myAncestorMap.Bind(Iter.Value(), Edges->Value(i));
myCorresp.Bind(Iter.Value(),Faces->Value(j));
}
}
else {
BRepTopAdaptor_FClass2d classifier(TopoDS::Face(Faces->Value(j)), BRepTopAdaptor_FClass2d classifier(TopoDS::Face(Faces->Value(j)),
Precision::Confusion()); Precision::Confusion());
gp_Pnt2d Puv; gp_Pnt2d Puv;