Index: Riskeer/Common/src/Riskeer.Common.Forms/Factories/RiskeerMapDataFactory.cs =================================================================== diff -u -r2dd7807c75311aa8401169f4a7db7ffce9b41355 -r49f869d57d02dab67341714eae6c842b9dc80960 --- Riskeer/Common/src/Riskeer.Common.Forms/Factories/RiskeerMapDataFactory.cs (.../RiskeerMapDataFactory.cs) (revision 2dd7807c75311aa8401169f4a7db7ffce9b41355) +++ Riskeer/Common/src/Riskeer.Common.Forms/Factories/RiskeerMapDataFactory.cs (.../RiskeerMapDataFactory.cs) (revision 49f869d57d02dab67341714eae6c842b9dc80960) @@ -28,7 +28,6 @@ using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.DikeProfiles; using Riskeer.Common.Data.FailureMechanism; -using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Forms.Properties; using RiskeerCommonDataResources = Riskeer.Common.Data.Properties.Resources; using RiskeerCommonUtilResources = Riskeer.Common.Util.Properties.Resources; Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r75323b0f453bbe2548aa92f64ce9211011f747dc -r49f869d57d02dab67341714eae6c842b9dc80960 --- Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 75323b0f453bbe2548aa92f64ce9211011f747dc) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 49f869d57d02dab67341714eae6c842b9dc80960) @@ -442,6 +442,25 @@ } /// + /// Looks up a localized string similar to Probabilistische berekeningen. + /// + public static string PipingFailureMechanismView_CreateCalculationsMapData_Probabilistisc_Calculations { + get { + return ResourceManager.GetString("PipingFailureMechanismView_CreateCalculationsMapData_Probabilistisc_Calculations", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Semi-probabilistische berekeningen. + /// + public static string PipingFailureMechanismView_CreateCalculationsMapData_Semi_Probabilistisc_Calculations { + get { + return ResourceManager.GetString("PipingFailureMechanismView_CreateCalculationsMapData_Semi_Probabilistisc_Calculat" + + "ions", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Dempingsfactor relateert respons van stijghoogte bij binnenteen aan buitenwaterstand.. /// public static string PipingInput_DampingFactorExit_Description { Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -r75323b0f453bbe2548aa92f64ce9211011f747dc -r49f869d57d02dab67341714eae6c842b9dc80960 --- Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 75323b0f453bbe2548aa92f64ce9211011f747dc) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 49f869d57d02dab67341714eae6c842b9dc80960) @@ -549,4 +549,10 @@ Probabilistische berekeningen + + Semi-probabilistische berekeningen + + + Probabilistische berekeningen + \ No newline at end of file Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingFailureMechanismView.cs =================================================================== diff -u -r4d135aeda52355ba7b1928128a14a114f080cbff -r49f869d57d02dab67341714eae6c842b9dc80960 --- Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingFailureMechanismView.cs (.../PipingFailureMechanismView.cs) (revision 4d135aeda52355ba7b1928128a14a114f080cbff) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingFailureMechanismView.cs (.../PipingFailureMechanismView.cs) (revision 49f869d57d02dab67341714eae6c842b9dc80960) @@ -38,6 +38,7 @@ using Riskeer.Piping.Data.SemiProbabilistic; using Riskeer.Piping.Data.SoilProfile; using Riskeer.Piping.Forms.Factories; +using Riskeer.Piping.Forms.Properties; using Riskeer.Piping.Primitives; using PipingDataResources = Riskeer.Piping.Data.Properties.Resources; @@ -177,8 +178,10 @@ hydraulicBoundaryLocationsMapData = RiskeerMapDataFactory.CreateHydraulicBoundaryLocationsMapData(); stochasticSoilModelsMapData = RiskeerMapDataFactory.CreateStochasticSoilModelsMapData(); surfaceLinesMapData = RiskeerMapDataFactory.CreateSurfaceLinesMapData(); - semiProbabilisticCalculationsMapData = RiskeerMapDataFactory.CreateCalculationsMapData("Semi-probabilistische berekeningen", Color.MediumPurple); - probabilisticCalculationsMapData = RiskeerMapDataFactory.CreateCalculationsMapData("Probabilistische berekeningen", Color.Pink); + semiProbabilisticCalculationsMapData = RiskeerMapDataFactory.CreateCalculationsMapData(Resources.PipingFailureMechanismView_CreateCalculationsMapData_Semi_Probabilistisc_Calculations, + Color.MediumPurple); + probabilisticCalculationsMapData = RiskeerMapDataFactory.CreateCalculationsMapData(Resources.PipingFailureMechanismView_CreateCalculationsMapData_Probabilistisc_Calculations, + Color.Pink); MapDataCollection sectionsMapDataCollection = RiskeerMapDataFactory.CreateSectionsMapDataCollection(); sectionsMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsMapData(); Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Factories/PipingMapDataFactoryTest.cs =================================================================== diff -u -r75323b0f453bbe2548aa92f64ce9211011f747dc -r49f869d57d02dab67341714eae6c842b9dc80960 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Factories/PipingMapDataFactoryTest.cs (.../PipingMapDataFactoryTest.cs) (revision 75323b0f453bbe2548aa92f64ce9211011f747dc) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Factories/PipingMapDataFactoryTest.cs (.../PipingMapDataFactoryTest.cs) (revision 49f869d57d02dab67341714eae6c842b9dc80960) @@ -41,7 +41,7 @@ Assert.AreEqual("Semi-probabilistische berekeningen", data.Name); AssertEqualStyle(data.Style, Color.MediumPurple, 2, LineDashStyle.Dash); } - + [Test] public void CreateProbabilisticCalculationsMapData_ReturnsEmptyMapPointDataWithExpectedStyling() { @@ -53,7 +53,7 @@ Assert.AreEqual("Probabilistische berekeningen", data.Name); AssertEqualStyle(data.Style, Color.Pink, 2, LineDashStyle.Dash); } - + private static void AssertEqualStyle(LineStyle lineStyle, Color color, int width, LineDashStyle style) { Assert.AreEqual(color, lineStyle.Color); Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs =================================================================== diff -u -r4d135aeda52355ba7b1928128a14a114f080cbff -r49f869d57d02dab67341714eae6c842b9dc80960 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision 4d135aeda52355ba7b1928128a14a114f080cbff) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision 49f869d57d02dab67341714eae6c842b9dc80960) @@ -1040,8 +1040,8 @@ } } } - - [Test] + + [Test] public void GivenViewWithAssemblyData_WhenProbabilisticCalculationNotified_ThenMapDataUpdated() { // Given