From 7419ea9c89a5f2b4fab8b901a5b18c77b5961b73 Mon Sep 17 00:00:00 2001 From: skv Date: Thu, 23 Apr 2015 18:38:08 +0300 Subject: [PATCH] Fix for test case bugs_10/K4 --- src/GEOMImpl/GEOMImpl_DiskDriver.cxx | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) mode change 100755 => 100644 src/GEOMImpl/GEOMImpl_DiskDriver.cxx diff --git a/src/GEOMImpl/GEOMImpl_DiskDriver.cxx b/src/GEOMImpl/GEOMImpl_DiskDriver.cxx old mode 100755 new mode 100644 index 63a21d866..76a6b30dc --- a/src/GEOMImpl/GEOMImpl_DiskDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_DiskDriver.cxx @@ -41,6 +41,7 @@ #include #include +#include #include #include #include @@ -91,12 +92,14 @@ Standard_Integer GEOMImpl_DiskDriver::Execute(TFunction_Logbook& log) const TopExp::Vertices(anE, V1, V2, Standard_True); if (!V1.IsNull() && !V2.IsNull()) { 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()); TopoDS_Shape aCircle = BRepBuilderAPI_MakeEdge(aCirc).Edge(); BRepBuilderAPI_MakeWire MW; MW.Add(TopoDS::Edge(aCircle)); - BRepBuilderAPI_MakeFace MF (MW, Standard_False); + BRepBuilderAPI_MakeFace MF (aPln, MW); 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"); if (gp_Vec(aP1, aP2).IsParallel(gp_Vec(aP1, aP3), Precision::Angular())) 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(); BRepBuilderAPI_MakeWire MW; MW.Add(TopoDS::Edge(aCircle)); - BRepBuilderAPI_MakeFace MF (MW, Standard_False); + BRepBuilderAPI_MakeFace MF (aPln, MW); aShape = MF.Shape(); } } @@ -139,12 +145,14 @@ Standard_Integer GEOMImpl_DiskDriver::Execute(TFunction_Logbook& log) const else if (anOrient == 3) 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()); TopoDS_Shape aCircle = BRepBuilderAPI_MakeEdge(aCirc).Edge(); BRepBuilderAPI_MakeWire MW; MW.Add(TopoDS::Edge(aCircle)); - BRepBuilderAPI_MakeFace MF (MW, Standard_False); + BRepBuilderAPI_MakeFace MF (aPln, MW); aShape = MF.Shape(); } else { -- 2.39.2