Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportSurfaceLine.cs =================================================================== diff -u -r2089 -r2255 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportSurfaceLine.cs (.../CsvExportSurfaceLine.cs) (revision 2089) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportSurfaceLine.cs (.../CsvExportSurfaceLine.cs) (revision 2255) @@ -65,11 +65,11 @@ StringBuilder sb = new StringBuilder(); foreach (GeometryPoint point in surfaceLine.Geometry.Points) { - sb.Append(point.X.ToString(CultureInfo.InvariantCulture)); + sb.Append(point.X.ToString("F3", CultureInfo.InvariantCulture)); sb.Append(";"); - sb.Append(point.Y.ToString(CultureInfo.InvariantCulture)); + sb.Append(point.Y.ToString("F3", CultureInfo.InvariantCulture)); sb.Append(";"); - sb.Append(point.Z.ToString(CultureInfo.InvariantCulture)); + sb.Append(point.Z.ToString("F3", CultureInfo.InvariantCulture)); sb.Append(";"); } return sb.ToString(); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportCharacteristicPoints.cs =================================================================== diff -u -r2089 -r2255 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportCharacteristicPoints.cs (.../CsvExportCharacteristicPoints.cs) (revision 2089) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportCharacteristicPoints.cs (.../CsvExportCharacteristicPoints.cs) (revision 2255) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System.Globalization; using Deltares.Geotechnics.SurfaceLines; namespace Deltares.Dam.Data @@ -33,43 +34,37 @@ this.csvExportSurfaceLineIdentifiers = csvExportSurfaceLineIdentifiers; } - double GetXfromPoint(SurfaceLine2 line, CharacteristicPointType type) + string GetXfromPoint(SurfaceLine2 line, CharacteristicPointType type) { var point = line.CharacteristicPoints.GetGeometryPoint(type); - if (point == null) + var result = -1.0; + if (point != null) { - return -1.0; + result = point.X; } - else - { - return point.X; - } + return result.ToString("F3", CultureInfo.InvariantCulture); } - double GetYfromPoint(SurfaceLine2 line, CharacteristicPointType type) + string GetYfromPoint(SurfaceLine2 line, CharacteristicPointType type) { var point = line.CharacteristicPoints.GetGeometryPoint(type); - if (point == null) + var result = -1.0; + if (point != null) { - return -1.0; + result = point.Y; } - else - { - return point.Y; - } + return result.ToString("F3", CultureInfo.InvariantCulture); } - double GetZfromPoint(SurfaceLine2 line, CharacteristicPointType type) + string GetZfromPoint(SurfaceLine2 line, CharacteristicPointType type) { var point = line.CharacteristicPoints.GetGeometryPoint(type); - if (point == null) + var result = -1.0; + if (point != null) { - return -1.0; + result = point.Z; } - else - { - return point.Z; - } + return result.ToString("F3", CultureInfo.InvariantCulture); } // The following 5 properties are identifiers and should be the first columns. @@ -91,116 +86,116 @@ // The following properties are the real surfaceline characteristic points data [CsvExportColumn(CharacteristicPointCsvIdentifiers.SurfaceLevelOutsideX, 2)] - public double SurfaceLevelOutsideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.SurfaceLevelOutside); } } + public string SurfaceLevelOutsideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.SurfaceLevelOutside); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.SurfaceLevelOutsideY, 3)] - public double SurfaceLevelOutsideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.SurfaceLevelOutside); } } + public string SurfaceLevelOutsideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.SurfaceLevelOutside); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.SurfaceLevelOutsideZ, 4)] - public double SurfaceLevelOutsideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.SurfaceLevelOutside); } } + public string SurfaceLevelOutsideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.SurfaceLevelOutside); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.DikeToeAtRiverX, 5)] - public double DikeToeAtRiverX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.DikeToeAtRiver); } } + public string DikeToeAtRiverX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.DikeToeAtRiver); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.DikeToeAtRiverY, 6)] - public double DikeToeAtRiverY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.DikeToeAtRiver); } } + public string DikeToeAtRiverY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.DikeToeAtRiver); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.DikeToeAtRiverZ, 7)] - public double DikeToeAtRiverZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.DikeToeAtRiver); } } + public string DikeToeAtRiverZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.DikeToeAtRiver); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.TopShoulderOutsideX, 8)] - public double ShoulderTopOutsideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.ShoulderTopOutside); } } + public string ShoulderTopOutsideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.ShoulderTopOutside); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.TopShoulderOutsideY, 9)] - public double ShoulderTopOutsideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.ShoulderTopOutside); } } + public string ShoulderTopOutsideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.ShoulderTopOutside); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.TopShoulderOutsideZ, 10)] - public double ShoulderTopOutsideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.ShoulderTopOutside); } } + public string ShoulderTopOutsideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.ShoulderTopOutside); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.InsteekShoulderOutsideX, 11)] - public double ShoulderBaseOutsideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.ShoulderBaseOutside); } } + public string ShoulderBaseOutsideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.ShoulderBaseOutside); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.InsteekShoulderOutsideY, 12)] - public double ShoulderBaseOutsideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.ShoulderBaseOutside); } } + public string ShoulderBaseOutsideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.ShoulderBaseOutside); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.InsteekShoulderOutsideZ, 13)] - public double ShoulderBaseOutsideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.ShoulderBaseOutside); } } + public string ShoulderBaseOutsideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.ShoulderBaseOutside); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.DikeTopAtRiverX, 14)] - public double DikeTopAtRiverX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.DikeTopAtRiver); } } + public string DikeTopAtRiverX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.DikeTopAtRiver); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.DikeTopAtRiverY, 15)] - public double DikeTopAtRiverY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.DikeTopAtRiver); } } + public string DikeTopAtRiverY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.DikeTopAtRiver); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.DikeTopAtRiverZ, 16)] - public double DikeTopAtRiverZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.DikeTopAtRiver); } } + public string DikeTopAtRiverZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.DikeTopAtRiver); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.TrafficLoadOutsideX, 17)] - public double TrafficLoadOutsideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.TrafficLoadOutside); } } + public string TrafficLoadOutsideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.TrafficLoadOutside); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.TrafficLoadOutsideY, 18)] - public double TrafficLoadOutsideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.TrafficLoadOutside); } } + public string TrafficLoadOutsideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.TrafficLoadOutside); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.TrafficLoadOutsideZ, 19)] - public double TrafficLoadOutsideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.TrafficLoadOutside); } } + public string TrafficLoadOutsideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.TrafficLoadOutside); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.TrafficLoadInsideX, 20)] - public double TrafficLoadInsideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.TrafficLoadInside); } } + public string TrafficLoadInsideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.TrafficLoadInside); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.TrafficLoadInsideY, 21)] - public double TrafficLoadInsideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.TrafficLoadInside); } } + public string TrafficLoadInsideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.TrafficLoadInside); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.TrafficLoadInsideZ, 22)] - public double TrafficLoadInsideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.TrafficLoadInside); } } + public string TrafficLoadInsideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.TrafficLoadInside); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.DikeTopAtPolderX, 23)] - public double DikeTopAtPolderX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.DikeTopAtPolder); } } + public string DikeTopAtPolderX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.DikeTopAtPolder); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.DikeTopAtPolderY, 24)] - public double DikeTopAtPolderY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.DikeTopAtPolder); } } + public string DikeTopAtPolderY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.DikeTopAtPolder); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.DikeTopAtPolderZ, 25)] - public double DikeTopAtPolderZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.DikeTopAtPolder); } } + public string DikeTopAtPolderZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.DikeTopAtPolder); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.InsteekShoulderInsideX, 26)] - public double ShoulderBaseInsideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.ShoulderBaseInside); } } + public string ShoulderBaseInsideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.ShoulderBaseInside); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.InsteekShoulderInsideY, 27)] - public double ShoulderBaseInsideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.ShoulderBaseInside); } } + public string ShoulderBaseInsideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.ShoulderBaseInside); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.InsteekShoulderInsideZ, 28)] - public double ShoulderBaseInsideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.ShoulderBaseInside); } } + public string ShoulderBaseInsideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.ShoulderBaseInside); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.TopShoulderInsideX, 29)] - public double ShoulderTopInsideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.ShoulderTopInside); } } + public string ShoulderTopInsideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.ShoulderTopInside); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.TopShoulderInsideY, 30)] - public double ShoulderTopInsideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.ShoulderTopInside); } } + public string ShoulderTopInsideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.ShoulderTopInside); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.TopShoulderInsideZ, 31)] - public double ShoulderTopInsideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.ShoulderTopInside); } } + public string ShoulderTopInsideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.ShoulderTopInside); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.DikeToeAtPolderX, 32)] - public double DikeToeAtPolderX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.DikeToeAtPolder); } } + public string DikeToeAtPolderX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.DikeToeAtPolder); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.DikeToeAtPolderY, 33)] - public double DikeToeAtPolderY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.DikeToeAtPolder); } } + public string DikeToeAtPolderY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.DikeToeAtPolder); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.DikeToeAtPolderZ, 34)] - public double DikeToeAtPolderZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.DikeToeAtPolder); } } + public string DikeToeAtPolderZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.DikeToeAtPolder); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.DitchDikeSideX, 35)] - public double DitchDikeSideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.DitchDikeSide); } } + public string DitchDikeSideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.DitchDikeSide); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.DitchDikeSideY, 36)] - public double DitchDikeSideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.DitchDikeSide); } } + public string DitchDikeSideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.DitchDikeSide); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.DitchDikeSideZ, 37)] - public double DitchDikeSideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.DitchDikeSide); } } + public string DitchDikeSideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.DitchDikeSide); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.BottomDitchDikeSideX, 38)] - public double BottomDitchDikeSideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.BottomDitchDikeSide); } } + public string BottomDitchDikeSideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.BottomDitchDikeSide); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.BottomDitchDikeSideY, 39)] - public double BottomDitchDikeSideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.BottomDitchDikeSide); } } + public string BottomDitchDikeSideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.BottomDitchDikeSide); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.BottomDitchDikeSideZ, 40)] - public double BottomDitchDikeSideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.BottomDitchDikeSide); } } + public string BottomDitchDikeSideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.BottomDitchDikeSide); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.BottomDitchPolderSideX, 41)] - public double BottomDitchPolderSideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.BottomDitchPolderSide); } } + public string BottomDitchPolderSideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.BottomDitchPolderSide); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.BottomDitchPolderSideY, 42)] - public double BottomDitchPolderSideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.BottomDitchPolderSide); } } + public string BottomDitchPolderSideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.BottomDitchPolderSide); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.BottomDitchPolderSideZ, 43)] - public double BottomDitchPolderSideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.BottomDitchPolderSide); } } + public string BottomDitchPolderSideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.BottomDitchPolderSide); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.DitchPolderSideX, 44)] - public double DitchPolderSideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.DitchPolderSide); } } + public string DitchPolderSideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.DitchPolderSide); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.DitchPolderSideY, 45)] - public double DitchPolderSideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.DitchPolderSide); } } + public string DitchPolderSideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.DitchPolderSide); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.DitchPolderSideZ, 46)] - public double DitchPolderSideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.DitchPolderSide); } } + public string DitchPolderSideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.DitchPolderSide); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.SurfaceLevelInsideX, 47)] - public double SurfaceLevelInsideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.SurfaceLevelInside); } } + public string SurfaceLevelInsideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.SurfaceLevelInside); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.SurfaceLevelInsideY, 48)] - public double SurfaceLevelInsideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.SurfaceLevelInside); } } + public string SurfaceLevelInsideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.SurfaceLevelInside); } } [CsvExportColumn(CharacteristicPointCsvIdentifiers.SurfaceLevelInsideZ, 49)] - public double SurfaceLevelInsideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.SurfaceLevelInside); } } + public string SurfaceLevelInsideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.SurfaceLevelInside); } } } }