X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Update.h;h=060b5c9d965cb36a18b4cf9f06db23053e44989e;hb=530f5aff42069e844c4a4ef164088ea23ba0e2dd;hp=a9a7bfee82e50711e447953cac2d8df2e063a309;hpb=38afbd899a8645c83e17f2c24a17a2b7414911b4;p=modules%2Fshaper.git

diff --git a/src/Model/Model_Update.h b/src/Model/Model_Update.h
index a9a7bfee8..060b5c9d9 100644
--- a/src/Model/Model_Update.h
+++ b/src/Model/Model_Update.h
@@ -16,6 +16,8 @@
 
 class ModelAPI_Object;
 class ModelAPI_Feature;
+class ModelAPI_CompositeFeature;
+class Model_Objects;
 
 /**\class Model_Update
  * \ingroup DataModel
@@ -23,17 +25,21 @@ class ModelAPI_Feature;
  */
 class Model_Update : public Events_Listener
 {
-  /// initial set of updated features that must be processed
-  std::set<std::shared_ptr<ModelAPI_Object> > myInitial;
-  /// already updated and processed features and modificated feature flag
-  std::map<std::shared_ptr<ModelAPI_Object>, bool> myUpdated;
-  /// to know that all next updates are caused by this execution
-  bool isExecuted;
-  /// 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<std::shared_ptr<ModelAPI_Object> > myJustCreatedOrUpdated;
+  /// Features and results that were modified and not yet processed.
+  /// The second set is the objects that causes this object is modified
+  std::map<std::shared_ptr<ModelAPI_Feature>, std::set<std::shared_ptr<ModelAPI_Feature> > >
+    myModified;
+  /// features that must be additionally processed after execution of finish operation
+  std::set<std::shared_ptr<ModelAPI_Feature> > myWaitForFinish;
+  /// to know that some parameter was changed during this operation (to enable update expressions)
+  bool myIsParamUpdated;
+  /// to execute features on finish if preview is needed only on finish operation
+  bool myIsFinish;
+  /// try if processing is currently performed
+  bool myIsProcessed;
+  /// set that contains features that must be executed only on finish of the operation
+  std::set<std::shared_ptr<ModelAPI_Feature> > myProcessOnFinish;
+
 
  public:
   /// Is called only once, on startup of the application
@@ -43,18 +49,38 @@ class Model_Update : public Events_Listener
   MODEL_EXPORT virtual void processEvent(const std::shared_ptr<Events_Message>& theMessage);
 
 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)
+  /// Appends the new modified feature to the myModified, clears myProcessed if needed
+  /// Returns true if some feature really was marked as modified
+  /// theReason is the object that causes modification of this feature
+  void addModified(
+    std::shared_ptr<ModelAPI_Feature> theFeature, std::shared_ptr<ModelAPI_Feature> theReason);
+
+  /// Recoursively checks and updates features if needed (calls the execute method)
   /// Returns true if feature was updated.
-  bool updateFeature(std::shared_ptr<ModelAPI_Feature> theFeature);
+  bool processFeature(std::shared_ptr<ModelAPI_Feature> theFeature);
+
+  /// 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(std::shared_ptr<ModelAPI_Object> theObject, const bool theCyclic = true);
   /// 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 theFinish is true for start, close or abort transaction: all objects must be processed
+  void processFeatures();
+
+  /// Performs the feature execution
+  /// \returns the status of execution
+  void executeFeature(std::shared_ptr<ModelAPI_Feature> theFeature);
+
+  /// Updates the properties of object because of stability state changes
+  void updateStability(void* theSender);
+
+  /// Returns true if theFeature modification was caused by theReason (may be feature of result of this feature)
+  bool isReason(
+    std::shared_ptr<ModelAPI_Feature>& theFeature, std::shared_ptr<ModelAPI_Object> theReason);
 };
 
 #endif