X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetFactory.cpp;h=a726704137c781af1afd750d78fec6a7796d5f64;hb=c685af45eca598fce4a5d40837f6b7d203c60976;hp=90886145f12e9b8e18b2f1b6c9ca5e8b96df6eeb;hpb=53df1b33d7d3787a433f8e4f3936eed28850c48b;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetFactory.cpp b/src/ModuleBase/ModuleBase_WidgetFactory.cpp index 90886145f..a72670413 100644 --- a/src/ModuleBase/ModuleBase_WidgetFactory.cpp +++ b/src/ModuleBase/ModuleBase_WidgetFactory.cpp @@ -1,3 +1,5 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D + /* * ModuleBase_WidgetFactory.cpp * @@ -9,19 +11,25 @@ #include #include -#include -#include -#include +//#include +//#include #include #include #include #include #include -#include +//#include #include #include #include #include +#include +#include +#include +#include + +#include +#include #include #include @@ -52,6 +60,7 @@ ModuleBase_WidgetFactory::ModuleBase_WidgetFactory(const std::string& theXmlRepr ModuleBase_WidgetFactory::~ModuleBase_WidgetFactory() { + delete myWidgetApi; } void ModuleBase_WidgetFactory::createWidget(QWidget* theParent) @@ -61,13 +70,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(ATTR_INTERNAL, false)) { aWidgetLay->addWidget(aWidget); } else { aWidget->setVisible(false); @@ -77,6 +85,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(aWidget); aGrBox->setTitle(aGroupName); } @@ -87,6 +96,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(aWidget); @@ -101,20 +111,16 @@ void ModuleBase_WidgetFactory::createWidget(QWidget* theParent) theParent->setLayout(aWidgetLay); } + QWidget* ModuleBase_WidgetFactory::labelControl(QWidget* theParent) { - QWidget* result = new QWidget(theParent); - QVBoxLayout* aLabelLay = new QVBoxLayout(result); - QLabel* aLabel = new QLabel(result); - aLabel->setWordWrap(true); - aLabel->setText(qs(myWidgetApi->getProperty(INFO_WDG_TEXT))); - aLabel->setToolTip(qs(myWidgetApi->getProperty(INFO_WDG_TOOLTIP))); - aLabelLay->addWidget(aLabel); - aLabelLay->addStretch(1); - result->setLayout(aLabelLay); - return result; + ModuleBase_WidgetLabel* aWgt = + new ModuleBase_WidgetLabel(theParent, myWidgetApi, myParentId); + myModelWidgets.append(aWgt); + return aWgt->getControl(); } + QWidget* ModuleBase_WidgetFactory::createWidgetByType(const std::string& theType, QWidget* theParent) { @@ -131,32 +137,32 @@ QWidget* ModuleBase_WidgetFactory::createWidgetByType(const std::string& theType } else if (theType == WDG_BOOLVALUE) { result = booleanControl(theParent); - } else if (theType == WDG_POINT_SELECTOR) { - result = pointSelectorControl(theParent); - - } else if (theType == WDG_FEATURE_SELECTOR) { - result = featureSelectorControl(theParent); + //} else if (theType == WDG_FEATURE_SELECTOR) { + // result = featureSelectorControl(theParent); - } else if (theType == WDG_FEATURE_OR_ATTRIBUTE_SELECTOR) { - result = featureOrAttributeSelectorControl(theParent); + //} else if (theType == WDG_FEATURE_OR_ATTRIBUTE_SELECTOR) { + // result = featureOrAttributeSelectorControl(theParent); } else if (theType == WDG_DOUBLEVALUE_EDITOR) { result = doubleValueEditor(theParent); - } else if (theType == WDG_POINT2D_DISTANCE) { - result = point2dDistanceControl(theParent); - } else if (theType == WDG_FILE_SELECTOR) { result = fileSelectorControl(theParent); } else if (theType == WDG_CHOICE) { result = choiceControl(theParent); + } else if (theType == WDG_STRINGVALUE) { + result = lineEditControl(theParent); + + } else if (theType == WDG_MULTISELECTOR) { + result = multiSelectorControl(theParent); + } else if (myWidgetApi->isContainerWidget() || myWidgetApi->isPagedWidget()) { result = createContainer(theType, theParent); } else { result = myWorkshop->module()->createWidgetByType(theType, theParent, myWidgetApi, - myModelWidgets); + myParentId, myModelWidgets); #ifdef _DEBUG if (!result) {qDebug("ModuleBase_WidgetFactory::fillWidget: find bad widget type");} #endif @@ -192,30 +198,6 @@ QWidget* ModuleBase_WidgetFactory::doubleSpinBoxControl(QWidget* theParent) return aDblWgt->getControl(); } -QWidget* ModuleBase_WidgetFactory::pointSelectorControl(QWidget* theParent) -{ - 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); - myModelWidgets.append(aWidget); - return aWidget->getControl(); -} - -QWidget* ModuleBase_WidgetFactory::featureOrAttributeSelectorControl(QWidget* theParent) -{ - ModuleBase_WidgetFeatureOrAttribute* aWidget = - new ModuleBase_WidgetFeatureOrAttribute(theParent, myWidgetApi, myParentId); - myModelWidgets.append(aWidget); - return aWidget->getControl(); -} - QWidget* ModuleBase_WidgetFactory::doubleValueEditor(QWidget* theParent) { ModuleBase_WidgetEditor* aWidget = @@ -240,14 +222,6 @@ QWidget* ModuleBase_WidgetFactory::booleanControl(QWidget* theParent) return aBoolWgt->getControl(); } -QWidget* ModuleBase_WidgetFactory::point2dDistanceControl(QWidget* theParent) -{ - ModuleBase_WidgetPoint2dDistance* aDistWgt = - new ModuleBase_WidgetPoint2dDistance(theParent, myWidgetApi, myParentId); - myModelWidgets.append(aDistWgt); - return aDistWgt->getControl(); -} - QWidget* ModuleBase_WidgetFactory::fileSelectorControl(QWidget* theParent) { ModuleBase_WidgetFileSelector* aFileSelectorWgt = @@ -264,18 +238,24 @@ QWidget* ModuleBase_WidgetFactory::choiceControl(QWidget* theParent) return aChoiceWgt->getControl(); } -bool ModuleBase_WidgetFactory::isInternalWidget(const std::string& theType) +QWidget* ModuleBase_WidgetFactory::lineEditControl(QWidget* theParent) { - std::string prop = myWidgetApi->getProperty(FEATURE_INTERNAL); + ModuleBase_WidgetLineEdit* aLineEditWgt = + new ModuleBase_WidgetLineEdit(theParent, myWidgetApi,myParentId); + myModelWidgets.append(aLineEditWgt); + return aLineEditWgt->getControl(); +} - std::transform(prop.begin(), prop.end(), prop.begin(), ::tolower); - if (prop.empty() || prop == "false" || prop == "0") { - return false; - } - return true; +QWidget* ModuleBase_WidgetFactory::multiSelectorControl(QWidget* theParent) +{ + ModuleBase_WidgetMultiSelector* aMultiselectorWgt = + new ModuleBase_WidgetMultiSelector(theParent, myWorkshop, myWidgetApi,myParentId); + myModelWidgets.append(aMultiselectorWgt); + return aMultiselectorWgt->getControl(); } QString ModuleBase_WidgetFactory::qs(const std::string& theStdString) const { return QString::fromStdString(theStdString); } +