Salome HOME
projects
/
modules
/
yacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Addition of autolocker class to avoid deadlocks on throw.
[modules/yacs.git]
/
src
/
genericgui
/
FormContainer.cxx
diff --git
a/src/genericgui/FormContainer.cxx
b/src/genericgui/FormContainer.cxx
index 611cb98e80597af18eee62e9c58aabaadd9946d7..07598f87e94ca532d9e0dc06ed19e37d1da5aec1 100644
(file)
--- a/
src/genericgui/FormContainer.cxx
+++ b/
src/genericgui/FormContainer.cxx
@@
-1,9
+1,9
@@
-// Copyright (C) 2006-201
3
CEA/DEN, EDF R&D
+// Copyright (C) 2006-201
4
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
//
// 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.
+// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-705,8
+705,16
@@
bool FormContainer::onApply()
SubjectContainer *scont =
QtGuiContext::getQtCurrent()->_mapOfSubjectContainer[_container];
YASSERT(scont);
SubjectContainer *scont =
QtGuiContext::getQtCurrent()->_mapOfSubjectContainer[_container];
YASSERT(scont);
- bool ret = scont->set
Properties(_properties
);
+ bool ret = scont->set
Name(le_name->text().toStdString()
);
DEBTRACE(ret);
DEBTRACE(ret);
- if (ret) ret = scont->set
Name(le_name->text().toStdString()
);
+ if (ret) ret = scont->set
Properties(_properties
);
return ret;
}
return ret;
}
+
+void FormContainer::onCancel()
+{
+ SubjectContainer *scont =
+ QtGuiContext::getQtCurrent()->_mapOfSubjectContainer[_container];
+ YASSERT(scont);
+ FillPanel(scont->getContainer());
+}