Init feature by model widget factory content

The code is moved here to be applyed for all types of features.

diff --git a/src/ModuleBase/ModuleBase_WidgetFactory.cpp b/src/ModuleBase/ModuleBase_WidgetFactory.cpp
index e52d5b2d4a78f6bdc8948b3face829e1ba38b22e..239b3eda336bdcf0034bbdec8d71c8b53ead0570 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetFactory.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetFactory.cpp
@@ -155,9 +155,6 @@ QWidget* ModuleBase_WidgetFactory::doubleSpinBoxControl(QWidget* theParent)
 
   myModelWidgets.append(aDblWgt);
 
-  // Init default values
-  if (!myOperation->isEditOperation())
-    aDblWgt->storeValue(myOperation->feature());
   return aDblWgt->getControl();
 }
 
@@ -207,8 +204,5 @@ QWidget* ModuleBase_WidgetFactory::booleanControl(QWidget* theParent)
 
   myModelWidgets.append(aBoolWgt);
 
-  // Init default values
-  if (!myOperation->isEditOperation())
-    aBoolWgt->storeValue(myOperation->feature());
   return aBoolWgt->getControl();
 }
\ No newline at end of file

diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp
index c4c6ac93951c4a80300d7f7e5278e6b2d26fc9e4..24fea8453e98aab44e834f9efca2895d1c39142e 100644 (file)
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -317,6 +317,16 @@ void XGUI_Workshop::onOperationStarted()
     QWidget* aContent = myPropertyPanel->contentWidget();
     qDeleteAll(aContent->children());
     aFactory.createWidget(aContent);
+
+    // Init default values
+    if (!aOperation->isEditOperation()) {
+      QList<ModuleBase_ModelWidget*> aWidgets = aFactory.getModelWidgets();
+      QList<ModuleBase_ModelWidget*>::const_iterator anIt = aWidgets.begin(), aLast = aWidgets.end();
+      for (; anIt != aLast; anIt++) {
+        (*anIt)->storeValue(aOperation->feature());
+      }
+    }
+
     myPropertyPanel->setModelWidgets(aFactory.getModelWidgets());
     myPropertyPanel->setWindowTitle(aOperation->getDescription()->description());
   }