X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Session.h;h=f31928620f78a87febc82bfbe2366db719a99524;hb=530f5aff42069e844c4a4ef164088ea23ba0e2dd;hp=df9a63a579fdb251f224a55afd714286758c3aff;hpb=abc04a43de67947a851486f8173e2a86bdd4c376;p=modules%2Fshaper.git diff --git a/src/Model/Model_Session.h b/src/Model/Model_Session.h index df9a63a57..f31928620 100644 --- a/src/Model/Model_Session.h +++ b/src/Model/Model_Session.h @@ -31,7 +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 + bool myOperationAttachedToNext; ///< the current operation must be committed twice, with nested public: //! Loads the OCAF document from the file. @@ -48,9 +48,10 @@ class Model_Session : public ModelAPI_Session, public Events_Listener //! Closes all documents MODEL_EXPORT virtual void closeAll(); - //! Starts a new operation (opens a tansaction) + //! 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 commited on the next commit with 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) @@ -79,7 +80,7 @@ class Model_Session : public ModelAPI_Session, public Events_Listener MODEL_EXPORT virtual std::shared_ptr moduleDocument(); /// Returns the document by ID, loads if not loaded yet. Returns null if no such document. - MODEL_EXPORT virtual std::shared_ptr document(std::string theDocID); + MODEL_EXPORT virtual std::shared_ptr document(int theDocID); /// Return true if root document has been already created MODEL_EXPORT virtual bool hasModuleDocument(); @@ -105,9 +106,9 @@ class Model_Session : public ModelAPI_Session, public Events_Listener /// Processes the configuration file reading MODEL_EXPORT virtual void processEvent(const std::shared_ptr& theMessage); - /// Copies the document to the new one wit hthe given id + /// Copies the document to the new one MODEL_EXPORT virtual std::shared_ptr copy( - std::shared_ptr theSource, std::string theID); + std::shared_ptr theSource, const int theDestID); /// Returns the validators factory: the only one instance per application MODEL_EXPORT virtual ModelAPI_ValidatorsFactory* validators();