X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Session.h;h=df9a63a579fdb251f224a55afd714286758c3aff;hb=853e0eec6016120b641efa6adf427a239cf203cf;hp=2584a2e201aa35a14012df0e8c79c6a08ea29d9c;hpb=735e05198d7a73d8cab22fc6261e038f46969250;p=modules%2Fshaper.git diff --git a/src/Model/Model_Session.h b/src/Model/Model_Session.h index 2584a2e20..df9a63a57 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 myCurrentDoc; ///< current working document bool myCheckTransactions; ///< if true, generates error if document is updated outside of transaction + bool myOperationAttachedToNext; ///< the current operation must be commited twice, with nested public: //! Loads the OCAF document from the file. @@ -48,7 +49,10 @@ class Model_Session : public ModelAPI_Session, public Events_Listener MODEL_EXPORT virtual void closeAll(); //! Starts a new operation (opens a tansaction) - MODEL_EXPORT virtual void startOperation(const std::string& theId = ""); + //! \param theAttachedToNested if it is true, it means that this transaction is attached to the nested + //! where it is located and will be commited 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 @@ -117,6 +121,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();