1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00

0021762: Integration of new Boolean Operation algorithm to OCCT.

Modifications:
- BRepOffset/BRepOffset_Tool.cxx, Features and Fillets algorithms have been ported on new BO algorithm.
- Old BO algorithm, that was implemented in BOP, BooleanOperations and BOPTools packages, has - been deleted.
- Porting SALOME algorithms to new BOP algorithm.
- Fixing regressions. Rebased on current master.
- Corrections in post treatment of section edges;
- Corrections in the accordance with the bug 0023293;
- Small corrections in the bopcheck and bopargcheck commands.
- NCollection maps have been replaced by NCollection indexed maps to guarantee the constant order of sub-shapes in the result of boolean operation.
- Test case feat featprism M9 has been fixed.
- Test cases chl 902 E3 H3 have been fixed (corrections in the treatment of section edges).
- Test cases caf driver B6 B7, caf named_shape F6 F7 have been modified according to the new order of sub-shapes in the result of boolean operation.
- Test cases blend buildevol G1, blend simple K4, bcommon_complex C7, feat featprism L6 have been modified as they are improvements.
- Test case boolean bsection A3 has been modified according to the new syntax of the bsection command.
- Test cases boolean bfuse_complex J1 P9 have been fixed (the function IsInternalFace has been modified to use the function GetFaceOff);
- Test case chl 902 H3 has been fixed (changes in the treatment of section edges);
- Test case boolean bsection D8 has been modified (removed TODO statement);
- Test case boolean bsection A3 has been modified (as the shapes have been changed).
- Added correction of the tolerance values of the shapes according to the bug 0023610.
- test cases:
    boolean bcommon_complex C3,
    boolean bcut_complex F2 O7,
    boolean bfuse_complex C4 C5 E4,
    boolean bsection B6 M8 M9 N4 N5 N7,
    boolean bfuse_simple ZP6,
    draft angle G8,
    feat featprism S2
have been marked as invalid according to the bug 0022033;
- New value of result has been set in the test cases :
    boolean bopsection D4
    boolean bsection R8
as it is correct.
- test case bugs modalg bug23472 has been rewritten according to the new format of bsection command.
- The classes IntTools_Context and IntTools_ShrunkRange have been replaced by BOPInt_Context and BOPInt_ShrunkRange accordingly.
- The new class BRepAlgoAPI_Check has been added according to the bug 0023648.
- Some regressions have been fixed.
- The following test cases have been marked as invalid or rewritten
    bugs modalg buc60462_2, 60531_2, 60776_1, bug472_1, bug472_2, bug472_3, bug497_3, bug62
    bugs moddata bug26_1, bug26_2,
- The test case bugs modalg buc60533 has been rewritten to use the general fuse algorithm for building the result.
- The new value of the result has been set in the test case bugs modalg 60776_2.
- The following test cases have been rewritten according to the new format of the bsection command
    bugs modlag fra62369, pro18892
    bugs moddata bug75_1, bug75_2
- Corrected BRepAlgoAPI_Check.
- Removed package BOPTColStd.
- Rewritten test cases caf named_shape F8 F9.
- Removed unnecessary comments.
- Corrected the following test scripts :
    boolean bcut_complex(012) O3 O4 O5 O6 O8
    boolean bfuse_complex(013) O5 O6 P8
    boolean bopcommon_complex(021) D8 D9
    boolean bopfuse_complex(022) H1 J6
    boolean boptuc_complex(024) D5
    bugs modalg(006) bug399 bug497_1
    feat featprism(003) C4
- Corrections in the treatment of section edges (putting paves on the curves);
- Corrections in BRepOffset_Tool;
- The following test cases have been rewritten according to the new format of the bsection command
   bugs modalg bug6502, bug6554, bug6766_1, bug6766_3
- The new value of the result has been set in the following test cases
   bugs modalg bug1255, bug1255_1
- The following test cases have been marked as invalid or rewritten
   bugs modalg bug472_2, bug472_3, bug825_2
   bugs moddata bug10603, bug152_1, bug152_2, bug3721_1, bug3721_2, bug3721_3
- The following test cases have been rewritten as improvements
   bugs modalg bug693, bug693_1, bug817_1
   bugs moddata bug3721_5, bug3721_6, bug6862_3, bug6862_4, bug6862_6
- Test cases bugs modlag buc60787_1, buc60787_2, buc60788_2, buc60788_3 have been corrected.
- Fixed some SALOME regressions (modifications in the treatment of the section edges);
- Fixed test case bugs modalg bug23100;
- Test cases bugs modalg bug21754, bug22990 have been corrected according to the new format of the bsection command.
- Test cases bugs modalg bug13116_*, bug23711 have been fixed;
- Test cases bugs modalg bug697_2, bug697_4, bug697_7, bug697_8 have been marked as invalid according to the issue 0022033;
- Test cases bugs modalg bug22109_2, bug22109_3 have been corrected;
- Test case bugs modalg bug18186 has been corrected as it is improvement;
- Test case bugs modalg bug22802 has been deleted as there is no package BOPTColStd.
This commit is contained in:
emv
2013-02-08 17:42:05 +04:00
parent a8676008f7
commit 4e57c75ee1
642 changed files with 41074 additions and 67959 deletions

View File

@@ -46,7 +46,8 @@
#include <gp_Pln.hxx>
#include <gp_Cylinder.hxx>
#include <BRepFeat_LocalOperation.hxx>
//#include <BRepFeat_LocalOperation.hxx>
#include <BRepFeat_Builder.hxx>
#include <BRepFeat_MakeCylindricalHole.hxx>
#include <BRepFeat_SplitShape.hxx>
#include <BRepFeat_Gluer.hxx>
@@ -156,9 +157,17 @@ static Standard_Integer Loc(Draw_Interpretor& theCommands,
// LF.Append(TopoDS::Face(DBRep::Get(a[i+5],TopAbs_FACE)));
}
BRepFeat_LocalOperation BLoc(S);
BLoc.Perform(T,LF,Fuse);
BLoc.BuildPartsOfTool();
//BRepFeat_LocalOperation BLoc(S);
//BLoc.Perform(T,LF,Fuse);
//BLoc.BuildPartsOfTool();
TopTools_ListOfShape parts;
BRepFeat_Builder BLoc;
BLoc.Init(S,T);
BLoc.SetOperation(Fuse);
//BRepFeat_LocalOperation BLoc;
//BLoc.Init(S,T,Fuse);
BLoc.Perform();
BLoc.PartsOfTool(parts);
#if 0
char newname[1024];
@@ -167,7 +176,7 @@ static Standard_Integer Loc(Draw_Interpretor& theCommands,
while (*p != '\0') p++;
*p = '_';
p++;
TopTools_ListIteratorOfListOfShape its(BLoc.PartsOfTool());
TopTools_ListIteratorOfListOfShape its(parts);
dout.Clear();
i = 0;
for (; its.More(); its.Next()) {
@@ -185,29 +194,29 @@ static Standard_Integer Loc(Draw_Interpretor& theCommands,
// S = TopoDS::Shell(DBRep::Get(".",TopAbs_SHELL));
Draw::LastPick(qq,ww,ee,button);
if (!S.IsNull()) {
switch (button) {
case 1:
BLoc.RemovePart(S);
break;
case 2:
BLoc.ActivatePart(S);
break;
default:
{}
}
switch (button) {
case 1:
//BLoc.RemovePart(S);
break;
case 2:
BLoc.KeepPart(S);
break;
default:
{}
}
}
else {
button = 3;
button = 3;
}
} while (button != 3);
}
#endif
BLoc.Build();
if (BLoc.IsDone()) {
BLoc.PerformResult();
if (!BLoc.ErrorStatus()) {
// dout.Clear();
DBRep::Set(a[1],BLoc);
DBRep::Set(a[1],BLoc.Shape());
dout.Flush();
return 0;
}
@@ -240,9 +249,9 @@ static Standard_Integer HOLE1(Draw_Interpretor& theCommands,
}
theHole.Build();
if (theHole.IsDone()) {
if (!theHole.ErrorStatus()) {
// dout.Clear();
DBRep::Set(a[1],theHole);
DBRep::Set(a[1],theHole.Shape());
dout.Flush();
return 0;
}
@@ -266,9 +275,9 @@ static Standard_Integer HOLE2(Draw_Interpretor& theCommands,
theHole.PerformThruNext(Radius,WithControl);
theHole.Build();
if (theHole.IsDone()) {
if (!theHole.ErrorStatus()) {
// dout.Clear();
DBRep::Set(a[1],theHole);
DBRep::Set(a[1],theHole.Shape());
dout.Flush();
return 0;
}
@@ -291,9 +300,9 @@ static Standard_Integer HOLE3(Draw_Interpretor& theCommands,
theHole.Init(S,gp_Ax1(Or,Di));
theHole.PerformUntilEnd(Radius,WithControl);
theHole.Build();
if (theHole.IsDone()) {
if (!theHole.ErrorStatus()) {
// dout.Clear();
DBRep::Set(a[1],theHole);
DBRep::Set(a[1],theHole.Shape());
dout.Flush();
return 0;
}
@@ -318,9 +327,9 @@ static Standard_Integer HOLE4(Draw_Interpretor& theCommands,
theHole.Init(S,gp_Ax1(Or,Di));
theHole.PerformBlind(Radius,Length,WithControl);
theHole.Build();
if (theHole.IsDone()) {
if (!theHole.ErrorStatus()) {
// dout.Clear();
DBRep::Set(a[1],theHole);
DBRep::Set(a[1],theHole.Shape());
dout.Flush();
return 0;
}
@@ -1079,12 +1088,16 @@ static Standard_Integer Debou(Draw_Interpretor& theCommands,
// LF2.Append(TopoDS::Face(DBRep::Get(a[i],TopAbs_FACE)));
}
BRepFeat_LocalOperation BLoc(S);
BLoc.Perform(LF,LF2,Fuse);
BLoc.Build();
if (BLoc.IsDone()) {
//BRepFeat_LocalOperation BLoc(S);
//BLoc.Perform(LF,LF2,Fuse);
//BLoc.Build();
BRepFeat_Builder BLoc;
BLoc.Init(S, S);
BLoc.Perform();
BLoc.PerformResult();
if (!BLoc.ErrorStatus()) {
// dout.Clear();
DBRep::Set(a[1],BLoc);
DBRep::Set(a[1],BLoc.Shape());
dout.Flush();
return 0;
}

View File

@@ -45,7 +45,9 @@
#include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
#include <BOPTools_DSFiller.hxx>
//#include <BOPTools_DSFiller.hxx>
#include <BOPAlgo_PaveFiller.hxx>
#include <BRepAlgoAPI_BooleanOperation.hxx>
#include <BRepAlgoAPI_Fuse.hxx>
#include <BRepAlgoAPI_Cut.hxx>
@@ -404,15 +406,17 @@ Standard_Integer boptopoblend(Draw_Interpretor& di, Standard_Integer narg, const
}
Standard_Real Rad = Draw::Atof(a[4]);
BOPTools_DSFiller theDSFiller;
theDSFiller.SetShapes( S1, S2 );
if (!theDSFiller.IsDone()) {
BOPAlgo_PaveFiller theDSFiller;
BOPCol_ListOfShape aLS;
aLS.Append(S1);
aLS.Append(S2);
theDSFiller.SetArguments(aLS);
//
theDSFiller.Perform();
if (theDSFiller.ErrorStatus()) {
printf("Check types of the arguments, please\n");
return 1;
}
theDSFiller.Perform();
BRepAlgoAPI_BooleanOperation* pBuilder=NULL;