Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/BR_IMPROVEMENTS' into BR_v14_rc
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_DataObject.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_DataObject.cxx
b/src/HYDROGUI/HYDROGUI_DataObject.cxx
index cde78b0d08e9e8627c87de4228f172a147298d01..e0183809bff9da876c0cd9f5bdcd50d93d4ed0e5 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_DataObject.cxx
+++ b/
src/HYDROGUI/HYDROGUI_DataObject.cxx
@@
-1,12
+1,8
@@
-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015 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
@@
-231,13
+227,9
@@
void HYDROGUI_DataObject::updateBy( SUIT_DataObject* theObj )
myIsValid = aDataObj->myIsValid;
myIsInOperation = aDataObj->myIsInOperation;
myIcon = aDataObj->myIcon;
myIsValid = aDataObj->myIsValid;
myIsInOperation = aDataObj->myIsInOperation;
myIcon = aDataObj->myIcon;
+ setModified( true );
}
}
-
-
-
-
-
HYDROGUI_NamedObject::HYDROGUI_NamedObject( SUIT_DataObject* theParent,
const QString& theName,
const QString& theParentEntry,
HYDROGUI_NamedObject::HYDROGUI_NamedObject( SUIT_DataObject* theParent,
const QString& theName,
const QString& theParentEntry,
@@
-296,6
+288,7
@@
void HYDROGUI_NamedObject::updateBy( SUIT_DataObject* theObj )
myParentEntry = aNamedObj->myParentEntry;
myIcon = aNamedObj->myIcon;
myIsInOperation = aNamedObj->myIsInOperation;
myParentEntry = aNamedObj->myParentEntry;
myIcon = aNamedObj->myIcon;
myIsInOperation = aNamedObj->myIsInOperation;
+ setModified( true );
}
}