X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Entity.h;h=fd8640636908aebc1c39c040225e6c84734425d5;hb=35d2822e3e33ca225dcc1ba24e6684a43e3bb2d1;hp=9ed01046878eac2ffd860900722cf79b8a591f42;hpb=ba91ed0e11fd28acbdec9fcb075282f8803d40a8;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Entity.h b/src/HYDROData/HYDROData_Entity.h index 9ed01046..fd864063 100644 --- a/src/HYDROData/HYDROData_Entity.h +++ b/src/HYDROData/HYDROData_Entity.h @@ -1,8 +1,4 @@ -// 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 -// +// 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 @@ -67,7 +63,8 @@ const ObjectKind KIND_SHAPES_GROUP = 22; const ObjectKind KIND_SPLITTED_GROUP = 23; const ObjectKind KIND_STREAM_ALTITUDE = 24; const ObjectKind KIND_OBSTACLE_ALTITUDE = 25; -const ObjectKind KIND_LAST = KIND_OBSTACLE_ALTITUDE; +const ObjectKind KIND_STRICKLER_TABLE = 26; +const ObjectKind KIND_LAST = KIND_STRICKLER_TABLE; DEFINE_STANDARD_HANDLE(HYDROData_Entity, MMgt_TShared) @@ -241,6 +238,20 @@ public: */ void findPythonReferenceObject( MapOfTreatedObjects& theTreatedObjects, QStringList& theScript ) const; + + /** + * Internal method that used to store the color attribute + * \param theTag tag of a label that keeps the attribute (for 0 this is myLab) + * \param theColor color to save + */ + HYDRODATA_EXPORT void SetColor( const QColor& theColor, const int theTag = 0 ); + + /** + * Internal method that used to retreive the color attribute + * \param theTag tag of a label that keeps the attribute (for 0 this is myLab) + * \param theDefColor default color to return if attribute has not been set before + */ + HYDRODATA_EXPORT QColor GetColor( const QColor& theDefColor, const int theTag = 0 ) const; protected: @@ -369,21 +380,7 @@ protected: * \param theTag tag of a label that keeps the attribute (for 0 this is myLab) */ void ClearReferenceObjects( const int theTag = 0 ); - - /** - * Internal method that used to store the color attribute - * \param theTag tag of a label that keeps the attribute (for 0 this is myLab) - * \param theColor color to save - */ - void SetColor( const QColor& theColor, const int theTag = 0 ); - - /** - * Internal method that used to retreive the color attribute - * \param theTag tag of a label that keeps the attribute (for 0 this is myLab) - * \param theDefColor default color to return if attribute has not been set before - */ - QColor GetColor( const QColor& theDefColor, const int theTag = 0 ) const; - + protected: /**