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
refs #568: use ordered list view with selection synchronized with object browser...
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_DataObject.h
diff --git
a/src/HYDROGUI/HYDROGUI_DataObject.h
b/src/HYDROGUI/HYDROGUI_DataObject.h
index d8b78a8c04e784cb7ae7e7665c411a25ca98a7cd..28aa22e4df5f90e668161e4ae712dd830b1141f3 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_DataObject.h
+++ b/
src/HYDROGUI/HYDROGUI_DataObject.h
@@
-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
@@
-20,18
+16,28
@@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
#ifndef HYDROGUI_DATAOBJECT_H
#define HYDROGUI_DATAOBJECT_H
#include <HYDROData_Entity.h>
#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>
#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.
/**
* \class HYDROGUI_DataObject
* \brief Module data object, used for object browser tree creation.
@@
-47,7
+53,7
@@
public:
//! Column id
enum {
RefObjectId = RefEntryId + 1, //!< Ref.Object column
//! Column id
enum {
RefObjectId = RefEntryId + 1, //!< Ref.Object column
-
BathymetryId //!< Bathymetry
column
+
AltitudeObjId //!< Altitude
column
};
//! Role
};
//! Role
@@
-141,6
+147,8
@@
public:
*/
bool isInOperation() const { return myIsInOperation; }
*/
bool isInOperation() const { return myIsInOperation; }
+ void updateBy( SUIT_DataObject* );
+
protected:
Handle(HYDROData_Entity) myData; ///< object from data model
QString myParentEntry;
protected:
Handle(HYDROData_Entity) myData; ///< object from data model
QString myParentEntry;
@@
-182,6
+190,11
@@
public:
*/
virtual QString name() const;
*/
virtual QString name() const;
+ /**
+ * Returns the font of displayed object name.
+ */
+ virtual QFont font( const int = SUIT_DataObject::NameId ) const;
+
/**
* Returns the object icon.
*/
/**
* Returns the object icon.
*/
@@
-194,6
+207,8
@@
public:
*/
bool isInOperation() const { return myIsInOperation; }
*/
bool isInOperation() const { return myIsInOperation; }
+ void updateBy( SUIT_DataObject* );
+
private:
QString myName; ///< name in the OB
QString myParentEntry;
private:
QString myName; ///< name in the OB
QString myParentEntry;