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

Static public method EnsureToleranceRule(const TopoDS_Shape & theS) was

Browse Source 
created in class BRepBuilderAPI_MakeShape to fix all tolerances of the
shape 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.
Draw command EnsureTolRule was created to test new functional.
Tolerance post Build (Perform) fix was made for:
- BRepBuilderAPI_Sewing,
- BRepFilletAPI_MakeChamfer,
- BRepFilletAPI_MakeFillet,
- BRepOffsetAPI_MakePipe,
- BRepOffsetAPI_NormalProjection,
- ShapeFix_Shape,
- ShapeUpgrade_ShapeDivide.
This commit is contained in:
abk 2012-12-25 13:15:00 +04:00
parent dc62669546
commit 61d1a3e028
11 changed files with 122 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/BRepBuilderAPI/BRepBuilderAPI_MakeShape.cdl
View File

@ -92,6 +92,11 @@ 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

@ -21,6 +21,10 @@
#include <BRepBuilderAPI_MakeShape.ixx>
#include <BRep_TEdge.hxx>
#include <BRep_TFace.hxx>
#include <BRep_TVertex.hxx>
#include <TopExp_Explorer.hxx>
#include <TopoDS.hxx>
#include <TopoDS_Shape.hxx>
#include <TopoDS_Face.hxx>
@ -116,4 +120,63 @@ Standard_Boolean BRepBuilderAPI_MakeShape::IsDeleted (const TopoDS_Shape& S)
//=======================================================================
//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);
}
}
}

2
src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx
View File

@ -127,6 +127,7 @@
#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,
@ -1909,6 +1910,7 @@ void BRepBuilderAPI_Sewing::Perform(const Handle(Message_ProgressIndicator)& the
mySewedShape.Nullify();
return;
}
BRepBuilderAPI_MakeShape::EnsureToleranceRule(mySewedShape);
}
#if DEB
chr_total.Stop();

1
src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.cxx
View File

@ -391,6 +391,7 @@ void BRepFilletAPI_MakeChamfer::Build()
if (myBuilder.IsDone()){
Done();
myShape = myBuilder.Shape();
EnsureToleranceRule(myShape);
//creation of the Map.
TopExp_Explorer ex;

1
src/BRepFilletAPI/BRepFilletAPI_MakeFillet.cxx
View File

@ -532,6 +532,7 @@ void BRepFilletAPI_MakeFillet::Build()
if(myBuilder.IsDone()) {
Done();
myShape = myBuilder.Shape();
EnsureToleranceRule(myShape);
// creation of the Map.
TopExp_Explorer ex;

1
src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cxx
View File

@ -59,6 +59,7 @@ const BRepFill_Pipe& BRepOffsetAPI_MakePipe::Pipe() const
void BRepOffsetAPI_MakePipe::Build()
{
myShape = myPipe.Shape();
BRepBuilderAPI_MakeShape::EnsureToleranceRule(myShape);
Done();
}

1
src/BRepOffsetAPI/BRepOffsetAPI_NormalProjection.cxx
View File

@ -64,6 +64,7 @@ BRepOffsetAPI_NormalProjection::BRepOffsetAPI_NormalProjection()
{
myNormalProjector.Build();
myShape = myNormalProjector.Projection();
BRepBuilderAPI_MakeShape::EnsureToleranceRule(myShape);
Done();
}

23
src/BRepTest/BRepTest_BasicCommands.cxx
View File

@ -800,6 +800,27 @@ static Standard_Integer scalexyz(Draw_Interpretor& di, Standard_Integer n, const
return 0;
}
static Standard_Integer EnsureTolRule(
Draw_Interpretor & theDI, Standard_Integer theC, const char ** theAs)
{
if (theC != 3)
{
return 1;
}
//
TopoDS_Shape aS = DBRep::Get(theAs[2]);
if (aS.IsNull())
{
return 1;
}
//
TopoDS_Shape aRes = BRepBuilderAPI_Copy(aS);
BRepBuilderAPI_MakeShape::EnsureToleranceRule(aRes);
//
DBRep::Set(theAs[1], aRes);
return 0;
}
void BRepTest::BasicCommands(Draw_Interpretor& theCommands)
{
static Standard_Boolean done = Standard_False;
@ -931,4 +952,6 @@ void BRepTest::BasicCommands(Draw_Interpretor& theCommands)
"scalexyz res shape factor_x factor_y factor_z",
__FILE__,
scalexyz, g);
theCommands.Add("EnsureTolRule", "res shape", __FILE__, EnsureTolRule, g);
}

6
src/ShapeFix/ShapeFix_Shape.cdl
View File

@ -49,10 +49,14 @@ is
Init (me: mutable; shape: Shape from TopoDS);
---Purpose: Initislises by shape.
Perform (me : mutable;
Perform (me : mutable;
theProgress : ProgressIndicator from Message = 0) returns Boolean;
---Purpose: Iterates on sub- shape and performs fixes
PerformR (me : mutable;
theProgress : ProgressIndicator from Message ) returns Boolean is private;
---Purpose: Internal method. Called by Perform.
SameParameter (me : mutable;
shape : Shape from TopoDS;
enforce : Boolean;

18
src/ShapeFix/ShapeFix_Shape.cxx
View File

@ -33,6 +33,7 @@
#include <TopAbs_ShapeEnum.hxx>
#include <BRepTools.hxx>
#include <BRep_Builder.hxx>
#include <BRepBuilderAPI_MakeShape.hxx>
#include <ShapeFix.hxx>
#include <ShapeBuild_ReShape.hxx>
@ -99,7 +100,22 @@ void ShapeFix_Shape::Init(const TopoDS_Shape& shape)
//purpose :
//=======================================================================
Standard_Boolean ShapeFix_Shape::Perform(const Handle(Message_ProgressIndicator)& theProgress)
Standard_Boolean ShapeFix_Shape::Perform(const Handle(Message_ProgressIndicator)& theProgress)
{
Standard_Boolean aR = PerformR(theProgress);
if (aR)
{
BRepBuilderAPI_MakeShape::EnsureToleranceRule(myResult);
}
return aR;
}
//=======================================================================
//function : PerformR
//purpose :
//=======================================================================
Standard_Boolean ShapeFix_Shape::PerformR(const Handle(Message_ProgressIndicator)& theProgress)
{
Standard_Integer savFixSmallAreaWireMode = 0;

3
src/ShapeUpgrade/ShapeUpgrade_ShapeDivide.cxx
View File

@ -37,6 +37,7 @@
#include <ShapeUpgrade_WireDivide.hxx>
#include <Standard_ErrorHandler.hxx>
#include <Standard_Failure.hxx>
#include <BRepBuilderAPI_MakeShape.hxx>
//=======================================================================
//function : ShapeUpgrade_ShapeDivide
@ -174,6 +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);
return Standard_True;
}
myResult = myShape;
@ -282,6 +284,7 @@ Standard_Boolean ShapeUpgrade_ShapeDivide::Perform(const Standard_Boolean newCon
}
}
myResult = myContext->Apply ( myShape, TopAbs_SHAPE );
BRepBuilderAPI_MakeShape::EnsureToleranceRule(myResult);
return ! myResult.IsSame ( myShape );
}