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

Fix for test case bugs_10/K4

Browse Source
This commit is contained in:
skv 2015-04-23 18:38:08 +03:00
parent 38f47f419d
commit 7419ea9c89
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/GEOMImpl/GEOMImpl_DiskDriver.cxx Executable file → Normal file
View File

@ -41,6 +41,7 @@
#include <Standard_ConstructionError.hxx> #include <Standard_ConstructionError.hxx>
#include <Precision.hxx> #include <Precision.hxx>
#include <gp_Pln.hxx>
#include <gp_Pnt.hxx> #include <gp_Pnt.hxx>
#include <gp_Vec.hxx> #include <gp_Vec.hxx>
#include <gp_Circ.hxx> #include <gp_Circ.hxx>
@ -91,12 +92,14 @@ Standard_Integer GEOMImpl_DiskDriver::Execute(TFunction_Logbook& log) const
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)); gp_Vec aV (BRep_Tool::Pnt(V1), BRep_Tool::Pnt(V2));
gp_Ax2 anAxes (aP, -aV); gp_Ax2 anAxes (aP, aV);
gp_Ax3 anAxes3(anAxes);
gp_Pln aPln(anAxes3);
gp_Circ aCirc (anAxes, aCI.GetRadius()); gp_Circ aCirc (anAxes, aCI.GetRadius());
TopoDS_Shape aCircle = BRepBuilderAPI_MakeEdge(aCirc).Edge(); TopoDS_Shape aCircle = BRepBuilderAPI_MakeEdge(aCirc).Edge();
BRepBuilderAPI_MakeWire MW; BRepBuilderAPI_MakeWire MW;
MW.Add(TopoDS::Edge(aCircle)); MW.Add(TopoDS::Edge(aCircle));
BRepBuilderAPI_MakeFace MF (MW, Standard_False); BRepBuilderAPI_MakeFace MF (aPln, MW);
aShape = MF.Shape(); aShape = MF.Shape();
} }
} }
@ -120,11 +123,14 @@ Standard_Integer GEOMImpl_DiskDriver::Execute(TFunction_Logbook& log) const
Standard_ConstructionError::Raise("Disk creation aborted: coincident points given"); Standard_ConstructionError::Raise("Disk creation aborted: coincident points given");
if (gp_Vec(aP1, aP2).IsParallel(gp_Vec(aP1, aP3), Precision::Angular())) if (gp_Vec(aP1, aP2).IsParallel(gp_Vec(aP1, aP3), Precision::Angular()))
Standard_ConstructionError::Raise("Disk creation aborted: points lay on one line"); Standard_ConstructionError::Raise("Disk creation aborted: points lay on one line");
Handle(Geom_Circle) aCirc = GC_MakeCircle(aP3, aP2, aP1).Value(); Handle(Geom_Circle) aCirc = GC_MakeCircle(aP1, aP2, aP3).Value();
gp_Circ aGpCirc = aCirc->Circ();
gp_Ax3 anAxes3(aGpCirc.Position());
gp_Pln aPln(anAxes3);
TopoDS_Shape aCircle = BRepBuilderAPI_MakeEdge(aCirc).Edge(); TopoDS_Shape aCircle = BRepBuilderAPI_MakeEdge(aCirc).Edge();
BRepBuilderAPI_MakeWire MW; BRepBuilderAPI_MakeWire MW;
MW.Add(TopoDS::Edge(aCircle)); MW.Add(TopoDS::Edge(aCircle));
BRepBuilderAPI_MakeFace MF (MW, Standard_False); BRepBuilderAPI_MakeFace MF (aPln, MW);
aShape = MF.Shape(); aShape = MF.Shape();
} }
} }
@ -139,12 +145,14 @@ Standard_Integer GEOMImpl_DiskDriver::Execute(TFunction_Logbook& log) const
else if (anOrient == 3) else if (anOrient == 3)
aV = gp::DY(); aV = gp::DY();
gp_Ax2 anAxes (aP, -aV); gp_Ax2 anAxes (aP, aV);
gp_Ax3 anAxes3(anAxes);
gp_Pln aPln(anAxes3);
gp_Circ aCirc (anAxes, aCI.GetRadius()); gp_Circ aCirc (anAxes, aCI.GetRadius());
TopoDS_Shape aCircle = BRepBuilderAPI_MakeEdge(aCirc).Edge(); TopoDS_Shape aCircle = BRepBuilderAPI_MakeEdge(aCirc).Edge();
BRepBuilderAPI_MakeWire MW; BRepBuilderAPI_MakeWire MW;
MW.Add(TopoDS::Edge(aCircle)); MW.Add(TopoDS::Edge(aCircle));
BRepBuilderAPI_MakeFace MF (MW, Standard_False); BRepBuilderAPI_MakeFace MF (aPln, MW);
aShape = MF.Shape(); aShape = MF.Shape();
} }
else { else {