X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_ModelWidget.h;h=d84271454f638bb1c310d83e2ad700cc5739e449;hb=39da05659a620750e11c2778a45be6f2dcb17308;hp=f1d257362076ea7b0204cb8f1219782adba2afd7;hpb=a26b3aee26fc2761728ea778939800b9b02e2a61;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_ModelWidget.h b/src/ModuleBase/ModuleBase_ModelWidget.h
index f1d257362..d84271454 100644
--- a/src/ModuleBase/ModuleBase_ModelWidget.h
+++ b/src/ModuleBase/ModuleBase_ModelWidget.h
@@ -9,7 +9,7 @@
 
 #include <ModuleBase.h>
 #include <ModuleBase_ViewerPrs.h>
-
+#include <ModuleBase_OperationFeature.h>
 #include <ModelAPI_Feature.h>
 
 #include <QWidget>
@@ -35,8 +35,9 @@ Q_OBJECT
  public:
    /// State of the widget
    enum ValueState { Stored, /// modification is finished and applyed to the model
-                     Modified, /// modification has not been finished and set to the model yet
-                     Reset };
+                     ModifiedInPP, /// modification has not been finished and set to the model yet
+                     ModifiedInViewer, /// modification performed by viewer events
+                     Reset }; /// the value is reset
 
    /// Constructor
   /// \param theParent the parent object
@@ -80,6 +81,10 @@ Q_OBJECT
   /// \return the enumeration result
   ValueState getValueState() const { return myState; }
 
+  /// Returns an attribute error according to the value state
+  /// It exists in all cases excepring the "Store" case
+  QString getValueStateError() const;
+
   /// Defines if it is supposed that the widget should interact with the viewer.
   virtual bool isViewerSelector() { return false; }
 
@@ -101,20 +106,19 @@ Q_OBJECT
   /// \return True in success
   bool restoreValue();
 
-  /// Saves the internal parameters to the given feature. Emits signals before and after store
-  /// \return True in success
-  void storeValueByApply();
-
   /// Set focus to the first control of the current widget. The focus policy of the control is checked.
   /// If the widget has the NonFocus focus policy, it is skipped.
   /// \return the state whether the widget can accept the focus
   virtual bool focusTo();
 
+  /// Select the internal content if it can be selected. It is empty in the default realization
+  virtual void selectContent() {}
+
   /// The method called when widget is activated
   void activate();
 
   /// The method called when widget is deactivated
-  virtual void deactivate() {}
+  virtual void deactivate();
 
   /// Returns list of widget controls
   /// \return a control list
@@ -196,6 +200,9 @@ signals:
   /// \param theEvent key release event
   void keyReleased(QKeyEvent* theEvent);
 
+  /// The signal is emitted if the enter is clicked in the control of the widget
+  void enterClicked();
+
   /// The signal about the widget is get focus
   /// \param theWidget the model base widget
   void focusInWidget(ModuleBase_ModelWidget* theWidget);
@@ -205,10 +212,7 @@ signals:
   void focusOutWidget(ModuleBase_ModelWidget* theWidget);
 
   /// The signal about value state modification
-  void valueStateChanged();
-
-  void focusNextPrev();
-  void valueStored();
+  void valueStateChanged(int theState);
 
 protected:
   /// Sets default value of widget. Normally, widget should fetch this value
@@ -222,8 +226,15 @@ protected:
   }
 
   /// Sets the current value state. If the value is changed, the signal is emitted
+  /// If the current value state is Blocked, this method do nothing
   /// \param theState a new state
-  void setValueState(const ValueState& theState);
+  /// \return the previous value state
+  ValueState setValueState(const ValueState& theState);
+
+  /// Blocks the value state change.
+  /// \param theBlocked a block state
+  /// \return the previous value
+  bool blockValueState(const bool theBlocked);
 
   /// Compute the feature default value and fill the controls with it
   /// or store the control value to the feature
@@ -288,6 +299,10 @@ private:
 
   /// the reset state. If it is false, the reset method of the widget is not performed
   bool myUseReset;
+  /// blocked flag of modification of the value state
+  bool myIsValueStateBlocked;
+
+  friend ModuleBase_OperationFeature; // to call storeValue() by commit if value state is ModifiedInPP
 };
 
 #endif