OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-06-30 12:14:08 +03:00
Code

0029606: [Regression vs 7.0] BRepClass3d_SolidClassifier classifies the point as IN while it is ON

Browse Source 
Simple treatment of some analytical cases when curve is parallel or belongs surface is added in curve - face/surface intersection algorithm
Treatment such cases is added in classifier algorithm
Test case added
This commit is contained in:
ifv 2018-03-28 17:00:50 +03:00 committed by bugmaster
parent d051064495
commit f84edf5816
8 changed files with 185 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/BRepClass3d/BRepClass3d_SClassifier.cxx
View File

@ -33,6 +33,8 @@
#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
#include <TopTools_MapOfShape.hxx>
#include <TopExp.hxx>
#include <BRepAdaptor_Surface.hxx>
#include <Extrema_ExtPS.hxx>
#include <vector>
@ -371,6 +373,46 @@ void BRepClass3d_SClassifier::Perform(BRepClass3d_SolidExplorer& SolidExplorer,
Intersector3d.Perform(L, minW, maxW);
if (Intersector3d.IsDone())
{
if (Intersector3d.NbPnt() == 0)
{
if (Intersector3d.IsParallel())
{
//Check distance between surface and point
BRepAdaptor_Surface aBAS(f, Standard_False);
Extrema_ExtPS aProj(P, aBAS, Precision::PConfusion(), Precision::PConfusion());
if (aProj.IsDone() && aProj.NbExt() > 0)
{
Standard_Integer i, indmin = 0;
Standard_Real d = RealLast();
for (i = 1; i <= aProj.NbExt(); ++i)
{
if (aProj.SquareDistance(i) < d)
{
d = aProj.SquareDistance(i);
indmin = i;
}
}
if (indmin > 0)
{
if (d <= Tol * Tol)
{
const Extrema_POnSurf& aPonS = aProj.Point(indmin);
Standard_Real anU, anV;
aPonS.Parameter(anU, anV);
gp_Pnt2d aP2d(anU, anV);
TopAbs_State aSt = Intersector3d.ClassifyUVPoint(aP2d);
if (aSt == TopAbs_IN || aSt == TopAbs_ON)
{
myState = 2;
myFace = f;
parmin = 0.;
break;
}
}
}
}
}
}
for (Standard_Integer i = 1; i <= Intersector3d.NbPnt(); i++)
{
if (Abs(Intersector3d.WParameter(i)) < Abs(parmin) - Precision::PConfusion())
@ -381,6 +423,7 @@ void BRepClass3d_SClassifier::Perform(BRepClass3d_SolidExplorer& SolidExplorer,
{
myState = 2;
myFace = f;
break;
}
// Treatment of case TopAbs_ON separately.
else if (aState == TopAbs_IN)
@ -414,11 +457,19 @@ void BRepClass3d_SClassifier::Perform(BRepClass3d_SolidExplorer& SolidExplorer,
//-- Or a Point has been found with a greater parameter.
}
} //-- loop by intersection points
if (myState == 2)
{
break;
}
} //-- Face has not been rejected
else
myState = 1;
}
}//-- Exploration of the faces
if (myState == 2)
{
break;
}
} //-- Shell has not been rejected
else
myState = 1;

2
src/IntCurveSurface/IntCurveSurface_Inter.gxx
View File

@ -1252,9 +1252,11 @@ void IntCurveSurface_Inter::AppendIntAna(const TheCurve& curve,
if(intana_ConicQuad.IsDone()) {
if(intana_ConicQuad.IsInQuadric()) {
//-- cout<<" Courbe Dans la Quadrique !!! Non Traite !!!"<<endl;
myIsParallel = Standard_True;
}
else if(intana_ConicQuad.IsParallel()) {
//-- cout<<" Courbe // a la Quadrique !!! Non Traite !!!"<<endl;
myIsParallel = Standard_True;
}
else {
Standard_Integer nbp = intana_ConicQuad.NbPoints();

11
src/IntCurveSurface/IntCurveSurface_Intersection.cxx
View File

@ -25,11 +25,19 @@
#define PARAMEQUAL(a,b) (Abs((a)-(b))< (1e-8))
//================================================================================
IntCurveSurface_Intersection::IntCurveSurface_Intersection(): done(Standard_False) {
IntCurveSurface_Intersection::IntCurveSurface_Intersection():
done(Standard_False),
myIsParallel(Standard_False)
{
}
//================================================================================
Standard_Boolean IntCurveSurface_Intersection::IsDone() const { return(done); }
//================================================================================
Standard_Boolean IntCurveSurface_Intersection::IsParallel() const
{
return(myIsParallel);
}
//================================================================================
Standard_Integer IntCurveSurface_Intersection::NbPoints() const {
if (!done) {throw StdFail_NotDone();}
return lpnt.Length();
@ -116,6 +124,7 @@ void IntCurveSurface_Intersection::ResetFields() {
lseg.Clear();
lpnt.Clear();
done=Standard_False;
myIsParallel = Standard_False;
}
}
//================================================================================

8
src/IntCurveSurface/IntCurveSurface_Intersection.hxx
View File

@ -65,6 +65,11 @@ public:
//! raises OutOfRange if Index is not in the range <1..NbSegment>
Standard_EXPORT const IntCurveSurface_IntersectionSegment& Segment (const Standard_Integer Index) const;
//! Returns true if curve is parallel or belongs surface
//! This case is recognized only for some pairs
//! of analytical curves and surfaces (plane - line, ...)
Standard_EXPORT Standard_Boolean IsParallel() const;
//! Dump all the fields.
Standard_EXPORT void Dump() const;
@ -101,6 +106,9 @@ protected:
Standard_Boolean done;
Standard_Boolean myIsParallel; //Curve is "parallel" surface
//This case is recognized only for some pairs
//of analytical curves and surfaces (plane - line, ...)
private:

7
src/IntCurvesFace/IntCurvesFace_Intersector.cxx
View File

@ -135,7 +135,8 @@ IntCurvesFace_Intersector::IntCurvesFace_Intersector(const TopoDS_Face& Face,
nbpnt(0),
PtrOnPolyhedron(NULL),
PtrOnBndBounding(NULL),
myUseBoundTol (UseBToler)
myUseBoundTol (UseBToler),
myIsParallel(Standard_False)
{
BRepAdaptor_Surface surface;
face = Face;
@ -336,6 +337,10 @@ void IntCurvesFace_Intersector::InternalCall(const IntCurveSurface_HInter &HICS,
} //-- classifier state is IN or ON
} //-- Loop on Intersection points.
} //-- HICS.IsDone()
else if (HICS.IsDone())
{
myIsParallel = HICS.IsParallel();
}
}
//=======================================================================
//function : Perform

8
src/IntCurvesFace/IntCurvesFace_Intersector.hxx
View File

@ -114,6 +114,11 @@ public:
//! ( the point is on a boudary of the face).
TopAbs_State State (const Standard_Integer I) const;
//! Returns true if curve is parallel or belongs face surface
//! This case is recognized only for some pairs
//! of analytical curves and surfaces (plane - line, ...)
Standard_Boolean IsParallel() const;
//! Returns the significant face used to determine
//! the intersection.
const TopoDS_Face& Face() const;
@ -160,6 +165,9 @@ private:
Standard_Address PtrOnPolyhedron;
Standard_Address PtrOnBndBounding;
Standard_Boolean myUseBoundTol;
Standard_Boolean myIsParallel; //Curve is "parallel" face surface
//This case is recognized only for some pairs
//of analytical curves and surfaces (plane - line, ...)
};

3
src/IntCurvesFace/IntCurvesFace_Intersector.lxx
View File

@ -58,6 +58,9 @@ inline TopAbs_State IntCurvesFace_Intersector::State(const Standard_Integer i) c
}
// Modified by skv - Wed Sep 3 15:34:20 2003 OCC578 End
//============================================================================
inline Standard_Boolean IntCurvesFace_Intersector::IsParallel() const {
return myIsParallel;
}
inline const TopoDS_Face& IntCurvesFace_Intersector::Face() const {
return(face);
}

17
tests/bugs/modalg_7/bug29606 Normal file
View File

@ -0,0 +1,17 @@
puts "========"
puts "OCC29606"
puts "========"
puts ""
#######################################################
#0029606: [Regression vs 7.0] BRepClass3d_SolidClassifier
#classifies the point as IN while it is ON
#######################################################
restore [locate_data_file bug29606.brep] s
point p1 621.05410336809734 47.416378469999998 111.25010709375
if {![regexp "The point is ON" [bclassify s p1]]} {
puts "Error: The Solid classification algorithm fails to classify the point"
}