Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs =================================================================== diff -u -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113 -ra10f78cf8ff03594c931cbcc227c6f7008a5154c --- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a10f78cf8ff03594c931cbcc227c6f7008a5154c) @@ -106,15 +106,6 @@ } /// - /// Looks up a localized string similar to Vakindeling. - /// - public static string FailureMechanism_Sections_DisplayName { - get { - return ResourceManager.GetString("FailureMechanism_Sections_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Kan geen bijdrageoverzicht maken zonder faalmechanismen.. /// public static string FailureMechanismContribution_FailureMechanismContribution_Can_not_create_FailureMechanismContribution_without_FailureMechanism_collection { Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx =================================================================== diff -u -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113 -ra10f78cf8ff03594c931cbcc227c6f7008a5154c --- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision a10f78cf8ff03594c931cbcc227c6f7008a5154c) @@ -129,9 +129,6 @@ Locaties - - Vakindeling - De geometrie die opgegeven werd voor de referentielijn heeft geen waarde. Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r76ace4042e4e8a92a0ba37e8e9a9373ed6cea951 -ra10f78cf8ff03594c931cbcc227c6f7008a5154c --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 76ace4042e4e8a92a0ba37e8e9a9373ed6cea951) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a10f78cf8ff03594c931cbcc227c6f7008a5154c) @@ -201,6 +201,33 @@ } /// + /// Looks up a localized string similar to Vakindeling. + /// + public static string FailureMechanism_Sections_DisplayName { + get { + return ResourceManager.GetString("FailureMechanism_Sections_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to eindpunten. + /// + public static string FailureMechanismSections_EndPoints_DisplayName { + get { + return ResourceManager.GetString("FailureMechanismSections_EndPoints_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to startpunten. + /// + public static string FailureMechanismSections_StartPoints_DisplayName { + get { + return ResourceManager.GetString("FailureMechanismSections_StartPoints_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// public static System.Drawing.Bitmap GeneralFolderIcon { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx =================================================================== diff -u -r76ace4042e4e8a92a0ba37e8e9a9373ed6cea951 -ra10f78cf8ff03594c931cbcc227c6f7008a5154c --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 76ace4042e4e8a92a0ba37e8e9a9373ed6cea951) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision a10f78cf8ff03594c931cbcc227c6f7008a5154c) @@ -196,4 +196,13 @@ ..\Resources\Sections.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + startpunten + + + eindpunten + + + Vakindeling + \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/FailureMechanismSectionsImporter.cs =================================================================== diff -u -re04155c0cc0efa8bbd13e0a82cb8643711a2dfd6 -ra10f78cf8ff03594c931cbcc227c6f7008a5154c --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/FailureMechanismSectionsImporter.cs (.../FailureMechanismSectionsImporter.cs) (revision e04155c0cc0efa8bbd13e0a82cb8643711a2dfd6) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/FailureMechanismSectionsImporter.cs (.../FailureMechanismSectionsImporter.cs) (revision a10f78cf8ff03594c931cbcc227c6f7008a5154c) @@ -15,7 +15,6 @@ using Ringtoets.Common.IO; using Ringtoets.Integration.Plugin.Properties; -using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; using CoreCommonBaseResources = Core.Common.Base.Properties.Resources; @@ -43,7 +42,7 @@ { get { - return RingtoetsCommonDataResources.FailureMechanism_Sections_DisplayName; + return RingtoetsCommonFormsResources.FailureMechanism_Sections_DisplayName; } } Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs =================================================================== diff -u -ra159e1199947de7db3ccd318cfa827d5865061a5 -ra10f78cf8ff03594c931cbcc227c6f7008a5154c --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs (.../RingtoetsGuiPlugin.cs) (revision a159e1199947de7db3ccd318cfa827d5865061a5) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs (.../RingtoetsGuiPlugin.cs) (revision a10f78cf8ff03594c931cbcc227c6f7008a5154c) @@ -159,7 +159,7 @@ yield return new TreeNodeInfo { - Text = context => RingtoetsCommonDataResources.FailureMechanism_Sections_DisplayName, + Text = context => RingtoetsCommonFormsResources.FailureMechanism_Sections_DisplayName, Image = context => RingtoetsCommonFormsResources.Sections, ForeColor = context => context.WrappedData.Any() ? Color.FromKnownColor(KnownColor.ControlText) : Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs =================================================================== diff -u -re658f4a188e6ab0aa6053cc444d5c21c24162b6c -ra10f78cf8ff03594c931cbcc227c6f7008a5154c --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs (.../PipingFailureMechanismView.cs) (revision e658f4a188e6ab0aa6053cc444d5c21c24162b6c) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs (.../PipingFailureMechanismView.cs) (revision a10f78cf8ff03594c931cbcc227c6f7008a5154c) @@ -29,6 +29,7 @@ using Core.Components.Gis.Forms; using Ringtoets.Common.Data; +using Ringtoets.Common.Forms.Properties; using Ringtoets.HydraRing.Data; using Ringtoets.Piping.Forms.PresentationObjects; @@ -120,6 +121,8 @@ // Bottom most layer mapDataList.Add(GetSurfaceLinesMapData()); mapDataList.Add(GetSectionsMapData()); + mapDataList.Add(GetSectionsStartPointsMapData()); + mapDataList.Add(GetSectionsEndPointsMapData()); mapDataList.Add(GetHydraulicBoundaryLocationsMapData()); mapDataList.Add(GetReferenceLineMapData()); // Topmost layer @@ -156,7 +159,25 @@ private MapData GetSectionsMapData() { IEnumerable> sectionLines = data.WrappedData.Sections.Select(sl => sl.Points); - return new MapMultiLineData(sectionLines, RingtoetsCommonDataResources.FailureMechanism_Sections_DisplayName); + return new MapMultiLineData(sectionLines, Resources.FailureMechanism_Sections_DisplayName); } + + private MapData GetSectionsStartPointsMapData() + { + IEnumerable startPoints = data.WrappedData.Sections.Select(sl => sl.GetStart()); + string mapDataName = string.Format("{0} ({1})", + Resources.FailureMechanism_Sections_DisplayName, + Resources.FailureMechanismSections_StartPoints_DisplayName); + return new MapPointData(startPoints, mapDataName); + } + + private MapData GetSectionsEndPointsMapData() + { + IEnumerable startPoints = data.WrappedData.Sections.Select(sl => sl.GetLast()); + string mapDataName = string.Format("{0} ({1})", + Resources.FailureMechanism_Sections_DisplayName, + Resources.FailureMechanismSections_EndPoints_DisplayName); + return new MapPointData(startPoints, mapDataName); + } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs =================================================================== diff -u -re658f4a188e6ab0aa6053cc444d5c21c24162b6c -ra10f78cf8ff03594c931cbcc227c6f7008a5154c --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision e658f4a188e6ab0aa6053cc444d5c21c24162b6c) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision a10f78cf8ff03594c931cbcc227c6f7008a5154c) @@ -67,11 +67,13 @@ // Assert var mapData = (MapDataCollection)map.Data; - Assert.AreEqual(4, mapData.List.Count); + Assert.AreEqual(6, mapData.List.Count); AssertSurfacelinesMapData(pipingFailureMechanism.SurfaceLines, mapData.List[0]); AssertFailureMechanismSectionsMapData(pipingFailureMechanism.Sections, mapData.List[1]); - AssertHydraulicBoundaryLocationsMapData(assessmentSectionBase.HydraulicBoundaryDatabase, mapData.List[2]); - AssertReferenceMapData(assessmentSectionBase.ReferenceLine, mapData.List[3]); + AssertFailureMechanismSectionsStartPointMapData(pipingFailureMechanism.Sections, mapData.List[2]); + AssertFailureMechanismSectionsEndPointMapData(pipingFailureMechanism.Sections, mapData.List[3]); + AssertHydraulicBoundaryLocationsMapData(assessmentSectionBase.HydraulicBoundaryDatabase, mapData.List[4]); + AssertReferenceMapData(assessmentSectionBase.ReferenceLine, mapData.List[5]); } [Test] @@ -119,65 +121,16 @@ Assert.IsInstanceOf(map.Data); var mapData = map.Data as MapDataCollection; Assert.IsNotNull(mapData); - + + Assert.AreEqual(6, mapData.List.Count); AssertSurfacelinesMapData(pipingFailureMechanism.SurfaceLines, mapData.List[0]); AssertFailureMechanismSectionsMapData(pipingFailureMechanism.Sections, mapData.List[1]); - AssertHydraulicBoundaryLocationsMapData(assessmentSectionBase.HydraulicBoundaryDatabase, mapData.List[2]); - AssertReferenceMapData(referenceLine, mapData.List[3]); + AssertFailureMechanismSectionsStartPointMapData(pipingFailureMechanism.Sections, mapData.List[2]); + AssertFailureMechanismSectionsEndPointMapData(pipingFailureMechanism.Sections, mapData.List[3]); + AssertHydraulicBoundaryLocationsMapData(assessmentSectionBase.HydraulicBoundaryDatabase, mapData.List[4]); + AssertReferenceMapData(assessmentSectionBase.ReferenceLine, mapData.List[5]); } - private void AssertReferenceMapData(ReferenceLine referenceLine, MapData mapData) - { - Assert.IsInstanceOf(mapData); - var referenceLineData = (MapLineData)mapData; - if (referenceLine == null) - { - CollectionAssert.IsEmpty(referenceLineData.Points); - } - else - { - CollectionAssert.AreEqual(referenceLine.Points, referenceLineData.Points); - } - Assert.AreEqual("Referentielijn", mapData.Name); - } - - private void AssertHydraulicBoundaryLocationsMapData(HydraulicBoundaryDatabase database, MapData mapData) - { - Assert.IsInstanceOf(mapData); - var hydraulicLocationsMapData = (MapPointData)mapData; - if (database == null) - { - CollectionAssert.IsEmpty(hydraulicLocationsMapData.Points); - } - else - { - CollectionAssert.AreEqual(database.Locations.Select(hrp => hrp.Location), hydraulicLocationsMapData.Points); - } - Assert.AreEqual("Hydraulische randvoorwaarden", mapData.Name); - } - - private void AssertFailureMechanismSectionsMapData(IEnumerable sections, MapData mapData) - { - Assert.IsInstanceOf(mapData); - var sectionsMapLinesData = (MapMultiLineData)mapData; - foreach (var failureMechanismSection in sections) - { - CollectionAssert.Contains(sectionsMapLinesData.Lines, failureMechanismSection.Points); - } - Assert.AreEqual("Vakindeling", mapData.Name); - } - - private void AssertSurfacelinesMapData(IEnumerable surfaceLines, MapData mapData) - { - Assert.IsInstanceOf(mapData); - var surfacelinesMapData = (MapMultiLineData)mapData; - foreach (var surfaceLine in surfaceLines) - { - CollectionAssert.Contains(surfacelinesMapData.Lines, surfaceLine.Points.Select(p => new Point2D(p.X, p.Y))); - } - Assert.AreEqual("Profielmetingen", mapData.Name); - } - [Test] public void UpdateObserver_HydraulicBoundaryDatabaseUpdated_SetNewMapDataData() { @@ -397,6 +350,74 @@ mocks.VerifyAll(); } + private void AssertReferenceMapData(ReferenceLine referenceLine, MapData mapData) + { + Assert.IsInstanceOf(mapData); + var referenceLineData = (MapLineData)mapData; + if (referenceLine == null) + { + CollectionAssert.IsEmpty(referenceLineData.Points); + } + else + { + CollectionAssert.AreEqual(referenceLine.Points, referenceLineData.Points); + } + Assert.AreEqual("Referentielijn", mapData.Name); + } + + private void AssertHydraulicBoundaryLocationsMapData(HydraulicBoundaryDatabase database, MapData mapData) + { + Assert.IsInstanceOf(mapData); + var hydraulicLocationsMapData = (MapPointData)mapData; + if (database == null) + { + CollectionAssert.IsEmpty(hydraulicLocationsMapData.Points); + } + else + { + CollectionAssert.AreEqual(database.Locations.Select(hrp => hrp.Location), hydraulicLocationsMapData.Points); + } + Assert.AreEqual("Hydraulische randvoorwaarden", mapData.Name); + } + + private void AssertFailureMechanismSectionsMapData(IEnumerable sections, MapData mapData) + { + Assert.IsInstanceOf(mapData); + var sectionsMapLinesData = (MapMultiLineData)mapData; + foreach (var failureMechanismSection in sections) + { + CollectionAssert.Contains(sectionsMapLinesData.Lines, failureMechanismSection.Points); + } + Assert.AreEqual("Vakindeling", mapData.Name); + } + + private void AssertFailureMechanismSectionsStartPointMapData(IEnumerable sections, MapData mapData) + { + Assert.IsInstanceOf(mapData); + var sectionsStartPointData = (MapPointData)mapData; + CollectionAssert.AreEqual(sections.Select(s => s.GetStart()), sectionsStartPointData.Points); + Assert.AreEqual("Vakindeling (startpunten)", mapData.Name); + } + + private void AssertFailureMechanismSectionsEndPointMapData(IEnumerable sections, MapData mapData) + { + Assert.IsInstanceOf(mapData); + var sectionsStartPointData = (MapPointData)mapData; + CollectionAssert.AreEqual(sections.Select(s => s.GetLast()), sectionsStartPointData.Points); + Assert.AreEqual("Vakindeling (eindpunten)", mapData.Name); + } + + private void AssertSurfacelinesMapData(IEnumerable surfaceLines, MapData mapData) + { + Assert.IsInstanceOf(mapData); + var surfacelinesMapData = (MapMultiLineData)mapData; + foreach (var surfaceLine in surfaceLines) + { + CollectionAssert.Contains(surfacelinesMapData.Lines, surfaceLine.Points.Select(p => new Point2D(p.X, p.Y))); + } + Assert.AreEqual("Profielmetingen", mapData.Name); + } + private class TestAssessmentSectionBase : AssessmentSectionBase { public override IEnumerable GetFailureMechanisms()