X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetShapeSelector.cpp;h=8673bb87c95b2d1202a3996678effa7c8b8c1e62;hb=aba714fbb23139b15272ed816c9a30595165106c;hp=e5ea9338995ae5ac20362446cbfc2a8d0a26f6f2;hpb=97917d3698f5a2f7fc9596e7c755ff8f6751e373;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp index e5ea93389..8673bb87c 100644 --- a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp +++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 CEA/DEN, EDF R&D +// Copyright (C) 2014-2021 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 @@ -216,24 +216,31 @@ void ModuleBase_WidgetShapeSelector::updateSelectionName() bool isNameUpdated = false; AttributeSelectionPtr aSelect = aData->selection(attributeID()); if (aSelect) { - myTextLine->setText(QString::fromStdString(aSelect->namingName(getDefaultValue()))); + std::wstring aDefault = translate(getDefaultValue()).toStdWString(); + myTextLine->setText(QString::fromStdWString(aSelect->namingName(aDefault))); isNameUpdated = true; } if (!isNameUpdated) { ObjectPtr anObject = ModuleBase_Tools::getObject(myFeature->attribute(attributeID())); if (anObject.get() != NULL) { - std::string aName = anObject->data()->name(); - myTextLine->setText(QString::fromStdString(aName)); + std::wstring aName = anObject->data()->name(); + myTextLine->setText(QString::fromStdWString(aName)); } else { AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID()); if (aRefAttr && aRefAttr->attr().get() != NULL) { //myIsObject = aRefAttr->isObject(); - std::string anAttrName = ModuleBase_Tools::generateName(aRefAttr->attr(), myWorkshop); - myTextLine->setText(QString::fromStdString(anAttrName)); + std::wstring anAttrName = ModuleBase_Tools::generateName(aRefAttr->attr(), myWorkshop); + myTextLine->setText(QString::fromStdWString(anAttrName)); } else { - myTextLine->setText(getDefaultValue().c_str()); + myTextLine->setText(translate(getDefaultValue())); } } } } + +//******************************************************************** +bool ModuleBase_WidgetShapeSelector::isModified() const +{ + return !myTextLine->text().isEmpty(); +} \ No newline at end of file