22355: EDF SMESH: New 1D hypothesis "Adaptive"

[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 403fb7ee5cc25e12c4bc7f57e01a7066cd7b943f..6b134e51f065449ad93babf5f350f308f858e335 100644 (file)
--- a/src/SMESH_I/SMESH_Gen_i.hxx
+++ b/src/SMESH_I/SMESH_Gen_i.hxx
@@ -439,7 +439,7 @@ public:
   // Copy-paste methods - returns true if object can be copied to the clipboard
   CORBA::Boolean CanCopy( SALOMEDS::SObject_ptr theObject ) { return false; }
   // Copy-paste methods - copy object to the clipboard
-  SALOMEDS::TMPFile* CopyFrom( SALOMEDS::SObject_ptr theObject, CORBA::Long& theObjectID ) { return false; }
+  SALOMEDS::TMPFile* CopyFrom( SALOMEDS::SObject_ptr theObject, CORBA::Long& theObjectID ) { return NULL; }
   // Copy-paste methods - returns true if object can be pasted from the clipboard
   CORBA::Boolean CanPaste( const char* theComponentName, CORBA::Long theObjectID ) { return false; }
   // Copy-paste methods - paste object from the clipboard
@@ -478,12 +478,18 @@ public:
                                            bool isMultiFile,
                                            bool isHistoricalDump,
                                            bool& aValidScript,
-                                           const TCollection_AsciiString& theSavedTrace);
+                                           TCollection_AsciiString& theSavedTrace);
 
   TCollection_AsciiString GetNewPythonLines (int theStudyID);
 
   void CleanPythonTrace (int theStudyID);
 
+  // SIMAN-related functions (check out/check in) : import data to study
+  virtual Engines::ListOfIdentifiers* importData(CORBA::Long studyId,
+                                                 Engines::DataContainer_ptr data,
+                                                 const Engines::ListOfOptions& options);
+  // SIMAN-related functions (check out/check in) : get modified data
+  virtual Engines::ListOfData* getModifiedData(CORBA::Long studyId);
 
   // *****************************************
   // Internal methods
@@ -587,8 +593,8 @@ public:
 
   // Move objects to the specified position
   void Move( const SMESH::sobject_list& what,
-            SALOMEDS::SObject_ptr where,
-            CORBA::Long row );
+             SALOMEDS::SObject_ptr where,
+             CORBA::Long row );
 
 private:
   // Create hypothesis of given type
@@ -637,6 +643,8 @@ private:
   std::vector< int >                                       myLastParamIndex;
   std::vector< std::string >                               myLastParameters;
   std::string                                              myLastObj;
+  int                                                      myImportedStudyId;      // SIMAN: identifier of the imported in importData study to keep no-modifiection flag for getModifiedData method
+  int                                                      myImportedStudyChanged; // SIMAN: flag that indicates that the imported study has been changed (by creation of the additional mesh)
 };