X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetFactory.cpp;h=e34798a1ac9ab0e66ebca341a07af55fd8cc98e1;hb=77ce6d35ac8d2f0fdaecb4f23e0870bf74e36103;hp=ecba43238c54b0249e6e9c63b8889e43e8a0fc49;hpb=87b6a30a3afb8fb32e7e43ade8d9c947d9eb1684;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetFactory.cpp b/src/ModuleBase/ModuleBase_WidgetFactory.cpp index ecba43238..e34798a1a 100644 --- a/src/ModuleBase/ModuleBase_WidgetFactory.cpp +++ b/src/ModuleBase/ModuleBase_WidgetFactory.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2024 CEA, EDF // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -12,10 +12,9 @@ // // 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 +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or -// email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -37,10 +36,13 @@ #include #include #include +#include #include #include #include +#include #include +#include #include #include #include @@ -48,6 +50,8 @@ #include #include #include +#include +#include #include #include @@ -73,10 +77,11 @@ #include ModuleBase_WidgetFactory::ModuleBase_WidgetFactory(const std::string& theXmlRepresentation, - ModuleBase_IWorkshop* theWorkshop) + ModuleBase_IWorkshop* theWorkshop, + const std::string theAttributePrefix) : myWorkshop(theWorkshop) { - myWidgetApi = new Config_WidgetAPI(theXmlRepresentation); + myWidgetApi = new Config_WidgetAPI(theXmlRepresentation, theAttributePrefix); } ModuleBase_WidgetFactory::~ModuleBase_WidgetFactory() @@ -128,17 +133,19 @@ void ModuleBase_WidgetFactory::createWidget(ModuleBase_PageBase* thePage, bool a //it's pages recursively and setup into the widget. if (myWidgetApi->toChildWidget()) { do { + if (myWidgetApi->getBooleanAttribute(ATTR_INTERNAL, false)) continue; 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) { + 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 ); + aContainer->addPage( aPage, aPageName, aCaseId, anIcon, aTooltip); } } while (myWidgetApi->toNextWidget()); } @@ -156,8 +163,12 @@ void ModuleBase_WidgetFactory::createPanel(ModuleBase_PageBase* thePage, 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->pageWidget(), theFeature, myWidgetApi); + ModuleBase_ModelWidget* aModelWdg = dynamic_cast(aPanel); + if (aModelWdg) + thePage->addModelWidget(aModelWdg); + else + thePage->addWidget(aPanel); thePage->alignToTop(); } } @@ -180,8 +191,8 @@ void ModuleBase_WidgetFactory::createWidget(ModuleBase_PageBase* thePage, aWidget->setVisible(false); } } + thePage->alignToTop(); } - thePage->alignToTop(); } void ModuleBase_WidgetFactory::getAttributeTitle(const std::string& theAttributeId, @@ -195,6 +206,8 @@ void ModuleBase_WidgetFactory::getAttributeTitle(const std::string& theAttribute theTitle = QString::fromStdString(myWidgetApi->getProperty(CONTAINER_PAGE_NAME)).toStdString().c_str(); } + else + theTitle = theAttributeId; } void ModuleBase_WidgetFactory::getGreedAttribute(std::string& theAttributeId) @@ -270,7 +283,8 @@ 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_OPTIONALBOX) { @@ -298,6 +312,8 @@ ModuleBase_ModelWidget* ModuleBase_WidgetFactory::createWidgetByType(const std:: result = new ModuleBase_WidgetLabel(theParent, myWidgetApi); } else if (theType == WDG_DOUBLEVALUE) { result = new ModuleBase_WidgetDoubleValue(theParent, myWidgetApi); + } else if (theType == WDG_UNDOLABEL) { + result = new ModuleBase_WidgetUndoLabel(theParent, myWorkshop, myWidgetApi); } else if (theType == WDG_DOUBLEVALUELABEL) { result = new ModuleBase_WidgetLabelValue(theParent, myWidgetApi); } else if (theType == WDG_INTEGERVALUE) { @@ -317,6 +333,9 @@ 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 ); @@ -326,6 +345,8 @@ ModuleBase_ModelWidget* ModuleBase_WidgetFactory::createWidgetByType(const std:: 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 || @@ -334,6 +355,10 @@ ModuleBase_ModelWidget* ModuleBase_WidgetFactory::createWidgetByType(const std:: 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)