mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-21 10:13:43 +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.
185 lines
6.2 KiB
C++
185 lines
6.2 KiB
C++
// Created on: 2012-12-17
|
|
// Created by: Eugeny MALTCHIKOV
|
|
// Copyright (c) 2012-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 <BRepAlgoAPI_Check.ixx>
|
|
#include <BOPAlgo_ArgumentAnalyzer.hxx>
|
|
#include <BRepBuilderAPI_Copy.hxx>
|
|
#include <BRepCheck_Analyzer.hxx>
|
|
|
|
//=======================================================================
|
|
//function : BRepAlgoAPI_Check
|
|
//purpose :
|
|
//=======================================================================
|
|
BRepAlgoAPI_Check::BRepAlgoAPI_Check()
|
|
: myAnalyzer(NULL)
|
|
{
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : BRepAlgoAPI_Check
|
|
//purpose :
|
|
//=======================================================================
|
|
BRepAlgoAPI_Check::BRepAlgoAPI_Check(const TopoDS_Shape& theS,
|
|
const Standard_Boolean bTestSE,
|
|
const Standard_Boolean bTestSI)
|
|
{
|
|
Init(theS, TopoDS_Shape(), BOPAlgo_UNKNOWN, bTestSE, bTestSI);
|
|
//
|
|
Perform();
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : BRepAlgoAPI_Check
|
|
//purpose :
|
|
//=======================================================================
|
|
BRepAlgoAPI_Check::BRepAlgoAPI_Check(const TopoDS_Shape& theS1,
|
|
const TopoDS_Shape& theS2,
|
|
const BOPAlgo_Operation theOp,
|
|
const Standard_Boolean bTestSE,
|
|
const Standard_Boolean bTestSI)
|
|
{
|
|
Init(theS1, theS2, theOp, bTestSE, bTestSI);
|
|
//
|
|
Perform();
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : ~BRepAlgoAPI_Check
|
|
//purpose :
|
|
//=======================================================================
|
|
BRepAlgoAPI_Check::~BRepAlgoAPI_Check()
|
|
{
|
|
if(myAnalyzer){
|
|
delete myAnalyzer;
|
|
myAnalyzer=NULL;
|
|
}
|
|
myResult.Clear();
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : SetData
|
|
//purpose :
|
|
//=======================================================================
|
|
void BRepAlgoAPI_Check::SetData(const TopoDS_Shape& theS,
|
|
const Standard_Boolean bTestSE,
|
|
const Standard_Boolean bTestSI)
|
|
{
|
|
Init(theS, TopoDS_Shape(), BOPAlgo_UNKNOWN, bTestSE, bTestSI);
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : SetData
|
|
//purpose :
|
|
//=======================================================================
|
|
void BRepAlgoAPI_Check::SetData(const TopoDS_Shape& theS1,
|
|
const TopoDS_Shape& theS2,
|
|
const BOPAlgo_Operation theOp,
|
|
const Standard_Boolean bTestSE,
|
|
const Standard_Boolean bTestSI)
|
|
{
|
|
Init(theS1, theS2, theOp, bTestSE, bTestSI);
|
|
}
|
|
|
|
|
|
//=======================================================================
|
|
//function : Init
|
|
//purpose :
|
|
//=======================================================================
|
|
void BRepAlgoAPI_Check::Init(const TopoDS_Shape& theS1,
|
|
const TopoDS_Shape& theS2,
|
|
const BOPAlgo_Operation theOp,
|
|
const Standard_Boolean bTestSE,
|
|
const Standard_Boolean bTestSI)
|
|
{
|
|
myResult.Clear();
|
|
myS1 = theS1.IsNull() ? theS1 : BRepBuilderAPI_Copy(theS1).Shape();
|
|
myS2 = theS2.IsNull() ? theS2 : BRepBuilderAPI_Copy(theS2).Shape();
|
|
//
|
|
myAnalyzer = new BOPAlgo_ArgumentAnalyzer();
|
|
//
|
|
myAnalyzer->SetShape1(myS1);
|
|
myAnalyzer->SetShape2(myS2);
|
|
myAnalyzer->OperationType()=theOp;
|
|
myAnalyzer->ArgumentTypeMode() = Standard_True;
|
|
myAnalyzer->SmallEdgeMode() = bTestSE;
|
|
myAnalyzer->SelfInterMode() = bTestSI;
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : Result
|
|
//purpose :
|
|
//=======================================================================
|
|
const BOPAlgo_ListOfCheckResult& BRepAlgoAPI_Check::Result()
|
|
{
|
|
return myResult;
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : IsValid
|
|
//purpose :
|
|
//=======================================================================
|
|
Standard_Boolean BRepAlgoAPI_Check::IsValid()
|
|
{
|
|
return myResult.IsEmpty();
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : Perform
|
|
//purpose :
|
|
//=======================================================================
|
|
void BRepAlgoAPI_Check::Perform()
|
|
{
|
|
Standard_Boolean isS1, isS2;
|
|
//incompatibility of shape types, small edges and self-interference
|
|
myAnalyzer->Perform();
|
|
if (myAnalyzer->HasFaulty()) {
|
|
myResult = myAnalyzer->GetCheckResult();
|
|
}
|
|
|
|
//topological validity
|
|
isS1 = !myS1.IsNull();
|
|
isS2 = !myS2.IsNull();
|
|
if (isS1) {
|
|
BRepCheck_Analyzer anS1(myS1);
|
|
isS1 = anS1.IsValid();
|
|
} else {
|
|
isS1 = Standard_True;
|
|
}
|
|
//
|
|
if (isS2) {
|
|
BRepCheck_Analyzer anS2(myS2);
|
|
isS2 = anS2.IsValid();
|
|
} else {
|
|
isS2 = Standard_True;
|
|
}
|
|
if (!isS1 || !isS2) {
|
|
BOPAlgo_CheckResult aRes;
|
|
aRes.SetCheckStatus(BOPAlgo_NotValid);
|
|
if (!isS1) {
|
|
aRes.SetShape1(myS1);
|
|
}
|
|
if (!isS1) {
|
|
aRes.SetShape2(myS2);
|
|
}
|
|
myResult.Append(aRes);
|
|
}
|
|
}
|
|
|
|
|