X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Session.h;h=1e200f40e0bc03836bfa608b8b98b891ff529a65;hb=a83e22046c5fb877969fa8879e42491d4054f198;hp=2584a2e201aa35a14012df0e8c79c6a08ea29d9c;hpb=735e05198d7a73d8cab22fc6261e038f46969250;p=modules%2Fshaper.git

diff --git a/src/Model/Model_Session.h b/src/Model/Model_Session.h
index 2584a2e20..1e200f40e 100644
--- a/src/Model/Model_Session.h
+++ b/src/Model/Model_Session.h
@@ -31,6 +31,7 @@ class Model_Session : public ModelAPI_Session, public Events_Listener
   std::string myCurrentPluginName;  ///< name of the plugin that must be loaded currently
   std::shared_ptr<ModelAPI_Document> myCurrentDoc;  ///< current working document
   bool myCheckTransactions;  ///< if true, generates error if document is updated outside of transaction
+  bool myOperationAttachedToNext; ///< the current operation must be committed twice, with nested
  public:
 
   //! Loads the OCAF document from the file.
@@ -47,8 +48,12 @@ class Model_Session : public ModelAPI_Session, public Events_Listener
   //! Closes all documents
   MODEL_EXPORT virtual void closeAll();
 
-  //! Starts a new operation (opens a tansaction)
-  MODEL_EXPORT virtual void startOperation(const std::string& theId = "");
+  //! Starts a new operation (opens a transaction)
+  //! \param theId string-identifier of the started transaction
+  //! \param theAttachedToNested if it is true, it means that this transaction is attached to the nested 
+  //!          where it is located and will be committed on the next commit with the nested
+  MODEL_EXPORT virtual void startOperation(
+    const std::string& theId = "", const bool theAttachedToNested = false);
   //! Finishes the previously started operation (closes the transaction)
   MODEL_EXPORT virtual void finishOperation();
   //! Aborts the operation 
@@ -101,7 +106,7 @@ class Model_Session : public ModelAPI_Session, public Events_Listener
   /// Processes the configuration file reading
   MODEL_EXPORT virtual void processEvent(const std::shared_ptr<Events_Message>& theMessage);
 
-  /// Copies the document to the new one wit hthe given id
+  /// Copies the document to the new one with the given id
   MODEL_EXPORT virtual std::shared_ptr<ModelAPI_Document> copy(
       std::shared_ptr<ModelAPI_Document> theSource, std::string theID);
 
@@ -117,6 +122,9 @@ class Model_Session : public ModelAPI_Session, public Events_Listener
   /// Is called only once, on startup of the application
   Model_Session();
 
+  /// Returns the global identifier of the current transaction (needed for the update algo)
+  MODEL_EXPORT virtual int transactionID();
+
  protected:
   /// Loads (if not done yet) the information about the features and plugins
   void LoadPluginsInfo();