From 259b9303793e2e821237de9b5fa8e66316b5bced Mon Sep 17 00:00:00 2001 From: abulyche Date: Fri, 9 Sep 2022 13:21:03 +0300 Subject: [PATCH] 0023954: Modeling Algorithms - BRepPrimAPI_MakeRevol fails to recognize a torus case Fixed the Toroidal surface recognition; The test case bugs/moddata_1/bug22296: the result is a torus with parameters: u [0, 2*PI], v [PI, 3*PI]; The test case bugs/modalg_5/bug23954: BAD -> OK. --- src/GeomAdaptor/GeomAdaptor_SurfaceOfRevolution.cxx | 11 +---------- tests/bugs/modalg_5/bug23954 | 2 -- tests/bugs/moddata_1/bug22296 | 4 ++-- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/GeomAdaptor/GeomAdaptor_SurfaceOfRevolution.cxx b/src/GeomAdaptor/GeomAdaptor_SurfaceOfRevolution.cxx index eea5ae45c9..62eb29784e 100644 --- a/src/GeomAdaptor/GeomAdaptor_SurfaceOfRevolution.cxx +++ b/src/GeomAdaptor/GeomAdaptor_SurfaceOfRevolution.cxx @@ -502,16 +502,7 @@ GeomAbs_SurfaceType GeomAdaptor_SurfaceOfRevolution::GetType() const MajorRadius = aLin.Distance(aLC); if(MajorRadius > aR) { - Standard_Real aT = 0., aDx, dX; - gp_Pnt aPx; - - aPx = ElCLib::Value(aT, C); - aDx = aLin.Distance(aPx); - dX = aDx - MajorRadius - aR; - if (dX < 0.) - dX = -dX; - if (dX < TolConf) - return GeomAbs_Torus; + return GeomAbs_Torus; } } break; diff --git a/tests/bugs/modalg_5/bug23954 b/tests/bugs/modalg_5/bug23954 index 58555b2bcb..1dc0cc10da 100644 --- a/tests/bugs/modalg_5/bug23954 +++ b/tests/bugs/modalg_5/bug23954 @@ -1,5 +1,3 @@ -puts "TODO OCC23954 ALL: Error: result is not Toroidal surface" - puts "============" puts "OCC23954" puts "============" diff --git a/tests/bugs/moddata_1/bug22296 b/tests/bugs/moddata_1/bug22296 index 8a4cf3d154..5a0e4a2b59 100755 --- a/tests/bugs/moddata_1/bug22296 +++ b/tests/bugs/moddata_1/bug22296 @@ -23,8 +23,8 @@ if { ${E_Length} < 6} { set good_umin 0 set good_umax 6.28319 - set good_vmin 0 - set good_vmax 6.28319 + set good_vmin 3.14159 + set good_vmax 9.42478 set xlist [xbounds f] set umin [lindex $xlist 0]