Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rc96f5829ddb898717ba2e98091a2219308f05d3e -r5fc981700e34ae08fff93a9a2207e2edde02213b --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c96f5829ddb898717ba2e98091a2219308f05d3e) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 5fc981700e34ae08fff93a9a2207e2edde02213b) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Runtime Version:4.0.30319.34209 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -1258,6 +1258,42 @@ } /// + /// Looks up a localized string similar to Het punt dat de slootbodem dijkzijde voorstelt.. + /// + public static string RingtoetsPipingSurfaceLine_BottomDitchDikeSide_Description { + get { + return ResourceManager.GetString("RingtoetsPipingSurfaceLine_BottomDitchDikeSide_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Slootbodem dijkzijde. + /// + public static string RingtoetsPipingSurfaceLine_BottomDitchDikeSide_DisplayName { + get { + return ResourceManager.GetString("RingtoetsPipingSurfaceLine_BottomDitchDikeSide_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Het punt dat de slootbodem polderzijde voorstelt.. + /// + public static string RingtoetsPipingSurfaceLine_BottomDitchPolderSide_Description { + get { + return ResourceManager.GetString("RingtoetsPipingSurfaceLine_BottomDitchPolderSide_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Slootbodem polderzijde. + /// + public static string RingtoetsPipingSurfaceLine_BottomDitchPolderSide_DisplayName { + get { + return ResourceManager.GetString("RingtoetsPipingSurfaceLine_BottomDitchPolderSide_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Profielmeting. /// public static string RingtoetsPipingSurfaceLine_DisplayName { @@ -1267,6 +1303,78 @@ } /// + /// Looks up a localized string similar to Het punt dat de intsteek sloot dijkzijde voorstelt.. + /// + public static string RingtoetsPipingSurfaceLine_DitchDikeSide_Description { + get { + return ResourceManager.GetString("RingtoetsPipingSurfaceLine_DitchDikeSide_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Insteek sloot dijkzijde. + /// + public static string RingtoetsPipingSurfaceLine_DitchDikeSide_DisplayName { + get { + return ResourceManager.GetString("RingtoetsPipingSurfaceLine_DitchDikeSide_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Het punt dat de intsteek sloot polderzijde voorstelt.. + /// + public static string RingtoetsPipingSurfaceLine_DitchPolderSide_Description { + get { + return ResourceManager.GetString("RingtoetsPipingSurfaceLine_DitchPolderSide_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Insteek sloot polderzijde. + /// + public static string RingtoetsPipingSurfaceLine_DitchPolderSide_DisplayName { + get { + return ResourceManager.GetString("RingtoetsPipingSurfaceLine_DitchPolderSide_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to De x-coördinaat van het intredepunt.. + /// + public static string RingtoetsPipingSurfaceLine_EntryPointL_Description { + get { + return ResourceManager.GetString("RingtoetsPipingSurfaceLine_EntryPointL_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Intredepunt. + /// + public static string RingtoetsPipingSurfaceLine_EntryPointL_DisplayName { + get { + return ResourceManager.GetString("RingtoetsPipingSurfaceLine_EntryPointL_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to De x-coördinaat van het uittredepunt.. + /// + public static string RingtoetsPipingSurfaceLine_ExitPointL_Description { + get { + return ResourceManager.GetString("RingtoetsPipingSurfaceLine_ExitPointL_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Uittredepunt. + /// + public static string RingtoetsPipingSurfaceLine_ExitPointL_DisplayName { + get { + return ResourceManager.GetString("RingtoetsPipingSurfaceLine_ExitPointL_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Naam van de profielmeting.. /// public static string RingtoetsPipingSurfaceLine_Name_Description { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -rc96f5829ddb898717ba2e98091a2219308f05d3e -r5fc981700e34ae08fff93a9a2207e2edde02213b --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision c96f5829ddb898717ba2e98091a2219308f05d3e) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 5fc981700e34ae08fff93a9a2207e2edde02213b) @@ -535,4 +535,40 @@ Er zijn geen berekeningen om uit te voeren. + + Het punt dat de slootbodem dijkzijde voorstelt. + + + Slootbodem dijkzijde + + + Het punt dat de slootbodem polderzijde voorstelt. + + + Slootbodem polderzijde + + + Het punt dat de intsteek sloot dijkzijde voorstelt. + + + Insteek sloot dijkzijde + + + Het punt dat de intsteek sloot polderzijde voorstelt. + + + Insteek sloot polderzijde + + + De x-coördinaat van het intredepunt. + + + Intredepunt + + + De x-coördinaat van het uittredepunt. + + + Uittredepunt + \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/RingtoetsPipingSurfaceLineProperties.cs =================================================================== diff -u -rdd7a5cfb0343fa2350b4143232b94cbba37612e9 -r5fc981700e34ae08fff93a9a2207e2edde02213b --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/RingtoetsPipingSurfaceLineProperties.cs (.../RingtoetsPipingSurfaceLineProperties.cs) (revision dd7a5cfb0343fa2350b4143232b94cbba37612e9) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/RingtoetsPipingSurfaceLineProperties.cs (.../RingtoetsPipingSurfaceLineProperties.cs) (revision 5fc981700e34ae08fff93a9a2207e2edde02213b) @@ -22,7 +22,6 @@ using System.Linq; using Core.Common.Base.Geometry; -using Core.Common.Gui; using Core.Common.Gui.Converters; using Core.Common.Gui.PropertyBag; using Core.Common.Utils.Attributes; @@ -51,6 +50,66 @@ } } + [ResourcesDisplayName(typeof(Resources), "RingtoetsPipingSurfaceLine_EntryPointL_DisplayName")] + [ResourcesDescription(typeof(Resources), "RingtoetsPipingSurfaceLine_EntryPointL_Description")] + public double EntryPointL + { + get + { + return data.EntryPointL; + } + } + + [ResourcesDisplayName(typeof(Resources), "RingtoetsPipingSurfaceLine_ExitPointL_DisplayName")] + [ResourcesDescription(typeof(Resources), "RingtoetsPipingSurfaceLine_ExitPointL_Description")] + public double ExitPointL + { + get + { + return data.ExitPointL; + } + } + + [ResourcesDisplayName(typeof(Resources), "RingtoetsPipingSurfaceLine_DitchDikeSide_DisplayName")] + [ResourcesDescription(typeof(Resources), "RingtoetsPipingSurfaceLine_DitchDikeSide_Description")] + public Point3D DitchDikeSide + { + get + { + return data.DitchDikeSide; + } + } + + [ResourcesDisplayName(typeof(Resources), "RingtoetsPipingSurfaceLine_BottomDitchDikeSide_DisplayName")] + [ResourcesDescription(typeof(Resources), "RingtoetsPipingSurfaceLine_BottomDitchDikeSide_Description")] + public Point3D BottomDitchDikeSide + { + get + { + return data.BottomDitchDikeSide; + } + } + + [ResourcesDisplayName(typeof(Resources), "RingtoetsPipingSurfaceLine_BottomDitchPolderSide_DisplayName")] + [ResourcesDescription(typeof(Resources), "RingtoetsPipingSurfaceLine_BottomDitchPolderSide_Description")] + public Point3D BottomDitchPolderSide + { + get + { + return data.BottomDitchPolderSide; + } + } + + [ResourcesDisplayName(typeof(Resources), "RingtoetsPipingSurfaceLine_DitchPolderSide_DisplayName")] + [ResourcesDescription(typeof(Resources), "RingtoetsPipingSurfaceLine_DitchPolderSide_Description")] + public Point3D DitchPolderSide + { + get + { + return data.DitchPolderSide; + } + } + [TypeConverter(typeof(ExpandableArrayConverter))] [ResourcesCategory(typeof(Resources), "Categories_General")] [ResourcesDisplayName(typeof(Resources), "RingtoetsPipingSurfaceLine_Points_DisplayName")] Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/RingtoetsPipingSurfaceLinePropertiesTest.cs =================================================================== diff -u -r0c64d8a6c718c0aa67403a16c94dd0c10f862455 -r5fc981700e34ae08fff93a9a2207e2edde02213b --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/RingtoetsPipingSurfaceLinePropertiesTest.cs (.../RingtoetsPipingSurfaceLinePropertiesTest.cs) (revision 0c64d8a6c718c0aa67403a16c94dd0c10f862455) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/RingtoetsPipingSurfaceLinePropertiesTest.cs (.../RingtoetsPipingSurfaceLinePropertiesTest.cs) (revision 5fc981700e34ae08fff93a9a2207e2edde02213b) @@ -1,4 +1,7 @@ -using Core.Common.Gui; +using System; +using System.Windows.Forms.VisualStyles; +using Core.Common.Base.Geometry; +using Core.Common.Gui; using Core.Common.Gui.PropertyBag; using NUnit.Framework; @@ -28,10 +31,33 @@ { // Setup const string expectedName = ""; + var random = new Random(21); + double expectedEntryPointL = random.NextDouble(); + double expectedExitPointL = random.NextDouble(); + var point1 = new Point3D + { + X = 1.1, Y = 2.2, Z = 3.3 + }; + var point2 = new Point3D + { + X = 2.1, Y = 2.2, Z = 3.3 + }; + var surfaceLine = new RingtoetsPipingSurfaceLine { Name = expectedName }; + surfaceLine.SetGeometry(new[] + { + point1, + point2 + }); + surfaceLine.EntryPointL = expectedEntryPointL; + surfaceLine.ExitPointL = expectedExitPointL; + surfaceLine.SetDitchDikeSideAt(point1); + surfaceLine.SetBottomDitchDikeSideAt(point1); + surfaceLine.SetBottomDitchPolderSideAt(point2); + surfaceLine.SetDitchPolderSideAt(point2); var properties = new RingtoetsPipingSurfaceLineProperties { @@ -41,6 +67,12 @@ // Call & Assert Assert.AreEqual(expectedName, properties.Name); CollectionAssert.AreEqual(surfaceLine.Points, properties.Points); + Assert.AreEqual(expectedEntryPointL, properties.EntryPointL); + Assert.AreEqual(expectedExitPointL, properties.ExitPointL); + Assert.AreEqual(point1, properties.DitchDikeSide); + Assert.AreEqual(point1, properties.BottomDitchDikeSide); + Assert.AreEqual(point2, properties.BottomDitchPolderSide); + Assert.AreEqual(point2, properties.DitchPolderSide); } } } \ No newline at end of file