Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Segment.cs =================================================================== diff -u -r1545 -r1996 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Segment.cs (.../Segment.cs) (revision 1545) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Segment.cs (.../Segment.cs) (revision 1996) @@ -25,6 +25,7 @@ using System.Linq; using System.Text; using Deltares.Geotechnics.Soils; +using Deltares.Standard.Attributes; namespace Deltares.Dam.Data { @@ -53,22 +54,24 @@ SoilGeometry2DName = soilGeometryProbability.SoilGeometry2DName; } - public SoilGeometryType SoilGeometryType + [XmlOldName("SoilGeometryType")] + public SoilProfileType SoilProfileType { get { if (SoilProfile != null) { - return SoilGeometryType.SoilGeometry1D; + return SoilProfileType.SoilProfile1D; } - else + if (SoilProfile2D != null) { - if (SoilGeometry2DName == null) - { - throw new Exception("No soilprofile assigned"); - } - return SoilGeometryType.SoilGeometry2D; + return SoilProfileType.SoilProfile2D; } + if (SoilGeometry2DName == null) + { + throw new Exception("No soilprofile assigned"); + } + return SoilProfileType.SoilGeometryStiFile; } } @@ -79,15 +82,15 @@ { get { - string soilGeometryName = ""; if (this.SoilProfile != null) { - soilGeometryName = this.SoilProfile.Name; + return SoilProfile.Name; } - else + if (this.SoilProfile2D != null) { - soilGeometryName = this.SoilGeometry2DName; - } return soilGeometryName; + return SoilProfile2D.Name; + } + return SoilGeometry2DName; } }