X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Update.h;h=862a078cee86db631bcff1f09868a8beb4345618;hb=77b93142eb8ba33bfb9a42040c2fd8926ffea5c8;hp=845118c88c92235a939be9e5d01055d627d3e8cb;hpb=5273a29f18f5e57e5c8c107ef912b64ce2676a96;p=modules%2Fshaper.git

diff --git a/src/Model/Model_Update.h b/src/Model/Model_Update.h
index 845118c88..862a078ce 100644
--- a/src/Model/Model_Update.h
+++ b/src/Model/Model_Update.h
@@ -17,6 +17,7 @@
 class ModelAPI_Object;
 class ModelAPI_Feature;
 class ModelAPI_CompositeFeature;
+class Model_Objects;
 
 /**\class Model_Update
  * \ingroup DataModel
@@ -24,8 +25,11 @@ class ModelAPI_CompositeFeature;
  */
 class Model_Update : public Events_Listener
 {
-  /// updated features during this transaction: must be updated immediately
-  std::set<std::shared_ptr<ModelAPI_Object> > myJustUpdated;
+  /// updated features during this transaction with IDs of iterations of modifications
+  /// (to reexecute the object twice if needed: for correct preview, etc.)
+  std::map<std::shared_ptr<ModelAPI_Object>, int > myUpdated;
+  /// current id of modification inside of the current transaction
+  int myModification;
   /// 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
@@ -36,16 +40,46 @@ class Model_Update : public Events_Listener
   bool myIsParamUpdated;
   /// to execute features of finish if perview is not needed
   bool myIsFinish;
-  /// Set of already processed features in the "processOperation" method
-  std::set<std::shared_ptr<ModelAPI_Feature> > myProcessed;
 
   /// internal structure that contains the updating iteration information:
   /// which object and subobject is iterated, t ocontinue iteration
-  struct IterationItem {
-    /// the main object, subs of it are iterated
+  class IterationItem {
+    /// The main object, subs of it are iterated
     std::shared_ptr<ModelAPI_CompositeFeature> myMain;
-    /// the currently iterated sub-object
+    /// The currently iterated sub-object of root document
     std::shared_ptr<ModelAPI_Feature> mySub;
+    /// If this is true, this iteration must be breaked immideately
+    bool myBreaked;
+    /// If this flag is true, the virtual iteration is performed, unbreackable
+    bool myIsVirtual;
+    /// For composite main contains the current index
+    int myIndex;
+    /// For root object constains the reference to objects
+    Model_Objects* myObjects;
+    /// If it is true, the next "next" will be ignored
+    bool mySkipNext;
+
+  public:
+    /// Constructs the iterator of subs
+    IterationItem(std::shared_ptr<ModelAPI_CompositeFeature> theFeature);
+    /// Increments the iteration if not-breaked
+    void next();
+    /// Returns true if current is not null
+    bool more();
+    /// Returns the current iterated sub-element
+    std::shared_ptr<ModelAPI_Feature> current();
+    /// Returns true if theFeature is in all iterated objects 
+    bool isIterated(std::shared_ptr<ModelAPI_Feature> theFeature);
+    /// Returns true if theFeature is earlier than the current value 
+    bool isEarlierThanCurrent(std::shared_ptr<ModelAPI_Feature> theFeature);
+    /// Make iteration breaked
+    void setBreaked();
+    /// Makes the iteration before the currently breaked (next "next" will be ignored)
+    void setCurrentBefore(std::shared_ptr<ModelAPI_Feature> theFeature);
+    /// Initializes iteration: virtual or real
+    void startIteration(const bool theVirtual);
+    /// Returns true if iteration was breaked
+    bool isBreaked() {return myBreaked;}
   };
   /// List of iterated features: composite feature to the currently iterated sub.
   /// The first element in the list has no "main": the root document is not feature.
@@ -73,6 +107,7 @@ protected:
 
   /// 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
+  /// \param theFinish is true for start, close or abort transaction: all objects must be processed
   void processOperation(const bool theTotalUpdate, const bool theFinish = false);
 
   /// Performs the feature execution
@@ -84,6 +119,12 @@ protected:
   /// \param theFeature is null for iteration of root document (which is not composite)
   /// \returns false if this feature should not be updated: iteration was moved much upper
   bool iterateUpdate(std::shared_ptr<ModelAPI_CompositeFeature> theFeature);
+  /// Feature is updated during the execution, so in this case if feature was already executed,
+  /// make the iterate Update process breaked to re-start iteration from this feature.
+  void iterateUpdateBreak(std::shared_ptr<ModelAPI_Feature> theFeature);
+  /// Returns true if the feature is older that the argument and it must be updated
+  bool isOlder(std::shared_ptr<ModelAPI_Feature> theFeature, 
+               std::shared_ptr<ModelAPI_Object> theArgument);
 };
 
 #endif