Merge branch 'Dev_0.6.1' of newgeom:newgeom.git into Dev_0.6.1

[modules/shaper.git] / src / XGUI / XGUI_OperationMgr.h

diff --git a/src/XGUI/XGUI_OperationMgr.h b/src/XGUI/XGUI_OperationMgr.h
index 29a340b0dad6dc55092248d56aa861fe2fbfe66a..1cf7dcefcbbd5fcbb6a5cc6588f24f313d39a979 100644 (file)
--- 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
@@ -80,6 +82,13 @@ Q_OBJECT
   /// 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();
@@ -99,8 +108,8 @@ signals:
   /// Signal about an operation is resumed. It is emitted after the resume() of operation is done.
   void operationResumed(ModuleBase_Operation* theOperation);
 
-  /// Emitted when current operation is comitted
-  void operationComitted(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);
@@ -108,9 +117,13 @@ signals:
   /// Signal is emitted after the validate methods calls.
   void operationValidated(bool);
 
+  /// 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:
 
   /// Commits the current operatin if it is valid
@@ -133,13 +146,16 @@ signals:
   void onOperationStopped();
   void onOperationStarted();
   void onOperationAborted();
-  void onOperationComitted();
+  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