Issue #559: Control doesn't have variable if its text is empty

[modules/shaper.git] / src / ModuleBase / ModuleBase_ModelWidget.h

diff --git a/src/ModuleBase/ModuleBase_ModelWidget.h b/src/ModuleBase/ModuleBase_ModelWidget.h
index 03067aa6810463257d3c92438816957ca870ff49..a6ad2ca97fec81c3ff6e7b094fb99f6d4de81da1 100644 (file)
--- a/src/ModuleBase/ModuleBase_ModelWidget.h
+++ b/src/ModuleBase/ModuleBase_ModelWidget.h
@@ -60,6 +60,10 @@ Q_OBJECT
   /// \return the boolean result
   std::string getDefaultValue() const { return myDefaultValue; }
 
+  /// Returns true, if the obligatory value of the widget is not defined in the XML or has true value
+  /// \return the boolean result
+  bool isObligatory() const { return myIsObligatory; }
+
   /// Defines if it is supposed that the widget should interact with the viewer.
   virtual bool isViewerSelector() { return false; }
 
@@ -69,8 +73,9 @@ Q_OBJECT
 
   /// Set the given wrapped value to the current widget
   /// This value should be processed in the widget according to the needs
-  /// \param theValue the wrapped widget value
-  virtual bool setSelection(ModuleBase_ViewerPrs theValue)
+  /// \param theValues the wrapped selection values
+  /// \param thePosition an index in the list of values, the values should be get from the index
+  virtual bool setSelection(const QList<ModuleBase_ViewerPrs>& theValues, int& thePosition)
   {
     return false;
   }
@@ -96,11 +101,12 @@ Q_OBJECT
   /// FocusIn events processing
   virtual bool eventFilter(QObject* theObject, QEvent *theEvent);
 
-  //! \brief Enables processing of focus event on all controls by the widget
-  void enableFocusProcessing();
+  /// \brief Enables processing of focus event on all controls by the widget
+  /// if this widget is not obligatory and set no-focus policy otherwise
+  virtual void enableFocusProcessing();
 
   //! Switch On/Off highlighting of the widget
-  void setHighlighted(bool isHighlighted);
+  virtual void setHighlighted(bool isHighlighted);
 
   /// Returns the attribute name
   /// \returns the string value
@@ -153,6 +159,9 @@ signals:
   void focusOutWidget(ModuleBase_ModelWidget* theWidget);
 
  protected:
+  /// Sets default value of widget. Nornaly, widget should fetch this value 
+  /// from the xml. However, some widgets derived widgets could define it
+  void setDefaultValue(const std::string& theValue);
   /// \brief Set the attribute name
   /// \param theAttribute the string value with attribute name
   void setAttributeID(const std::string& theAttribute)
@@ -197,6 +206,10 @@ protected slots:
   /// Flag which shows that current operation is in editing mode
   bool myIsEditing; 
 
+  /// Flag which shows whether current widget is obligatory
+  /// The non-obligatory widgets should not accept the focus in the property panel
+  bool myIsObligatory;
+
 private:
   /// Value should be computed on execute, like radius for circle's constraint (can not be zero)
   bool myIsComputedDefault;