X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Iterator.cxx;h=181bc496e1c6839f0accc7495ce78294d9e44752;hb=e7225e329739e01faed6682de0bc83cf84c28de6;hp=734356260d90a69f7bb04f0daae004ea1bf2dbbc;hpb=0c8c9e56851dc04f32e6f6485229568d8cc9a837;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Iterator.cxx b/src/HYDROData/HYDROData_Iterator.cxx index 73435626..181bc496 100644 --- a/src/HYDROData/HYDROData_Iterator.cxx +++ b/src/HYDROData/HYDROData_Iterator.cxx @@ -6,10 +6,13 @@ #include "HYDROData_CalculationCase.h" #include "HYDROData_Channel.h" #include "HYDROData_Confluence.h" +#include "HYDROData_DummyObject3D.h" #include "HYDROData_Digue.h" +#include "HYDROData_ShapesGroup.h" #include "HYDROData_Image.h" #include "HYDROData_ImmersibleZone.h" #include "HYDROData_Obstacle.h" +#include "HYDROData_ObstacleAltitude.h" #include "HYDROData_Polyline3D.h" #include "HYDROData_PolylineXY.h" #include "HYDROData_Profile.h" @@ -17,7 +20,9 @@ #include "HYDROData_VisualState.h" #include "HYDROData_Region.h" #include "HYDROData_River.h" +#include "HYDROData_SplittedShapesGroup.h" #include "HYDROData_Stream.h" +#include "HYDROData_StreamAltitude.h" #include "HYDROData_Zone.h" #include @@ -104,62 +109,30 @@ Handle(HYDROData_Entity) HYDROData_Iterator::Object( const TDF_Label& theLabel ) switch( 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; - case KIND_ALTITUDE: - aResult = new HYDROData_AltitudeObject(); - break; - 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_CalculationCase(); - break; - case KIND_REGION: - aResult = new HYDROData_Region(); - break; - case KIND_ZONE: - aResult = new HYDROData_Zone(); - break; - case KIND_VISUAL_STATE: - aResult = new HYDROData_VisualState(); - break; - default: - break; + case KIND_IMAGE: aResult = new HYDROData_Image(); break; + case KIND_POLYLINE: aResult = new HYDROData_Polyline3D(); break; + case KIND_BATHYMETRY: aResult = new HYDROData_Bathymetry(); break; + case KIND_ALTITUDE: aResult = new HYDROData_AltitudeObject(); break; + 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_CalculationCase(); break; + case KIND_REGION: aResult = new HYDROData_Region(); break; + case KIND_ZONE: aResult = new HYDROData_Zone(); break; + 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_STREAM_ALTITUDE: aResult = new HYDROData_StreamAltitude(); break; + case KIND_OBSTACLE_ALTITUDE: aResult = new HYDROData_ObstacleAltitude(); break; + default: break; } if ( !aResult.IsNull() )