Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs =================================================================== diff -u -rb2b200315a083c291be715da833f87b0247a4050 -rfe9be55b75061a8035a3388a2d1bb8f80d49f0f8 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs (.../MacroStabilityInwardsChartDataFactory.cs) (revision b2b200315a083c291be715da833f87b0247a4050) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs (.../MacroStabilityInwardsChartDataFactory.cs) (revision fe9be55b75061a8035a3388a2d1bb8f80d49f0f8) @@ -23,6 +23,7 @@ using System.Drawing; using Core.Components.Chart.Data; using Core.Components.Chart.Styles; +using Ringtoets.Common.Forms.Helpers; using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.Properties; using Ringtoets.MacroStabilityInwards.Primitives; @@ -211,10 +212,10 @@ throw new ArgumentNullException(nameof(layer)); } MacroStabilityInwardsSoilLayerData data = layer.Data; - return new ChartMultipleAreaData(data.MaterialName, + return new ChartMultipleAreaData(SoilLayerVisualizationHelper.GetDisplayName(data.MaterialName), new ChartAreaStyle { - FillColor = data.Color, + FillColor = SoilLayerVisualizationHelper.GetDisplayColor(data.Color), StrokeColor = Color.Black, StrokeThickness = 1 }); Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFormattedSoilLayerDataRow.cs =================================================================== diff -u -r9e2f9f7fe2d7daf45c943fc446cd9edc4298290d -rfe9be55b75061a8035a3388a2d1bb8f80d49f0f8 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFormattedSoilLayerDataRow.cs (.../MacroStabilityInwardsFormattedSoilLayerDataRow.cs) (revision 9e2f9f7fe2d7daf45c943fc446cd9edc4298290d) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFormattedSoilLayerDataRow.cs (.../MacroStabilityInwardsFormattedSoilLayerDataRow.cs) (revision fe9be55b75061a8035a3388a2d1bb8f80d49f0f8) @@ -26,6 +26,7 @@ using Core.Common.Base.Data; using Core.Common.Utils; using Ringtoets.Common.Data.Probabilistics; +using Ringtoets.Common.Forms.Helpers; using Ringtoets.MacroStabilityInwards.Primitives; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; @@ -49,8 +50,8 @@ throw new ArgumentNullException(nameof(layerData)); } - MaterialName = layerData.MaterialName; - Color = layerData.Color; + MaterialName = SoilLayerVisualizationHelper.GetDisplayName(layerData.MaterialName); + Color = SoilLayerVisualizationHelper.GetDisplayColor(layerData.Color); IsAquifer = layerData.IsAquifer; AbovePhreaticLevel = FormatVariationCoefficientDesignVariableWithShift(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetAbovePhreaticLevel(layerData)); BelowPhreaticLevel = FormatVariationCoefficientDesignVariableWithShift(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetBelowPhreaticLevel(layerData)); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs =================================================================== diff -u -rb2b200315a083c291be715da833f87b0247a4050 -rfe9be55b75061a8035a3388a2d1bb8f80d49f0f8 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs (.../MacroStabilityInwardsChartDataFactoryTest.cs) (revision b2b200315a083c291be715da833f87b0247a4050) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs (.../MacroStabilityInwardsChartDataFactoryTest.cs) (revision fe9be55b75061a8035a3388a2d1bb8f80d49f0f8) @@ -236,6 +236,22 @@ } [Test] + public void CreateSoilLayerChartData_LayerWithEmptyNameAndColor_ReturnsEmptyChartDataCollectionWithExpectedStyling() + { + // Call + MacroStabilityInwardsSoilLayer2D layer = MacroStabilityInwardsSoilLayer2DTestFactory.CreateMacroStabilityInwardsSoilLayer2D(); + layer.Data.MaterialName = string.Empty; + layer.Data.Color = Color.Empty; + + ChartMultipleAreaData data = MacroStabilityInwardsChartDataFactory.CreateSoilLayerChartData(layer); + + // Assert + CollectionAssert.IsEmpty(data.Areas); + Assert.AreEqual("Onbekend", data.Name); + AssertEqualStyle(data.Style, Color.White, Color.Black, 1, false); + } + + [Test] public void UpdateSurfaceLineChartDataName_SurfaceLineNull_NameSetToDefaultSurfaceLineName() { // Setup Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFormattedSoilLayerDataRowTest.cs =================================================================== diff -u -r9e2f9f7fe2d7daf45c943fc446cd9edc4298290d -rfe9be55b75061a8035a3388a2d1bb8f80d49f0f8 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFormattedSoilLayerDataRowTest.cs (.../MacroStabilityInwardsFormattedSoilLayerDataRowTest.cs) (revision 9e2f9f7fe2d7daf45c943fc446cd9edc4298290d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFormattedSoilLayerDataRowTest.cs (.../MacroStabilityInwardsFormattedSoilLayerDataRowTest.cs) (revision fe9be55b75061a8035a3388a2d1bb8f80d49f0f8) @@ -118,13 +118,13 @@ [Test] [SetCulture("nl-NL")] - public void Constructor_WithSoilLayerDataNaN_ExpectedValues() + public void Constructor_WithSoilLayerDataEmptyAndNaN_ExpectedValues() { // Setup var soilLayerData = new MacroStabilityInwardsSoilLayerData { - MaterialName = "Sand", - Color = Color.Black, + MaterialName = string.Empty, + Color = Color.Empty, IsAquifer = true, AbovePhreaticLevel = new VariationCoefficientLogNormalDistribution { @@ -172,8 +172,8 @@ TestHelper.AssertTypeConverter( nameof(MacroStabilityInwardsFormattedSoilLayerDataRow.ShearStrengthModel)); - Assert.AreEqual(soilLayerData.MaterialName, formattedSoilLayerDataRow.MaterialName); - Assert.AreEqual(soilLayerData.Color, formattedSoilLayerDataRow.Color); + Assert.AreEqual("Onbekend", formattedSoilLayerDataRow.MaterialName); + Assert.AreEqual(Color.White, formattedSoilLayerDataRow.Color); Assert.AreEqual(soilLayerData.IsAquifer, formattedSoilLayerDataRow.IsAquifer); Assert.AreEqual("NaN", formattedSoilLayerDataRow.AbovePhreaticLevel); Assert.AreEqual("NaN", formattedSoilLayerDataRow.BelowPhreaticLevel); Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingChartDataFactory.cs =================================================================== diff -u -rb2b200315a083c291be715da833f87b0247a4050 -rfe9be55b75061a8035a3388a2d1bb8f80d49f0f8 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingChartDataFactory.cs (.../PipingChartDataFactory.cs) (revision b2b200315a083c291be715da833f87b0247a4050) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingChartDataFactory.cs (.../PipingChartDataFactory.cs) (revision fe9be55b75061a8035a3388a2d1bb8f80d49f0f8) @@ -23,6 +23,7 @@ using System.Drawing; using Core.Components.Chart.Data; using Core.Components.Chart.Styles; +using Ringtoets.Common.Forms.Helpers; using Ringtoets.Piping.Forms.Properties; using Ringtoets.Piping.Primitives; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; @@ -67,10 +68,10 @@ { throw new ArgumentNullException(nameof(layer)); } - return new ChartMultipleAreaData(layer.MaterialName, + return new ChartMultipleAreaData(SoilLayerVisualizationHelper.GetDisplayName(layer.MaterialName), new ChartAreaStyle { - FillColor = layer.Color, + FillColor = SoilLayerVisualizationHelper.GetDisplayColor(layer.Color), StrokeColor = Color.Black, StrokeThickness = 1 }); Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingSoilLayerTable.cs =================================================================== diff -u -r09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c -rfe9be55b75061a8035a3388a2d1bb8f80d49f0f8 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingSoilLayerTable.cs (.../PipingSoilLayerTable.cs) (revision 09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingSoilLayerTable.cs (.../PipingSoilLayerTable.cs) (revision fe9be55b75061a8035a3388a2d1bb8f80d49f0f8) @@ -24,6 +24,7 @@ using System.Linq; using Core.Common.Base.Data; using Core.Common.Controls.DataGrid; +using Ringtoets.Common.Forms.Helpers; using Ringtoets.Piping.Forms.Properties; using Ringtoets.Piping.Primitives; @@ -72,8 +73,8 @@ { public FormattedPipingSoilLayerRow(PipingSoilLayer layer) { - MaterialName = layer.MaterialName; - Color = layer.Color; + MaterialName = SoilLayerVisualizationHelper.GetDisplayName(layer.MaterialName); + Color = SoilLayerVisualizationHelper.GetDisplayColor(layer.Color); Top = new RoundedDouble(2, layer.Top); IsAquifer = layer.IsAquifer; PermeabilityMean = new RoundedDouble(6, layer.PermeabilityMean); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingChartDataFactoryTest.cs =================================================================== diff -u -rb2b200315a083c291be715da833f87b0247a4050 -rfe9be55b75061a8035a3388a2d1bb8f80d49f0f8 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingChartDataFactoryTest.cs (.../PipingChartDataFactoryTest.cs) (revision b2b200315a083c291be715da833f87b0247a4050) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingChartDataFactoryTest.cs (.../PipingChartDataFactoryTest.cs) (revision fe9be55b75061a8035a3388a2d1bb8f80d49f0f8) @@ -88,6 +88,22 @@ } [Test] + public void CreateSoilLayerChartData_LayerWithEmptyNameAndColor_ReturnsEmptyChartDataCollectionWithExpectedStyling() + { + // Call + ChartMultipleAreaData data = PipingChartDataFactory.CreateSoilLayerChartData(new PipingSoilLayer(0) + { + MaterialName = string.Empty, + Color = Color.Empty + }); + + // Assert + CollectionAssert.IsEmpty(data.Areas); + Assert.AreEqual("Onbekend", data.Name); + AssertEqualStyle(data.Style, Color.White, Color.Black, 1); + } + + [Test] public void UpdateSurfaceLineChartDataName_SurfaceLineNull_NameSetToDefaultSurfaceLineName() { // Setup Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingSoilLayerTableTest.cs =================================================================== diff -u -rfe90a6d174a01975381e6cda55ed1f7f4e831a51 -rfe9be55b75061a8035a3388a2d1bb8f80d49f0f8 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingSoilLayerTableTest.cs (.../PipingSoilLayerTableTest.cs) (revision fe90a6d174a01975381e6cda55ed1f7f4e831a51) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingSoilLayerTableTest.cs (.../PipingSoilLayerTableTest.cs) (revision fe9be55b75061a8035a3388a2d1bb8f80d49f0f8) @@ -191,6 +191,45 @@ } } + [Test] + public void SetData_WithEmptyNameAndColor_ExpectedValuesInTable() + { + // Setup + using (var table = new PipingSoilLayerTable()) + { + PipingSoilLayer soilLayer = CreatePipingSoilLayer(); + soilLayer.MaterialName = string.Empty; + soilLayer.Color = Color.Empty; + + var layers = new[] + { + soilLayer + }; + table.SetData(new[] + { + new PipingSoilLayer(1.0) + }); + + // Call + table.SetData(layers); + + // Assert + PipingSoilLayer pipingSoilLayer = layers[0]; + DataGridViewCellCollection rowCells = table.Rows[0].Cells; + AssertColumnValueEqual("Onbekend", rowCells[nameColumnIndex].Value); + AssertColumnValueEqual(Color.White, rowCells[colorColumnIndex].Value); + AssertColumnValueEqual(pipingSoilLayer.Top, rowCells[topColumnIndex].Value); + AssertColumnValueEqual(pipingSoilLayer.IsAquifer, rowCells[isAquiferColumnIndex].Value); + AssertColumnValueEqual(pipingSoilLayer.PermeabilityMean, rowCells[permeabilityMeanColumnIndex].Value); + AssertColumnValueEqual(pipingSoilLayer.PermeabilityCoefficientOfVariation, rowCells[permeabilityCoefficientOfVariationColumnIndex].Value); + AssertColumnValueEqual(pipingSoilLayer.DiameterD70Mean, rowCells[d70MeanColumnIndex].Value); + AssertColumnValueEqual(pipingSoilLayer.DiameterD70CoefficientOfVariation, rowCells[d70CoefficientOfVariationColumnIndex].Value); + AssertColumnValueEqual(pipingSoilLayer.BelowPhreaticLevelMean, rowCells[belowPhreaticLevelWeightMeanColumnIndex].Value); + AssertColumnValueEqual(pipingSoilLayer.BelowPhreaticLevelDeviation, rowCells[belowPhreaticLevelWeightDeviationColumnIndex].Value); + AssertColumnValueEqual(pipingSoilLayer.BelowPhreaticLevelShift, rowCells[belowPhreaticLevelWeightShiftColumnIndex].Value); + } + } + private void AssertColumnValueEqual(object expectedValue, object actualValue) { if (expectedValue is string || expectedValue is Color)