mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-07-25 12:55:50 +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.
212 lines
6.4 KiB
C++
212 lines
6.4 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 <BOPInt_Tools.ixx>
|
|
|
|
#include <gp_Pnt.hxx>
|
|
#include <BndLib_Add3dCurve.hxx>
|
|
#include <Bnd_Box.hxx>
|
|
#include <Geom_Curve.hxx>
|
|
#include <GeomAdaptor_Curve.hxx>
|
|
|
|
//=======================================================================
|
|
//function : CheckCurve
|
|
//purpose :
|
|
//=======================================================================
|
|
Standard_Boolean BOPInt_Tools::CheckCurve(const Handle (Geom_Curve)& aC3D,
|
|
const Standard_Real aTolR3D,
|
|
Bnd_Box& aBox)
|
|
{
|
|
Standard_Boolean bRet;
|
|
Standard_Real aXmin, aYmin, aZmin, aXmax, aYmax, aZmax, dX, dY, dZ;
|
|
Standard_Real dS, aTol;
|
|
GeomAdaptor_Curve aGAC;
|
|
//
|
|
aGAC.Load(aC3D);
|
|
BndLib_Add3dCurve::Add(aGAC, aTolR3D, aBox);
|
|
// 910/B1
|
|
aBox.Get(aXmin, aYmin, aZmin, aXmax, aYmax, aZmax);
|
|
dX=aXmax-aXmin;
|
|
dY=aYmax-aYmin;
|
|
dZ=aZmax-aZmin;
|
|
dS=1.e-12;
|
|
aTol=2.*aTolR3D+dS;
|
|
bRet=(dX>aTol || dY>aTol || dZ>aTol);
|
|
//
|
|
return bRet;
|
|
}
|
|
|
|
|
|
//=======================================================================
|
|
//function : IsOnPave
|
|
//purpose :
|
|
//=======================================================================
|
|
Standard_Boolean BOPInt_Tools::IsOnPave(const Standard_Real aT1,
|
|
const IntTools_Range& aRange,
|
|
const Standard_Real aTolerance)
|
|
{
|
|
Standard_Boolean firstisonpave1, firstisonpave2, bIsOnPave;
|
|
//
|
|
firstisonpave1 = (Abs(aRange.First() - aT1) < aTolerance);
|
|
firstisonpave2 = (Abs(aRange.Last() - aT1) < aTolerance);
|
|
bIsOnPave=(firstisonpave1 || firstisonpave2);
|
|
return bIsOnPave;
|
|
}
|
|
//=======================================================================
|
|
// function: VertexParameters
|
|
// purpose:
|
|
//=======================================================================
|
|
void BOPInt_Tools::VertexParameters(const IntTools_CommonPrt& aCPart,
|
|
Standard_Real& aT1,
|
|
Standard_Real& aT2)
|
|
{
|
|
const IntTools_Range& aR1=aCPart.Range1();
|
|
aT1=0.5*(aR1.First()+aR1.Last());
|
|
//
|
|
if((aCPart.VertexParameter1() >= aR1.First()) &&
|
|
(aCPart.VertexParameter1() <= aR1.Last())) {
|
|
aT1 = aCPart.VertexParameter1();
|
|
}
|
|
//
|
|
const IntTools_SequenceOfRanges& aRanges2=aCPart.Ranges2();
|
|
const IntTools_Range& aR2=aRanges2(1);
|
|
aT2=0.5*(aR2.First()+aR2.Last());
|
|
//
|
|
if((aCPart.VertexParameter2() >= aR2.First()) &&
|
|
(aCPart.VertexParameter2() <= aR2.Last())) {
|
|
aT2 = aCPart.VertexParameter2();
|
|
}
|
|
}
|
|
//=======================================================================
|
|
// function: VertexParameter
|
|
// purpose:
|
|
//=======================================================================
|
|
void BOPInt_Tools::VertexParameter(const IntTools_CommonPrt& aCPart,
|
|
Standard_Real& aT)
|
|
{
|
|
const IntTools_Range& aR=aCPart.Range1();
|
|
aT=0.5*(aR.First()+aR.Last());
|
|
if((aCPart.VertexParameter1() >= aR.First()) &&
|
|
(aCPart.VertexParameter1() <= aR.Last())) {
|
|
aT = aCPart.VertexParameter1();
|
|
}
|
|
}
|
|
//=======================================================================
|
|
// function: IsOnPave1
|
|
// purpose:
|
|
//=======================================================================
|
|
Standard_Boolean BOPInt_Tools::IsOnPave1(const Standard_Real aTR,
|
|
const IntTools_Range& aCPRange,
|
|
const Standard_Real aTolerance)
|
|
{
|
|
Standard_Boolean bIsOnPave;
|
|
Standard_Real aT1, aT2, dT1, dT2;
|
|
//
|
|
aT1=aCPRange.First();
|
|
aT2=aCPRange.Last();
|
|
bIsOnPave=(aTR>=aT1 && aTR<=aT1);
|
|
if (bIsOnPave) {
|
|
return bIsOnPave;
|
|
}
|
|
//
|
|
dT1=Abs(aTR-aT1);
|
|
dT2=Abs(aTR-aT2);
|
|
bIsOnPave=(dT1<=aTolerance || dT2<=aTolerance);
|
|
return bIsOnPave;
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//=======================================================================
|
|
//function : SegPln
|
|
//purpose :
|
|
//=======================================================================
|
|
Standard_Integer BOPInt_Tools::SegPln(const gp_Lin& theLin,
|
|
const Standard_Real theTLin1,
|
|
const Standard_Real theTLin2,
|
|
const Standard_Real theTolLin,
|
|
const gp_Pln& thePln,
|
|
const Standard_Real theTolPln,
|
|
gp_Pnt& theP,
|
|
Standard_Real& theTP,
|
|
Standard_Real& theTolP,
|
|
Standard_Real& theTPmin,
|
|
Standard_Real& theTPmax)
|
|
{
|
|
Standard_Integer iRet;
|
|
Standard_Real aTol, aA, aB, aC, aD, aE, aH, aTP, aDist1, aDist2;
|
|
gp_Pnt aP1, aP2;
|
|
//
|
|
iRet=0;
|
|
aTol=theTolLin+theTolPln;
|
|
//
|
|
const gp_Ax3& aPosPln=thePln.Position();
|
|
const gp_Dir& aDirPln=aPosPln.Direction();
|
|
const gp_Pnt& aLocPln=aPosPln.Location();
|
|
//
|
|
const gp_Dir& aDirLin=theLin.Direction();
|
|
const gp_Pnt& aLocLin=theLin.Location();
|
|
//
|
|
aP1.SetXYZ(aLocLin.XYZ()+theTLin1*aDirLin.XYZ());
|
|
aDist1=aDirPln.X()*(aP1.X()-aLocPln.X())+
|
|
aDirPln.Y()*(aP1.Y()-aLocPln.Y())+
|
|
aDirPln.Z()*(aP1.Z()-aLocPln.Z());
|
|
//
|
|
aP2.SetXYZ(aLocLin.XYZ()+theTLin2*aDirLin.XYZ());
|
|
aDist2=aDirPln.X()*(aP2.X()-aLocPln.X())+
|
|
aDirPln.Y()*(aP2.Y()-aLocPln.Y())+
|
|
aDirPln.Z()*(aP2.Z()-aLocPln.Z());
|
|
//
|
|
if (aDist1<aTol && aDist2<aTol){
|
|
iRet=1; // common block
|
|
return iRet;
|
|
}
|
|
//
|
|
if (aDist1*aDist2 > 0.) {
|
|
iRet=2; // segment lays on one side to the Plane
|
|
return iRet;
|
|
}
|
|
//
|
|
thePln.Coefficients(aA, aB, aC, aD);
|
|
aE=aA*aLocLin.X()+aB*aLocLin.Y()+aC*aLocLin.Z()+aD;
|
|
aH=aA*aDirLin.X()+aB*aDirLin.Y()+aC*aDirLin.Z();
|
|
aTP=-aE/aH;
|
|
if (aTP < theTLin1-aTol || aTP > theTLin2+aTol) {
|
|
iRet=3; // no intersections due to range of the Line
|
|
return iRet;
|
|
}
|
|
//
|
|
theTP=aTP;
|
|
theP.SetXYZ(aLocLin.XYZ()+aTP*aDirLin.XYZ());
|
|
theTolP=aTol;
|
|
theTPmin=theTP-theTolPln;
|
|
theTPmax=theTP+theTolPln;
|
|
iRet=0; // intersection point
|
|
return iRet;
|
|
}
|