Merge branch 'master' of ssh://git.salome-platform.org/modules/hydro

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

diff --git a/src/HYDROGUI/HYDROGUI_DataObject.h b/src/HYDROGUI/HYDROGUI_DataObject.h
index 8f1582885d4b8e4cc4d5610582ae755369a834f2..eba8646094d7086b926a8bc307e2203c1ab3fbfb 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_DataObject.h
+++ b/src/HYDROGUI/HYDROGUI_DataObject.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  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
@@ -6,7 +6,7 @@
 // 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
@@ -20,18 +20,28 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
+
 #ifndef HYDROGUI_DATAOBJECT_H
 #define HYDROGUI_DATAOBJECT_H
 
 #include <HYDROData_Entity.h>
 
-#include <LightApp_DataObject.h>
+#ifdef WIN32
+  #pragma warning( disable: 4250 )
+  #pragma warning( disable: 4251 )
+#endif
 
+#include <LightApp_DataObject.h>
 #include <QString>
 #include <QMap>
 #include <QPixmap>
 #include <QColor>
 
+#ifdef WIN32
+  #pragma warning( disable: 4250 )
+  #pragma warning( disable: 4251 )
+#endif
+
 /**
  * \class HYDROGUI_DataObject
  * \brief Module data object, used for object browser tree creation.
@@ -141,6 +151,8 @@ public:
    */
   bool isInOperation() const { return myIsInOperation; }
 
+  void updateBy( SUIT_DataObject* );
+
 protected:
   Handle(HYDROData_Entity) myData; ///< object from data model
   QString myParentEntry;
@@ -182,6 +194,11 @@ public:
    */
   virtual QString name() const;
 
+  /**
+   * Returns the font of displayed object name.
+   */
+  virtual QFont font( const int = SUIT_DataObject::NameId ) const;
+
   /**
    * Returns the object icon.
    */
@@ -194,6 +211,8 @@ public:
    */
   bool isInOperation() const { return myIsInOperation; }
 
+  void updateBy( SUIT_DataObject* );
+
 private:
   QString myName; ///< name in the OB
   QString myParentEntry;