Fix for the issue #587 and general optimization and debug of parametric update.

[modules/shaper.git] / src / Model / Model_Update.h

diff --git a/src/Model/Model_Update.h b/src/Model/Model_Update.h
index ab4e4c8ff1cfeb9a4956d08b37e7f30e20329838..d8d590497deb710c2867dc21f7a8b35bca0c1707 100644 (file)
--- 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,35 +23,47 @@ 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;
+  /// updated features during this transaction: must be updated immediately
+  std::set<std::shared_ptr<ModelAPI_Object> > myJustUpdated;
+  /// features that must be additionally processed after execution of finish operation
+  std::set<std::shared_ptr<ModelAPI_Object> > myWaitForFinish;
   /// 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;
-  /// just created features: they must be updated immideately even in not-automatic mode for 
-  /// preview; cleared on commit operations
-  std::set<boost::shared_ptr<ModelAPI_Object> > myJustCreatedOrUpdated;
+  bool myIsAutomatic;
+  /// to know that some parameter was changed during this operation
+  bool myIsParamUpdated;
+  /// to execute features of finish if perview is not needed
+  bool myIsFinish;
 
  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:
   /// 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,
+    std::set<std::shared_ptr<ModelAPI_Feature> >& theProcessed);
+
+  /// Updates the selection and parametrical arguments before the later feature analysis
+  /// Returns true if something really was updated
+  void updateArguments(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, const bool theCyclic = true);
   /// Sends the redisplay events for feature and results, updates the updated status
-  void redisplayWithResults(boost::shared_ptr<ModelAPI_Feature> theFeature);
+  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);
 };
 
 #endif