PAL9166. Add possibility to make sketcher on an existing plane

diff --git a/idl/GEOM_Gen.idl b/idl/GEOM_Gen.idl
index 5615e85fc7ee3af7015b5624bd264ce53f47da2c..6bc1582c6a1fae15830282617ba4e0d5dd5c7d01 100644 (file)
--- a/idl/GEOM_Gen.idl
+++ b/idl/GEOM_Gen.idl
@@ -1511,6 +1511,17 @@ module GEOM
      *  \return New GEOM_Object, containing the created wire.
      */
     GEOM_Object MakeSketcher (in string theCommand, in ListOfDouble theWorkingPlane);
+
+      /*!
+     *  Create a sketcher (wire or face), following the textual description,
+     *  passed through \a theCommand argument. \n
+     *  For format of the description string see the previous method.\n
+     *  \param theCommand String, defining the sketcher in local
+     *                    coordinates of the working plane.
+     *  \param theWorkingPlane Planar Face of the working plane.
+     *  \return New GEOM_Object, containing the created wire.
+     */
+    GEOM_Object MakeSketcherOnPlane (in string theCommand, in GEOM_Object theWorkingPlane);
   };
 
   /*!

diff --git a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
index d694ff5373eeb55bf31248bb4a5dd417343a50b0..cb5857aa713dce63a236a6d67737d02df8f82136 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
@@ -485,7 +485,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSketcher (const char* theCom
 
   //Add a new Sketcher function
   Handle(GEOM_Function) aFunction =
-    aSketcher->AddFunction(GEOMImpl_SketcherDriver::GetID(), SKETCHER_COMMAND);
+    aSketcher->AddFunction(GEOMImpl_SketcherDriver::GetID(), SKETCHER_NINE_DOUBLS);
   if (aFunction.IsNull()) return NULL;
 
   //Check if the function is set correctly
@@ -528,3 +528,57 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSketcher (const char* theCom
   SetErrorCode(OK);
   return aSketcher;
 }
+
+//=============================================================================
+/*!
+ *  MakeSketcherOnPlane
+ */
+//=============================================================================
+Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSketcherOnPlane (const char* theCommand,
+                                                                     Handle(GEOM_Object) theWorkingPlane)
+{
+  SetErrorCode(KO);
+
+  if (!theCommand) return NULL;
+  if (strcmp(theCommand, "") == 0) return NULL;
+
+  //Add a new Sketcher object
+  Handle(GEOM_Object) aSketcher = GetEngine()->AddObject(GetDocID(), GEOM_SKETCHER);
+
+  //Add a new Sketcher function
+  Handle(GEOM_Function) aFunction =
+    aSketcher->AddFunction(GEOMImpl_SketcherDriver::GetID(), SKETCHER_PLANE);
+  if (aFunction.IsNull()) return NULL;
+
+  //Check if the function is set correctly
+  if (aFunction->GetDriverGUID() != GEOMImpl_SketcherDriver::GetID()) return NULL;
+
+  GEOMImpl_ISketcher aCI (aFunction);
+
+  TCollection_AsciiString aCommand ((char*) theCommand);
+  aCI.SetCommand(aCommand);
+
+  Handle(GEOM_Function) aRefPlane = theWorkingPlane->GetLastFunction();
+  if (aRefPlane.IsNull()) return NULL;
+  aCI.SetWorkingPlane( aRefPlane );
+
+  //Compute the Sketcher value
+  try {
+    if (!GetSolver()->ComputeFunction(aFunction)) {
+      SetErrorCode("Sketcher driver failed");
+      return NULL;
+    }
+  }
+  catch (Standard_Failure) {
+    Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+    SetErrorCode(aFail->GetMessageString());
+    return NULL;
+  }
+
+  //Make a Python command
+  GEOM::TPythonDump (aFunction) << aSketcher << " = geompy.MakeSketcherOnPlane(\""
+    << theCommand << "\", " << theWorkingPlane << " )";
+
+  SetErrorCode(OK);
+  return aSketcher;
+}

diff --git a/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx
index 0c52cc7ecf56d696994dfa27a56559fc41b9506d..e421f642ea7eef8015f7febef0a1863875e4bfdb 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx
@@ -35,6 +35,8 @@ class GEOMImpl_ICurvesOperations : public GEOM_IOperations {
   Handle(GEOM_Object) MakeSplineInterpolation (list<Handle(GEOM_Object)> thePoints);
 
   Handle(GEOM_Object) MakeSketcher (const char* theCommand, list<double> theWorkingPlane);
+  Handle(GEOM_Object) MakeSketcherOnPlane (const char*         theCommand,
+                                           Handle(GEOM_Object) theWorkingPlane);
 };
 
 #endif

diff --git a/src/GEOMImpl/GEOMImpl_ISketcher.hxx b/src/GEOMImpl/GEOMImpl_ISketcher.hxx
index 74912ff38b27c216382b8fb3e8734ba26d99f3f0..b32dab4d60eaef410411790d53901f311133ddb5 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_ISketcher.hxx
+++ b/src/GEOMImpl/GEOMImpl_ISketcher.hxx
@@ -4,7 +4,8 @@
 #include "GEOM_Function.hxx"
 
 #define SKETCH_ARG_CMD 1
-#define SKETCH_ARG_WPLANE 2
+#define SKETCH_ARG_DOUBLE 2
+#define SKETCH_ARG_WPLANE 12
 
 class GEOMImpl_ISketcher
 {
@@ -18,9 +19,14 @@ class GEOMImpl_ISketcher
   TCollection_AsciiString GetCommand() { return _func->GetString(SKETCH_ARG_CMD); }
 
   void SetWorkingPlane(int theInd, double theValue)
-              { _func->SetReal(SKETCH_ARG_WPLANE + theInd, theValue); }
+              { _func->SetReal(SKETCH_ARG_DOUBLE + theInd, theValue); }
 
-  double GetWorkingPlane(int theInd) { return _func->GetReal(SKETCH_ARG_WPLANE + theInd); }
+  double GetWorkingPlane(int theInd) { return _func->GetReal(SKETCH_ARG_DOUBLE + theInd); }
+
+  void SetWorkingPlane(Handle(GEOM_Function) thePlane)
+              { _func->SetReference(SKETCH_ARG_WPLANE, thePlane); }
+
+  Handle(GEOM_Function) GetWorkingPlane() { return _func->GetReference(SKETCH_ARG_WPLANE); }
 
  private:
 

diff --git a/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx b/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx
index 0b79130b20c136899c482e88de5ee306eee6bab3..b0822626abac35137f7e45b8a1939e982d475df8 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx
@@ -5,10 +5,12 @@ using namespace std;
 #include "GEOMImpl_Types.hxx"
 #include "GEOM_Function.hxx"
 
-#include <TopoDS_Shape.hxx>
-#include <gp_Dir.hxx>
-#include <gp_Ax3.hxx>
 #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>
 
@@ -63,12 +65,30 @@ 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();
+  }
   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);

diff --git a/src/GEOMImpl/GEOMImpl_Types.hxx b/src/GEOMImpl/GEOMImpl_Types.hxx
index 982ef59ae597379631c9ebbe2df3f8585152e15c..d3ede4bd558064ade97ed097de4bce7b7868f6b9 100755 (executable)
--- a/src/GEOMImpl/GEOMImpl_Types.hxx
+++ b/src/GEOMImpl/GEOMImpl_Types.hxx
@@ -188,7 +188,8 @@
 
 #define GLUE_FACES 1
 
-#define SKETCHER_COMMAND 1
+#define SKETCHER_NINE_DOUBLS 1
+#define SKETCHER_PLANE 2
 
 #define CDG_MEASURE 1
 

diff --git a/src/GEOM_I/GEOM_ICurvesOperations_i.cc b/src/GEOM_I/GEOM_ICurvesOperations_i.cc
index ba436bb03ac088c378561dfdb3c30d5b9ff363ed..5182be099aa6b5c3d58d2711b4f787e4a73a15f6 100644 (file)
--- a/src/GEOM_I/GEOM_ICurvesOperations_i.cc
+++ b/src/GEOM_I/GEOM_ICurvesOperations_i.cc
@@ -303,3 +303,28 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeSketcher (const char* theCom
 
   return GetObject(anObject);
 }
+
+
+//=============================================================================
+/*!
+ *  MakeSketcherOnPlane
+ */
+//============================================================================= 
+GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeSketcherOnPlane (const char* theCommand, GEOM::GEOM_Object_ptr theWorkingPlane)
+{
+  GEOM::GEOM_Object_var aGEOMObject;
+
+  //Set a not done flag
+  GetOperations()->SetNotDone();
+
+  Handle(GEOM_Object) aWorkingPlane = GetOperations()->GetEngine()->GetObject
+    (theWorkingPlane->GetStudyID(), theWorkingPlane->GetEntry());
+
+  // Make Sketcher
+  Handle(GEOM_Object) anObject =
+      GetOperations()->MakeSketcherOnPlane(theCommand, aWorkingPlane);
+  if (!GetOperations()->IsDone() || anObject.IsNull())
+    return aGEOMObject._retn();
+
+  return GetObject(anObject);
+}

diff --git a/src/GEOM_I/GEOM_ICurvesOperations_i.hh b/src/GEOM_I/GEOM_ICurvesOperations_i.hh
index 6308621f8b5f55429bb439eaeb1183b2129016dd..28f028d196e5ce112142ac075793fbc3e542ef5e 100644 (file)
--- a/src/GEOM_I/GEOM_ICurvesOperations_i.hh
+++ b/src/GEOM_I/GEOM_ICurvesOperations_i.hh
@@ -44,6 +44,8 @@ class GEOM_ICurvesOperations_i :
 
   GEOM::GEOM_Object_ptr MakeSketcher (const char* theCommand, const GEOM::ListOfDouble& theWorkingPlane);
 
+  GEOM::GEOM_Object_ptr MakeSketcherOnPlane (const char* theCommand, GEOM::GEOM_Object_ptr theWorkingPlane);
+
   ::GEOMImpl_ICurvesOperations* GetOperations()
   { return (::GEOMImpl_ICurvesOperations*)GetImpl(); }
 };