X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Iterator.cxx;h=f33065fab44a56230b684b79524d472d473a986d;hb=deed826b2d6c39ba2ed410108cdf54d64cded321;hp=43ab980c2160ac02064a835ec6eaabb96588caa1;hpb=bdc5180a07545c7ec07641a41753add63d08ba36;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Iterator.cxx b/src/HYDROData/HYDROData_Iterator.cxx
index 43ab980c..f33065fa 100644
--- a/src/HYDROData/HYDROData_Iterator.cxx
+++ b/src/HYDROData/HYDROData_Iterator.cxx
@@ -3,12 +3,21 @@
 
 #include "HYDROData_AltitudeObject.h"
 #include "HYDROData_Bathymetry.h"
-#include "HYDROData_Calculation.h"
+#include "HYDROData_CalculationCase.h"
+#include "HYDROData_Channel.h"
+#include "HYDROData_Confluence.h"
+#include "HYDROData_Digue.h"
 #include "HYDROData_Image.h"
 #include "HYDROData_ImmersibleZone.h"
+#include "HYDROData_Obstacle.h"
 #include "HYDROData_Polyline.h"
+#include "HYDROData_PolylineXY.h"
+#include "HYDROData_Profile.h"
+#include "HYDROData_ProfileUZ.h"
 #include "HYDROData_VisualState.h"
 #include "HYDROData_Region.h"
+#include "HYDROData_River.h"
+#include "HYDROData_Stream.h"
 #include "HYDROData_Zone.h"
 
 #include <TDataStd_Name.hxx>
@@ -23,9 +32,10 @@ static TDF_Label GetLabelByKind(TDF_Label theRoot, ObjectKind theKind)
   return theRoot.FindChild(theKind);
 }
 
-HYDROData_Iterator::HYDROData_Iterator(Handle(HYDROData_Document) theDoc, ObjectKind theKind)
-  : myIter(GetLabelByKind(theDoc->LabelOfObjects(), theKind), 
-           TDataStd_Name::GetID(), theKind == KIND_UNKNOWN) // iterate all sub-objects for unknown kind
+HYDROData_Iterator::HYDROData_Iterator( const Handle(HYDROData_Document)& theDoc,
+                                        const ObjectKind                  theKind )
+: myIter( GetLabelByKind( theDoc->LabelOfObjects(), theKind ), 
+          TDataStd_Name::GetID(), theKind == KIND_UNKNOWN ) // iterate all sub-objects for unknown kind
 {
 }
 
@@ -109,8 +119,35 @@ Handle(HYDROData_Entity) HYDROData_Iterator::Object( const TDF_Label& theLabel )
     case KIND_IMMERSIBLE_ZONE:
       aResult = new HYDROData_ImmersibleZone();
       break;
+    case KIND_RIVER:
+      aResult = new HYDROData_River();
+      break;
+    case KIND_STREAM:
+      aResult = new HYDROData_Stream();
+      break;
+    case KIND_CONFLUENCE:
+      aResult = new HYDROData_Confluence();
+      break;
+    case KIND_CHANNEL:
+      aResult = new HYDROData_Channel();
+      break;
+    case KIND_OBSTACLE:
+      aResult = new HYDROData_Obstacle();
+      break;
+    case KIND_DIGUE:
+      aResult = new HYDROData_Digue();
+      break;
+    case KIND_PROFILE:
+      aResult = new HYDROData_Profile();
+      break;
+    case KIND_PROFILEUZ:
+      aResult = new HYDROData_ProfileUZ();
+      break;
+    case KIND_POLYLINEXY:
+      aResult = new HYDROData_PolylineXY();
+      break;
     case KIND_CALCULATION:
-      aResult = new HYDROData_Calculation();
+      aResult = new HYDROData_CalculationCase();
       break;
     case KIND_REGION:
       aResult = new HYDROData_Region();