Fix for Bug IPAL11843:

[modules/smesh.git] / src / SMESH_I / SMESH_Gen_i.hxx

diff --git a/src/SMESH_I/SMESH_Gen_i.hxx b/src/SMESH_I/SMESH_Gen_i.hxx
index 1ffe1993fa50f8acf19321ec530d05ca474cb8c7..11f07f75d13158bf6c904dc8794f194ab82420a4 100644 (file)
--- a/src/SMESH_I/SMESH_Gen_i.hxx
+++ b/src/SMESH_I/SMESH_Gen_i.hxx
@@ -166,6 +166,11 @@ public:
   // Interface methods
   // *****************************************
 
+  // Set current study
+  void SetEmbeddedMode( CORBA::Boolean theMode );
+  // Get current study
+  CORBA::Boolean IsEmbeddedMode();
+
   // Set current study
   void SetCurrentStudy( SALOMEDS::Study_ptr theStudy );
   // Get current study
@@ -176,6 +181,13 @@ public:
                                                 const char* theLibName)
     throw ( SALOME::SALOME_Exception );
   
+  // Return hypothesis of given type holding parameter values of the existing mesh
+  SMESH::SMESH_Hypothesis_ptr GetHypothesisParameterValues (const char*           theHypType,
+                                                            const char*           theLibName,
+                                                            SMESH::SMESH_Mesh_ptr theMesh,
+                                                            GEOM::GEOM_Object_ptr theGeom)
+    throw ( SALOME::SALOME_Exception );
+  
   // Create empty mesh on a shape
   SMESH::SMESH_Mesh_ptr CreateMesh( GEOM::GEOM_Object_ptr theShapeObject )
     throw ( SALOME::SALOME_Exception );
@@ -213,6 +225,11 @@ public:
                                      const SMESH::object_array& theListOfSubShape )
     throw ( SALOME::SALOME_Exception );
 
+  // Return geometrical object the given element is built on
+  GEOM::GEOM_Object_ptr GetGeometryByMeshElement( SMESH::SMESH_Mesh_ptr  theMesh,
+                                                  CORBA::Long            theElementID,
+                                                  const char*            theGeomName)
+    throw ( SALOME::SALOME_Exception );
 
   // ****************************************************
   // Interface inherited methods (from SALOMEDS::Driver)
@@ -295,8 +312,6 @@ public:
 
   void RemoveLastFromPythonScript (int theStudyID);
 
-  static void AddToCurrentPyScript (const TCollection_AsciiString& theString);
-
   void SavePython (SALOMEDS::Study_ptr theStudy);
 
   TCollection_AsciiString DumpPython_impl (int theStudyID, 
@@ -310,28 +325,6 @@ public:
 
   void CleanPythonTrace (int theStudyID);
 
-  // Dump python comfort methods
-
-  static TCollection_AsciiString& AddObject(TCollection_AsciiString& theStr,
-                                            CORBA::Object_ptr        theObject);
-  // add object to script string
-
-  template <class _array>
-    static TCollection_AsciiString& AddArray(TCollection_AsciiString& theStr,
-                                             const _array &           array)
-      // put array contents into theStr like this: "[ 1, 2, 5 ]"
-    {
-      ostringstream sout; // can convert long int, and TCollection_AsciiString cant
-      sout << "[ ";
-      for (int i = 1; i <= array.length(); i++) {
-        sout << array[i-1];
-        if ( i < array.length() )
-          sout << ", ";
-      }
-      sout << " ]";
-      theStr += (char*) sout.str().c_str();
-      return theStr;
-    }
 
   // *****************************************
   // Internal methods
@@ -429,6 +422,7 @@ private:
 
   GEOM_Client*              myShapeReader;      // Shape reader
   SALOMEDS::Study_var       myCurrentStudy;     // Current study
+  CORBA::Boolean            myIsEmbeddedMode;   // Current mode
 
   // Dump Python: trace of API methods calls
   std::map < int, Handle(TColStd_HSequenceOfAsciiString) > myPythonScripts;