Issue #1424: Make impossible to create non-valid parameters more the a one

[modules/shaper.git] / src / ModuleBase / ModuleBase_WidgetFactory.cpp

diff --git a/src/ModuleBase/ModuleBase_WidgetFactory.cpp b/src/ModuleBase/ModuleBase_WidgetFactory.cpp
index f9627d5259ac72bead2166c8b06f986a624f76f5..d8e6bc26229a8c950ed918a3b6c08f006f3f83e0 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetFactory.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetFactory.cpp
@@ -8,6 +8,7 @@
  */
 
 #include <ModuleBase_WidgetFactory.h>
+#include <ModuleBase_IconFactory.h>
 
 #include <ModuleBase_Operation.h>
 #include <ModuleBase_OperationDescription.h>
@@ -25,7 +26,6 @@
 #include <ModuleBase_WidgetLineEdit.h>
 #include <ModuleBase_WidgetMultiSelector.h>
 #include <ModuleBase_WidgetLabel.h>
-#include <ModuleBase_WidgetErrorLabel.h>
 #include <ModuleBase_WidgetToolbox.h>
 #include <ModuleBase_PageBase.h>
 #include <ModuleBase_PageGroupBox.h>
@@ -33,6 +33,7 @@
 #include <ModuleBase_PageWidget.h>
 #include <ModuleBase_WidgetExprEditor.h>
 #include <ModuleBase_WidgetCreatorFactory.h>
+#include <ModuleBase_WidgetAction.h>
 
 #include <ModelAPI_Validator.h>
 #include <ModelAPI_Session.h>
@@ -69,7 +70,7 @@ ModuleBase_WidgetFactory::~ModuleBase_WidgetFactory()
   delete myWidgetApi;
 }
 
-void ModuleBase_WidgetFactory::createWidget(ModuleBase_PageBase* thePage)
+void ModuleBase_WidgetFactory::createWidget(ModuleBase_PageBase* thePage, bool alignToTop)
 {
   std::string aWType = myWidgetApi->widgetType();
   if (aWType == NODE_FEATURE) {
@@ -121,7 +122,7 @@ void ModuleBase_WidgetFactory::createWidget(ModuleBase_PageBase* thePage)
               ModuleBase_PagedContainer* aContainer = qobject_cast<ModuleBase_PagedContainer*>(aWidget);
 
               QString anIconPath = qs( myWidgetApi->getProperty( CONTAINER_PAGE_ICON ) );
-              QPixmap anIcon( anIconPath );
+              QPixmap anIcon = ModuleBase_IconFactory::loadPixmap( anIconPath );
               aContainer->addPage( aPage, aPageName, aCaseId, anIcon );
             }
           } while (myWidgetApi->toNextWidget());
@@ -130,7 +131,8 @@ void ModuleBase_WidgetFactory::createWidget(ModuleBase_PageBase* thePage)
     }
   } while (myWidgetApi->toNextWidget());
 
-  thePage->alignToTop();
+  if (alignToTop)
+    thePage->alignToTop();
 }
 
 void ModuleBase_WidgetFactory::createPanel(ModuleBase_PageBase* thePage,
@@ -280,8 +282,6 @@ ModuleBase_ModelWidget* ModuleBase_WidgetFactory::createWidgetByType(const std::
 
   if (theType == WDG_INFO) {
     result = new ModuleBase_WidgetLabel(theParent, myWidgetApi);
-  } else if (theType == WDG_ERRORINFO) {
-    result = new ModuleBase_WidgetErrorLabel(theParent, myWidgetApi);
   } else if (theType == WDG_DOUBLEVALUE) {
     result = new ModuleBase_WidgetDoubleValue(theParent, myWidgetApi);
   } else if (theType == WDG_INTEGERVALUE) {
@@ -312,6 +312,8 @@ ModuleBase_ModelWidget* ModuleBase_WidgetFactory::createWidgetByType(const std::
              theType == NODE_VALIDATOR) {
     // Do nothing for "box" and "case"
     result = NULL;
+  } else if (theType == WDG_ACTION) {
+    result = new ModuleBase_WidgetAction(theParent, myWidgetApi);
   } else {
     result = myWorkshop->module()->createWidgetByType(theType, theParent, myWidgetApi);
     if (!result)