X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Update.h;h=7eb4a8ef2e9424fd342efe8841a3b9cd8b2f92c0;hb=f67ce3bc59a476ac462b865a8f08d92cd93497cb;hp=862a078cee86db631bcff1f09868a8beb4345618;hpb=4748bf45f55c8185533d460302d3dbefc948b56e;p=modules%2Fshaper.git diff --git a/src/Model/Model_Update.h b/src/Model/Model_Update.h index 862a078ce..7eb4a8ef2 100644 --- a/src/Model/Model_Update.h +++ b/src/Model/Model_Update.h @@ -25,65 +25,24 @@ class Model_Objects; */ class Model_Update : public Events_Listener { - /// updated features during this transaction with IDs of iterations of modifications - /// (to reexecute the object twice if needed: for correct preview, etc.) - std::map, int > myUpdated; - /// current id of modification inside of the current transaction - int myModification; + /// 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::set > > + myModified; /// features that must be additionally processed after execution of finish operation - std::set > myWaitForFinish; - /// to know that all next updates are caused by this execution - bool myIsExecuted; - /// to know execute or not automatically all update - bool myIsAutomatic; - /// to know that some parameter was changed during this operation + std::set > myWaitForFinish; + /// to know that some parameter was changed during this operation (to enable update expressions) bool myIsParamUpdated; - /// to execute features of finish if perview is not needed + /// to execute features on finish if preview is needed only on finish operation bool myIsFinish; - - /// internal structure that contains the updating iteration information: - /// which object and subobject is iterated, t ocontinue iteration - class IterationItem { - /// The main object, subs of it are iterated - std::shared_ptr myMain; - /// The currently iterated sub-object of root document - std::shared_ptr 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 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 current(); - /// Returns true if theFeature is in all iterated objects - bool isIterated(std::shared_ptr theFeature); - /// Returns true if theFeature is earlier than the current value - bool isEarlierThanCurrent(std::shared_ptr theFeature); - /// Make iteration breaked - void setBreaked(); - /// Makes the iteration before the currently breaked (next "next" will be ignored) - void setCurrentBefore(std::shared_ptr 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. - std::list myProcessIterator; + /// try if processing is currently performed + bool myIsProcessed; + /// set that contains features that must be executed only on finish of the operation + std::set > myProcessOnFinish; + /// to avoid infinitive cycling: feature -> count of the processing periods during this update + std::map, int > myProcessed; + /// if preview in hte property panel is blocked and any update is postponed until the end of operation + bool myIsPreviewBlocked; public: /// Is called only once, on startup of the application @@ -93,9 +52,16 @@ class Model_Update : public Events_Listener MODEL_EXPORT virtual void processEvent(const std::shared_ptr& theMessage); protected: - /// 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 + /// returns true if something reallsy was added to the modified and must be processed + bool addModified( + std::shared_ptr theFeature, std::shared_ptr theReason); + + /// Recoursively checks and updates features if needed (calls the execute method) /// Returns true if feature was updated. - void updateFeature(std::shared_ptr theFeature); + bool processFeature(std::shared_ptr theFeature); /// Updates the selection and parametrical arguments before the later feature analysis /// Returns true if something really was updated @@ -106,25 +72,19 @@ protected: 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 - /// \param theFinish is true for start, close or abort transaction: all objects must be processed - void processOperation(const bool theTotalUpdate, const bool theFinish = false); + //! \param theFlushRedisplay a boolean value if the redisplay signal should be flushed + void processFeatures(const bool theFlushRedisplay = true); /// Performs the feature execution /// \returns the status of execution void executeFeature(std::shared_ptr theFeature); - /// Iterates and updates features from theFeature by managing myProcessIterator. - /// Returns only after the iteration is finished. - /// \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 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 theFeature); - /// Returns true if the feature is older that the argument and it must be updated - bool isOlder(std::shared_ptr theFeature, - std::shared_ptr theArgument); + /// 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& theFeature, std::shared_ptr theReason); }; #endif