Within Issue #143 highlight active inputs

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

diff --git a/src/ModuleBase/ModuleBase_WidgetFactory.cpp b/src/ModuleBase/ModuleBase_WidgetFactory.cpp
index cbe5a9939e34712f06d310b761d88c7ab6adc993..9ce1c133fa9f9a6a4ad05c756300f0aabda1e95f 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetFactory.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetFactory.cpp
@@ -14,7 +14,7 @@
 #include <ModuleBase_WidgetFeature.h>
 #include <ModuleBase_WidgetEditor.h>
 #include <ModuleBase_WidgetSwitch.h>
-#include <ModuleBase_WidgetSelector.h>
+#include <ModuleBase_WidgetShapeSelector.h>
 #include <ModuleBase_WidgetDoubleValue.h>
 #include <ModuleBase_WidgetBoolValue.h>
 #include <ModuleBase_WidgetPoint2dDistance.h>
@@ -22,6 +22,9 @@
 #include <ModuleBase_WidgetChoice.h>
 #include <ModuleBase_IWorkshop.h>
 #include <ModuleBase_IModule.h>
+#include <ModuleBase_Tools.h>
+
+#include <ModelAPI_Validator.h>
 
 #include <Config_Keywords.h>
 #include <Config_WidgetAPI.h>
@@ -61,13 +64,12 @@ void ModuleBase_WidgetFactory::createWidget(QWidget* theParent)
     return;
 
   QVBoxLayout* aWidgetLay = new QVBoxLayout(theParent);
-  aWidgetLay->setContentsMargins(2, 2, 2, 2);
   do {  //Iterate over each node
     std::string aWdgType = myWidgetApi->widgetType();
     //Create a widget (doublevalue, groupbox, toolbox, etc.
     QWidget* aWidget = createWidgetByType(aWdgType, theParent);
     if (aWidget) {
-      if (!isInternalWidget(aWdgType)) {
+      if (!myWidgetApi->getBooleanAttribute(FEATURE_INTERNAL, false)) {
         aWidgetLay->addWidget(aWidget);
       } else {
         aWidget->setVisible(false);
@@ -77,6 +79,7 @@ void ModuleBase_WidgetFactory::createWidget(QWidget* theParent)
       //if current widget is groupbox (container) process it's children recursively
       QString aGroupName = qs(myWidgetApi->getProperty(CONTAINER_PAGE_NAME));
       createWidget(aWidget);
+      ModuleBase_Tools::adjustMargins(aWidget);
       QGroupBox* aGrBox = qobject_cast<QGroupBox*>(aWidget);
       aGrBox->setTitle(aGroupName);
     }
@@ -87,6 +90,7 @@ void ModuleBase_WidgetFactory::createWidget(QWidget* theParent)
       do {
         QString aPageName = qs(myWidgetApi->getProperty(CONTAINER_PAGE_NAME));
         QWidget* aPage = new QWidget(aWidget);
+        ModuleBase_Tools::adjustMargins(aPage);
         createWidget(aPage);
         if (aWdgType == WDG_SWITCH) {
           ModuleBase_WidgetSwitch* aSwitch = qobject_cast<ModuleBase_WidgetSwitch*>(aWidget);
@@ -125,8 +129,8 @@ QWidget* ModuleBase_WidgetFactory::createWidgetByType(const std::string& theType
   } else if (theType == WDG_INFO) {
     result = labelControl(theParent);
 
-  } else if (theType == WDG_SELECTOR) {
-    result = selectorControl(theParent);
+  } else if (theType == WDG_SHAPE_SELECTOR) {
+    result = shapeSelectorControl(theParent);
 
   } else if (theType == WDG_BOOLVALUE) {
     result = booleanControl(theParent);
@@ -143,9 +147,6 @@ QWidget* ModuleBase_WidgetFactory::createWidgetByType(const std::string& theType
   } else if (theType == WDG_DOUBLEVALUE_EDITOR) {
     result = doubleValueEditor(theParent);
 
-  } else if (theType == WDG_DOUBLEVALUE_EDITOR) {
-    result = doubleValueEditor(theParent);
-
   } else if (theType == WDG_POINT2D_DISTANCE) {
     result = point2dDistanceControl(theParent);
 
@@ -164,6 +165,17 @@ QWidget* ModuleBase_WidgetFactory::createWidgetByType(const std::string& theType
     if (!result) {qDebug("ModuleBase_WidgetFactory::fillWidget: find bad widget type");}
 #endif
   }
+  if (result) {
+    // register that this attribute in feature is not obligatory for the feature execution
+    // so, it is not needed for the standard validation mechanism
+    bool isObligatory = 
+      myWidgetApi ? myWidgetApi->getBooleanAttribute(FEATURE_OBLIGATORY, true) : true;
+    if (!isObligatory) {
+      ModelAPI_Session::get()->validators()->registerNotObligatory(
+        myParentId, myWidgetApi->widgetId());
+    }
+  }
+
   return result;
 }
 
@@ -189,85 +201,65 @@ QWidget* ModuleBase_WidgetFactory::createContainer(const std::string& theType, Q
 
 QWidget* ModuleBase_WidgetFactory::doubleSpinBoxControl(QWidget* theParent)
 {
-  ModuleBase_WidgetDoubleValue* aDblWgt = new ModuleBase_WidgetDoubleValue(theParent, myWidgetApi,
-                                                                           myParentId);
+  ModuleBase_WidgetDoubleValue* aDblWgt =
+      new ModuleBase_WidgetDoubleValue(theParent, myWidgetApi, myParentId);
   myModelWidgets.append(aDblWgt);
-
   return aDblWgt->getControl();
 }
 
 QWidget* ModuleBase_WidgetFactory::pointSelectorControl(QWidget* theParent)
 {
-  ModuleBase_WidgetPoint2D* aWidget = new ModuleBase_WidgetPoint2D(theParent, myWidgetApi,
-                                                                   myParentId);
+  ModuleBase_WidgetPoint2D* aWidget =
+      new ModuleBase_WidgetPoint2D(theParent, myWidgetApi,myParentId);
   myModelWidgets.append(aWidget);
   return aWidget->getControl();
 }
 
 QWidget* ModuleBase_WidgetFactory::featureSelectorControl(QWidget* theParent)
 {
-  ModuleBase_WidgetFeature* aWidget = new ModuleBase_WidgetFeature(theParent, myWidgetApi,
-                                                                   myParentId);
+  ModuleBase_WidgetFeature* aWidget =
+      new ModuleBase_WidgetFeature(theParent, myWidgetApi,myParentId);
   myModelWidgets.append(aWidget);
   return aWidget->getControl();
 }
 
 QWidget* ModuleBase_WidgetFactory::featureOrAttributeSelectorControl(QWidget* theParent)
 {
-  ModuleBase_WidgetFeatureOrAttribute* aWidget = new ModuleBase_WidgetFeatureOrAttribute(
-      theParent, myWidgetApi, myParentId);
+  ModuleBase_WidgetFeatureOrAttribute* aWidget =
+      new ModuleBase_WidgetFeatureOrAttribute(theParent, myWidgetApi, myParentId);
   myModelWidgets.append(aWidget);
   return aWidget->getControl();
 }
 
 QWidget* ModuleBase_WidgetFactory::doubleValueEditor(QWidget* theParent)
 {
-  ModuleBase_WidgetEditor* aWidget = new ModuleBase_WidgetEditor(theParent, myWidgetApi,
-                                                                 myParentId);
+  ModuleBase_WidgetEditor* aWidget =
+      new ModuleBase_WidgetEditor(theParent, myWidgetApi, myParentId);
   myModelWidgets.append(aWidget);
   return aWidget->getControl();
 }
 
-QString ModuleBase_WidgetFactory::qs(const std::string& theStdString) const
-{
-  return QString::fromStdString(theStdString);
-}
-
-bool ModuleBase_WidgetFactory::isInternalWidget(const std::string& theType)
+QWidget* ModuleBase_WidgetFactory::shapeSelectorControl(QWidget* theParent)
 {
-  std::string prop = myWidgetApi->getProperty(FEATURE_INTERNAL);
-
-  std::transform(prop.begin(), prop.end(), prop.begin(), ::tolower);
-  if (prop.empty() || prop == "false" || prop == "0") {
-    return false;
-  }
-  return true;
-}
-
-QWidget* ModuleBase_WidgetFactory::selectorControl(QWidget* theParent)
-{
-  ModuleBase_WidgetSelector* aSelector = new ModuleBase_WidgetSelector(theParent, myWorkshop,
-                                                                       myWidgetApi, myParentId);
+  ModuleBase_WidgetShapeSelector* aSelector =
+      new ModuleBase_WidgetShapeSelector(theParent, myWorkshop, myWidgetApi, myParentId);
   myModelWidgets.append(aSelector);
   return aSelector->getControl();
 }
 
 QWidget* ModuleBase_WidgetFactory::booleanControl(QWidget* theParent)
 {
-  ModuleBase_WidgetBoolValue* aBoolWgt = new ModuleBase_WidgetBoolValue(theParent, myWidgetApi,
-                                                                        myParentId);
+  ModuleBase_WidgetBoolValue* aBoolWgt =
+      new ModuleBase_WidgetBoolValue(theParent, myWidgetApi, myParentId);
   myModelWidgets.append(aBoolWgt);
-
   return aBoolWgt->getControl();
 }
 
 QWidget* ModuleBase_WidgetFactory::point2dDistanceControl(QWidget* theParent)
 {
-  ModuleBase_WidgetPoint2dDistance* aDistWgt = new ModuleBase_WidgetPoint2dDistance(theParent,
-                                                                                    myWidgetApi,
-                                                                                    myParentId);
+  ModuleBase_WidgetPoint2dDistance* aDistWgt =
+      new ModuleBase_WidgetPoint2dDistance(theParent, myWidgetApi, myParentId);
   myModelWidgets.append(aDistWgt);
-
   return aDistWgt->getControl();
 }
 
@@ -276,16 +268,18 @@ QWidget* ModuleBase_WidgetFactory::fileSelectorControl(QWidget* theParent)
   ModuleBase_WidgetFileSelector* aFileSelectorWgt =
       new ModuleBase_WidgetFileSelector(theParent, myWidgetApi, myParentId);
   myModelWidgets.append(aFileSelectorWgt);
-
   return aFileSelectorWgt->getControl();
 }
 
 QWidget* ModuleBase_WidgetFactory::choiceControl(QWidget* theParent)
 {
-  ModuleBase_WidgetChoice* aChoiceWgt = new ModuleBase_WidgetChoice(theParent, myWidgetApi,
-                                                                        myParentId);
+  ModuleBase_WidgetChoice* aChoiceWgt =
+      new ModuleBase_WidgetChoice(theParent, myWidgetApi,myParentId);
   myModelWidgets.append(aChoiceWgt);
-
   return aChoiceWgt->getControl();
 }
 
+QString ModuleBase_WidgetFactory::qs(const std::string& theStdString) const
+{
+  return QString::fromStdString(theStdString);
+}