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
bos #29479 Merge branch 'CR29479'
[modules/shaper.git]
/
src
/
ModuleBase
/
ModuleBase_ModelWidget.cpp
diff --git
a/src/ModuleBase/ModuleBase_ModelWidget.cpp
b/src/ModuleBase/ModuleBase_ModelWidget.cpp
index f0c41371291e04b4a420f5011968142af6ed8ad4..a21cf4517902ce714da983ed57c2d26c2c22e4a2 100644
(file)
--- a/
src/ModuleBase/ModuleBase_ModelWidget.cpp
+++ b/
src/ModuleBase/ModuleBase_ModelWidget.cpp
@@
-1,4
+1,4
@@
-// Copyright (C) 2014-202
0
CEA/DEN, EDF R&D
+// Copyright (C) 2014-202
2
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
@@
-52,11
+52,11
@@
ModuleBase_ModelWidget::ModuleBase_ModelWidget(QWidget* theParent,
const Config_WidgetAPI* theData)
: QWidget(theParent),
ModuleBase_ModelWidget::ModuleBase_ModelWidget(QWidget* theParent,
const Config_WidgetAPI* theData)
: QWidget(theParent),
- my
IsEditing(false
),
+ my
WidgetValidator(0
),
myState(Stored),
myState(Stored),
+ myIsEditing(false),
myIsValueStateBlocked(false),
myIsValueStateBlocked(false),
- myFlushUpdateBlocked(false),
- myWidgetValidator(0)
+ myFlushUpdateBlocked(false)
{
#ifdef DEBUG_WIDGET_INSTANCE
qDebug("ModuleBase_ModelWidget::ModuleBase_ModelWidget");
{
#ifdef DEBUG_WIDGET_INSTANCE
qDebug("ModuleBase_ModelWidget::ModuleBase_ModelWidget");
@@
-191,7
+191,6
@@
QString ModuleBase_ModelWidget::getError(const bool theValueStateChecked) const
if (!feature().get())
return anError;
if (!feature().get())
return anError;
- std::string aFeatureID = feature()->getKind();
std::string anAttributeID = attributeID();
AttributePtr anAttribute = feature()->attribute(anAttributeID);
if (!anAttribute.get())
std::string anAttributeID = attributeID();
AttributePtr anAttribute = feature()->attribute(anAttributeID);
if (!anAttribute.get())
@@
-206,7
+205,7
@@
QString ModuleBase_ModelWidget::getError(const bool theValueStateChecked) const
anErrorMsg = "Unknown error.";
if (anErrorMsg.context().empty()) {
anErrorMsg = "Unknown error.";
if (anErrorMsg.context().empty()) {
- anErrorMsg.setContext(
aFeatureID + ":" + anAttributeID
+ ":" + aValidatorID);
+ anErrorMsg.setContext(
context()
+ ":" + aValidatorID);
}
}
}
}