X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_OperationMgr.h;h=1cf7dcefcbbd5fcbb6a5cc6588f24f313d39a979;hb=340b387f8fe22028900d0f2ba2b81eac538014c4;hp=e43485b5c392a0a850267cea3a1107a6b26ea2d5;hpb=d347ec7b3de1e661ae76c4afea48d5d2cbc843ac;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_OperationMgr.h b/src/XGUI/XGUI_OperationMgr.h
index e43485b5c..1cf7dcefc 100644
--- a/src/XGUI/XGUI_OperationMgr.h
+++ b/src/XGUI/XGUI_OperationMgr.h
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+
 // File:        XGUI_OperationMgr.h
 // Created:     20 Apr 2014
 // Author:      Natalia ERMOLAEVA
@@ -37,10 +39,23 @@ Q_OBJECT
   /// Returns the current operation or NULL
   /// \return the current operation
   ModuleBase_Operation* currentOperation() const;
+
+  /// Check if the given operation is active operation.
+  /// Also, returns false is ther is no active operation.
+  bool isCurrentOperation(ModuleBase_Operation* theOperation);
+
   /// Returns true is operation manager has at least one non-null operation.
   bool hasOperation() const;
+
+  /// Returns true is operation manager has an operation with given Id.
+  bool hasOperation(const QString& theId) const;
+
+  /// Find and return operation by its Id.
+  ModuleBase_Operation* findOperation(const QString& theId) const;
+
   /// Returns number of operations in the stack
   int operationsCount() const;
+
   /// Returns list of all operations IDs
   QStringList operationList() const;
 
@@ -57,6 +72,23 @@ Q_OBJECT
 
   bool abortAllOperations();
 
+  /// Returns whether the operation can be started. Check if there is already started operation and
+  /// the granted parameter of the launched operation
+  /// \param theId id of the operation which is going to start
+  bool canStartOperation(QString theId);
+
+  bool canStopOperation();
+
+  /// Returns true if the operation can be aborted
+  bool canAbortOperation();
+
+  /// Blocking/unblocking enabling of Ok button in property panel.
+  /// It is used when operation can not be validated even all attributes are valid
+  void setLockValidating(bool toLock) { myIsValidationLock = toLock; }
+
+  /// Returns state of validation locking
+  bool isValidationLocked() const { return myIsValidationLock; }
+
  public slots:
   /// Slot that commits the current operation.
   void onCommitOperation();
@@ -67,17 +99,30 @@ Q_OBJECT
 
 signals:
   /// Signal about an operation is started. It is emitted after the start() of operation is done.
-  void operationStarted();
+  void operationStarted(ModuleBase_Operation* theOperation);
+
   /// Signal about an operation is stopped. It is emitted after the stop() of operation is done.
   /// \param theOperation a stopped operation
   void operationStopped(ModuleBase_Operation* theOperation);
+
   /// Signal about an operation is resumed. It is emitted after the resume() of operation is done.
-  void operationResumed();
+  void operationResumed(ModuleBase_Operation* theOperation);
+
+  /// Emitted when current operation is Committed
+  void operationCommitted(ModuleBase_Operation* theOperation);
+
+  /// Emitted when current operation is aborted
+  void operationAborted(ModuleBase_Operation* theOperation);
+
   /// Signal is emitted after the validate methods calls.
   void operationValidated(bool);
-  /// Signal about the necessety of the next widget activating
-  /// \param theWidget the model widget
-  void activateNextWidget(ModuleBase_ModelWidget* theWidget);
+
+  /// Signal is emitted after the current operation is filled with existing preselection.
+  void operationActivatedByPreselection();
+
+  /// Signal is emitted after the key released click.
+  void keyEnterReleased();
+
 
  protected:
 
@@ -89,39 +134,28 @@ signals:
   /// \return the state whether the operation is resumed
   void resumeOperation(ModuleBase_Operation* theOperation);
 
-  /// Checks if given operation is Valid, if so sends operationValidated signal
-  /// \param theOperation to be validated
-  /// \return validation state (true means valid)
-  bool validateOperation(ModuleBase_Operation* theOperation);
-  /// Returns whether the operation can be started. Check if there is already started operation and
-  /// the granted parameter of the launched operation
-  /// \param theOperation an operation to check
-  bool canStartOperation(ModuleBase_Operation* theOperation);
-
-  bool canStopOperation();
-
-  /// Returns true if the operation can be aborted
-  bool canAbortOperation();
-
  public slots:
   /// SLOT, that is called by the key in the property panel is clicked.
   /// \param theName the attribute name
   /// \param theEvent the mouse event
-  void onKeyReleased(QKeyEvent* theEvent);
-
-  /// SLOT, that reacts to the widget activation
-  /// \param theWidget an activated widget
-  void onWidgetActivated(ModuleBase_ModelWidget* theWidget);
+  bool onKeyReleased(QKeyEvent* theEvent);
 
   protected slots:
   /// Slot that is called by an operation stop. Removes the stopped operation form the stack.
   /// If there is a suspended operation, restart it.
   void onOperationStopped();
+  void onOperationStarted();
+  void onOperationAborted();
+  void onOperationCommitted();
+  void onOperationResumed();
 
  private:
   typedef QList<ModuleBase_Operation*> Operations;  ///< definition for a list of operations
   Operations myOperations;  ///< a stack of started operations. The active operation is on top,
                             // others are suspended and started by the active is finished
+
+  /// Lock/Unlock access to Ok button in property panel
+  bool myIsValidationLock;
 };
 
 #endif