X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetFactory.cpp;h=90886145f12e9b8e18b2f1b6c9ca5e8b96df6eeb;hb=53df1b33d7d3787a433f8e4f3936eed28850c48b;hp=ecfe258e6646956c15f132d5ddb9f6a5a6b0fdcc;hpb=47933cff9cf39f2d420b8a772ac125d2a969d2b5;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetFactory.cpp b/src/ModuleBase/ModuleBase_WidgetFactory.cpp index ecfe258e6..90886145f 100644 --- a/src/ModuleBase/ModuleBase_WidgetFactory.cpp +++ b/src/ModuleBase/ModuleBase_WidgetFactory.cpp @@ -7,12 +7,21 @@ #include -#include #include #include #include +#include +#include +#include #include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -26,7 +35,6 @@ #include #include #include -#include #ifdef _DEBUG #include @@ -35,11 +43,11 @@ #include #include -ModuleBase_WidgetFactory::ModuleBase_WidgetFactory(ModuleBase_Operation* theOperation, ModuleBase_IWorkshop* theWorkshop) - : myOperation(theOperation), myWorkshop(theWorkshop) +ModuleBase_WidgetFactory::ModuleBase_WidgetFactory(const std::string& theXmlRepresentation, + ModuleBase_IWorkshop* theWorkshop) + : myWorkshop(theWorkshop) { - QString aXml = myOperation->getDescription()->xmlRepresentation(); - myWidgetApi = new Config_WidgetAPI(aXml.toStdString()); + myWidgetApi = new Config_WidgetAPI(theXmlRepresentation); } ModuleBase_WidgetFactory::~ModuleBase_WidgetFactory() @@ -48,17 +56,22 @@ ModuleBase_WidgetFactory::~ModuleBase_WidgetFactory() void ModuleBase_WidgetFactory::createWidget(QWidget* theParent) { + myParentId = myWidgetApi->widgetId(); if (!myWidgetApi->toChildWidget()) return; QVBoxLayout* aWidgetLay = new QVBoxLayout(theParent); aWidgetLay->setContentsMargins(2, 2, 2, 2); - do { //Iterate over each node + do { //Iterate over each node std::string aWdgType = myWidgetApi->widgetType(); //Create a widget (doublevalue, groupbox, toolbox, etc. QWidget* aWidget = createWidgetByType(aWdgType, theParent); if (aWidget) { - aWidgetLay->addWidget(aWidget); + if (!isInternalWidget(aWdgType)) { + aWidgetLay->addWidget(aWidget); + } else { + aWidget->setVisible(false); + } } if (myWidgetApi->isContainerWidget()) { //if current widget is groupbox (container) process it's children recursively @@ -78,13 +91,13 @@ void ModuleBase_WidgetFactory::createWidget(QWidget* theParent) if (aWdgType == WDG_SWITCH) { ModuleBase_WidgetSwitch* aSwitch = qobject_cast(aWidget); aSwitch->addPage(aPage, aPageName); - } else if (aWdgType == WDG_TOOLBOX){ + } else if (aWdgType == WDG_TOOLBOX) { QToolBox* aToolbox = qobject_cast(aWidget); aToolbox->addItem(aPage, aPageName); } - } while(myWidgetApi->toNextWidget()); + } while (myWidgetApi->toNextWidget()); } - } while(myWidgetApi->toNextWidget()); + } while (myWidgetApi->toNextWidget()); theParent->setLayout(aWidgetLay); } @@ -93,6 +106,7 @@ 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); @@ -101,17 +115,18 @@ QWidget* ModuleBase_WidgetFactory::labelControl(QWidget* theParent) return result; } -QWidget* ModuleBase_WidgetFactory::createWidgetByType(const std::string& theType, QWidget* theParent) +QWidget* ModuleBase_WidgetFactory::createWidgetByType(const std::string& theType, + QWidget* theParent) { QWidget* result = NULL; if (theType == WDG_DOUBLEVALUE) { - result = doubleSpinBoxControl(); + result = doubleSpinBoxControl(theParent); } 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); @@ -119,12 +134,33 @@ QWidget* ModuleBase_WidgetFactory::createWidgetByType(const std::string& theType } else if (theType == WDG_POINT_SELECTOR) { result = pointSelectorControl(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_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 (myWidgetApi->isContainerWidget() || myWidgetApi->isPagedWidget()) { result = createContainer(theType, theParent); - } + } else { + result = myWorkshop->module()->createWidgetByType(theType, theParent, myWidgetApi, + myModelWidgets); #ifdef _DEBUG - else { qDebug() << "ModuleBase_WidgetFactory::fillWidget: find bad widget type"; } + if (!result) {qDebug("ModuleBase_WidgetFactory::fillWidget: find bad widget type");} #endif + } return result; } @@ -143,108 +179,103 @@ QWidget* ModuleBase_WidgetFactory::createContainer(const std::string& theType, Q result = NULL; } #ifdef _DEBUG - else { qDebug() << "ModuleBase_WidgetFactory::fillWidget: find bad container type"; } + else {qDebug() << "ModuleBase_WidgetFactory::fillWidget: find bad container type";} #endif return result; } -QWidget* ModuleBase_WidgetFactory::doubleSpinBoxControl() -{ - QWidget* result = new QWidget(); - QHBoxLayout* aControlLay = new QHBoxLayout(result); - aControlLay->setContentsMargins(0, 0, 0, 0); - QString aLabelText = qs(myWidgetApi->widgetLabel()); - QString aLabelIcon = qs(myWidgetApi->widgetIcon()); - QLabel* aLabel = new QLabel(aLabelText); - aLabel->setPixmap(QPixmap(aLabelIcon)); - - aControlLay->addWidget(aLabel); - QDoubleSpinBox* aBox = new QDoubleSpinBox(result); - QString anObjName = QString::fromStdString(myWidgetApi->widgetId()); - aBox->setObjectName(anObjName); - bool isOk = false; - std::string aProp = myWidgetApi->getProperty(DOUBLE_WDG_MIN); - double aMinVal = qs(aProp).toDouble(&isOk); - if (isOk) { - aBox->setMinimum(aMinVal); - } else { - aBox->setMinimum(-DBL_MAX); - } - aProp = myWidgetApi->getProperty(DOUBLE_WDG_MAX); - double aMaxVal = qs(aProp).toDouble(&isOk); - if (isOk) { - aBox->setMaximum(aMaxVal); - } else { - aBox->setMaximum(DBL_MAX); - } - aProp = myWidgetApi->getProperty(DOUBLE_WDG_STEP); - double aStepVal = qs(aProp).toDouble(&isOk); - if (isOk) { - aBox->setSingleStep(aStepVal); - } - aProp = myWidgetApi->getProperty(DOUBLE_WDG_DFLT); - double aDefVal = qs(aProp).toDouble(&isOk); - if (isOk) { - aBox->setValue(aDefVal); - } - QString aTTip = qs(myWidgetApi->widgetTooltip()); - aBox->setToolTip(aTTip); - aControlLay->addWidget(aBox); - aControlLay->setStretch(1, 1); - result->setLayout(aControlLay); - connectWidget(aBox, WDG_DOUBLEVALUE); - return result; +QWidget* ModuleBase_WidgetFactory::doubleSpinBoxControl(QWidget* theParent) +{ + 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, - qs(myWidgetApi->getProperty(CONTAINER_PAGE_NAME)), - myWidgetApi->widgetId()); - connectWidget(aWidget, WDG_POINT_SELECTOR); + ModuleBase_WidgetPoint2D* aWidget = + new ModuleBase_WidgetPoint2D(theParent, myWidgetApi,myParentId); myModelWidgets.append(aWidget); return aWidget->getControl(); } -bool ModuleBase_WidgetFactory::connectWidget(QObject* theWidget, const QString& theType) +QWidget* ModuleBase_WidgetFactory::featureSelectorControl(QWidget* theParent) { - bool result = false; - if (theType == WDG_DOUBLEVALUE) { - result = QObject::connect(theWidget, SIGNAL(valueChanged(double)), - myOperation, SLOT(storeReal(double))); - } - if (theType == WDG_POINT_SELECTOR) { - result = QObject::connect(theWidget, SIGNAL(valuesChanged()), - myOperation, SLOT(storeCustomValue())); - } - return result; + ModuleBase_WidgetFeature* aWidget = + new ModuleBase_WidgetFeature(theParent, myWidgetApi,myParentId); + myModelWidgets.append(aWidget); + return aWidget->getControl(); } -QString ModuleBase_WidgetFactory::qs(const std::string& theStdString) const +QWidget* ModuleBase_WidgetFactory::featureOrAttributeSelectorControl(QWidget* theParent) { - return QString::fromStdString(theStdString); + ModuleBase_WidgetFeatureOrAttribute* aWidget = + new ModuleBase_WidgetFeatureOrAttribute(theParent, myWidgetApi, myParentId); + myModelWidgets.append(aWidget); + return aWidget->getControl(); } - -QWidget* ModuleBase_WidgetFactory::selectorControl(QWidget* theParent) +QWidget* ModuleBase_WidgetFactory::doubleValueEditor(QWidget* theParent) { - ModuleBase_SelectorWidget* aSelector = new ModuleBase_SelectorWidget(theParent, myWorkshop, myWidgetApi); - - QObject::connect(aSelector, SIGNAL(valuesChanged()), myOperation, SLOT(storeCustomValue())); + ModuleBase_WidgetEditor* aWidget = + new ModuleBase_WidgetEditor(theParent, myWidgetApi, myParentId); + myModelWidgets.append(aWidget); + return aWidget->getControl(); +} +QWidget* ModuleBase_WidgetFactory::shapeSelectorControl(QWidget* theParent) +{ + ModuleBase_WidgetShapeSelector* aSelector = + new ModuleBase_WidgetShapeSelector(theParent, myWorkshop, myWidgetApi, myParentId); myModelWidgets.append(aSelector); return aSelector->getControl(); } - QWidget* ModuleBase_WidgetFactory::booleanControl(QWidget* theParent) { - QString aText = qs(myWidgetApi->widgetLabel()); - QString aToolTip = qs(myWidgetApi->widgetTooltip()); - QString aDefault = qs(myWidgetApi->getProperty("default")); + 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); + myModelWidgets.append(aDistWgt); + return aDistWgt->getControl(); +} + +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); + myModelWidgets.append(aChoiceWgt); + return aChoiceWgt->getControl(); +} - QCheckBox* aRes = new QCheckBox(aText, theParent); - aRes->setToolTip(aToolTip); - aRes->setChecked(aDefault == "true"); - return aRes; -} \ No newline at end of file +bool ModuleBase_WidgetFactory::isInternalWidget(const std::string& theType) +{ + 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; +} + +QString ModuleBase_WidgetFactory::qs(const std::string& theStdString) const +{ + return QString::fromStdString(theStdString); +}