OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

BRepBuilderAPI_MakeShape::EnsureToleranceRule was replaced by

Browse Source 
BRepLib::UpdateTolerances.

BRepBuilderAPI_MakeShape::EnsureToleranceRule was removed.
This commit is contained in:
abk 2013-02-13 19:02:19 +04:00
parent 3c96653472
commit 6e1764d5d8
13 changed files with 27 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/BRepAlgoAPI/BRepAlgoAPI_BooleanOperation.cxx
View File

@ -21,6 +21,7 @@
#include <BRepAlgoAPI_BooleanOperation.ixx>
#include <BRepLib_FuseEdges.hxx>
#include <BRepLib.hxx>
#include <TopExp.hxx>
#include <TopTools_MapOfShape.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
@ -295,7 +296,7 @@ const TopTools_ListOfShape& BRepAlgoAPI_BooleanOperation::Modified(const TopoDS_
myErrorStatus=0;
myBuilderCanWork=Standard_True;
myShape=myBuilder->Result();
EnsureToleranceRule(myShape);
BRepLib::UpdateTolerances(myShape);
Done();
}
else {
@ -318,8 +319,13 @@ const TopTools_ListOfShape& BRepAlgoAPI_BooleanOperation::Modified(const TopoDS_
if (!iErr) {
myErrorStatus=0;
myBuilderCanWork=Standard_True;
<<<<<<< HEAD
myShape=myBuilder->Shape();
EnsureToleranceRule(myShape);
=======
myShape=myBuilder->Result();
BRepLib::UpdateTolerances(myShape);
>>>>>>> d61c0a6... BRepBuilderAPI_MakeShape::EnsureToleranceRule was replaced by
Done();
}
else {

5
src/BRepBuilderAPI/BRepBuilderAPI_MakeShape.cdl
View File

@ -92,11 +92,6 @@ is
is virtual;
---Purpose: Returns true if the shape S has been deleted.
EnsureToleranceRule (myclass; theS : Shape from TopoDS);
---Purpose: Fixes all tolerances of shape theS and it's subshapes by the tolerance
-- rule: vertex tolerance >= edge tolerance >= face tolerance.
-- Edge or vertex tolerance which does not satisfy the tolerance rule will
-- be increased.
fields

63
src/BRepBuilderAPI/BRepBuilderAPI_MakeShape.cxx
View File

@ -117,66 +117,3 @@ Standard_Boolean BRepBuilderAPI_MakeShape::IsDeleted (const TopoDS_Shape& S)
{
return Standard_False;
}
//=======================================================================
//function : EnsureToleranceRule
//purpose :
//=======================================================================
void BRepBuilderAPI_MakeShape::EnsureToleranceRule(const TopoDS_Shape & theS)
{
if (theS.IsNull())
{
return;
}
//
for (TopExp_Explorer aFE(theS, TopAbs_FACE); aFE.More(); aFE.Next())
{
TopoDS_Face aF = TopoDS::Face(aFE.Current());
Standard_Real aFT = ((Handle_BRep_TFace &)aF.TShape())->Tolerance();
//
for (TopExp_Explorer anEE(aF, TopAbs_EDGE); anEE.More(); anEE.Next())
{
TopoDS_Edge anES = TopoDS::Edge(anEE.Current());
Handle_BRep_TEdge & anEG = (Handle_BRep_TEdge &)anES.TShape();
Standard_Real anET = anEG->Tolerance();
if (anET < aFT)
{
anET = aFT;
anEG->Tolerance(anET);
}
for (TopExp_Explorer aVE(anES, TopAbs_VERTEX); aVE.More(); aVE.Next())
{
TopoDS_Vertex aVS = TopoDS::Vertex(aVE.Current());
Handle_BRep_TVertex & aVG = (Handle_BRep_TVertex &)aVS.TShape();
aVG->UpdateTolerance(anET);
}
}
//
for (TopExp_Explorer aVE(aF, TopAbs_VERTEX, TopAbs_EDGE);
aVE.More(); aVE.Next())
{
TopoDS_Vertex aVS = TopoDS::Vertex(aVE.Current());
Handle_BRep_TVertex & aVG = (Handle_BRep_TVertex &)aVS.TShape();
aVG->UpdateTolerance(aFT);
}
}
//
for (TopExp_Explorer anEE(theS, TopAbs_EDGE, TopAbs_FACE);
anEE.More(); anEE.Next())
{
TopoDS_Edge anES = TopoDS::Edge(anEE.Current());
Handle_BRep_TEdge & anEG = (Handle_BRep_TEdge &)anES.TShape();
Standard_Real anET = anEG->Tolerance();
for (TopExp_Explorer aVE(anES, TopAbs_VERTEX); aVE.More(); aVE.Next())
{
TopoDS_Vertex aVS = TopoDS::Vertex(aVE.Current());
Handle_BRep_TVertex & aVG = (Handle_BRep_TVertex &)aVS.TShape();
aVG->UpdateTolerance(anET);
}
}
}

3
src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx
View File

@ -127,7 +127,6 @@
#include <BRepBuilderAPI_VertexInspector.hxx>
#include <BRepBuilderAPI_CellFilter.hxx>
#include <BRepBuilderAPI_BndBoxTreeSelector.hxx>
#include <BRepBuilderAPI_MakeShape.hxx>
#include <NCollection_UBTreeFiller.hxx>
static void SortBox (const Handle(Bnd_HArray1OfBox) hSetBoxes,
@ -1910,7 +1909,7 @@ void BRepBuilderAPI_Sewing::Perform(const Handle(Message_ProgressIndicator)& the
mySewedShape.Nullify();
return;
}
BRepBuilderAPI_MakeShape::EnsureToleranceRule(mySewedShape);
BRepLib::UpdateTolerances(mySewedShape);
}
#if DEB
chr_total.Stop();

4
src/BRepFeat/BRepFeat_MakePrism.cxx
View File

@ -45,6 +45,8 @@
#include <BRep_Tool.hxx>
#include <BRepLib.hxx>
#include <BRepTools.hxx>
@ -463,7 +465,7 @@ void BRepFeat_MakePrism::Perform(const TopoDS_Shape& Until)
}
}
}
EnsureToleranceRule(myShape);
BRepLib::UpdateTolerances(myShape);
/* // loop of control of descendance
TopExp_Explorer expr(mySbase, TopAbs_FACE);

3
src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.cxx
View File

@ -25,6 +25,7 @@
#include <TopTools_ListIteratorOfListOfShape.hxx>
#include <ChFiDS_Spine.hxx>
#include <TopExp_Explorer.hxx>
#include <BRepLib.hxx>
@ -391,7 +392,7 @@ void BRepFilletAPI_MakeChamfer::Build()
if (myBuilder.IsDone()){
Done();
myShape = myBuilder.Shape();
EnsureToleranceRule(myShape);
BRepLib::UpdateTolerances(myShape);
//creation of the Map.
TopExp_Explorer ex;

3
src/BRepFilletAPI/BRepFilletAPI_MakeFillet.cxx
View File

@ -30,6 +30,7 @@
#include <Law_Linear.hxx>
#include <Law_S.hxx>
#include <Law_Interpol.hxx>
#include <BRepLib.hxx>
//=======================================================================
//function : BRepFilletAPI_MakeFillet
@ -532,7 +533,7 @@ void BRepFilletAPI_MakeFillet::Build()
if(myBuilder.IsDone()) {
Done();
myShape = myBuilder.Shape();
EnsureToleranceRule(myShape);
BRepLib::UpdateTolerances(myShape);
// creation of the Map.
TopExp_Explorer ex;

3
src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cxx
View File

@ -21,6 +21,7 @@
#include <BRepOffsetAPI_MakePipe.ixx>
#include <BRepLib.hxx>
#include <TopExp_Explorer.hxx>
#include <TopoDS_Face.hxx>
#include <TopoDS_Edge.hxx>
@ -59,7 +60,7 @@ const BRepFill_Pipe& BRepOffsetAPI_MakePipe::Pipe() const
void BRepOffsetAPI_MakePipe::Build()
{
myShape = myPipe.Shape();
BRepBuilderAPI_MakeShape::EnsureToleranceRule(myShape);
BRepLib::UpdateTolerances(myShape);
Done();
}

3
src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cxx
View File

@ -22,6 +22,7 @@
#include <BRepOffsetAPI_MakePipeShell.ixx>
#include <BRepLib.hxx>
#include <GeomFill_PipeError.hxx>
#include <Standard_NotImplemented.hxx>
#include <StdFail_NotDone.hxx>
@ -225,7 +226,7 @@ void BRepOffsetAPI_MakePipeShell::Delete( const TopoDS_Shape& Profile)
Ok = myPipe->Build();
if (Ok) {
myShape = myPipe->Shape();
EnsureToleranceRule(myShape);
BRepLib::UpdateTolerances(myShape);
Done();
}
else NotDone();

3
src/BRepOffsetAPI/BRepOffsetAPI_NormalProjection.cxx
View File

@ -20,6 +20,7 @@
#include <BRepOffsetAPI_NormalProjection.ixx>
#include <BRepLib.hxx>
BRepOffsetAPI_NormalProjection::BRepOffsetAPI_NormalProjection()
{
@ -64,7 +65,7 @@ BRepOffsetAPI_NormalProjection::BRepOffsetAPI_NormalProjection()
{
myNormalProjector.Build();
myShape = myNormalProjector.Projection();
BRepBuilderAPI_MakeShape::EnsureToleranceRule(myShape);
BRepLib::UpdateTolerances(myShape);
Done();
}

2
src/BRepTest/BRepTest_BasicCommands.cxx
View File

@ -815,7 +815,7 @@ static Standard_Integer EnsureTolRule(
}
//
TopoDS_Shape aRes = BRepBuilderAPI_Copy(aS);
BRepBuilderAPI_MakeShape::EnsureToleranceRule(aRes);
BRepLib::UpdateTolerances(aRes);
//
DBRep::Set(theAs[1], aRes);
return 0;

4
src/ShapeFix/ShapeFix_Shape.cxx
View File

@ -33,7 +33,7 @@
#include <TopAbs_ShapeEnum.hxx>
#include <BRepTools.hxx>
#include <BRep_Builder.hxx>
#include <BRepBuilderAPI_MakeShape.hxx>
#include <BRepLib.hxx>
#include <ShapeFix.hxx>
#include <ShapeBuild_ReShape.hxx>
@ -103,7 +103,7 @@ void ShapeFix_Shape::Init(const TopoDS_Shape& shape)
Standard_Boolean ShapeFix_Shape::Perform(const Handle(Message_ProgressIndicator)& theProgress)
{
Standard_Boolean aR = PerformR(theProgress);
BRepBuilderAPI_MakeShape::EnsureToleranceRule(myResult);
BRepLib::UpdateTolerances(myResult);
return aR;
}

6
src/ShapeUpgrade/ShapeUpgrade_ShapeDivide.cxx
View File

@ -37,7 +37,7 @@
#include <ShapeUpgrade_WireDivide.hxx>
#include <Standard_ErrorHandler.hxx>
#include <Standard_Failure.hxx>
#include <BRepBuilderAPI_MakeShape.hxx>
#include <BRepLib.hxx>
//=======================================================================
//function : ShapeUpgrade_ShapeDivide
@ -175,7 +175,7 @@ Standard_Boolean ShapeUpgrade_ShapeDivide::Perform(const Standard_Boolean newCon
if ( Status ( ShapeExtend_DONE ) ) {
myResult = myContext->Apply ( C, TopAbs_SHAPE );
myContext->Replace ( myShape, myResult );
BRepBuilderAPI_MakeShape::EnsureToleranceRule(myResult);
BRepLib::UpdateTolerances(myResult);
return Standard_True;
}
myResult = myShape;
@ -284,7 +284,7 @@ Standard_Boolean ShapeUpgrade_ShapeDivide::Perform(const Standard_Boolean newCon
}
}
myResult = myContext->Apply ( myShape, TopAbs_SHAPE );
BRepBuilderAPI_MakeShape::EnsureToleranceRule(myResult);
BRepLib::UpdateTolerances(myResult);
return ! myResult.IsSame ( myShape );
}