Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/occ/19115' into fixes_for_950
[modules/shaper.git]
/
src
/
ModuleBase
/
ModuleBase_WidgetShapeSelector.cpp
diff --git
a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
index c0f8bd0dceca75e7fa63a8c58134eea69c21eae9..89c506e8616a6ab567b72501212f57e68f76ff70 100644
(file)
--- a/
src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
+++ b/
src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
@@
-1,4
+1,4
@@
-// Copyright (C) 2014-20
17
CEA/DEN, EDF R&D
+// Copyright (C) 2014-20
20
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
//
// 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
//
// 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<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include <ModuleBase_WidgetShapeSelector.h>
//
#include <ModuleBase_WidgetShapeSelector.h>
@@
-217,7
+216,8
@@
void ModuleBase_WidgetShapeSelector::updateSelectionName()
bool isNameUpdated = false;
AttributeSelectionPtr aSelect = aData->selection(attributeID());
if (aSelect) {
bool isNameUpdated = false;
AttributeSelectionPtr aSelect = aData->selection(attributeID());
if (aSelect) {
- myTextLine->setText(QString::fromStdString(aSelect->namingName(getDefaultValue())));
+ std::string aDefault = translate(getDefaultValue()).toStdString();
+ myTextLine->setText(QString::fromStdString(aSelect->namingName(aDefault)));
isNameUpdated = true;
}
if (!isNameUpdated) {
isNameUpdated = true;
}
if (!isNameUpdated) {
@@
-229,12
+229,18
@@
void ModuleBase_WidgetShapeSelector::updateSelectionName()
AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID());
if (aRefAttr && aRefAttr->attr().get() != NULL) {
//myIsObject = aRefAttr->isObject();
AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID());
if (aRefAttr && aRefAttr->attr().get() != NULL) {
//myIsObject = aRefAttr->isObject();
- std::string anAttrName = generateName(aRefAttr->attr(), myWorkshop);
+ std::string anAttrName =
ModuleBase_Tools::
generateName(aRefAttr->attr(), myWorkshop);
myTextLine->setText(QString::fromStdString(anAttrName));
}
else {
myTextLine->setText(QString::fromStdString(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