X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Update.h;h=c28d30b255ca3cba728e4a94e9713f3700c640fc;hb=refs%2Ftags%2FV_1.2.1;hp=ff3e67660b3b4875ad31bb3c8a1def6fe30fa858;hpb=32d1a4d19ab1a5d7c172e9660130fcf8ecb1e520;p=modules%2Fshaper.git

diff --git a/src/Model/Model_Update.h b/src/Model/Model_Update.h
index ff3e67660..c28d30b25 100644
--- a/src/Model/Model_Update.h
+++ b/src/Model/Model_Update.h
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        Model_Update.hxx
 // Created:     25 Jun 2014
 // Author:      Mikhail PONIKAROV
@@ -6,8 +8,9 @@
 #define Model_Update_H_
 
 #include "Model.h"
+#include <ModelAPI_Data.h>
 #include "Events_Listener.h"
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <set>
 #include <map>
 
@@ -20,32 +23,48 @@ class ModelAPI_Feature;
  */
 class Model_Update : public Events_Listener
 {
-  /// initial set of updated features that must be processed
-  std::set<boost::shared_ptr<ModelAPI_Object> > myInitial;
-  /// already updated and processed features and modificated feature flag
-  std::map<boost::shared_ptr<ModelAPI_Object>, bool> myUpdated;
+  /// created features during this transaction: must be updated all the time
+  std::set<std::shared_ptr<ModelAPI_Object> > myJustCreated;
+  /// updated features during this transaction: must be updated in the end of transaction
+  std::set<std::shared_ptr<ModelAPI_Object> > myJustUpdated;
   /// to know that all next updates are caused by this execution
-  bool isExecuted;
+  bool myIsExecuted;
   /// to know execute or not automatically all update
-  bool isAutomatic;
-  /// execute just created features for sure
-  bool isCreated;
+  bool myIsAutomatic;
+  /// to know that some parameter was changed during this operation
+  bool myIsParamUpdated;
 
  public:
   /// Is called only once, on startup of the application
   Model_Update();
 
   /// Processes the feature argument update: executes the results
-  MODEL_EXPORT virtual void processEvent(const boost::shared_ptr<Events_Message>& theMessage);
+  MODEL_EXPORT virtual void processEvent(const std::shared_ptr<Events_Message>& theMessage);
 
- protected:
+protected:
+  /// updates all features in the document and then - in sub-documents
+  void updateInDoc(std::shared_ptr<ModelAPI_Document> theDoc);
   /// Recoursively checks and updates the feature if needed (calls the execute method)
   /// Returns true if feature was updated.
-  bool updateFeature(boost::shared_ptr<ModelAPI_Feature> theFeature);
+  void updateFeature(std::shared_ptr<ModelAPI_Feature> theFeature);
+
+  /// Updates the selection and parametrical arguments before the later feature analysis
+  void updateArguments(std::shared_ptr<ModelAPI_Feature> theFeature);
+
+  /// Sends the redisplay events for feature and results, updates the updated status
+  void redisplayWithResults(std::shared_ptr<ModelAPI_Feature> theFeature, 
+    const ModelAPI_ExecState theState);
+
+  /// On operation start/end/abort the "Just" fileds must be cleared and processed in the right way
+  /// \param theTotalUpdate force to updates everything that has been changed in this operation
+  void processOperation(const bool theTotalUpdate, const bool theFinish = false);
+
+  /// Performs the feature execution
+  /// \returns the status of execution
+  void executeFeature(std::shared_ptr<ModelAPI_Feature> theFeature);
 
-  /// Recoursively checks and updates the object (result or feature) if needed (calls updateFeature)
-  /// Returns true if object was updated.
-  bool updateObject(boost::shared_ptr<ModelAPI_Object> theObject);
+  /// returns true if the object was created or updated
+  bool isUpdated(const std::shared_ptr<ModelAPI_Object>& theObj);
 };
 
 #endif