X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_OperationMgr.h;h=e7e715128b6e7e07e20876cd28a589875a3ad2f9;hb=5544702339b340e6e612420ecbab44a033828d87;hp=f6c25a87b439909f5e753dc154c41ac4d78ed4ab;hpb=34bfe89b8ad83a4a3d5b07bcf08a4df075c3f83c;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_OperationMgr.h b/src/XGUI/XGUI_OperationMgr.h
old mode 100644
new mode 100755
index f6c25a87b..e7e715128
--- a/src/XGUI/XGUI_OperationMgr.h
+++ b/src/XGUI/XGUI_OperationMgr.h
@@ -10,6 +10,7 @@
 #include "XGUI.h"
 
 #include <ModuleBase_Operation.h>
+#include "ModelAPI_Feature.h"
 
 #include <QList>
 #include <QObject>
@@ -89,8 +90,7 @@ Q_OBJECT
   /// 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
-  /// \param isAdditionallyGranted a boolean flag whether the id operation is granted in the previous one
-  bool canStartOperation(const QString& theId, const bool isAdditionallyGranted = false);
+  bool canStartOperation(const QString& theId);
 
   /// Aborts the parameter operation if it is current, else abort operations from the stack
   /// of operations until the operation is found. All operations upper the parameter one are
@@ -98,22 +98,6 @@ Q_OBJECT
   /// \param theOperation an aborted operation
   void abortOperation(ModuleBase_Operation* theOperation);
 
-  /// 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);
-
-  /// Returns state of validation locking
-  bool isValidationLocked() const { return myIsValidationLock; }
-
-  /// Returns enable apply state 
-  /// \return theEnabled a boolean value
-  bool isApplyEnabled() const;
-
-  /// Returns valid state of the parent operation. If the current operation is the last one
-  /// it returns the valid state of the operation
-  /// \return boolean value
-  bool isParentOperationValid() const;
-
 public slots:
   /// Slot that commits the current operation.
   void onCommitOperation();
@@ -149,11 +133,6 @@ signals:
   /// Signal is emitted after the key released click.
   void keyEnterReleased();
 
- protected:
-  /// Sets apply state to the value and emit signal about this state is changed
-  /// \param theEnabled the state value
-  void setApplyEnabled(const bool theEnabled);
-
 public: // TEMPORARY, it should be protected and be performed automatically
   /// Emits nestedStateChange for operations with an information about validity of the operation
   /// \param theOperation the sent operation. If it is NULL, all operations in the stack are sent.
@@ -174,23 +153,43 @@ protected: // TEMPORARY
   /// \return boolean result
   bool isGrantedOperation(const QString& theId);
 
+  /// Sets the feature as a current in the document
+  /// \param theFeature a feature
+  void setCurrentFeature(const FeaturePtr& theFeature);
+
  public slots:
   /// SLOT, that is called by the key in the property panel is clicked.
   /// \param theEvent the mouse event
   bool onKeyReleased(QKeyEvent* theEvent);
 
+  /// The functionaly, that should be done by enter click
+  /// Fistly the active widget processes it, then module. If no one do not
+  /// process it, the current operation is committed
+  bool onProcessEnter();
+
   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();
 
-  /// Slot called on operation start
+  /// Slot called before operation started. Stores the previous current feature, set the feature
+  /// of the operation as a current in the document. The previous current feature should be restored
+  /// by the operation abort/commit
+  void onBeforeOperationStarted();
+
+  /// Slot called after operation started
   void onOperationStarted();
 
-  /// Slot called on operation abort
+  /// Slot called before operation aborted. Restore the previous current operation
+  void onBeforeOperationAborted();
+
+  /// Slot called after operation aborted
   void onOperationAborted();
 
-  /// Slot called on operation commit
+  /// Slot called before operation committed. Restore the previous current operation
+  void onBeforeOperationCommitted();
+
+  /// Slot called after operation committed
   void onOperationCommitted();
 
   /// Slot called on operation resume
@@ -206,12 +205,6 @@ private:
 
   /// Current workshop
   ModuleBase_IWorkshop* myWorkshop;
-
-
-  /// Lock/Unlock access to Ok button in property panel
-  bool myIsValidationLock;
-  /// Lock/Unlock access to Ok button in property panel
-  bool myIsApplyEnabled;
 };
 
 #endif