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

0030722: Modeling Algorithms - BRepExtrema_DistShapeShape computes wrong distances

Browse Source 
Updated the math_DirectPolynomialRoots.cxx
Added the test case "bug30722"
Updated the command "b2dclassify" in the BOPTest_LowCommands.cxx
This commit is contained in:
abulyche 2021-09-01 17:45:52 +03:00 committed by smoskvin
parent a1ae05e173
commit 41e2eed0fc
3 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/BOPTest/BOPTest_LowCommands.cxx
View File

@ -68,7 +68,11 @@ static Standard_Integer bhaspc (Draw_Interpretor& , Standard_Integer , con
const char* g = "BOPTest commands"; const char* g = "BOPTest commands";
theCommands.Add("bclassify" , "use bclassify Solid Point [Tolerance=1.e-7]", theCommands.Add("bclassify" , "use bclassify Solid Point [Tolerance=1.e-7]",
__FILE__, bclassify , g); __FILE__, bclassify , g);
theCommands.Add("b2dclassify" , "use b2dclassify Face Point2d [Tol] ", theCommands.Add("b2dclassify" , "use b2dclassify Face Point2d [Tol] [UseBox] [GapCheckTol]\n"
"Classify the Point Point2d with Tolerance <Tol> on the face described by <Face>.\n"
"<UseBox> == 1/0 (default <UseBox> = 0): switch on/off the use Bnd_Box in the classification.\n"
"<GapCheckTol> (default <GapCheckTol> = 0.1): this is for additional verification of\n"
"the vertex with a tolerance >= <GapCheckTol>.",
__FILE__, b2dclassify , g); __FILE__, b2dclassify , g);
theCommands.Add("b2dclassifx" , "use b2dclassifx Face Point2d [Tol] ", theCommands.Add("b2dclassifx" , "use b2dclassifx Face Point2d [Tol] ",
__FILE__, b2dclassifx , g); __FILE__, b2dclassifx , g);
@ -77,7 +81,7 @@ static Standard_Integer bhaspc (Draw_Interpretor& , Standard_Integer , con
} }
// //lj cd
//======================================================================= //=======================================================================
//function : b2dclassifx //function : b2dclassifx
//purpose : //purpose :
@ -142,10 +146,10 @@ Standard_Integer b2dclassify (Draw_Interpretor& theDI,
// //
DrawTrSurf::GetPoint2d (theArgVec[2], aP); DrawTrSurf::GetPoint2d (theArgVec[2], aP);
const TopoDS_Face& aF = TopoDS::Face(aS); const TopoDS_Face& aF = TopoDS::Face(aS);
const Standard_Real aTol = (theArgNb == 4) ? const Standard_Real aTol = (theArgNb >= 4) ?
Draw::Atof (theArgVec[3]) : BRep_Tool::Tolerance (aF); Draw::Atof (theArgVec[3]) : BRep_Tool::Tolerance (aF);
const Standard_Boolean anUseBox = (theArgNb == 5 && Draw::Atof(theArgVec[4]) == 0) ? const Standard_Boolean anUseBox = (theArgNb >= 5 && Draw::Atof(theArgVec[4]) == 1) ?
Standard_False : Standard_True; Standard_True : Standard_False;
const Standard_Real aGapCheckTol = (theArgNb == 6) ? Draw::Atof(theArgVec[5]) : 0.1; const Standard_Real aGapCheckTol = (theArgNb == 6) ? Draw::Atof(theArgVec[5]) : 0.1;
BRepClass_FaceClassifier aClassifier; BRepClass_FaceClassifier aClassifier;
aClassifier.Perform(aF, aP, aTol, anUseBox, aGapCheckTol); aClassifier.Perform(aF, aP, aTol, anUseBox, aGapCheckTol);

16
src/math/math_DirectPolynomialRoots.cxx
View File

@ -263,21 +263,19 @@ void math_DirectPolynomialRoots::Solve(const Standard_Real a,
Q = Ydemi + SdiscrQ0; Q = Ydemi + SdiscrQ0;
P1 = Ademi - P0; P1 = Ademi - P0;
Q1 = Ydemi - SdiscrQ0; Q1 = Ydemi - SdiscrQ0;
// Modified by skv - Wed Apr 14 16:05:24 2004 IDEM(Airbus) Begin //
Standard_Real eps; Standard_Real anEps = 100 * EPSILON;
eps = Epsilon(100.*Max(Ademi, P0)); if (Abs(P) <= anEps)
if (Abs(P) <= eps)
P = 0.; P = 0.;
if (Abs(P1) <= eps) if (Abs(P1) <= anEps)
P1 = 0.; P1 = 0.;
eps = Epsilon(100.*Max(Ydemi, SdiscrQ0)); if (Abs(Q) <= anEps)
if (Abs(Q) <= eps)
Q = 0.; Q = 0.;
if (Abs(Q1) <= eps) if (Abs(Q1) <= anEps)
Q1 = 0.; Q1 = 0.;
// Modified by skv - Wed Apr 14 16:05:24 2004 IDEM(Airbus) End //
Ademi = 1.0; Ademi = 1.0;
math_DirectPolynomialRoots ASol2(Ademi, P, Q); math_DirectPolynomialRoots ASol2(Ademi, P, Q);

16
tests/bugs/modalg_7/bug30722 Normal file
View File

@ -0,0 +1,16 @@
puts "================================================================="
puts "OCC30722: Modeling Algorithms - BRepExtrema_DistShapeShape computes wrong distances"
puts "================================================================="
puts ""
restore [locate_data_file bug30722_1.brep] w
restore [locate_data_file bug30722_2.brep] e
explode w
mkcurve c1 w_1
mkcurve c2 e
extrema c1 c2
if { [isdraw ext_1] == 0 } {
puts "Error: no solutions!"
}