X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Session.h;h=f31928620f78a87febc82bfbe2366db719a99524;hb=530f5aff42069e844c4a4ef164088ea23ba0e2dd;hp=41d62e4f9162fb0124ff7f969e271eb9da524583;hpb=c130b98205c701e153fd4a8372c6d1aa4e8257df;p=modules%2Fshaper.git

diff --git a/src/Model/Model_Session.h b/src/Model/Model_Session.h
index 41d62e4f9..f31928620 100644
--- a/src/Model/Model_Session.h
+++ b/src/Model/Model_Session.h
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        Model_Session.hxx
 // Created:     20 Mar 2014
 // Author:      Mikhail PONIKAROV
@@ -29,11 +31,11 @@ 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.
   //! \param theFileName full name of the file to load
-  //! \param theStudyID identifier of the SALOME study to associate with loaded file
   //! \returns true if file was loaded successfully
   MODEL_EXPORT virtual bool load(const char* theFileName);
 
@@ -46,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();
+  //! 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 
@@ -65,12 +71,16 @@ class Model_Session : public ModelAPI_Session, public Events_Listener
   MODEL_EXPORT virtual bool canRedo();
   //! Redoes last operation
   MODEL_EXPORT virtual void redo();
+  //! Returns stack of performed operations
+  MODEL_EXPORT virtual std::list<std::string> undoList();
+  //! Returns stack of rolled back operations
+  MODEL_EXPORT virtual std::list<std::string> redoList();
 
   /// Returns the root document of the application (that may contains sub-documents)
   MODEL_EXPORT virtual std::shared_ptr<ModelAPI_Document> moduleDocument();
 
   /// Returns the document by ID, loads if not loaded yet. Returns null if no such document.
-  MODEL_EXPORT virtual std::shared_ptr<ModelAPI_Document> document(std::string theDocID);
+  MODEL_EXPORT virtual std::shared_ptr<ModelAPI_Document> document(int theDocID);
 
   /// Return true if root document has been already created
   MODEL_EXPORT virtual bool hasModuleDocument();
@@ -85,6 +95,9 @@ class Model_Session : public ModelAPI_Session, public Events_Listener
   /// Returns all the opened documents of the session (without postponed)
   MODEL_EXPORT virtual std::list<std::shared_ptr<ModelAPI_Document> > allOpenedDocuments();
 
+  /// Returns true if document is not loaded yet
+  MODEL_EXPORT virtual bool isLoadByDemand(const std::string theDocID);
+
   /// Registers the plugin that creates features.
   /// It is obligatory for each plugin to call this function on loading to be found by 
   /// the plugin manager on call of the feature)
@@ -93,13 +106,14 @@ 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
   MODEL_EXPORT virtual std::shared_ptr<ModelAPI_Document> copy(
-      std::shared_ptr<ModelAPI_Document> theSource, std::string theID);
+      std::shared_ptr<ModelAPI_Document> theSource, const int theDestID);
 
   /// Returns the validators factory: the only one instance per application
   MODEL_EXPORT virtual ModelAPI_ValidatorsFactory* validators();
 
+  /// Sets the flag to check modifications outside the transaction or not
   void setCheckTransactions(const bool theCheck)
   {
     myCheckTransactions = theCheck;
@@ -108,12 +122,18 @@ 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();
 
   /// Creates the feature object using plugins functionality
-  virtual FeaturePtr createFeature(std::string theFeatureID);
+  FeaturePtr createFeature(std::string theFeatureID, Model_Document* theDocOwner);
+
+  friend class Model_Document;
+  friend class Model_Objects;
 };
 
 #endif