X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetFactory.cpp;h=0cc45bf0947f676388cd9fb748f86c0286a6169e;hb=603561c4589b1938525c51f9ceab8576cf8b5367;hp=e8176696254d4ce51b8a1c0d0aae89c4cdfa22ad;hpb=818bc197ba38350efb1a88e5735687a9da5ed6c3;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetFactory.cpp b/src/ModuleBase/ModuleBase_WidgetFactory.cpp index e81766962..0cc45bf09 100644 --- a/src/ModuleBase/ModuleBase_WidgetFactory.cpp +++ b/src/ModuleBase/ModuleBase_WidgetFactory.cpp @@ -1,20 +1,33 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -/* - * ModuleBase_WidgetFactory.cpp - * - * Created on: Apr 3, 2014 - * Author: sbh - */ +// Copyright (C) 2014-2019 CEA/DEN, EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include +#include #include #include #include #include #include +#include #include +#include #include #include #include @@ -23,16 +36,21 @@ #include #include #include +#include #include +#include #include -#include #include +#include #include #include -#include +#include #include #include #include +#include +#include +#include #include #include @@ -69,13 +87,18 @@ 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) { - QWidget* aPanel = createPanel(thePage->pageWidget()); - thePage->addWidget(aPanel); - return; + // if XML definition of the feature contains the next key, the widgets should not be created, + // but a specific panel should be made. However, to provide persistent of the panel values, + // we need to get into the panel the feature of the operation. As a result this panel should + // be created after the feature creating(create operation). The method setPanel() of this + // class is used for this. Here, we just return to avoid the widgets creation. + std::string aPanelName = myWidgetApi->getProperty(PROPERTY_PANEL_ID); + if (!aPanelName.empty()) + return; } if (!myWidgetApi->toChildWidget()) @@ -106,25 +129,41 @@ void ModuleBase_WidgetFactory::createWidget(ModuleBase_PageBase* thePage) if (myWidgetApi->isPagedWidget()) { //If current widget is toolbox or switch-casebox then fetch all //it's pages recursively and setup into the widget. - myWidgetApi->toChildWidget(); - do { - QString aPageName = qs(myWidgetApi->getProperty(CONTAINER_PAGE_NAME)); - QString aCaseId = qs(myWidgetApi->getProperty(_ID)); - ModuleBase_PageBase* aPage = new ModuleBase_PageWidget(aWidget); - createWidget(aPage); - if (aWdgType == WDG_SWITCH || aWdgType == WDG_TOOLBOX) { - ModuleBase_PagedContainer* aContainer = qobject_cast(aWidget); - - QString anIconPath = qs( myWidgetApi->getProperty( CONTAINER_PAGE_ICON ) ); - QPixmap anIcon( anIconPath ); - aContainer->addPage( aPage, aPageName, aCaseId, anIcon ); - } - } while (myWidgetApi->toNextWidget()); + if (myWidgetApi->toChildWidget()) { + do { + QString aPageName = qs(myWidgetApi->getProperty(CONTAINER_PAGE_NAME)); + QString aTooltip = qs(myWidgetApi->getProperty(FEATURE_TOOLTIP)); + QString aCaseId = qs(myWidgetApi->getProperty(_ID)); + ModuleBase_PageBase* aPage = new ModuleBase_PageWidget(aWidget); + createWidget(aPage); + if (aWdgType == WDG_SWITCH || aWdgType == WDG_TOOLBOX || aWdgType == WDG_RADIOBOX) { + ModuleBase_PagedContainer* aContainer = + qobject_cast(aWidget); + + QString anIconPath = qs( myWidgetApi->getProperty( CONTAINER_PAGE_ICON ) ); + QPixmap anIcon = ModuleBase_IconFactory::loadPixmap( anIconPath ); + aContainer->addPage( aPage, aPageName, aCaseId, anIcon, aTooltip); + } + } while (myWidgetApi->toNextWidget()); + } } } } while (myWidgetApi->toNextWidget()); - thePage->alignToTop(); + if (alignToTop) + thePage->alignToTop(); +} + +void ModuleBase_WidgetFactory::createPanel(ModuleBase_PageBase* thePage, + const FeaturePtr& theFeature) +{ + std::string aPanelName = myWidgetApi->getProperty(PROPERTY_PANEL_ID); + if (!aPanelName.empty() && ModuleBase_WidgetCreatorFactory::get()->hasPanelWidget(aPanelName)) { + QWidget* aPanel = ModuleBase_WidgetCreatorFactory::get()->createPanelByType(aPanelName, + thePage->pageWidget(), theFeature); + thePage->addWidget(aPanel); + thePage->alignToTop(); + } } void ModuleBase_WidgetFactory::createWidget(ModuleBase_PageBase* thePage, @@ -157,7 +196,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(); } } @@ -184,10 +224,11 @@ void ModuleBase_WidgetFactory::getGreedAttribute(std::string& theAttributeId) if (theAttributeId.empty() && myWidgetApi->isPagedWidget()) { //If current widget is toolbox or switch-casebox then fetch all //it's pages recursively and setup into the widget. - myWidgetApi->toChildWidget(); - do { - getGreedAttribute(theAttributeId); - } while (theAttributeId.empty() && myWidgetApi->toNextWidget()); + if (myWidgetApi->toChildWidget()) { + do { + getGreedAttribute(theAttributeId); + } while (theAttributeId.empty() && myWidgetApi->toNextWidget()); + } } } } while (theAttributeId.empty() && myWidgetApi->toNextWidget()); @@ -215,24 +256,16 @@ void ModuleBase_WidgetFactory::moveToWidgetId(const std::string& theWidgetId, bo if (!theFound && myWidgetApi->isPagedWidget()) { //If current widget is toolbox or switch-casebox then fetch all //it's pages recursively and setup into the widget. - myWidgetApi->toChildWidget(); - do { - moveToWidgetId(theWidgetId, theFound); - } while (!theFound && myWidgetApi->toNextWidget()); + if (myWidgetApi->toChildWidget()) { + do { + moveToWidgetId(theWidgetId, theFound); + } while (!theFound && myWidgetApi->toNextWidget()); + } } } } while (!theFound && myWidgetApi->toNextWidget()); } -QWidget* ModuleBase_WidgetFactory::createPanel(QWidget* theParent) -{ - QWidget* aPanel = 0; - std::string aPanelName = myWidgetApi->getProperty(PROPERTY_PANEL_ID); - if (!aPanelName.empty() && ModuleBase_WidgetCreatorFactory::get()->hasPanelWidget(aPanelName)) - aPanel = ModuleBase_WidgetCreatorFactory::get()->createPanel(aPanelName, theParent); - return aPanel; -} - ModuleBase_PageBase* ModuleBase_WidgetFactory::createPageByType(const std::string& theType, QWidget* theParent) { @@ -241,14 +274,13 @@ ModuleBase_PageBase* ModuleBase_WidgetFactory::createPageByType(const std::strin if (theType == WDG_GROUP) { QString aGroupName = qs(myWidgetApi->getProperty(CONTAINER_PAGE_NAME)); ModuleBase_PageGroupBox* aPage = new ModuleBase_PageGroupBox(theParent); - aPage->setTitle(aGroupName); + aPage->setTitle(ModuleBase_Tools::translate( + myWidgetApi->myFeatureId, aGroupName.toStdString())); 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) @@ -269,14 +301,16 @@ 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_DOUBLEVALUELABEL) { + result = new ModuleBase_WidgetLabelValue(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) { @@ -288,19 +322,32 @@ ModuleBase_ModelWidget* ModuleBase_WidgetFactory::createWidgetByType(const std:: } else if (theType == WDG_STRINGVALUE) { std::string aPlaceHolder = myWidgetApi->getProperty( WDG_PLACE_HOLDER ); result = new ModuleBase_WidgetLineEdit( theParent, myWidgetApi, aPlaceHolder ); + } else if (theType == WDG_NAMEVALUE) { + std::string aPlaceHolder = myWidgetApi->getProperty( WDG_PLACE_HOLDER ); + result = new ModuleBase_WidgetNameEdit( theParent, myWidgetApi, aPlaceHolder ); } else if (theType == WDG_EXPR_EDITOR) { std::string aPlaceHolder = myWidgetApi->getProperty( WDG_PLACE_HOLDER ); 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_RADIOBOX) { + result = new ModuleBase_WidgetRadiobox(theParent, myWidgetApi); } else if (theType == WDG_SWITCH) { result = new ModuleBase_WidgetSwitch(theParent, myWidgetApi); } else if (theType == WDG_TOOLBOX_BOX || theType == WDG_SWITCH_CASE || theType == NODE_VALIDATOR) { // Do nothing for "box" and "case" result = NULL; + } else if (theType == WDG_ACTION) { + result = new ModuleBase_WidgetAction(theParent, myWidgetApi); + } else if (theType == WDG_POINT_INPUT) { + result = new ModuleBase_WidgetPointInput(theParent, myWorkshop, myWidgetApi); + } else if (theType == WDG_SELECTION_FILTERS) { + result = new ModuleBase_WidgetSelectionFilter(theParent, myWorkshop, myWidgetApi); } else { result = myWorkshop->module()->createWidgetByType(theType, theParent, myWidgetApi); if (!result)