mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-16 10:08:36 +03:00
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.
256 lines
6.8 KiB
C++
256 lines
6.8 KiB
C++
// Created by: Peter KURNEV
|
|
// Copyright (c) 1999-2012 OPEN CASCADE SAS
|
|
//
|
|
// The content of this file is subject to the Open CASCADE Technology Public
|
|
// License Version 6.5 (the "License"). You may not use the content of this file
|
|
// except in compliance with the License. Please obtain a copy of the License
|
|
// at http://www.opencascade.org and read it completely before using this file.
|
|
//
|
|
// The Initial Developer of the Original Code is Open CASCADE S.A.S., having its
|
|
// main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France.
|
|
//
|
|
// The Original Code and all software distributed under the License is
|
|
// distributed on an "AS IS" basis, without warranty of any kind, and the
|
|
// Initial Developer hereby disclaims all such warranties, including without
|
|
// limitation, any warranties of merchantability, fitness for a particular
|
|
// purpose or non-infringement. Please see the License for the specific terms
|
|
// and conditions governing the rights and limitations under the License.
|
|
|
|
|
|
#include <BOPTest.ixx>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <NCollection_IncAllocator.hxx>
|
|
|
|
#include <DBRep.hxx>
|
|
#include <Draw.hxx>
|
|
#include <Draw_Color.hxx>
|
|
#include <DrawTrSurf.hxx>
|
|
|
|
#include <TopoDS_Shape.hxx>
|
|
//
|
|
#include <BOPAlgo_Builder.hxx>
|
|
#include <BOPAlgo_PaveFiller.hxx>
|
|
#include <BOPAlgo_Operation.hxx>
|
|
#include <BOPAlgo_BOP.hxx>
|
|
//
|
|
#include <BOPTest_DrawableShape.hxx>
|
|
#include <BOPTest_Objects.hxx>
|
|
|
|
//
|
|
static Standard_Integer bfillds (Draw_Interpretor&, Standard_Integer, const char**);
|
|
static Standard_Integer bbuild (Draw_Interpretor&, Standard_Integer, const char**);
|
|
static Standard_Integer bbop (Draw_Interpretor&, Standard_Integer, const char**);
|
|
static Standard_Integer bclear (Draw_Interpretor&, Standard_Integer, const char**);
|
|
//=======================================================================
|
|
//function : PartitionCommands
|
|
//purpose :
|
|
//=======================================================================
|
|
void BOPTest::PartitionCommands(Draw_Interpretor& theCommands)
|
|
{
|
|
static Standard_Boolean done = Standard_False;
|
|
if (done) return;
|
|
done = Standard_True;
|
|
// Chapter's name
|
|
const char* g = "Partition commands";
|
|
// Commands
|
|
theCommands.Add("bfillds" , "use bfillds" , __FILE__, bfillds , g);
|
|
theCommands.Add("bbuild" , "use bbuild r" , __FILE__, bbuild, g);
|
|
theCommands.Add("bbop" , "use bbop r op" , __FILE__, bbop, g);
|
|
theCommands.Add("bclear" , "use bclear" , __FILE__, bclear, g);
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : bclear
|
|
//purpose :
|
|
//=======================================================================
|
|
Standard_Integer bclear(Draw_Interpretor& di, Standard_Integer n, const char** )
|
|
{
|
|
if (n!=1) {
|
|
di << " use bclear\n";
|
|
return 0;
|
|
}
|
|
//
|
|
BOPTest_Objects::Clear();
|
|
return 0;
|
|
}
|
|
//=======================================================================
|
|
//function : bfillds
|
|
//purpose :
|
|
//=======================================================================
|
|
Standard_Integer bfillds(Draw_Interpretor& di, Standard_Integer n, const char** )
|
|
{
|
|
if (n!=1) {
|
|
di << " Use bfillds\n";
|
|
return 0;
|
|
}
|
|
//
|
|
char buf[32];
|
|
Standard_Integer aNbS, aNbT, iErr;
|
|
BOPCol_ListIteratorOfListOfShape aIt;
|
|
BOPCol_ListOfShape aLC;
|
|
|
|
BOPCol_ListOfShape& aLS=BOPTest_Objects::Shapes();
|
|
aNbS=aLS.Extent();
|
|
if (!aNbS) {
|
|
di << " no objects to process\n";
|
|
return 0;
|
|
}
|
|
//
|
|
BOPCol_ListOfShape& aLT=BOPTest_Objects::Tools();
|
|
aNbT=aLT.Extent();
|
|
//
|
|
aIt.Initialize(aLS);
|
|
for (; aIt.More(); aIt.Next()) {
|
|
const TopoDS_Shape& aS=aIt.Value();
|
|
aLC.Append(aS);
|
|
}
|
|
//
|
|
aIt.Initialize(aLT);
|
|
for (; aIt.More(); aIt.Next()) {
|
|
const TopoDS_Shape& aS=aIt.Value();
|
|
aLC.Append(aS);
|
|
}
|
|
//
|
|
BOPAlgo_PaveFiller& aPF=BOPTest_Objects::PaveFiller();
|
|
//
|
|
aPF.SetArguments(aLC);
|
|
//
|
|
aPF.Perform();
|
|
iErr=aPF.ErrorStatus();
|
|
if (iErr) {
|
|
Sprintf(buf, " error: %d\n", iErr);
|
|
di << buf;
|
|
return 0;
|
|
}
|
|
//
|
|
return 0;
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : bbuild
|
|
//purpose :
|
|
//=======================================================================
|
|
Standard_Integer bbuild(Draw_Interpretor& di, Standard_Integer n, const char** a)
|
|
{
|
|
if (n!=2) {
|
|
di << " Use bbuild r\n";
|
|
return 0;
|
|
}
|
|
//
|
|
BOPDS_PDS pDS=BOPTest_Objects::PDS();
|
|
if (!pDS) {
|
|
di << " prepare PaveFiller first\n";
|
|
return 0;
|
|
}
|
|
//
|
|
char buf[32];
|
|
Standard_Integer iErr;
|
|
BOPCol_ListIteratorOfListOfShape aIt;
|
|
//
|
|
BOPAlgo_PaveFiller& aPF=BOPTest_Objects::PaveFiller();
|
|
//
|
|
BOPAlgo_Builder& aBuilder=BOPTest_Objects::Builder();
|
|
aBuilder.Clear();
|
|
//
|
|
BOPCol_ListOfShape& aLSObj=BOPTest_Objects::Shapes();
|
|
aIt.Initialize(aLSObj);
|
|
for (; aIt.More(); aIt.Next()) {
|
|
const TopoDS_Shape& aS=aIt.Value();
|
|
aBuilder.AddArgument(aS);
|
|
}
|
|
//
|
|
BOPCol_ListOfShape& aLSTool=BOPTest_Objects::Tools();
|
|
aIt.Initialize(aLSTool);
|
|
for (; aIt.More(); aIt.Next()) {
|
|
const TopoDS_Shape& aS=aIt.Value();
|
|
aBuilder.AddArgument(aS);
|
|
}
|
|
//
|
|
aBuilder.PerformWithFiller(aPF);
|
|
iErr=aBuilder.ErrorStatus();
|
|
if (iErr) {
|
|
Sprintf(buf, " error: %d\n", iErr);
|
|
di << buf;
|
|
return 0;
|
|
}
|
|
//
|
|
const TopoDS_Shape& aR=aBuilder.Shape();
|
|
if (aR.IsNull()) {
|
|
di << " null shape\n";
|
|
return 0;
|
|
}
|
|
//
|
|
DBRep::Set(a[1], aR);
|
|
return 0;
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : bbop
|
|
//purpose :
|
|
//=======================================================================
|
|
Standard_Integer bbop(Draw_Interpretor& di, Standard_Integer n, const char** a)
|
|
{
|
|
if (n!=3) {
|
|
di << " use bbop r op\n";
|
|
return 0;
|
|
}
|
|
//
|
|
BOPDS_PDS pDS=BOPTest_Objects::PDS();
|
|
if (!pDS) {
|
|
di << " prepare PaveFiller first\n";
|
|
return 0;
|
|
}
|
|
//
|
|
char buf[32];
|
|
Standard_Integer iErr, iOp;
|
|
BOPAlgo_Operation aOp;
|
|
BOPCol_ListIteratorOfListOfShape aIt;
|
|
//
|
|
iOp=Draw::Atoi(a[2]);
|
|
if (iOp<0 || iOp>4) {
|
|
di << " invalid operation type\n";
|
|
}
|
|
aOp=(BOPAlgo_Operation)iOp;
|
|
//
|
|
BOPAlgo_PaveFiller& aPF=BOPTest_Objects::PaveFiller();
|
|
//
|
|
BOPAlgo_BOP& aBOP=BOPTest_Objects::BOP();
|
|
aBOP.Clear();
|
|
//
|
|
BOPCol_ListOfShape& aLSObj=BOPTest_Objects::Shapes();
|
|
aIt.Initialize(aLSObj);
|
|
for (; aIt.More(); aIt.Next()) {
|
|
const TopoDS_Shape& aS=aIt.Value();
|
|
aBOP.AddArgument(aS);
|
|
}
|
|
//
|
|
BOPCol_ListOfShape& aLSTools=BOPTest_Objects::Tools();
|
|
aIt.Initialize(aLSTools);
|
|
for (; aIt.More(); aIt.Next()) {
|
|
const TopoDS_Shape& aS=aIt.Value();
|
|
aBOP.AddTool(aS);
|
|
}
|
|
//
|
|
aBOP.SetOperation(aOp);
|
|
//
|
|
aBOP.PerformWithFiller(aPF);
|
|
iErr=aBOP.ErrorStatus();
|
|
if (iErr) {
|
|
Sprintf(buf, " error: %d\n", iErr);
|
|
di << buf;
|
|
return 0;
|
|
}
|
|
//
|
|
const TopoDS_Shape& aR=aBOP.Shape();
|
|
if (aR.IsNull()) {
|
|
di << " null shape\n";
|
|
return 0;
|
|
}
|
|
//
|
|
DBRep::Set(a[1], aR);
|
|
return 0;
|
|
}
|
|
|