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

0029233: Incorrect result of conversion to the STEP format.

Browse Source 
Modified the method TopoDSToStep_MakeStepFace::Init
Added processing of degenerate toroidal surfaces, which are the base surfaces of offset surfaces
Added test
This commit is contained in:
asemenov 2021-09-02 15:32:11 +03:00 committed by smoskvin
parent 36d21f1a1a
commit 8019a482b5
2 changed files with 60 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/TopoDSToStep/TopoDSToStep_MakeStepFace.cxx
View File

@ -63,6 +63,7 @@
#include <StepGeom_Surface.hxx>
#include <StepGeom_SurfaceCurve.hxx>
#include <StepGeom_ToroidalSurface.hxx>
#include <Geom_OffsetSurface.hxx>
#include <StepRepr_DefinitionalRepresentation.hxx>
#include <StepRepr_HArray1OfRepresentationItem.hxx>
#include <StepShape_AdvancedFace.hxx>
@ -211,40 +212,63 @@ void TopoDSToStep_MakeStepFace::Init(const TopoDS_Face& aFace,
//%pdn 30 Nov 98: TestRally 9 issue on r1001_ec.stp:
// toruses with major_radius < minor are re-coded as degenerate
// rln 19.01.99: uncomment %30 pdn for integration into K4L
if(Spms->IsKind(STANDARD_TYPE(StepGeom_ToroidalSurface))) {
Handle(StepGeom_ToroidalSurface) trsf = Handle(StepGeom_ToroidalSurface)::DownCast(Spms);
Standard_Real R = trsf->MajorRadius();
Standard_Real r = trsf->MinorRadius();
if ( R < r ) { // if torus is degenerate, make revolution instead
Handle(Geom_ToroidalSurface) TS = Handle(Geom_ToroidalSurface)::DownCast(Su);
{
// If the surface is Offset it is necessary to check the base surface
Standard_Boolean aSurfaceIsOffset = Standard_False;
Handle(Geom_OffsetSurface) anOffsetSu;
if (Su->IsKind(STANDARD_TYPE(Geom_OffsetSurface)))
{
aSurfaceIsOffset = Standard_True;
anOffsetSu = Handle(Geom_OffsetSurface)::DownCast(Su);
}
if ((Spms->IsKind(STANDARD_TYPE(StepGeom_ToroidalSurface))) ||
((aSurfaceIsOffset) && anOffsetSu->BasisSurface()->IsKind(STANDARD_TYPE(Geom_ToroidalSurface))))
{
Handle(Geom_ToroidalSurface) TS;
if (aSurfaceIsOffset)
TS = Handle(Geom_ToroidalSurface)::DownCast(anOffsetSu->BasisSurface());
else
TS = Handle(Geom_ToroidalSurface)::DownCast(Su);
Standard_Real R = TS->MajorRadius();
Standard_Real r = TS->MinorRadius();
if (R < r) // if torus is degenerate or base surface is degenerate, make revolution instead
{
gp_Ax3 Ax3 = TS->Position();
gp_Pnt pos = Ax3.Location();
gp_Dir dir = Ax3.Direction();
gp_Dir X = Ax3.XDirection();
gp_Dir X = Ax3.XDirection();
// create basis curve
Standard_Real UF, VF, UL, VL;
ShapeAlgo::AlgoContainer()->GetFaceUVBounds ( aFace, UF, UL, VF, VL );
gp_Ax2 Ax2 ( pos.XYZ() + X.XYZ() * TS->MajorRadius(), X ^ dir, X );
Handle(Geom_Curve) BasisCurve = new Geom_Circle ( Ax2, TS->MinorRadius() );
ShapeAlgo::AlgoContainer()->GetFaceUVBounds(aFace, UF, UL, VF, VL);
gp_Ax2 Ax2(pos.XYZ() + X.XYZ() * TS->MajorRadius(), X ^ dir, X);
Handle(Geom_Curve) BasisCurve = new Geom_Circle(Ax2, TS->MinorRadius());
// convert basis curve to bspline in order to avoid self-intersecting
// surface of revolution (necessary e.g. for CATIA)
if ( VL - VF - 2 * M_PI < -Precision::PConfusion() )
BasisCurve = ShapeAlgo::AlgoContainer()->ConvertCurveToBSpline (BasisCurve, VF, VL, Precision::Approximation(),
GeomAbs_C1, 100, 9);
// BasisCurve = new Geom_TrimmedCurve ( BasisCurve, VF, VL );
if (VL - VF - 2 * M_PI < -Precision::PConfusion())
BasisCurve = ShapeAlgo::AlgoContainer()->ConvertCurveToBSpline(BasisCurve, VF, VL, Precision::Approximation(),
GeomAbs_C1, 100, 9);
//BasisCurve = new Geom_TrimmedCurve ( BasisCurve, VF, VL );
// create surface of revolution
gp_Ax1 Axis = Ax3.Axis();
if ( ! Ax3.Direct() ) Axis.Reverse();
Handle(Geom_SurfaceOfRevolution) Rev = new Geom_SurfaceOfRevolution ( BasisCurve, Axis );
if (!Ax3.Direct()) Axis.Reverse();
Handle(Geom_SurfaceOfRevolution) Rev = new Geom_SurfaceOfRevolution(BasisCurve, Axis);
// and translate it
GeomToStep_MakeSurface MkRev(Rev);
Spms = MkRev.Value();
if (aSurfaceIsOffset)
{
anOffsetSu->SetBasisSurface(Rev);
GeomToStep_MakeSurface MkRev(anOffsetSu);
Spms = MkRev.Value();
}
else
{
GeomToStep_MakeSurface MkRev(Rev);
Spms = MkRev.Value();
}
}
}
}
// ----------------
// Translates Wires

15
tests/bugs/step/bug29233 Normal file
View File

@ -0,0 +1,15 @@
puts "============"
puts "OCC29233"
puts "============"
puts ""
#####################################################
# Incorrect result of conversion to the STEP format.
#####################################################
restore [locate_data_file bug29233.brep] orig
set aTmpFile "$imagedir/${casename}.brep"
testwritestep "$aTmpFile" orig
testreadstep "$aTmpFile" result
file delete "$aTmpFile"
checknbshapes result -face 22
checkmaxtol result -ref 1.e-7