Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r0bfca392717044da8addac9f1b81b29f287812d5 -r2e7596ec3ca6c2e22c2554b86a453d83e4cf2c0c --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 0bfca392717044da8addac9f1b81b29f287812d5) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 2e7596ec3ca6c2e22c2554b86a453d83e4cf2c0c) @@ -63,9 +63,9 @@ /// /// Looks up a localized string similar to Is er een havendam aanwezig?. /// - public static string BreakWater_UseBreakWater_Discription { + public static string BreakWater_UseBreakWater_Description { get { - return ResourceManager.GetString("BreakWater_UseBreakWater_Discription", resourceCulture); + return ResourceManager.GetString("BreakWater_UseBreakWater_Description", resourceCulture); } } @@ -206,7 +206,7 @@ } /// - /// Looks up a localized string similar to Lijst met punten in lokale coördinaten.. + /// Looks up a localized string similar to Lijst met punten in coördinaten.. /// public static string DikeGeometry_Coordinates_Description { get { @@ -280,14 +280,14 @@ /// /// Looks up a localized string similar to Aantal coördinaten tot de teen van de dijk.. /// - public static string Foreshore_NumberOfCoordinates_Discription { + public static string Foreshore_NumberOfCoordinates_Description { get { - return ResourceManager.GetString("Foreshore_NumberOfCoordinates_Discription", resourceCulture); + return ResourceManager.GetString("Foreshore_NumberOfCoordinates_Description", resourceCulture); } } /// - /// Looks up a localized string similar to Aantal. + /// Looks up a localized string similar to Aantal coördinaten. /// public static string Foreshore_NumberOfCoordinates_DisplayName { get { @@ -298,9 +298,9 @@ /// /// Looks up a localized string similar to Is er een voorland aanwezig?. /// - public static string Foreshore_UseForeshore_Discription { + public static string Foreshore_UseForeshore_Description { get { - return ResourceManager.GetString("Foreshore_UseForeshore_Discription", resourceCulture); + return ResourceManager.GetString("Foreshore_UseForeshore_Description", resourceCulture); } } Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx =================================================================== diff -u -r0bfca392717044da8addac9f1b81b29f287812d5 -r2e7596ec3ca6c2e22c2554b86a453d83e4cf2c0c --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 0bfca392717044da8addac9f1b81b29f287812d5) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 2e7596ec3ca6c2e22c2554b86a453d83e4cf2c0c) @@ -172,7 +172,7 @@ Type - + Is er een havendam aanwezig? @@ -185,7 +185,7 @@ Dijkgeometrie - Lijst met punten in lokale coördinaten. + Lijst met punten in coördinaten. Coördinaten [m] @@ -208,17 +208,17 @@ Voorland - + Is er een voorland aanwezig? Aanwezig - + Aantal coördinaten tot de teen van de dijk. - Aantal + Aantal coördinaten Oriëntatie van de dijk. Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/BreakWaterProperties.cs =================================================================== diff -u -r61f2445be56feb2180cb0990d8889164c17b79f0 -r2e7596ec3ca6c2e22c2554b86a453d83e4cf2c0c --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/BreakWaterProperties.cs (.../BreakWaterProperties.cs) (revision 61f2445be56feb2180cb0990d8889164c17b79f0) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/BreakWaterProperties.cs (.../BreakWaterProperties.cs) (revision 2e7596ec3ca6c2e22c2554b86a453d83e4cf2c0c) @@ -40,7 +40,7 @@ { [PropertyOrder(1)] [ResourcesDisplayName(typeof(Resources), "BreakWater_UseBreakWater_DisplayName")] - [ResourcesDescription(typeof(Resources), "BreakWater_UseBreakWater_Discription")] + [ResourcesDescription(typeof(Resources), "BreakWater_UseBreakWater_Description")] public bool UseBreakWater { get @@ -89,7 +89,7 @@ public override string ToString() { - return Resources.BreakWaterProperties_DisplayName; + return string.Empty; } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeGeometryProperties.cs =================================================================== diff -u -r8c915b3e32d3e34f825bdb6d114344b5a2eb4ca8 -r2e7596ec3ca6c2e22c2554b86a453d83e4cf2c0c --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeGeometryProperties.cs (.../DikeGeometryProperties.cs) (revision 8c915b3e32d3e34f825bdb6d114344b5a2eb4ca8) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeGeometryProperties.cs (.../DikeGeometryProperties.cs) (revision 2e7596ec3ca6c2e22c2554b86a453d83e4cf2c0c) @@ -23,6 +23,7 @@ using System.ComponentModel; using System.Linq; using Core.Common.Base.Data; +using Core.Common.Base.Geometry; using Core.Common.Gui.Attributes; using Core.Common.Gui.Converters; using Core.Common.Gui.PropertyBag; @@ -43,20 +44,20 @@ [TypeConverter(typeof(ExpandableReadOnlyArrayConverter))] [ResourcesDisplayName(typeof(Resources), "DikeGeometry_Coordinates_DisplayName")] [ResourcesDescription(typeof(Resources), "DikeGeometry_Coordinates_Description")] - public RoundedDouble[] Coordinates + public Point2D[] Coordinates { get { var startingPoint = data.WrappedData.DikeGeometry.FirstOrDefault(); if (startingPoint == null) { - return new RoundedDouble[0]; + return new Point2D[0]; } - var coordinates = new List + var coordinates = new List { - new RoundedDouble(2, startingPoint.StartingPoint.X) + startingPoint.StartingPoint }; - coordinates.AddRange(data.WrappedData.DikeGeometry.Select(d => new RoundedDouble(2, d.EndingPoint.X))); + coordinates.AddRange(data.WrappedData.DikeGeometry.Select(d => d.EndingPoint)); return coordinates.ToArray(); } } @@ -76,7 +77,7 @@ public override string ToString() { - return Resources.DikeGeometryProperties_DisplayName; + return string.Empty; } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/ForeshoreProperties.cs =================================================================== diff -u -reaa8b3e276e1a0a6a4d0a2f96016879d8d12d394 -r2e7596ec3ca6c2e22c2554b86a453d83e4cf2c0c --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/ForeshoreProperties.cs (.../ForeshoreProperties.cs) (revision eaa8b3e276e1a0a6a4d0a2f96016879d8d12d394) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/ForeshoreProperties.cs (.../ForeshoreProperties.cs) (revision 2e7596ec3ca6c2e22c2554b86a453d83e4cf2c0c) @@ -37,7 +37,7 @@ [PropertyOrder(useForeshorePropertyIndex)] [ResourcesDisplayName(typeof(Resources), "Foreshore_UseForeshore_DisplayName")] - [ResourcesDescription(typeof(Resources), "Foreshore_UseForeshore_Discription")] + [ResourcesDescription(typeof(Resources), "Foreshore_UseForeshore_Description")] public bool UseForeshore { get @@ -53,7 +53,7 @@ [PropertyOrder(numberOfCoordinatesPropertyIndex)] [ResourcesDisplayName(typeof(Resources), "Foreshore_NumberOfCoordinates_DisplayName")] - [ResourcesDescription(typeof(Resources), "Foreshore_NumberOfCoordinates_Discription")] + [ResourcesDescription(typeof(Resources), "Foreshore_NumberOfCoordinates_Description")] public int NumberOfCoordinates { get @@ -64,7 +64,7 @@ public override string ToString() { - return Resources.ForeshoreProperties_DisplayName; + return string.Empty; } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/BreakWaterPropertiesTest.cs =================================================================== diff -u -r0bfca392717044da8addac9f1b81b29f287812d5 -r2e7596ec3ca6c2e22c2554b86a453d83e4cf2c0c --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/BreakWaterPropertiesTest.cs (.../BreakWaterPropertiesTest.cs) (revision 0bfca392717044da8addac9f1b81b29f287812d5) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/BreakWaterPropertiesTest.cs (.../BreakWaterPropertiesTest.cs) (revision 2e7596ec3ca6c2e22c2554b86a453d83e4cf2c0c) @@ -53,7 +53,7 @@ // Assert Assert.IsInstanceOf>(properties); Assert.IsNull(properties.Data); - Assert.AreEqual(Resources.BreakWaterProperties_DisplayName, properties.ToString()); + Assert.AreEqual(string.Empty, properties.ToString()); } [Test] Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeGeometryPropertiesTest.cs =================================================================== diff -u -r8c915b3e32d3e34f825bdb6d114344b5a2eb4ca8 -r2e7596ec3ca6c2e22c2554b86a453d83e4cf2c0c --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeGeometryPropertiesTest.cs (.../DikeGeometryPropertiesTest.cs) (revision 8c915b3e32d3e34f825bdb6d114344b5a2eb4ca8) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeGeometryPropertiesTest.cs (.../DikeGeometryPropertiesTest.cs) (revision 2e7596ec3ca6c2e22c2554b86a453d83e4cf2c0c) @@ -51,7 +51,7 @@ // Assert Assert.IsInstanceOf>(properties); Assert.IsNull(properties.Data); - Assert.AreEqual(Resources.DikeGeometryProperties_DisplayName, properties.ToString()); + Assert.AreEqual(string.Empty, properties.ToString()); } [Test] @@ -106,7 +106,7 @@ Assert.IsNotNull(coordinatesProperty); Assert.IsTrue(coordinatesProperty.IsReadOnly); Assert.AreEqual("Coördinaten [m]", coordinatesProperty.DisplayName); - Assert.AreEqual("Lijst met punten in lokale coördinaten.", coordinatesProperty.Description); + Assert.AreEqual("Lijst met punten in coördinaten.", coordinatesProperty.Description); PropertyDescriptor numberOfCoordinatesDikeHeightProperty = dynamicProperties[numberOfCoordinatesDikeHeightPropertyIndex]; Assert.IsNotNull(numberOfCoordinatesDikeHeightProperty); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/ForeshorePropertiesTest.cs =================================================================== diff -u -r811b71e4352212dc32ade0b5680e4e06aa883f4b -r2e7596ec3ca6c2e22c2554b86a453d83e4cf2c0c --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/ForeshorePropertiesTest.cs (.../ForeshorePropertiesTest.cs) (revision 811b71e4352212dc32ade0b5680e4e06aa883f4b) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/ForeshorePropertiesTest.cs (.../ForeshorePropertiesTest.cs) (revision 2e7596ec3ca6c2e22c2554b86a453d83e4cf2c0c) @@ -52,7 +52,7 @@ // Assert Assert.IsInstanceOf>(properties); Assert.IsNull(properties.Data); - Assert.AreEqual(Resources.ForeshoreProperties_DisplayName, properties.ToString()); + Assert.AreEqual(string.Empty, properties.ToString()); } [Test] @@ -140,7 +140,7 @@ PropertyDescriptor numberOfCoordinatesProperty = dynamicProperties[numberOfCoordinatesDikeHeightProperty]; Assert.IsNotNull(numberOfCoordinatesProperty); Assert.IsTrue(numberOfCoordinatesProperty.IsReadOnly); - Assert.AreEqual("Aantal", numberOfCoordinatesProperty.DisplayName); + Assert.AreEqual("Aantal coördinaten", numberOfCoordinatesProperty.DisplayName); Assert.AreEqual("Aantal coördinaten tot de teen van de dijk.", numberOfCoordinatesProperty.Description); mockRepository.VerifyAll(); }