1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-24 13:50:49 +03:00
This commit is contained in:
nbv
2017-10-13 15:28:19 +03:00
parent 6ce74431d8
commit f2b2db7683
8 changed files with 17 additions and 17 deletions

View File

@@ -593,7 +593,7 @@ void BOPAlgo_BuilderFace::PerformAreas()
// 5.2. Add unused holes to the original face // 5.2. Add unused holes to the original face
if (aNbHoles != aNbInOutMap) { if (aNbHoles != aNbInOutMap) {
Bnd_Box aBoxF; Bnd_Box aBoxF;
BRepBndLib::Add(myFace, aBoxF); BRepBndLib::AddOptimal(myFace, aBoxF, Standard_True, Standard_True);
if (aBoxF.IsOpenXmin() || aBoxF.IsOpenXmax() || if (aBoxF.IsOpenXmin() || aBoxF.IsOpenXmax() ||
aBoxF.IsOpenYmin() || aBoxF.IsOpenYmax() || aBoxF.IsOpenYmin() || aBoxF.IsOpenYmax() ||
aBoxF.IsOpenZmin() || aBoxF.IsOpenZmax()) { aBoxF.IsOpenZmin() || aBoxF.IsOpenZmax()) {

View File

@@ -600,7 +600,7 @@ void BOPAlgo_BuilderSolid::PerformAreas()
const TopoDS_Shape& aShell = aItLS.Value(); const TopoDS_Shape& aShell = aItLS.Value();
aSB.SetShape(aShell); aSB.SetShape(aShell);
// //
BRepBndLib::Add(aShell, aBox); BRepBndLib::AddOptimal(aShell, aBox, Standard_True, Standard_True);
bIsHole=Standard_False; bIsHole=Standard_False;
// //
bIsGrowth=IsGrowthShell(aShell, aMHF); bIsGrowth=IsGrowthShell(aShell, aMHF);
@@ -834,7 +834,7 @@ void BOPAlgo_BuilderSolid::PerformInternalShapes()
const BOPAlgo_FacePnt& aFP=aVFP(k); const BOPAlgo_FacePnt& aFP=aVFP(k);
const TopoDS_Face& aF=aFP.Face(); const TopoDS_Face& aF=aFP.Face();
// //
BRepBndLib::Add(aF, aBox); BRepBndLib::AddOptimal(aF, aBox, Standard_True, Standard_True);
aTreeFiller.Add(k, aBox); aTreeFiller.Add(k, aBox);
} }
// //

View File

@@ -577,7 +577,7 @@ void BOPAlgo_Builder::FillIn3DParts
continue; continue;
} }
Bnd_Box aBox; Bnd_Box aBox;
BRepBndLib::Add(aSx, aBox); BRepBndLib::AddOptimal(aSx, aBox, Standard_True, Standard_True);
aBox.SetGap(aBox.GetGap() + Precision::Confusion()); aBox.SetGap(aBox.GetGap() + Precision::Confusion());
// //
BOPAlgo_ShapeBox& aSB=aVSB.Append1(); BOPAlgo_ShapeBox& aSB=aVSB.Append1();

View File

@@ -97,7 +97,7 @@ void BOPAlgo_PaveFiller::UpdateEdgeTolerance (const Standard_Integer nE,
const TopoDS_Edge& aE = *(TopoDS_Edge*)&myDS->Shape(nE); const TopoDS_Edge& aE = *(TopoDS_Edge*)&myDS->Shape(nE);
aBB.UpdateEdge(aE, aTol); aBB.UpdateEdge(aE, aTol);
Bnd_Box& aBoxE=aSIE.ChangeBox(); Bnd_Box& aBoxE=aSIE.ChangeBox();
BRepBndLib::Add(aE, aBoxE); BRepBndLib::AddOptimal(aE, aBoxE, Standard_True, Standard_True);
aBoxE.SetGap(aBoxE.GetGap() + Precision::Confusion()); aBoxE.SetGap(aBoxE.GetGap() + Precision::Confusion());
// //
aIt.Initialize(aLI); aIt.Initialize(aLI);
@@ -113,7 +113,7 @@ void BOPAlgo_PaveFiller::UpdateEdgeTolerance (const Standard_Integer nE,
aBB.UpdateVertex(aV, aTol); aBB.UpdateVertex(aV, aTol);
BOPDS_ShapeInfo& aSIV = myDS->ChangeShapeInfo(nV); BOPDS_ShapeInfo& aSIV = myDS->ChangeShapeInfo(nV);
Bnd_Box& aBoxV = aSIV.ChangeBox(); Bnd_Box& aBoxV = aSIV.ChangeBox();
BRepBndLib::Add(aV, aBoxV); BRepBndLib::AddOptimal(aV, aBoxV, Standard_True, Standard_True);
aBoxV.SetGap(aBoxV.GetGap() + Precision::Confusion()); aBoxV.SetGap(aBoxV.GetGap() + Precision::Confusion());
} }
} }
@@ -141,7 +141,7 @@ Standard_Integer BOPAlgo_PaveFiller::UpdateVertex
aBB.UpdateVertex(aVSD, aTolNew); aBB.UpdateVertex(aVSD, aTolNew);
BOPDS_ShapeInfo& aSIV = myDS->ChangeShapeInfo(nVNew); BOPDS_ShapeInfo& aSIV = myDS->ChangeShapeInfo(nVNew);
Bnd_Box& aBoxV = aSIV.ChangeBox(); Bnd_Box& aBoxV = aSIV.ChangeBox();
BRepBndLib::Add(aVSD, aBoxV); BRepBndLib::AddOptimal(aVSD, aBoxV, Standard_True, Standard_True);
aBoxV.SetGap(aBoxV.GetGap() + Precision::Confusion()); aBoxV.SetGap(aBoxV.GetGap() + Precision::Confusion());
} }
return nVNew; return nVNew;
@@ -165,7 +165,7 @@ Standard_Integer BOPAlgo_PaveFiller::UpdateVertex
// bounding box for the new vertex // bounding box for the new vertex
BOPDS_ShapeInfo& aSIDS = myDS->ChangeShapeInfo(nVNew); BOPDS_ShapeInfo& aSIDS = myDS->ChangeShapeInfo(nVNew);
Bnd_Box& aBoxDS = aSIDS.ChangeBox(); Bnd_Box& aBoxDS = aSIDS.ChangeBox();
BRepBndLib::Add(aVNew, aBoxDS); BRepBndLib::AddOptimal(aVNew, aBoxDS, Standard_True, Standard_True);
aBoxDS.SetGap(aBoxDS.GetGap() + Precision::Confusion()); aBoxDS.SetGap(aBoxDS.GetGap() + Precision::Confusion());
// //
// add vertex to SD map // add vertex to SD map

View File

@@ -630,7 +630,7 @@ void BOPAlgo_PaveFiller::MakeBlocks()
BOPDS_ShapeInfo& aSIDS=myDS->ChangeShapeInfo(nV1); BOPDS_ShapeInfo& aSIDS=myDS->ChangeShapeInfo(nV1);
Bnd_Box& aBoxDS=aSIDS.ChangeBox(); Bnd_Box& aBoxDS=aSIDS.ChangeBox();
aBoxDS = Bnd_Box(); aBoxDS = Bnd_Box();
BRepBndLib::Add(aV, aBoxDS); BRepBndLib::AddOptimal(aV, aBoxDS, Standard_True, Standard_True);
aBoxDS.SetGap(aBoxDS.GetGap() + Precision::Confusion()); aBoxDS.SetGap(aBoxDS.GetGap() + Precision::Confusion());
// //
if (aDMVLV.IsBound(nV1)) if (aDMVLV.IsBound(nV1))
@@ -1536,7 +1536,7 @@ void BOPAlgo_PaveFiller::PutBoundPaveOnCurve(const TopoDS_Face& aF1,
// //
BOPDS_ShapeInfo& aSIDS=myDS->ChangeShapeInfo(nVn); BOPDS_ShapeInfo& aSIDS=myDS->ChangeShapeInfo(nVn);
Bnd_Box& aBoxDS=aSIDS.ChangeBox(); Bnd_Box& aBoxDS=aSIDS.ChangeBox();
BRepBndLib::Add(aVn, aBoxDS); BRepBndLib::AddOptimal(aVn, aBoxDS, Standard_True, Standard_True);
aBoxDS.SetGap(aBoxDS.GetGap() + Precision::Confusion()); aBoxDS.SetGap(aBoxDS.GetGap() + Precision::Confusion());
// //
aLVB.Append(nVn); aLVB.Append(nVn);
@@ -2154,7 +2154,7 @@ void BOPAlgo_PaveFiller::PutPaveOnCurve
// //
BOPDS_ShapeInfo& aSIDS=myDS->ChangeShapeInfo(nV); BOPDS_ShapeInfo& aSIDS=myDS->ChangeShapeInfo(nV);
Bnd_Box& aBoxDS=aSIDS.ChangeBox(); Bnd_Box& aBoxDS=aSIDS.ChangeBox();
BRepBndLib::Add(aV, aBoxDS); BRepBndLib::AddOptimal(aV, aBoxDS, Standard_True, Standard_True);
aBoxDS.SetGap(aBoxDS.GetGap() + Precision::Confusion()); aBoxDS.SetGap(aBoxDS.GetGap() + Precision::Confusion());
} }
} }

View File

@@ -142,7 +142,7 @@ class BOPAlgo_SplitEdge : public BOPAlgo_Algo {
myV1, myT1, myV1, myT1,
myV2, myT2, myV2, myT2,
myESp); myESp);
BRepBndLib::Add(myESp, myBox); BRepBndLib::AddOptimal(myESp, myBox, Standard_True, Standard_True);
myBox.SetGap(myBox.GetGap() + Precision::Confusion()); myBox.SetGap(myBox.GetGap() + Precision::Confusion());
} }
// //
@@ -525,7 +525,7 @@ Standard_Integer BOPAlgo_PaveFiller::SplitEdge(const Standard_Integer nE,
aSI.SetShape(aSp); aSI.SetShape(aSp);
// //
Bnd_Box& aBox=aSI.ChangeBox(); Bnd_Box& aBox=aSI.ChangeBox();
BRepBndLib::Add(aSp, aBox); BRepBndLib::AddOptimal(aSp, aBox, Standard_True, Standard_True);
aBox.SetGap(aBox.GetGap() + Precision::Confusion()); aBox.SetGap(aBox.GetGap() + Precision::Confusion());
// //
nSp=myDS->Append(aSI); nSp=myDS->Append(aSI);

View File

@@ -463,7 +463,7 @@ void BOPDS_DS::Init(const Standard_Real theFuzz)
} }
// //
Bnd_Box& aBox=aSI.ChangeBox(); Bnd_Box& aBox=aSI.ChangeBox();
BRepBndLib::Add(aE, aBox); BRepBndLib::AddOptimal(aE, aBox, Standard_True, Standard_True);
// //
const BOPCol_ListOfInteger& aLV=aSI.SubShapes(); const BOPCol_ListOfInteger& aLV=aSI.SubShapes();
aIt1.Initialize(aLV); aIt1.Initialize(aLV);
@@ -490,7 +490,7 @@ void BOPDS_DS::Init(const Standard_Real theFuzz)
const TopoDS_Shape& aS=aSI.Shape(); const TopoDS_Shape& aS=aSI.Shape();
// //
Bnd_Box& aBox=aSI.ChangeBox(); Bnd_Box& aBox=aSI.ChangeBox();
BRepBndLib::Add(aS, aBox); BRepBndLib::AddOptimal(aS, aBox, Standard_True, Standard_True);
// //
BOPCol_ListOfInteger& aLW=aSI.ChangeSubShapes(); BOPCol_ListOfInteger& aLW=aSI.ChangeSubShapes();
aIt1.Initialize(aLW); aIt1.Initialize(aLW);
@@ -1786,7 +1786,7 @@ void BOPDS_DS::UpdateEdgeTolerance(const Standard_Integer nE,
aBB.UpdateEdge(aE, aTol); aBB.UpdateEdge(aE, aTol);
BOPDS_ShapeInfo& aSIE=ChangeShapeInfo(nE); BOPDS_ShapeInfo& aSIE=ChangeShapeInfo(nE);
Bnd_Box& aBoxE=aSIE.ChangeBox(); Bnd_Box& aBoxE=aSIE.ChangeBox();
BRepBndLib::Add(aE, aBoxE); BRepBndLib::AddOptimal(aE, aBoxE, Standard_True, Standard_True);
aBoxE.SetGap(aBoxE.GetGap() + aTolAdd); aBoxE.SetGap(aBoxE.GetGap() + aTolAdd);
// //
const BOPCol_ListOfInteger& aLI = aSIE.SubShapes(); const BOPCol_ListOfInteger& aLI = aSIE.SubShapes();

View File

@@ -199,7 +199,7 @@ Bnd_Box& IntTools_Context::BndBox(const TopoDS_Shape& aS)
new (pBox) Bnd_Box(); new (pBox) Bnd_Box();
// //
Bnd_Box &aBox=*pBox; Bnd_Box &aBox=*pBox;
BRepBndLib::Add(aS, aBox); BRepBndLib::AddOptimal(aS, aBox, Standard_True, Standard_True);
// //
anAdr=(Standard_Address)pBox; anAdr=(Standard_Address)pBox;
myBndBoxDataMap.Bind(aS, anAdr); myBndBoxDataMap.Bind(aS, anAdr);