refs #550: fix crash when myObject is NULL

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_DataObject.cxx

diff --git a/src/HYDROGUI/HYDROGUI_DataObject.cxx b/src/HYDROGUI/HYDROGUI_DataObject.cxx
index cc62a54a38a1aa759bca0bbc2c597613f23e6ebf..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
-// 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
@@ -220,7 +216,19 @@ bool HYDROGUI_DataObject::renameAllowed( const int theColumnId ) const
   return aRes;
 }
 
-
+void HYDROGUI_DataObject::updateBy( SUIT_DataObject* theObj )
+{
+  HYDROGUI_DataObject* aDataObj = dynamic_cast<HYDROGUI_DataObject*>( theObj );
+  if( !aDataObj )
+    return;
+
+  myData = aDataObj->myData;
+  myParentEntry = aDataObj->myParentEntry;
+  myIsValid = aDataObj->myIsValid;
+  myIsInOperation = aDataObj->myIsInOperation;
+  myIcon = aDataObj->myIcon;
+  setModified( true );
+}
 
 HYDROGUI_NamedObject::HYDROGUI_NamedObject( SUIT_DataObject* theParent,
                                             const QString&   theName,
@@ -244,7 +252,7 @@ QString HYDROGUI_NamedObject::entry() const
 
 QString HYDROGUI_NamedObject::name() const
 {
-  return myName;
+  return myName.toUpper();
 }
 
 QPixmap HYDROGUI_NamedObject::icon( const int theId ) const
@@ -257,6 +265,37 @@ QPixmap HYDROGUI_NamedObject::icon( const int theId ) const
   return LightApp_DataObject::icon( theId );
 }
 
+QFont HYDROGUI_NamedObject::font( const int theId ) const
+{
+  QFont aFont = LightApp_DataObject::font( theId );
+  if( theId == NameId )
+  {
+  if ( dynamic_cast<CAM_ModuleObject*>( parent() ) )
+    {
+      aFont.setBold( true );
+    }
+  }
+  return aFont;
+}
+
+void HYDROGUI_NamedObject::updateBy( SUIT_DataObject* theObj )
+{
+  HYDROGUI_NamedObject* aNamedObj = dynamic_cast<HYDROGUI_NamedObject*>( theObj );
+  if( !aNamedObj )
+    return;
+
+  myName = aNamedObj->myName;
+  myParentEntry = aNamedObj->myParentEntry;
+  myIcon = aNamedObj->myIcon;
+  myIsInOperation = aNamedObj->myIsInOperation;
+  setModified( true );
+}
+
+
+
+
+
+
 HYDROGUI_DropTargetObject::HYDROGUI_DropTargetObject( SUIT_DataObject* theParent,
                                             const QString&   theName,
                                             const QString&   theParentEntry,