Mantis issue 0021414: There is a difference between vectors and other edges in Geometry.

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

diff --git a/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx b/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx
index 0b79130b20c136899c482e88de5ee306eee6bab3..95605cb8fe82ab0dc716e1cf28ca22136cd08edc 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx
@@ -1,14 +1,43 @@
-
-using namespace std;
-#include "GEOMImpl_SketcherDriver.hxx"
-#include "GEOMImpl_ISketcher.hxx"
-#include "GEOMImpl_Types.hxx"
-#include "GEOM_Function.hxx"
-
-#include <TopoDS_Shape.hxx>
-#include <gp_Dir.hxx>
-#include <gp_Ax3.hxx>
+// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  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>
+
+#include <GEOMImpl_SketcherDriver.hxx>
+#include <GEOMImpl_ISketcher.hxx>
+#include <GEOMImpl_Types.hxx>
+#include <GEOM_Function.hxx>
+
+#include <GEOMImpl_IMeasureOperations.hxx>
+
+#include <Basics_Utils.hxx>
+
+// OCCT Includes
 #include <BRepBuilderAPI_Transform.hxx>
+#include <BRep_Tool.hxx>
+#include <Geom_Plane.hxx>
+#include <TopoDS.hxx>
+#include <TopoDS_Shape.hxx>
+#include <gp_Pln.hxx>
 
 #include <Sketcher_Profile.hxx>
 
@@ -52,6 +81,9 @@ Standard_Integer GEOMImpl_SketcherDriver::Execute(TFunction_Logbook& log) const
 
   TopoDS_Shape aShape;
 
+  // Set "C" numeric locale to save numbers correctly
+  Kernel_Utils::Localizer loc;
+
   // create sketcher
   Sketcher_Profile aProfile (aCommand.ToCString());
 
@@ -63,12 +95,31 @@ Standard_Integer GEOMImpl_SketcherDriver::Execute(TFunction_Logbook& log) const
   if (aShape.IsNull())
     return 0;
 
+  gp_Ax3 aWPlane;
+  if ( aFunction->GetType() == SKETCHER_NINE_DOUBLS )
+  {
+    gp_Pnt aOrigin =
+      gp_Pnt(aCI.GetWorkingPlane(1), aCI.GetWorkingPlane(2), aCI.GetWorkingPlane(3));
+    gp_Dir aDirZ =
+      gp_Dir(aCI.GetWorkingPlane(4), aCI.GetWorkingPlane(5), aCI.GetWorkingPlane(6));
+    gp_Dir aDirX =
+      gp_Dir(aCI.GetWorkingPlane(7), aCI.GetWorkingPlane(8), aCI.GetWorkingPlane(9));
+    aWPlane = gp_Ax3(aOrigin, aDirZ, aDirX);
+  }
+  else
+  {
+    Handle(GEOM_Function) aRefFace = aCI.GetWorkingPlane();
+    TopoDS_Shape aShape = aRefFace->GetValue();
+    //if ( aShape.IsNull() || aShape.ShapeType() != TopAbs_FACE )
+    //  return 0;
+    //Handle(Geom_Surface) aGS = BRep_Tool::Surface( TopoDS::Face( aShape ));
+    //if ( aGS.IsNull() || !aGS->IsKind( STANDARD_TYPE( Geom_Plane )))
+    //  return 0;
+    //Handle(Geom_Plane) aGPlane = Handle(Geom_Plane)::DownCast( aGS );
+    //aWPlane = aGPlane->Pln().Position();
+    aWPlane = GEOMImpl_IMeasureOperations::GetPosition(aShape);
+  }
   gp_Trsf aTrans;
-  gp_Pnt aOrigin = gp_Pnt(aCI.GetWorkingPlane(1), aCI.GetWorkingPlane(2), aCI.GetWorkingPlane(3));
-  gp_Dir aDirZ = gp_Dir(aCI.GetWorkingPlane(4), aCI.GetWorkingPlane(5), aCI.GetWorkingPlane(6));
-  gp_Dir aDirX = gp_Dir(aCI.GetWorkingPlane(7), aCI.GetWorkingPlane(8), aCI.GetWorkingPlane(9));
-  gp_Ax3 aWPlane = gp_Ax3(aOrigin, aDirZ, aDirX);
-
   aTrans.SetTransformation(aWPlane);
   aTrans.Invert();
   BRepBuilderAPI_Transform aTransformation (aShape, aTrans, Standard_False);
@@ -103,10 +154,10 @@ Standard_EXPORT Handle_Standard_Type& GEOMImpl_SketcherDriver_Type_()
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
   static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_SketcherDriver",
-                                                        sizeof(GEOMImpl_SketcherDriver),
-                                                        1,
-                                                        (Standard_Address)_Ancestors,
-                                                        (Standard_Address)NULL);
+                                                         sizeof(GEOMImpl_SketcherDriver),
+                                                         1,
+                                                         (Standard_Address)_Ancestors,
+                                                         (Standard_Address)NULL);
 
   return _aType;
 }