Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -rf4f041e353f89e0e93a4243968acee599b2186a7 -r3262df0bfbe3a0fbfa0b42bbe880697c027a12fb
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f4f041e353f89e0e93a4243968acee599b2186a7)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3262df0bfbe3a0fbfa0b42bbe880697c027a12fb)
@@ -98,5 +98,14 @@
return ResourceManager.GetString("DuneErosionFailureMechanism_DisplayName", resourceCulture);
}
}
+
+ ///
+ /// Looks up a localized string similar to 0.#.
+ ///
+ public static string DuneLocation_Offset_format {
+ get {
+ return ResourceManager.GetString("DuneLocation_Offset_format", resourceCulture);
+ }
+ }
}
}
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/Properties/Resources.resx
===================================================================
diff -u -rf4f041e353f89e0e93a4243968acee599b2186a7 -r3262df0bfbe3a0fbfa0b42bbe880697c027a12fb
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/Properties/Resources.resx (.../Resources.resx) (revision f4f041e353f89e0e93a4243968acee599b2186a7)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/Properties/Resources.resx (.../Resources.resx) (revision 3262df0bfbe3a0fbfa0b42bbe880697c027a12fb)
@@ -123,4 +123,7 @@
Duinwaterkering - Duinafslag
+
+ 0.#
+
\ No newline at end of file
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/PropertyClasses/DuneLocationProperties.cs
===================================================================
diff -u -r988794432302c63a2ecbe29c024c7d69edfe7cd3 -r3262df0bfbe3a0fbfa0b42bbe880697c027a12fb
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/PropertyClasses/DuneLocationProperties.cs (.../DuneLocationProperties.cs) (revision 988794432302c63a2ecbe29c024c7d69edfe7cd3)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/PropertyClasses/DuneLocationProperties.cs (.../DuneLocationProperties.cs) (revision 3262df0bfbe3a0fbfa0b42bbe880697c027a12fb)
@@ -20,6 +20,7 @@
// All rights reserved.
using System.ComponentModel;
+using System.Globalization;
using Core.Common.Base.Data;
using Core.Common.Base.Geometry;
using Core.Common.Gui.PropertyBag;
@@ -30,6 +31,7 @@
using Ringtoets.DuneErosion.Data;
using Ringtoets.DuneErosion.Forms.Properties;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+using DuneErosionDataResources = Ringtoets.DuneErosion.Data.Properties.Resources;
namespace Ringtoets.DuneErosion.Forms.PropertyClasses
{
@@ -75,11 +77,11 @@
[ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_General")]
[ResourcesDisplayName(typeof(Resources), "DuneLocation_Offset_DisplayName")]
[ResourcesDescription(typeof(Resources), "DuneLocation_Offset_Description")]
- public RoundedDouble Offset
+ public string Offset
{
get
{
- return data.Offset;
+ return data.Offset.ToString(DuneErosionDataResources.DuneLocation_Offset_format, CultureInfo.InvariantCulture);
}
}
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.IO/DuneLocationsWriter.cs
===================================================================
diff -u -re261f847e5058d2f9612f091421a6a463cb17edf -r3262df0bfbe3a0fbfa0b42bbe880697c027a12fb
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.IO/DuneLocationsWriter.cs (.../DuneLocationsWriter.cs) (revision e261f847e5058d2f9612f091421a6a463cb17edf)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.IO/DuneLocationsWriter.cs (.../DuneLocationsWriter.cs) (revision 3262df0bfbe3a0fbfa0b42bbe880697c027a12fb)
@@ -29,6 +29,7 @@
using Ringtoets.DuneErosion.Data;
using Ringtoets.DuneErosion.IO.Properties;
using CoreCommonUtilsResources = Core.Common.Utils.Properties.Resources;
+using DuneErosionDataResources = Ringtoets.DuneErosion.Data.Properties.Resources;
namespace Ringtoets.DuneErosion.IO
{
@@ -80,7 +81,7 @@
var stringComponents = new List
{
location.CoastalAreaId.ToString(null, CultureInfo.InvariantCulture),
- location.Offset.ToString(Resources.DuneLocationsWriter_CreateCsvLine_Offset_format, CultureInfo.InvariantCulture),
+ location.Offset.ToString(DuneErosionDataResources.DuneLocation_Offset_format, CultureInfo.InvariantCulture),
Resources.DuneLocationsWriter_CreateCsvLine_Parameter_without_value,
location.D50.ToString(null, CultureInfo.InvariantCulture)
};
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -re261f847e5058d2f9612f091421a6a463cb17edf -r3262df0bfbe3a0fbfa0b42bbe880697c027a12fb
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e261f847e5058d2f9612f091421a6a463cb17edf)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3262df0bfbe3a0fbfa0b42bbe880697c027a12fb)
@@ -82,15 +82,6 @@
}
///
- /// Looks up a localized string similar to 0.#.
- ///
- internal static string DuneLocationsWriter_CreateCsvLine_Offset_format {
- get {
- return ResourceManager.GetString("DuneLocationsWriter_CreateCsvLine_Offset_format", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to *.
///
internal static string DuneLocationsWriter_CreateCsvLine_Parameter_without_value {
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.IO/Properties/Resources.resx
===================================================================
diff -u -re261f847e5058d2f9612f091421a6a463cb17edf -r3262df0bfbe3a0fbfa0b42bbe880697c027a12fb
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.IO/Properties/Resources.resx (.../Resources.resx) (revision e261f847e5058d2f9612f091421a6a463cb17edf)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.IO/Properties/Resources.resx (.../Resources.resx) (revision 3262df0bfbe3a0fbfa0b42bbe880697c027a12fb)
@@ -1,110 +1,126 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 1.3
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
*
Kv Nr Rp Hs Tp Tm-1,0 D50
-
- 0.#
-
\ No newline at end of file
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationPropertiesTest.cs
===================================================================
diff -u -r988794432302c63a2ecbe29c024c7d69edfe7cd3 -r3262df0bfbe3a0fbfa0b42bbe880697c027a12fb
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationPropertiesTest.cs (.../DuneLocationPropertiesTest.cs) (revision 988794432302c63a2ecbe29c024c7d69edfe7cd3)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationPropertiesTest.cs (.../DuneLocationPropertiesTest.cs) (revision 3262df0bfbe3a0fbfa0b42bbe880697c027a12fb)
@@ -21,6 +21,7 @@
using System;
using System.ComponentModel;
+using System.Globalization;
using Core.Common.Base.Geometry;
using Core.Common.TestUtil;
using Core.Common.Utils;
@@ -70,7 +71,7 @@
Assert.AreEqual(duneLocation.Id, properties.Id);
Assert.AreEqual(duneLocation.Name, properties.Name);
Assert.AreEqual(duneLocation.CoastalAreaId, properties.CoastalAreaId);
- Assert.AreEqual(duneLocation.Offset, properties.Offset);
+ Assert.AreEqual(duneLocation.Offset.ToString("0.#", CultureInfo.InvariantCulture), properties.Offset);
Assert.AreEqual(duneLocation.Location, properties.Location);
Assert.IsNaN(properties.WaterLevel);
@@ -149,7 +150,7 @@
Assert.AreEqual(id, properties.Id);
Assert.AreEqual(name, properties.Name);
Assert.AreEqual(coastalAreaId, properties.CoastalAreaId);
- Assert.AreEqual(location.Offset, properties.Offset, properties.Offset.GetAccuracy());
+ Assert.AreEqual(location.Offset.ToString("0.#", CultureInfo.InvariantCulture), properties.Offset);
var expectedLocation = new Point2D(x, y);
Assert.AreEqual(expectedLocation, properties.Location);
@@ -284,5 +285,25 @@
"Is convergentie bereikt in de berekening voor de hydraulische randvoorwaarden van de duinlocatie?",
true);
}
+
+ [Test]
+ [TestCase(3.0, "3")]
+ [TestCase(3.1, "3.1")]
+ public void Offset_Always_FormatToString(double offset, string expectedPropertyValue)
+ {
+ var location = new DuneLocation(1, "test", new Point2D(0, 0), new DuneLocation.ConstructionProperties
+ {
+ Offset = offset
+ });
+
+ // Call
+ var properties = new DuneLocationProperties
+ {
+ Data = location
+ };
+
+ // Assert
+ Assert.AreEqual(expectedPropertyValue, properties.Offset);
+ }
}
}
\ No newline at end of file
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationsContextPropertiesTest.cs
===================================================================
diff -u -rc0c0380b5e555ca5e0c136e9ca252a2943106a70 -r3262df0bfbe3a0fbfa0b42bbe880697c027a12fb
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationsContextPropertiesTest.cs (.../DuneLocationsContextPropertiesTest.cs) (revision c0c0380b5e555ca5e0c136e9ca252a2943106a70)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationsContextPropertiesTest.cs (.../DuneLocationsContextPropertiesTest.cs) (revision 3262df0bfbe3a0fbfa0b42bbe880697c027a12fb)
@@ -20,6 +20,7 @@
// All rights reserved.
using System.ComponentModel;
+using System.Globalization;
using System.Linq;
using Core.Common.Gui.Converters;
using Core.Common.TestUtil;
@@ -70,7 +71,7 @@
Assert.AreEqual(location.Id, duneLocationProperties.Id);
Assert.AreEqual(location.Name, duneLocationProperties.Name);
Assert.AreEqual(location.CoastalAreaId, duneLocationProperties.CoastalAreaId);
- Assert.AreEqual(location.Offset, duneLocationProperties.Offset);
+ Assert.AreEqual(location.Offset.ToString("0.#", CultureInfo.InvariantCulture), duneLocationProperties.Offset);
Assert.AreEqual(location.Location, duneLocationProperties.Location);
Assert.IsNaN(duneLocationProperties.WaterLevel);