ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-15 01:58:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

Bug 0020233: Infinite loop in boolean operation with a sphere with r=0

Browse Source
This commit is contained in:
jfa 2009-04-10 11:06:03 +00:00
parent 136270a5cf
commit 3313eb5f07
2 changed files with 95 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
src/GEOMImpl/GEOMImpl_CircleDriver.cxx
View File

@ -78,65 +78,92 @@ Standard_Integer GEOMImpl_CircleDriver::Execute(TFunction_Logbook& log) const
TopoDS_Shape aShape; TopoDS_Shape aShape;
if (aType == CIRCLE_PNT_VEC_R) { if (aType == CIRCLE_PNT_VEC_R) {
Handle(GEOM_Function) aRefPoint = aCI.GetCenter(); // Center
gp_Pnt aP = gp::Origin();
Handle(GEOM_Function) aRefPoint = aCI.GetCenter();
if (!aRefPoint.IsNull()) {
TopoDS_Shape aShapePnt = aRefPoint->GetValue();
if (aShapePnt.ShapeType() != TopAbs_VERTEX) {
Standard_ConstructionError::Raise
("Circle creation aborted: invalid center argument, must be a point");
}
aP = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt));
}
// Normal
gp_Vec aV = gp::DZ();
Handle(GEOM_Function) aRefVector = aCI.GetVector(); Handle(GEOM_Function) aRefVector = aCI.GetVector();
TopoDS_Shape aShapePnt = aRefPoint->GetValue(); if (!aRefVector.IsNull()) {
TopoDS_Shape aShapeVec = aRefVector->GetValue(); TopoDS_Shape aShapeVec = aRefVector->GetValue();
if (aShapePnt.ShapeType() == TopAbs_VERTEX && if (aShapeVec.ShapeType() != TopAbs_EDGE) {
aShapeVec.ShapeType() == TopAbs_EDGE) { Standard_ConstructionError::Raise
gp_Pnt aP = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt)); ("Circle creation aborted: invalid vector argument, must be a vector or an edge");
}
TopoDS_Edge anE = TopoDS::Edge(aShapeVec); TopoDS_Edge anE = TopoDS::Edge(aShapeVec);
TopoDS_Vertex V1, V2; TopoDS_Vertex V1, V2;
TopExp::Vertices(anE, V1, V2, Standard_True); TopExp::Vertices(anE, V1, V2, Standard_True);
if (!V1.IsNull() && !V2.IsNull()) { if (!V1.IsNull() && !V2.IsNull()) {
gp_Vec aV (BRep_Tool::Pnt(V1), BRep_Tool::Pnt(V2)); aV = gp_Vec(BRep_Tool::Pnt(V1), BRep_Tool::Pnt(V2));
gp_Ax2 anAxes (aP, aV); if (aV.Magnitude() < gp::Resolution()) {
gp_Circ aCirc (anAxes, aCI.GetRadius()); Standard_ConstructionError::Raise
aShape = BRepBuilderAPI_MakeEdge(aCirc).Edge(); ("Circle creation aborted: vector of zero length is given");
}
} }
} }
// Axes
gp_Ax2 anAxes (aP, aV);
// Radius
double anR = aCI.GetRadius();
char aMsg[] = "Circle creation aborted: radius value less than 1e-07 is not acceptable";
if (anR < Precision::Confusion())
Standard_ConstructionError::Raise(aMsg);
// Circle
gp_Circ aCirc (anAxes, anR);
aShape = BRepBuilderAPI_MakeEdge(aCirc).Edge();
} }
else if (aType == CIRCLE_CENTER_TWO_PNT) { else if (aType == CIRCLE_CENTER_TWO_PNT) {
Handle(GEOM_Function) aRefPoint1 = aCI.GetPoint1(); Handle(GEOM_Function) aRefPoint1 = aCI.GetPoint1();
Handle(GEOM_Function) aRefPoint2 = aCI.GetPoint2(); Handle(GEOM_Function) aRefPoint2 = aCI.GetPoint2();
Handle(GEOM_Function) aRefPoint3 = aCI.GetPoint3(); Handle(GEOM_Function) aRefPoint3 = aCI.GetPoint3();
TopoDS_Shape aShapePnt1 = aRefPoint1->GetValue(); TopoDS_Shape aShapePnt1 = aRefPoint1->GetValue();
TopoDS_Shape aShapePnt2 = aRefPoint2->GetValue(); TopoDS_Shape aShapePnt2 = aRefPoint2->GetValue();
TopoDS_Shape aShapePnt3 = aRefPoint3->GetValue(); TopoDS_Shape aShapePnt3 = aRefPoint3->GetValue();
if (aShapePnt1.ShapeType() == TopAbs_VERTEX && aShapePnt2.ShapeType() == TopAbs_VERTEX && if (aShapePnt1.ShapeType() == TopAbs_VERTEX &&
aShapePnt3.ShapeType() == TopAbs_VERTEX) aShapePnt2.ShapeType() == TopAbs_VERTEX &&
{ aShapePnt3.ShapeType() == TopAbs_VERTEX)
gp_Pnt aP1 = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt1)); {
gp_Pnt aP2 = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt2)); gp_Pnt aP1 = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt1));
gp_Pnt aP3 = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt3)); gp_Pnt aP2 = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt2));
gp_Pnt aP3 = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt3));
if (aP1.Distance(aP2) < gp::Resolution() || if (aP1.Distance(aP2) < gp::Resolution() ||
aP1.Distance(aP3) < gp::Resolution() || aP1.Distance(aP3) < gp::Resolution() ||
aP2.Distance(aP3) < gp::Resolution()) aP2.Distance(aP3) < gp::Resolution())
Standard_ConstructionError::Raise("Circle creation aborted: coincident points given"); Standard_ConstructionError::Raise("Circle creation aborted: coincident points given");
if (gp_Vec(aP1, aP2).IsParallel(gp_Vec(aP1, aP3), Precision::Angular()))
Standard_ConstructionError::Raise("Circle creation aborted: points lay on one line"); if (gp_Vec(aP1, aP2).IsParallel(gp_Vec(aP1, aP3), Precision::Angular()))
double x, y, z, x1, y1, z1, x2, y2, z2, dx, dy, dz, dx2, dy2, dz2, dx3, dy3, dz3, aRadius; Standard_ConstructionError::Raise("Circle creation aborted: points lay on one line");
//Calculations for Radius
x = aP1.X(); y = aP1.Y(); z = aP1.Z(); double x, y, z, x1, y1, z1, x2, y2, z2, dx, dy, dz, dx2, dy2, dz2, dx3, dy3, dz3, aRadius;
x1 = aP2.X(); y1 = aP2.Y(); z1 = aP2.Z(); //Calculations for Radius
dx = x1 - x; x = aP1.X(); y = aP1.Y(); z = aP1.Z();
dy = y1 - y; x1 = aP2.X(); y1 = aP2.Y(); z1 = aP2.Z();
dz = z1 - z; dx = x1 - x;
aRadius = sqrt(dx*dx + dy*dy + dz*dz); dy = y1 - y;
//Calculations for Plane Vector dz = z1 - z;
x2 = aP3.X(); y2 = aP3.Y(); z2 = aP3.Z(); aRadius = sqrt(dx*dx + dy*dy + dz*dz);
dx2 = x2 - x; dy2 = y2 - y; dz2 = z2 - z; //Calculations for Plane Vector
dx3 = ((dy*dz2) - (dy2*dz))/100; x2 = aP3.X(); y2 = aP3.Y(); z2 = aP3.Z();
dy3 = ((dx2*dz) - (dx*dz2))/100; dx2 = x2 - x; dy2 = y2 - y; dz2 = z2 - z;
dz3 = ((dx*dy2) - (dx2*dy))/100; dx3 = ((dy*dz2) - (dy2*dz))/100;
//Make Plane Vector dy3 = ((dx2*dz) - (dx*dz2))/100;
gp_Dir aDir ( dx3, dy3, dz3 ); dz3 = ((dx*dy2) - (dx2*dy))/100;
//Make Circle //Make Plane Vector
gp_Ax2 anAxes (aP1, aDir); gp_Dir aDir ( dx3, dy3, dz3 );
gp_Circ aCirc (anAxes, aRadius); //Make Circle
aShape = BRepBuilderAPI_MakeEdge(aCirc).Edge(); gp_Ax2 anAxes (aP1, aDir);
} gp_Circ aCirc (anAxes, aRadius);
aShape = BRepBuilderAPI_MakeEdge(aCirc).Edge();
}
} }
else if (aType == CIRCLE_THREE_PNT) { else if (aType == CIRCLE_THREE_PNT) {
Handle(GEOM_Function) aRefPoint1 = aCI.GetPoint1(); Handle(GEOM_Function) aRefPoint1 = aCI.GetPoint1();
@ -161,7 +188,7 @@ Standard_Integer GEOMImpl_CircleDriver::Execute(TFunction_Logbook& log) const
aShape = BRepBuilderAPI_MakeEdge(aCirc).Edge(); aShape = BRepBuilderAPI_MakeEdge(aCirc).Edge();
} }
} }
else { else {
} }
if (aShape.IsNull()) return 0; if (aShape.IsNull()) return 0;

23
src/GEOMImpl/GEOMImpl_SphereDriver.cxx
View File

@ -18,7 +18,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include <Standard_Stream.hxx> #include <Standard_Stream.hxx>
#include <GEOMImpl_SphereDriver.hxx> #include <GEOMImpl_SphereDriver.hxx>
@ -67,16 +67,27 @@ Standard_Integer GEOMImpl_SphereDriver::Execute(TFunction_Logbook& log) const
TopoDS_Shape aShape; TopoDS_Shape aShape;
char aMsg[] = "Sphere creation aborted: radius value less than 1e-07 is not acceptable";
if (aType == SPHERE_R) { if (aType == SPHERE_R) {
aShape = BRepPrimAPI_MakeSphere(aCI.GetR()).Shape(); double anR = aCI.GetR();
if (anR < Precision::Confusion())
Standard_ConstructionError::Raise(aMsg);
aShape = BRepPrimAPI_MakeSphere(anR).Shape();
} }
else if (aType == SPHERE_PNT_R) { else if (aType == SPHERE_PNT_R) {
double anR = aCI.GetR();
if (anR < Precision::Confusion())
Standard_ConstructionError::Raise(aMsg);
Handle(GEOM_Function) aRefPoint = aCI.GetPoint(); Handle(GEOM_Function) aRefPoint = aCI.GetPoint();
TopoDS_Shape aShapePnt = aRefPoint->GetValue(); TopoDS_Shape aShapePnt = aRefPoint->GetValue();
if (aShapePnt.ShapeType() == TopAbs_VERTEX) { if (aShapePnt.ShapeType() != TopAbs_VERTEX)
gp_Pnt aP = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt)); Standard_ConstructionError::Raise("Invalid shape given for sphere center: it must be a point");
aShape = BRepPrimAPI_MakeSphere(aP, aCI.GetR()).Shape(); gp_Pnt aP = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt));
}
aShape = BRepPrimAPI_MakeSphere(aP, anR).Shape();
} }
else { else {
} }