X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Iterator.cxx;h=46212c31953d1c34354d63f8efa442fe52cddda1;hb=6120f6f24e5568ffa69e959689789e1fbe59d58a;hp=210975044d9f29a662671d24f64e7200b99628ea;hpb=660e6f7a98935b2ab471f6734b8be1ce4ce81dd2;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Iterator.cxx b/src/HYDROData/HYDROData_Iterator.cxx
index 21097504..46212c31 100644
--- a/src/HYDROData/HYDROData_Iterator.cxx
+++ b/src/HYDROData/HYDROData_Iterator.cxx
@@ -27,10 +27,10 @@
 #include "HYDROData_DummyObject3D.h"
 #include "HYDROData_Image.h"
 #include "HYDROData_ImmersibleZone.h"
-#include "HYDROData_LandCover.h"
 #include "HYDROData_LandCoverMap.h"
 #include "HYDROData_Obstacle.h"
 #include "HYDROData_ObstacleAltitude.h"
+#include "HYDROData_ChannelAltitude.h"
 #include "HYDROData_Polyline3D.h"
 #include "HYDROData_PolylineXY.h"
 #include "HYDROData_Profile.h"
@@ -38,18 +38,22 @@
 #include "HYDROData_Region.h"
 #include "HYDROData_River.h"
 #include "HYDROData_ShapesGroup.h"
-#include "HYDROData_SplittedShapesGroup.h"
+#include "HYDROData_SplitShapesGroup.h"
 #include "HYDROData_Stream.h"
 #include "HYDROData_StreamAltitude.h"
 #include "HYDROData_VisualState.h"
 #include "HYDROData_Zone.h"
 #include "HYDROData_StricklerTable.h"
-
+#include "HYDROData_DTM.h"
+#include "HYDROData_BCPolygon.h"
 #include <TDataStd_Name.hxx>
 #include <TDataStd_NamedData.hxx>
 
 #include <NCollection_DataMap.hxx>
 
+#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+
 //! Returns label by root objects kind and the kind of the object
 static TDF_Label GetLabelByKind(TDF_Label theRoot, ObjectKind theKind)
 {
@@ -102,7 +106,7 @@ Handle(HYDROData_Entity) HYDROData_Iterator::CreateObject( TDF_Label&        the
 
   Handle(TDataStd_NamedData) aNamedData;
   theNewLabel.FindAttribute( TDataStd_NamedData::GetID(), aNamedData );
-  aNamedData->SetInteger( "ObjectKind", theObjectKind );
+  aNamedData->SetInteger( "ObjectKind", theObjectKind ); //??CAF
 
   return Object( theNewLabel );
 }
@@ -129,6 +133,7 @@ Handle(HYDROData_Entity) HYDROData_Iterator::Object( const TDF_Label& theLabel )
   
   switch( aKind )
   {
+    DEBTRACE("HYDROData_Iterator::Object " << aKind);
     case KIND_IMAGE:              aResult = new HYDROData_Image();                break;
     case KIND_POLYLINE:           aResult = new HYDROData_Polyline3D();           break;
     case KIND_BATHYMETRY:         aResult = new HYDROData_Bathymetry();           break;
@@ -149,13 +154,16 @@ Handle(HYDROData_Entity) HYDROData_Iterator::Object( const TDF_Label& theLabel )
     case KIND_VISUAL_STATE:       aResult = new HYDROData_VisualState();          break;
     case KIND_DUMMY_3D:           aResult = new HYDROData_DummyObject3D();        break;
     case KIND_SHAPES_GROUP:       aResult = new HYDROData_ShapesGroup();          break;
-    case KIND_SPLITTED_GROUP:     aResult = new HYDROData_SplittedShapesGroup();  break;
+    case KIND_SPLIT_GROUP:        aResult = new HYDROData_SplitShapesGroup();     break;
     case KIND_STREAM_ALTITUDE:    aResult = new HYDROData_StreamAltitude();       break;
     case KIND_OBSTACLE_ALTITUDE:  aResult = new HYDROData_ObstacleAltitude();     break;
     case KIND_STRICKLER_TABLE:    aResult = new HYDROData_StricklerTable();       break;
-    case KIND_LAND_COVER:         aResult = new HYDROData_LandCover();            break;
-    case KIND_LAND_COVER_MAP:     aResult = new HYDROData_LandCoverMap();            break;
-    default:                                                                      break;
+    case KIND_LAND_COVER_OBSOLETE: break;
+    case KIND_CHANNEL_ALTITUDE:   aResult = new HYDROData_ChannelAltitude();      break;
+    case KIND_LAND_COVER_MAP:     aResult = new HYDROData_LandCoverMap();         break;
+    case KIND_DTM:                aResult = new HYDROData_DTM();                  break;
+    case KIND_BC_POLYGON:         aResult = new HYDROData_BCPolygon();            break;
+    default:                       break;
   }
 
   if ( !aResult.IsNull() )