Issue #1860: fix end lines with spaces

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

diff --git a/src/ModuleBase/ModuleBase_WidgetFactory.cpp b/src/ModuleBase/ModuleBase_WidgetFactory.cpp
index f9627d5259ac72bead2166c8b06f986a624f76f5..d4c1b9ef45dd19471cde84189f6e9d5454e07df1 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetFactory.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetFactory.cpp
@@ -8,12 +8,14 @@
  */
 
 #include <ModuleBase_WidgetFactory.h>
+#include <ModuleBase_IconFactory.h>
 
 #include <ModuleBase_Operation.h>
 #include <ModuleBase_OperationDescription.h>
 #include <ModuleBase_WidgetEditor.h>
 #include <ModuleBase_WidgetSwitch.h>
 #include <ModuleBase_WidgetShapeSelector.h>
+#include <ModuleBase_WidgetFeatureSelector.h>
 #include <ModuleBase_WidgetDoubleValue.h>
 #include <ModuleBase_WidgetIntValue.h>
 #include <ModuleBase_WidgetBoolValue.h>
@@ -24,15 +26,16 @@
 #include <ModuleBase_Tools.h>
 #include <ModuleBase_WidgetLineEdit.h>
 #include <ModuleBase_WidgetMultiSelector.h>
+#include <ModuleBase_WidgetConcealedObjects.h>
 #include <ModuleBase_WidgetLabel.h>
-#include <ModuleBase_WidgetErrorLabel.h>
 #include <ModuleBase_WidgetToolbox.h>
 #include <ModuleBase_PageBase.h>
 #include <ModuleBase_PageGroupBox.h>
-#include <ModuleBase_WidgetCheckGroupBox.h>
+#include <ModuleBase_WidgetOptionalBox.h>
 #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 +72,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) {
@@ -118,10 +121,11 @@ void ModuleBase_WidgetFactory::createWidget(ModuleBase_PageBase* thePage)
             ModuleBase_PageBase* aPage = new ModuleBase_PageWidget(aWidget);
             createWidget(aPage);
             if (aWdgType == WDG_SWITCH || aWdgType == WDG_TOOLBOX) {
-              ModuleBase_PagedContainer* aContainer = qobject_cast<ModuleBase_PagedContainer*>(aWidget);
+              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 +134,8 @@ void ModuleBase_WidgetFactory::createWidget(ModuleBase_PageBase* thePage)
     }
   } while (myWidgetApi->toNextWidget());
 
-  thePage->alignToTop();
+  if (alignToTop)
+    thePage->alignToTop();
 }
 
 void ModuleBase_WidgetFactory::createPanel(ModuleBase_PageBase* thePage,
@@ -175,7 +180,8 @@ void ModuleBase_WidgetFactory::getAttributeTitle(const std::string& theAttribute
   if (aFound) {
     theTitle = QString::fromStdString(myWidgetApi->widgetLabel()).toStdString().c_str();
     if (theTitle.empty())
-      theTitle = QString::fromStdString(myWidgetApi->getProperty(CONTAINER_PAGE_NAME)).toStdString().c_str();
+      theTitle =
+      QString::fromStdString(myWidgetApi->getProperty(CONTAINER_PAGE_NAME)).toStdString().c_str();
   }
 }
 
@@ -255,11 +261,9 @@ ModuleBase_PageBase* ModuleBase_WidgetFactory::createPageByType(const std::strin
     aPage->setTitle(aGroupName);
     aResult = aPage;
   }
-  else if (theType == WDG_CHECK_GROUP) {
-    QString aGroupName = qs(myWidgetApi->getProperty(CONTAINER_PAGE_NAME));
-    ModuleBase_WidgetCheckGroupBox* aPage = new ModuleBase_WidgetCheckGroupBox(theParent,
+  else if (theType == WDG_OPTIONALBOX) {
+    ModuleBase_WidgetOptionalBox* aPage = new ModuleBase_WidgetOptionalBox(theParent,
                                                                 myWidgetApi);
-    aPage->setTitle(aGroupName);
     aResult = aPage;
   }
   if (!aResult)
@@ -280,14 +284,14 @@ 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) {
     result = new ModuleBase_WidgetIntValue(theParent, myWidgetApi);
   } else if (theType == WDG_SHAPE_SELECTOR) {
     result = new ModuleBase_WidgetShapeSelector(theParent, myWorkshop, myWidgetApi);
+  } else if (theType == WDG_FEATURE_SELECTOR) {
+    result = new ModuleBase_WidgetFeatureSelector(theParent, myWorkshop, myWidgetApi);
   } else if (theType == WDG_BOOLVALUE) {
     result = new ModuleBase_WidgetBoolValue(theParent, myWidgetApi);
   //} else if (theType == WDG_DOUBLEVALUE_EDITOR) {
@@ -304,6 +308,8 @@ ModuleBase_ModelWidget* ModuleBase_WidgetFactory::createWidgetByType(const std::
     result = new ModuleBase_WidgetExprEditor( theParent, myWidgetApi, aPlaceHolder );
   } else if (theType == WDG_MULTISELECTOR) {
     result = new ModuleBase_WidgetMultiSelector(theParent, myWorkshop, myWidgetApi);
+  } else if (theType == WDG_CONCEALED_OBJECTS_VIEW) {
+    result = new ModuleBase_WidgetConcealedObjects(theParent, myWidgetApi);
   } else if (theType == WDG_TOOLBOX) {
     result = new ModuleBase_WidgetToolbox(theParent, myWidgetApi);
   } else if (theType == WDG_SWITCH) {
@@ -312,6 +318,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)