X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_ModelWidget.cpp;h=6dfddcc390bea76f84bfbb984ab526765d574ba9;hb=b25922145a97fccf8d2613d0ef52a283d3ce0987;hp=dde892d224818d1606bbbf003c74fb512e192081;hpb=a5a4efb5a57703a634a60c097b6ab9179a04e6d4;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_ModelWidget.cpp b/src/ModuleBase/ModuleBase_ModelWidget.cpp
index dde892d22..6dfddcc39 100644
--- a/src/ModuleBase/ModuleBase_ModelWidget.cpp
+++ b/src/ModuleBase/ModuleBase_ModelWidget.cpp
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        ModuleBase_ModelWidget.h
 // Created:     25 Apr 2014
 // Author:      Natalia ERMOLAEVA
@@ -15,19 +17,22 @@
 #include <Events_Loop.h>
 
 #include <QEvent>
-#include <QWidget>
 #include <QGraphicsDropShadowEffect>
 #include <QColor>
 #include <QLabel>
 
-ModuleBase_ModelWidget::ModuleBase_ModelWidget(QWidget* theParent, const Config_WidgetAPI* theData,
+ModuleBase_ModelWidget::ModuleBase_ModelWidget(QWidget* theParent,
+                                               const Config_WidgetAPI* theData,
                                                const std::string& theParentId)
-    : QObject(theParent),
-      myParentId(theParentId)
+    : QWidget(theParent),
+      myParentId(theParentId),
+      myIsEditing(false)
 {
-  myIsComputedDefault = false;
-  myIsObligatory = theData ? theData->getBooleanAttribute(FEATURE_OBLIGATORY, true) : true;
+  myDefaultValue = theData->getProperty(ATTR_DEFAULT);
+  myIsComputedDefault = theData->getProperty(ATTR_DEFAULT) == DOUBLE_WDG_DEFAULT_COMPUTED;
   myAttributeID = theData ? theData->widgetId() : "";
+
+  connect(this, SIGNAL(valuesChanged()), this, SLOT(onWidgetValuesChanged()));
 }
 
 bool ModuleBase_ModelWidget::isInitialized(ObjectPtr theObject) const
@@ -69,6 +74,13 @@ void ModuleBase_ModelWidget::setHighlighted(bool isHighlighted)
   }
 }
 
+void ModuleBase_ModelWidget::setFeature(const FeaturePtr& theFeature, const bool theToStoreValue)
+{
+  myFeature = theFeature;
+  if (theToStoreValue)
+    storeValue();
+}
+
 bool ModuleBase_ModelWidget::focusTo()
 {
   QList<QWidget*> aControls = getControls();
@@ -83,6 +95,26 @@ bool ModuleBase_ModelWidget::focusTo()
   return true;
 }
 
+void ModuleBase_ModelWidget::activate()
+{
+  // the control value is stored to the mode by the focus in on the widget
+  // we need the value is initialized in order to enable the apply button in the property panel.
+  // It should happens in the creation mode only because all fields are filled in the edition mode
+  if (!isEditingMode()) {
+    AttributePtr anAttribute = myFeature->data()->attribute(myAttributeID);
+    if (anAttribute.get() != NULL && !anAttribute->isInitialized()) {
+      if (isComputedDefault()) {
+        if (myFeature->compute(myAttributeID)) {
+          restoreValue();
+        }      
+      }
+      else {
+        storeValue();
+      }
+    }
+  }
+  activateCustom();
+}
 
 void ModuleBase_ModelWidget::updateObject(ObjectPtr theObj) const
 {
@@ -91,6 +123,13 @@ void ModuleBase_ModelWidget::updateObject(ObjectPtr theObj) const
   ModelAPI_EventCreator::get()->sendUpdated(theObj, anEvent);
 }
 
+void ModuleBase_ModelWidget::moveObject(ObjectPtr theObj) const
+{
+  static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_MOVED);
+  ModelAPI_EventCreator::get()->sendUpdated(theObj, anEvent);
+  Events_Loop::loop()->flush(anEvent);
+}
+
 bool ModuleBase_ModelWidget::eventFilter(QObject* theObject, QEvent *theEvent)
 {
   QWidget* aWidget = qobject_cast<QWidget*>(theObject);
@@ -103,3 +142,9 @@ bool ModuleBase_ModelWidget::eventFilter(QObject* theObject, QEvent *theEvent)
 
   return QObject::eventFilter(theObject, theEvent);
 }
+
+//**************************************************************
+void ModuleBase_ModelWidget::onWidgetValuesChanged()
+{
+  storeValue();
+}