Merge from branch BR_Dev_For_4_0 (from tag mergeto_BR_QT4_Dev_12Feb08)

[modules/geom.git] / src / GEOMImpl / GEOMImpl_CircleDriver.cxx

diff --git a/src/GEOMImpl/GEOMImpl_CircleDriver.cxx b/src/GEOMImpl/GEOMImpl_CircleDriver.cxx
index 998c6384d8018340c93800de4b3a3249eb33cf60..79184422b9616e9a88c21370cca98049aafcdf17 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_CircleDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_CircleDriver.cxx
@@ -1,3 +1,22 @@
+// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either 
+// version 2.1 of the License.
+// 
+// This library is distributed in the hope that it will be useful 
+// but WITHOUT ANY WARRANTY; without even the implied warranty of 
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public  
+// License along with this library; if not, write to the Free Software 
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <Standard_Stream.hxx>
 
@@ -76,6 +95,48 @@ Standard_Integer GEOMImpl_CircleDriver::Execute(TFunction_Logbook& log) const
       }
     }
   }
+ else if (aType == CIRCLE_CENTER_TWO_PNT) {
+       Handle(GEOM_Function) aRefPoint1 = aCI.GetPoint1();
+       Handle(GEOM_Function) aRefPoint2 = aCI.GetPoint2();
+       Handle(GEOM_Function) aRefPoint3 = aCI.GetPoint3();
+       TopoDS_Shape aShapePnt1 = aRefPoint1->GetValue();
+       TopoDS_Shape aShapePnt2 = aRefPoint2->GetValue();
+       TopoDS_Shape aShapePnt3 = aRefPoint3->GetValue();
+       if (aShapePnt1.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 aP3 = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt3));
+
+        if (aP1.Distance(aP2) < gp::Resolution() ||
+            aP1.Distance(aP3) < gp::Resolution() ||
+            aP2.Distance(aP3) < gp::Resolution())
+          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");
+         double x, y, z, x1, y1, z1, x2, y2, z2, dx, dy, dz, dx2, dy2, dz2, dx3, dy3, dz3, aRadius;
+        //Calculations for Radius
+        x = aP1.X(); y = aP1.Y(); z = aP1.Z();
+        x1 = aP2.X(); y1 = aP2.Y(); z1 = aP2.Z();
+        dx = x1 - x;
+         dy = y1 - y;
+        dz = z1 - z;
+        aRadius = sqrt(dx*dx + dy*dy + dz*dz);
+        //Calculations for Plane Vector
+        x2 = aP3.X(); y2 = aP3.Y(); z2 = aP3.Z();
+        dx2 = x2 - x; dy2 = y2 - y; dz2 = z2 - z;
+        dx3 = ((dy*dz2) - (dy2*dz))/100;
+        dy3 = ((dx2*dz) - (dx*dz2))/100;
+        dz3 = ((dx*dy2) - (dx2*dy))/100;
+        //Make Plane Vector
+        gp_Dir aDir ( dx3, dy3, dz3 );
+        //Make Circle
+        gp_Ax2 anAxes (aP1, aDir);
+        gp_Circ aCirc (anAxes, aRadius);
+        aShape = BRepBuilderAPI_MakeEdge(aCirc).Edge();  
+       }
+  }
   else if (aType == CIRCLE_THREE_PNT) {
     Handle(GEOM_Function) aRefPoint1 = aCI.GetPoint1();
     Handle(GEOM_Function) aRefPoint2 = aCI.GetPoint2();
@@ -97,9 +158,9 @@ Standard_Integer GEOMImpl_CircleDriver::Execute(TFunction_Logbook& log) const
         Standard_ConstructionError::Raise("Circle creation aborted: points lay on one line");
       Handle(Geom_Circle) aCirc = GC_MakeCircle(aP1, aP2, aP3).Value();
       aShape = BRepBuilderAPI_MakeEdge(aCirc).Edge();
-    }
+    }  
   }
-  else {
+   else {
   }
 
   if (aShape.IsNull()) return 0;