ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-02-06 04:54:17 +05:00
Code Issues Packages Projects Releases Wiki Activity

0022051: [CEA 744] SALOME crashes when calliing "BasicProperties" on a sphere degenerated edge

Browse Source
This commit is contained in:
vsr 2013-01-22 11:33:30 +00:00
parent 32ceab19f3
commit 011f7da686
1 changed files with 58 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/GEOMImpl/GEOMImpl_PointDriver.cxx
View File

@ -43,6 +43,7 @@
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
#include <TopoDS_Vertex.hxx> #include <TopoDS_Vertex.hxx>
#include <TopoDS_Compound.hxx> #include <TopoDS_Compound.hxx>
#include <TopoDS_Iterator.hxx>
#include <GCPnts_AbscissaPoint.hxx> #include <GCPnts_AbscissaPoint.hxx>
#include <IntTools.hxx> #include <IntTools.hxx>
@ -142,8 +143,27 @@ Standard_Integer GEOMImpl_PointDriver::Execute(TFunction_Logbook& log) const
} }
Standard_Real aFP, aLP, aP; Standard_Real aFP, aLP, aP;
Handle(Geom_Curve) aCurve = BRep_Tool::Curve(TopoDS::Edge(aRefShape), aFP, aLP); Handle(Geom_Curve) aCurve = BRep_Tool::Curve(TopoDS::Edge(aRefShape), aFP, aLP);
aP = aFP + (aLP - aFP) * aPI.GetParameter(); if ( !aCurve.IsNull() ) {
aPnt = aCurve->Value(aP); aP = aFP + (aLP - aFP) * aPI.GetParameter();
aPnt = aCurve->Value(aP);
}
else {
// null curve, e.g. degenerated edge
TopoDS_Iterator It(aRefShape, Standard_False, Standard_False);
TopoDS_Vertex aVertex;
if ( It.More() ) {
TopoDS_Shape aShape = It.Value();
if ( !aShape.IsNull() )
aVertex = TopoDS::Vertex( aShape );
}
if ( !aVertex.IsNull() ) {
aPnt = BRep_Tool::Pnt( aVertex );
}
else {
Standard_TypeMismatch::Raise
("Point On Curve creation aborted : null curve");
}
}
} }
else if (aType == POINT_CURVE_COORD) { else if (aType == POINT_CURVE_COORD) {
Handle(GEOM_Function) aRefFunc = aPI.GetCurve(); Handle(GEOM_Function) aRefFunc = aPI.GetCurve();
@ -201,25 +221,45 @@ Standard_Integer GEOMImpl_PointDriver::Execute(TFunction_Logbook& log) const
// Check orientation // Check orientation
Standard_Real UFirst, ULast; Standard_Real UFirst, ULast;
Handle(Geom_Curve) EdgeCurve = BRep_Tool::Curve(aRefEdge, UFirst, ULast); Handle(Geom_Curve) EdgeCurve = BRep_Tool::Curve(aRefEdge, UFirst, ULast);
Handle(Geom_Curve) ReOrientedCurve = EdgeCurve;
Standard_Real dU = ULast - UFirst; if ( !EdgeCurve.IsNull() ) {
Standard_Real par1 = UFirst + 0.1 * dU; Handle(Geom_Curve) ReOrientedCurve = EdgeCurve;
Standard_Real par2 = ULast - 0.1 * dU;
gp_Pnt P1 = EdgeCurve->Value(par1); Standard_Real dU = ULast - UFirst;
gp_Pnt P2 = EdgeCurve->Value(par2); Standard_Real par1 = UFirst + 0.1 * dU;
Standard_Real par2 = ULast - 0.1 * dU;
if (aRefPnt.SquareDistance(P2) < aRefPnt.SquareDistance(P1)) {
ReOrientedCurve = EdgeCurve->Reversed(); gp_Pnt P1 = EdgeCurve->Value(par1);
UFirst = EdgeCurve->ReversedParameter(ULast); gp_Pnt P2 = EdgeCurve->Value(par2);
if (aRefPnt.SquareDistance(P2) < aRefPnt.SquareDistance(P1)) {
ReOrientedCurve = EdgeCurve->Reversed();
UFirst = EdgeCurve->ReversedParameter(ULast);
}
// Get the point by length
GeomAdaptor_Curve AdapCurve = GeomAdaptor_Curve(ReOrientedCurve);
GCPnts_AbscissaPoint anAbsPnt (AdapCurve, aLength, UFirst);
Standard_Real aParam = anAbsPnt.Parameter();
aPnt = AdapCurve.Value(aParam);
}
else {
// null curve, e.g. degenerated edge
TopoDS_Iterator It(aRefEdge, Standard_False, Standard_False);
TopoDS_Vertex aVertex;
if ( It.More() ) {
TopoDS_Shape aShape = It.Value();
if ( !aShape.IsNull() )
aVertex = TopoDS::Vertex( aShape );
}
if ( !aVertex.IsNull() ) {
aPnt = BRep_Tool::Pnt( aVertex );
}
else {
Standard_TypeMismatch::Raise
("Point On Curve creation aborted : null curve");
}
} }
// Get the point by length
GeomAdaptor_Curve AdapCurve = GeomAdaptor_Curve(ReOrientedCurve);
GCPnts_AbscissaPoint anAbsPnt (AdapCurve, aLength, UFirst);
Standard_Real aParam = anAbsPnt.Parameter();
aPnt = AdapCurve.Value(aParam);
} }
else if (aType == POINT_SURFACE_PAR) { else if (aType == POINT_SURFACE_PAR) {
Handle(GEOM_Function) aRefFunc = aPI.GetSurface(); Handle(GEOM_Function) aRefFunc = aPI.GetSurface();