X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Entity.h;h=0c612ba279daf2ac967c76498700636c7f91a7d4;hb=dcc909ad422bdc89b0fdcf7fb21df1db6271c88d;hp=4e6e5f090190cd1464f353bed41d654b0d734934;hpb=d3d7ea6412ef12cf3ecdda87c52881fa03accfee;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Entity.h b/src/HYDROData/HYDROData_Entity.h
index 4e6e5f09..0c612ba2 100644
--- a/src/HYDROData/HYDROData_Entity.h
+++ b/src/HYDROData/HYDROData_Entity.h
@@ -20,11 +20,8 @@
 #define HYDROData_Entity_HeaderFile
 
 #include "HYDROData.h"
-
 #include <NCollection_Sequence.hxx>
-
 #include <TDF_Label.hxx>
-
 #include <QMap>
 
 class QColor;
@@ -33,45 +30,55 @@ class QVariant;
 class QStringList;
 class Handle(TDataStd_ReferenceList);
 class Handle_HYDROData_Entity;
+class TopoDS_Shape;
 
 ///! Kind of an object in a document
 typedef int ObjectKind;
 
-const ObjectKind KIND_UNKNOWN           = 0; ///! Unrecognized object
-const ObjectKind KIND_IMAGE             = 1;
-const ObjectKind KIND_POLYLINE          = 2;
-const ObjectKind KIND_BATHYMETRY        = 3;
-const ObjectKind KIND_ALTITUDE          = 4;
-const ObjectKind KIND_IMMERSIBLE_ZONE   = 5;
-const ObjectKind KIND_RIVER             = 6;
-const ObjectKind KIND_STREAM            = 7;
-const ObjectKind KIND_CONFLUENCE        = 8;
-const ObjectKind KIND_CHANNEL           = 9;
-const ObjectKind KIND_OBSTACLE          = 10;
-const ObjectKind KIND_DIGUE             = 11;
-const ObjectKind KIND_PROFILE           = 12;
-const ObjectKind KIND_PROFILEUZ         = 13;
-const ObjectKind KIND_POLYLINEXY        = 14;
-const ObjectKind KIND_CALCULATION       = 15;
-const ObjectKind KIND_ZONE              = 16;
-const ObjectKind KIND_REGION            = 17;
-const ObjectKind KIND_VISUAL_STATE      = 18;
-const ObjectKind KIND_ARTIFICIAL_OBJECT = 19;
-const ObjectKind KIND_NATURAL_OBJECT    = 20;
-const ObjectKind KIND_DUMMY_3D          = 21;
-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_STRICKLER_TABLE   = 26;
-const ObjectKind KIND_LAND_COVER        = 27;
-const ObjectKind KIND_LAST              = KIND_LAND_COVER;
+const ObjectKind KIND_UNKNOWN             = 0; ///! Unrecognized object
+const ObjectKind KIND_IMAGE               = 1;
+const ObjectKind KIND_POLYLINE            = 2;
+const ObjectKind KIND_BATHYMETRY          = 3;
+const ObjectKind KIND_ALTITUDE            = 4;
+const ObjectKind KIND_IMMERSIBLE_ZONE     = 5;
+const ObjectKind KIND_RIVER               = 6;
+const ObjectKind KIND_STREAM              = 7;
+const ObjectKind KIND_CONFLUENCE          = 8;
+const ObjectKind KIND_CHANNEL             = 9;
+const ObjectKind KIND_OBSTACLE            = 10;
+const ObjectKind KIND_DIGUE               = 11;
+const ObjectKind KIND_PROFILE             = 12;
+const ObjectKind KIND_PROFILEUZ           = 13;
+const ObjectKind KIND_POLYLINEXY          = 14;
+const ObjectKind KIND_CALCULATION         = 15;
+const ObjectKind KIND_ZONE                = 16;
+const ObjectKind KIND_REGION              = 17;
+const ObjectKind KIND_VISUAL_STATE        = 18;
+const ObjectKind KIND_ARTIFICIAL_OBJECT   = 19;
+const ObjectKind KIND_NATURAL_OBJECT      = 20;
+const ObjectKind KIND_DUMMY_3D            = 21;
+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_STRICKLER_TABLE     = 26;
+const ObjectKind KIND_LAND_COVER_OBSOLETE = 27;
+const ObjectKind KIND_LAND_COVER_MAP      = 28;
+const ObjectKind KIND_LAST                = KIND_LAND_COVER_MAP;
 
 DEFINE_STANDARD_HANDLE(HYDROData_Entity, MMgt_TShared)
 
-typedef QMap<QString,Handle(Standard_Transient)> MapOfTreatedObjects;
+class MapOfTreatedObjects : public QMap<QString,Handle(Standard_Transient)>
+{
+};
 
-typedef NCollection_Sequence<Handle_HYDROData_Entity> HYDROData_SequenceOfObjects;
+class HYDRODATA_EXPORT HYDROData_SequenceOfObjects : public NCollection_Sequence<Handle_HYDROData_Entity>
+{
+public:
+  HYDROData_SequenceOfObjects();
+  HYDROData_SequenceOfObjects( const HYDROData_SequenceOfObjects& );
+  HYDROData_SequenceOfObjects( const NCollection_Sequence<Handle_HYDROData_Entity>& );
+};
 
 ///! Is Equal for HYDROData_Entity mapping
 HYDRODATA_EXPORT bool IsEqual(const Handle_HYDROData_Entity& theObj1, const Handle_HYDROData_Entity& theObj2);
@@ -420,7 +427,9 @@ protected:
 
   Handle(TDataStd_ReferenceList) getReferenceList( const int  theTag,
                                                    const bool theIsCreate ) const;
-
+  
+  void SetShape( int theTag, const TopoDS_Shape& theShape );
+  TopoDS_Shape GetShape( int theTag ) const;
 
   int GetGeomChangeFlag() const;