Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsChartDataFactory.cs =================================================================== diff -u -r246dc954b190c640ad46a4ea8c7dc53076a45808 -r2fc082ea75494a149eca240146035aa8fa7f9e1c --- Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsChartDataFactory.cs (.../RingtoetsChartDataFactory.cs) (revision 246dc954b190c640ad46a4ea8c7dc53076a45808) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsChartDataFactory.cs (.../RingtoetsChartDataFactory.cs) (revision 2fc082ea75494a149eca240146035aa8fa7f9e1c) @@ -23,6 +23,7 @@ using Core.Components.Chart.Data; using Core.Components.Chart.Styles; using Ringtoets.Common.Forms.Properties; +using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; namespace Ringtoets.Common.Forms.Factories { @@ -69,5 +70,95 @@ { return new ChartDataCollection(Resources.StochasticSoilProfileProperties_DisplayName); } + + /// + /// Create with default styling for a characteristic point + /// of type ditch polder side. + /// + /// The created . + public static ChartPointData CreateDitchPolderSideChartData() + { + return new ChartPointData(RingtoetsCommonDataResources.CharacteristicPoint_DitchPolderSide, + GetCharacteristicPointStyle(Color.IndianRed, + Color.Transparent, + ChartPointSymbol.Circle)); + } + + /// + /// Create with default styling for a characteristic point + /// of type bottom ditch polder side. + /// + /// The created . + public static ChartPointData CreateBottomDitchPolderSideChartData() + { + return new ChartPointData(RingtoetsCommonDataResources.CharacteristicPoint_BottomDitchPolderSide, + GetCharacteristicPointStyle(Color.Teal, + Color.Transparent, + ChartPointSymbol.Circle)); + } + + /// + /// Create with default styling for a characteristic point + /// of type bottom ditch dike side. + /// + /// The created . + public static ChartPointData CreateBottomDitchDikeSideChartData() + { + return new ChartPointData(RingtoetsCommonDataResources.CharacteristicPoint_BottomDitchDikeSide, + GetCharacteristicPointStyle(Color.DarkSeaGreen, + Color.Transparent, + ChartPointSymbol.Circle)); + } + + /// + /// Create with default styling for a characteristic point + /// of type ditch dike side. + /// + /// The created . + public static ChartPointData CreateDitchDikeSideChartData() + { + return new ChartPointData(RingtoetsCommonDataResources.CharacteristicPoint_DitchDikeSide, + GetCharacteristicPointStyle(Color.MediumPurple, + Color.Transparent, + ChartPointSymbol.Circle)); + } + + /// + /// Create with default styling for a characteristic point + /// of type dike toe at polder. + /// + /// The created . + public static ChartPointData CreateDikeToeAtPolderChartData() + { + return new ChartPointData(RingtoetsCommonDataResources.CharacteristicPoint_DikeToeAtPolder, + GetCharacteristicPointStyle(Color.LightGray, + Color.Black, + ChartPointSymbol.Square)); + } + + /// + /// Create with default styling for a characteristic point + /// of type dike toe at river. + /// + /// The created . + public static ChartPointData CreateDikeToeAtRiverChartData() + { + return new ChartPointData(RingtoetsCommonDataResources.CharacteristicPoint_DikeToeAtRiver, + GetCharacteristicPointStyle(Color.DarkGray, + Color.Black, + ChartPointSymbol.Square)); + } + + private static ChartPointStyle GetCharacteristicPointStyle(Color fillColor, Color strokeColor, ChartPointSymbol symbol) + { + return new ChartPointStyle + { + Color = fillColor, + StrokeColor = strokeColor, + Size = 8, + StrokeThickness = strokeColor == Color.Transparent ? 0 : 1, + Symbol = symbol + }; + } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsChartDataFactoryTest.cs =================================================================== diff -u -r83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12 -r2fc082ea75494a149eca240146035aa8fa7f9e1c --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsChartDataFactoryTest.cs (.../RingtoetsChartDataFactoryTest.cs) (revision 83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsChartDataFactoryTest.cs (.../RingtoetsChartDataFactoryTest.cs) (revision 2fc082ea75494a149eca240146035aa8fa7f9e1c) @@ -65,6 +65,88 @@ Assert.AreEqual("Ondergrondschematisatie", data.Name); } + [Test] + public void CreateDitchPolderSideChartData_ReturnsChartPointDataWithDefaultStyling() + { + // Call + ChartPointData data = RingtoetsChartDataFactory.CreateDitchPolderSideChartData(); + + // Assert + Assert.IsFalse(data.HasData); + Assert.AreEqual("Insteek sloot polderzijde", data.Name); + AssertEqualStyle(data.Style, Color.IndianRed, 8, Color.Transparent, 0, ChartPointSymbol.Circle); + } + + [Test] + public void CreateBottomDitchPolderSideChartData_ReturnsChartPointDataWithDefaultStyling() + { + // Call + ChartPointData data = RingtoetsChartDataFactory.CreateBottomDitchPolderSideChartData(); + + // Assert + Assert.IsFalse(data.HasData); + Assert.AreEqual("Slootbodem polderzijde", data.Name); + AssertEqualStyle(data.Style, Color.Teal, 8, Color.Transparent, 0, ChartPointSymbol.Circle); + } + + [Test] + public void CreateBottomDitchDikeSideChartData_ReturnsChartPointDataWithDefaultStyling() + { + // Call + ChartPointData data = RingtoetsChartDataFactory.CreateBottomDitchDikeSideChartData(); + + // Assert + Assert.IsFalse(data.HasData); + Assert.AreEqual("Slootbodem dijkzijde", data.Name); + AssertEqualStyle(data.Style, Color.DarkSeaGreen, 8, Color.Transparent, 0, ChartPointSymbol.Circle); + } + + [Test] + public void CreateDitchDikeSideChartData_ReturnsChartPointDataWithDefaultStyling() + { + // Call + ChartPointData data = RingtoetsChartDataFactory.CreateDitchDikeSideChartData(); + + // Assert + Assert.IsFalse(data.HasData); + Assert.AreEqual("Insteek sloot dijkzijde", data.Name); + AssertEqualStyle(data.Style, Color.MediumPurple, 8, Color.Transparent, 0, ChartPointSymbol.Circle); + } + + [Test] + public void CreateDikeToeAtPolderChartData_ReturnsChartPointDataWithDefaultStyling() + { + // Call + ChartPointData data = RingtoetsChartDataFactory.CreateDikeToeAtPolderChartData(); + + // Assert + Assert.IsFalse(data.HasData); + Assert.AreEqual("Teen dijk binnenwaarts", data.Name); + AssertEqualStyle(data.Style, Color.LightGray, 8, Color.Black, 1, ChartPointSymbol.Square); + } + + [Test] + public void CreateDikeToeAtRiverChartData_ReturnsChartPointDataWithDefaultStyling() + { + // Call + ChartPointData data = RingtoetsChartDataFactory.CreateDikeToeAtRiverChartData(); + + // Assert + Assert.IsFalse(data.HasData); + Assert.AreEqual("Teen dijk buitenwaarts", data.Name); + AssertEqualStyle(data.Style, Color.DarkGray, 8, Color.Black, 1, ChartPointSymbol.Square); + } + + private static void AssertEqualStyle(ChartPointStyle pointStyle, Color fillColor, int size, + Color strokeColor, int strokeThickness, ChartPointSymbol symbol) + { + Assert.AreEqual(fillColor, pointStyle.Color); + Assert.AreEqual(size, pointStyle.Size); + Assert.AreEqual(strokeColor, pointStyle.StrokeColor); + Assert.AreEqual(strokeThickness, pointStyle.StrokeThickness); + Assert.AreEqual(symbol, pointStyle.Symbol); + } + private static void AssertEqualStyle(ChartLineStyle lineStyle, Color color, int width, ChartLineDashStyle style) { Assert.AreEqual(color, lineStyle.Color); Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs =================================================================== diff -u -rb10bbf87b67aadd7c647938226b57be19afb4b46 -r2fc082ea75494a149eca240146035aa8fa7f9e1c --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs (.../MacroStabilityInwardsChartDataFactory.cs) (revision b10bbf87b67aadd7c647938226b57be19afb4b46) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs (.../MacroStabilityInwardsChartDataFactory.cs) (revision 2fc082ea75494a149eca240146035aa8fa7f9e1c) @@ -24,9 +24,9 @@ using System.Linq; using Core.Components.Chart.Data; using Core.Components.Chart.Styles; -using Ringtoets.MacroStabilityInwards.Forms.Properties; using Ringtoets.MacroStabilityInwards.Primitives; using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; +using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.MacroStabilityInwards.Forms.Factories { @@ -48,32 +48,6 @@ /// /// Create with default styling for a characteristic point - /// of type ditch dike side. - /// - /// The created . - public static ChartPointData CreateDitchDikeSideChartData() - { - return new ChartPointData(RingtoetsCommonDataResources.CharacteristicPoint_DitchDikeSide, - GetCharacteristicPointStyle(Color.MediumPurple, - Color.Transparent, - ChartPointSymbol.Circle)); - } - - /// - /// Create with default styling for a characteristic point - /// of type ditch polder side. - /// - /// The created . - public static ChartPointData CreateDitchPolderSideChartData() - { - return new ChartPointData(RingtoetsCommonDataResources.CharacteristicPoint_DitchPolderSide, - GetCharacteristicPointStyle(Color.IndianRed, - Color.Transparent, - ChartPointSymbol.Circle)); - } - - /// - /// Create with default styling for a characteristic point /// of type dike top at polder. /// /// The created . @@ -151,58 +125,6 @@ } /// - /// Create with default styling for a characteristic point - /// of type bottom ditch dike side. - /// - /// The created . - public static ChartPointData CreateBottomDitchDikeSideChartData() - { - return new ChartPointData(RingtoetsCommonDataResources.CharacteristicPoint_BottomDitchDikeSide, - GetCharacteristicPointStyle(Color.DarkSeaGreen, - Color.Transparent, - ChartPointSymbol.Circle)); - } - - /// - /// Create with default styling for a characteristic point - /// of type bottom ditch polder side. - /// - /// The created . - public static ChartPointData CreateBottomDitchPolderSideChartData() - { - return new ChartPointData(RingtoetsCommonDataResources.CharacteristicPoint_BottomDitchPolderSide, - GetCharacteristicPointStyle(Color.Teal, - Color.Transparent, - ChartPointSymbol.Circle)); - } - - /// - /// Create with default styling for a characteristic point - /// of type dike toe at polder. - /// - /// The created . - public static ChartPointData CreateDikeToeAtPolderChartData() - { - return new ChartPointData(RingtoetsCommonDataResources.CharacteristicPoint_DikeToeAtPolder, - GetCharacteristicPointStyle(Color.LightGray, - Color.Black, - ChartPointSymbol.Square)); - } - - /// - /// Create with default styling for a characteristic point - /// of type dike toe at river. - /// - /// The created . - public static ChartPointData CreateDikeToeAtRiverChartData() - { - return new ChartPointData(RingtoetsCommonDataResources.CharacteristicPoint_DikeToeAtRiver, - GetCharacteristicPointStyle(Color.DarkGray, - Color.Black, - ChartPointSymbol.Square)); - } - - /// /// Create for a based on its color. /// /// The index of the in for which to create . @@ -243,7 +165,7 @@ { chartData.Name = surfaceLine != null ? surfaceLine.Name - : Resources.RingtoetsMacroStabilityInwardsSurfaceLine_DisplayName; + : RingtoetsCommonFormsResources.SurfaceLine_DisplayName; } /// @@ -257,7 +179,7 @@ { chartData.Name = soilProfile != null ? soilProfile.Name - : Resources.StochasticSoilProfileProperties_DisplayName; + : RingtoetsCommonFormsResources.StochasticSoilProfileProperties_DisplayName; } private static ChartPointStyle GetCharacteristicPointStyle(Color fillColor, Color strokeColor, ChartPointSymbol symbol) @@ -267,7 +189,9 @@ Color = fillColor, StrokeColor = strokeColor, Size = 8, - StrokeThickness = strokeColor == Color.Transparent ? 0 : 1, + StrokeThickness = strokeColor == Color.Transparent + ? 0 + : 1, Symbol = symbol }; } Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/MacroStabilityInwardsSurfaceLineSelectionDialog.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r2fc082ea75494a149eca240146035aa8fa7f9e1c --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/MacroStabilityInwardsSurfaceLineSelectionDialog.cs (.../MacroStabilityInwardsSurfaceLineSelectionDialog.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/MacroStabilityInwardsSurfaceLineSelectionDialog.cs (.../MacroStabilityInwardsSurfaceLineSelectionDialog.cs) (revision 2fc082ea75494a149eca240146035aa8fa7f9e1c) @@ -27,6 +27,7 @@ using Ringtoets.Common.Forms.Views; using Ringtoets.MacroStabilityInwards.Forms.Properties; using Ringtoets.MacroStabilityInwards.Primitives; +using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.MacroStabilityInwards.Forms { @@ -51,7 +52,7 @@ } Text = Resources.MacroStabilityInwardsSurfaceLineSelectionDialog_Select_SurfaceLines; - InitializeDataGridView(Resources.RingtoetsMacroStabilityInwardsSurfaceLine_DisplayName); + InitializeDataGridView(RingtoetsCommonFormsResources.SurfaceLine_DisplayName); SetDataSource(surfaceLines.Select(sl => new SelectableRow(sl, sl.Name)).ToArray()); } Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r6a241363ac2d257e8012cb6336d66a8e9e350b8d -r2fc082ea75494a149eca240146035aa8fa7f9e1c --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6a241363ac2d257e8012cb6336d66a8e9e350b8d) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 2fc082ea75494a149eca240146035aa8fa7f9e1c) @@ -450,15 +450,6 @@ } /// - /// Looks up a localized string similar to Profielschematisatie. - /// - public static string RingtoetsMacroStabilityInwardsSurfaceLine_DisplayName { - get { - return ResourceManager.GetString("RingtoetsMacroStabilityInwardsSurfaceLine_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Naam van de profielschematisatie.. /// public static string RingtoetsMacroStabilityInwardsSurfaceLine_Name_Description { @@ -677,15 +668,6 @@ } /// - /// Looks up a localized string similar to Ondergrondschematisatie. - /// - public static string StochasticSoilProfileProperties_DisplayName { - get { - return ResourceManager.GetString("StochasticSoilProfileProperties_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// public static System.Drawing.Bitmap SurfaceLineIcon { Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx =================================================================== diff -u -r6a241363ac2d257e8012cb6336d66a8e9e350b8d -r2fc082ea75494a149eca240146035aa8fa7f9e1c --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 6a241363ac2d257e8012cb6336d66a8e9e350b8d) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 2fc082ea75494a149eca240146035aa8fa7f9e1c) @@ -136,9 +136,6 @@ Geometriepunten - - Profielschematisatie - De schematisatie van de hoogte van het dwarsprofiel. @@ -160,9 +157,6 @@ Naam - - Ondergrondschematisatie - De niveaus van de bovenkant van de lagen binnen de ondergrondschematisatie. Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/RingtoetsMacroStabilityInwardsSurfaceLineProperties.cs =================================================================== diff -u -r36089e883fc170498c85a840b883f786b96023d8 -r2fc082ea75494a149eca240146035aa8fa7f9e1c --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/RingtoetsMacroStabilityInwardsSurfaceLineProperties.cs (.../RingtoetsMacroStabilityInwardsSurfaceLineProperties.cs) (revision 36089e883fc170498c85a840b883f786b96023d8) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/RingtoetsMacroStabilityInwardsSurfaceLineProperties.cs (.../RingtoetsMacroStabilityInwardsSurfaceLineProperties.cs) (revision 2fc082ea75494a149eca240146035aa8fa7f9e1c) @@ -27,7 +27,6 @@ using Ringtoets.MacroStabilityInwards.Forms.Properties; using Ringtoets.MacroStabilityInwards.Primitives; using TypeConverter = System.ComponentModel.TypeConverterAttribute; - using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; @@ -36,7 +35,7 @@ /// /// ViewModel of for properties panel. /// - [ResourcesDisplayName(typeof(Resources), nameof(Resources.RingtoetsMacroStabilityInwardsSurfaceLine_DisplayName))] + [ResourcesDisplayName(typeof(Resources), nameof(RingtoetsCommonFormsResources.SurfaceLine_DisplayName))] public class RingtoetsMacroStabilityInwardsSurfaceLineProperties : ObjectProperties { [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))] Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/StochasticSoilProfileProperties.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r2fc082ea75494a149eca240146035aa8fa7f9e1c --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/StochasticSoilProfileProperties.cs (.../StochasticSoilProfileProperties.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/StochasticSoilProfileProperties.cs (.../StochasticSoilProfileProperties.cs) (revision 2fc082ea75494a149eca240146035aa8fa7f9e1c) @@ -37,7 +37,7 @@ /// /// ViewModel of for properties panel. /// - [ResourcesDisplayName(typeof(Resources), nameof(Resources.StochasticSoilProfileProperties_DisplayName))] + [ResourcesDisplayName(typeof(Resources), nameof(RingtoetsCommonFormsResources.StochasticSoilProfileProperties_DisplayName))] [TypeConverter(typeof(ExpandableObjectConverter))] public class StochasticSoilProfileProperties : ObjectProperties { Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs =================================================================== diff -u -r015737b4977d3a180f8a962ceeb24e6814227316 -r2fc082ea75494a149eca240146035aa8fa7f9e1c --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs (.../MacroStabilityInwardsInputView.cs) (revision 015737b4977d3a180f8a962ceeb24e6814227316) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs (.../MacroStabilityInwardsInputView.cs) (revision 2fc082ea75494a149eca240146035aa8fa7f9e1c) @@ -79,17 +79,17 @@ soilProfileChartData = RingtoetsChartDataFactory.CreateSoilProfileChartData(); surfaceLineChartData = RingtoetsChartDataFactory.CreateSurfaceLineChartData(); surfaceLevelInsideChartData = MacroStabilityInwardsChartDataFactory.CreateSurfaceLevelInsideChartData(); - ditchPolderSideChartData = MacroStabilityInwardsChartDataFactory.CreateDitchPolderSideChartData(); - bottomDitchPolderSideChartData = MacroStabilityInwardsChartDataFactory.CreateBottomDitchPolderSideChartData(); - bottomDitchDikeSideChartData = MacroStabilityInwardsChartDataFactory.CreateBottomDitchDikeSideChartData(); - ditchDikeSideChartData = MacroStabilityInwardsChartDataFactory.CreateDitchDikeSideChartData(); - dikeToeAtPolderChartData = MacroStabilityInwardsChartDataFactory.CreateDikeToeAtPolderChartData(); + ditchPolderSideChartData = RingtoetsChartDataFactory.CreateDitchPolderSideChartData(); + bottomDitchPolderSideChartData = RingtoetsChartDataFactory.CreateBottomDitchPolderSideChartData(); + bottomDitchDikeSideChartData = RingtoetsChartDataFactory.CreateBottomDitchDikeSideChartData(); + ditchDikeSideChartData = RingtoetsChartDataFactory.CreateDitchDikeSideChartData(); + dikeToeAtPolderChartData = RingtoetsChartDataFactory.CreateDikeToeAtPolderChartData(); shoulderTopInsideChartData = MacroStabilityInwardsChartDataFactory.CreateShoulderTopInsideChartData(); shoulderBaseInsideChartData = MacroStabilityInwardsChartDataFactory.CreateShoulderBaseInsideChartData(); trafficLoadInsideChartData = MacroStabilityInwardsChartDataFactory.CreateTrafficLoadInsideChartData(); dikeTopAtPolderChartData = MacroStabilityInwardsChartDataFactory.CreateDikeTopAtPolderChartData(); trafficLoadOutsideChartData = MacroStabilityInwardsChartDataFactory.CreateTrafficLoadOutsideChartData(); - dikeToeAtRiverChartData = MacroStabilityInwardsChartDataFactory.CreateDikeToeAtRiverChartData(); + dikeToeAtRiverChartData = RingtoetsChartDataFactory.CreateDikeToeAtRiverChartData(); surfaceLevelOutsideChartData = MacroStabilityInwardsChartDataFactory.CreateSurfaceLevelOutsideChartData(); chartDataCollection.Add(soilProfileChartData); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs =================================================================== diff -u -rb10bbf87b67aadd7c647938226b57be19afb4b46 -r2fc082ea75494a149eca240146035aa8fa7f9e1c --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs (.../MacroStabilityInwardsChartDataFactoryTest.cs) (revision b10bbf87b67aadd7c647938226b57be19afb4b46) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs (.../MacroStabilityInwardsChartDataFactoryTest.cs) (revision 2fc082ea75494a149eca240146035aa8fa7f9e1c) @@ -47,30 +47,6 @@ } [Test] - public void CreateDitchDikeSideChartData_ReturnsChartPointDataWithDefaultStyling() - { - // Call - ChartPointData data = MacroStabilityInwardsChartDataFactory.CreateDitchDikeSideChartData(); - - // Assert - Assert.IsFalse(data.HasData); - Assert.AreEqual("Insteek sloot dijkzijde", data.Name); - AssertEqualStyle(data.Style, Color.MediumPurple, 8, Color.Transparent, 0, ChartPointSymbol.Circle); - } - - [Test] - public void CreateDitchPolderSideChartData_ReturnsChartPointDataWithDefaultStyling() - { - // Call - ChartPointData data = MacroStabilityInwardsChartDataFactory.CreateDitchPolderSideChartData(); - - // Assert - Assert.IsFalse(data.HasData); - Assert.AreEqual("Insteek sloot polderzijde", data.Name); - AssertEqualStyle(data.Style, Color.IndianRed, 8, Color.Transparent, 0, ChartPointSymbol.Circle); - } - - [Test] public void CreateDikeTopAtPolderChartData_ReturnsChartPointDataWithDefaultStyling() { // Call @@ -143,54 +119,6 @@ } [Test] - public void CreateBottomDitchDikeSideChartData_ReturnsChartPointDataWithDefaultStyling() - { - // Call - ChartPointData data = MacroStabilityInwardsChartDataFactory.CreateBottomDitchDikeSideChartData(); - - // Assert - Assert.IsFalse(data.HasData); - Assert.AreEqual("Slootbodem dijkzijde", data.Name); - AssertEqualStyle(data.Style, Color.DarkSeaGreen, 8, Color.Transparent, 0, ChartPointSymbol.Circle); - } - - [Test] - public void CreateBottomDitchPolderSideChartData_ReturnsChartPointDataWithDefaultStyling() - { - // Call - ChartPointData data = MacroStabilityInwardsChartDataFactory.CreateBottomDitchPolderSideChartData(); - - // Assert - Assert.IsFalse(data.HasData); - Assert.AreEqual("Slootbodem polderzijde", data.Name); - AssertEqualStyle(data.Style, Color.Teal, 8, Color.Transparent, 0, ChartPointSymbol.Circle); - } - - [Test] - public void CreateDikeToeAtPolderChartData_ReturnsChartPointDataWithDefaultStyling() - { - // Call - ChartPointData data = MacroStabilityInwardsChartDataFactory.CreateDikeToeAtPolderChartData(); - - // Assert - Assert.IsFalse(data.HasData); - Assert.AreEqual("Teen dijk binnenwaarts", data.Name); - AssertEqualStyle(data.Style, Color.LightGray, 8, Color.Black, 1, ChartPointSymbol.Square); - } - - [Test] - public void CreateDikeToeAtRiverChartData_ReturnsChartPointDataWithDefaultStyling() - { - // Call - ChartPointData data = MacroStabilityInwardsChartDataFactory.CreateDikeToeAtRiverChartData(); - - // Assert - Assert.IsFalse(data.HasData); - Assert.AreEqual("Teen dijk buitenwaarts", data.Name); - AssertEqualStyle(data.Style, Color.DarkGray, 8, Color.Black, 1, ChartPointSymbol.Square); - } - - [Test] public void CreateSoilLayerChartData_SoilProfileNull_ThrowsArgumentNullException() { // Call Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r2fc082ea75494a149eca240146035aa8fa7f9e1c --- Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 2fc082ea75494a149eca240146035aa8fa7f9e1c) @@ -82,60 +82,6 @@ } /// - /// Looks up a localized string similar to Slootbodem dijkzijde. - /// - public static string CharacteristicPoint_BottomDitchDikeSide { - get { - return ResourceManager.GetString("CharacteristicPoint_BottomDitchDikeSide", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Slootbodem polderzijde. - /// - public static string CharacteristicPoint_BottomDitchPolderSide { - get { - return ResourceManager.GetString("CharacteristicPoint_BottomDitchPolderSide", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Teen dijk binnenwaarts. - /// - public static string CharacteristicPoint_DikeToeAtPolder { - get { - return ResourceManager.GetString("CharacteristicPoint_DikeToeAtPolder", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Teen dijk buitenwaarts. - /// - public static string CharacteristicPoint_DikeToeAtRiver { - get { - return ResourceManager.GetString("CharacteristicPoint_DikeToeAtRiver", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Insteek sloot dijkzijde. - /// - public static string CharacteristicPoint_DitchDikeSide { - get { - return ResourceManager.GetString("CharacteristicPoint_DitchDikeSide", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Insteek sloot polderzijde. - /// - public static string CharacteristicPoint_DitchPolderSide { - get { - return ResourceManager.GetString("CharacteristicPoint_DitchPolderSide", resourceCulture); - } - } - - /// /// Looks up a localized string similar to De waarde moet binnen het bereik {0} liggen.. /// public static string GeneralPipingInput_WaterVolumetricWeight_must_be_in_Range_0_ { Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r2fc082ea75494a149eca240146035aa8fa7f9e1c --- Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx (.../Resources.resx) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx (.../Resources.resx) (revision 2fc082ea75494a149eca240146035aa8fa7f9e1c) @@ -117,24 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Slootbodem dijkzijde - - - Slootbodem polderzijde - - - Teen dijk binnenwaarts - - - Teen dijk buitenwaarts - - - Insteek sloot dijkzijde - - - Insteek sloot polderzijde - Dijken en dammen - Piping Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingChartDataFactory.cs =================================================================== diff -u -r83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12 -r2fc082ea75494a149eca240146035aa8fa7f9e1c --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingChartDataFactory.cs (.../PipingChartDataFactory.cs) (revision 83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingChartDataFactory.cs (.../PipingChartDataFactory.cs) (revision 2fc082ea75494a149eca240146035aa8fa7f9e1c) @@ -26,7 +26,7 @@ using Core.Components.Chart.Styles; using Ringtoets.Piping.Forms.Properties; using Ringtoets.Piping.Primitives; -using PipingDataResources = Ringtoets.Piping.Data.Properties.Resources; +using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.Piping.Forms.Factories { @@ -56,66 +56,6 @@ } /// - /// Create with default styling for a characteristic point of type ditch polder side. - /// - /// The created . - public static ChartPointData CreateDitchPolderSideChartData() - { - return new ChartPointData(PipingDataResources.CharacteristicPoint_DitchPolderSide, - GetCharacteristicPointStyle(Color.IndianRed)); - } - - /// - /// Create with default styling for a characteristic point of type bottom ditch polder side. - /// - /// The created . - public static ChartPointData CreateBottomDitchPolderSideChartData() - { - return new ChartPointData(PipingDataResources.CharacteristicPoint_BottomDitchPolderSide, - GetCharacteristicPointStyle(Color.Teal)); - } - - /// - /// Create with default styling for a characteristic point of type bottom ditch dike side. - /// - /// The created . - public static ChartPointData CreateBottomDitchDikeSideChartData() - { - return new ChartPointData(PipingDataResources.CharacteristicPoint_BottomDitchDikeSide, - GetCharacteristicPointStyle(Color.DarkSeaGreen)); - } - - /// - /// Create with default styling for a characteristic point of type ditch dike side. - /// - /// The created . - public static ChartPointData CreateDitchDikeSideChartData() - { - return new ChartPointData(PipingDataResources.CharacteristicPoint_DitchDikeSide, - GetCharacteristicPointStyle(Color.MediumPurple)); - } - - /// - /// Create with default styling for a characteristic point of type dike toe at river. - /// - /// The created . - public static ChartPointData CreateDikeToeAtRiverChartData() - { - return new ChartPointData(PipingDataResources.CharacteristicPoint_DikeToeAtRiver, - GetCharacteristicPointStyle(Color.DarkBlue)); - } - - /// - /// Create with default styling for a characteristic point of type dike toe at polder. - /// - /// The created . - public static ChartPointData CreateDikeToeAtPolderChartData() - { - return new ChartPointData(PipingDataResources.CharacteristicPoint_DikeToeAtPolder, - GetCharacteristicPointStyle(Color.SlateGray)); - } - - /// /// Create for a based on its color. /// /// The index of the in for which to create . @@ -156,7 +96,7 @@ { chartData.Name = surfaceLine != null ? surfaceLine.Name - : Resources.RingtoetsPipingSurfaceLine_DisplayName; + : RingtoetsCommonFormsResources.SurfaceLine_DisplayName; } /// @@ -170,7 +110,7 @@ { chartData.Name = soilProfile != null ? soilProfile.Name - : Resources.StochasticSoilProfileProperties_DisplayName; + : RingtoetsCommonFormsResources.StochasticSoilProfileProperties_DisplayName; } private static ChartPointStyle GetGeneralPointStyle(Color color) @@ -184,17 +124,5 @@ Symbol = ChartPointSymbol.Triangle }; } - - private static ChartPointStyle GetCharacteristicPointStyle(Color indianRed) - { - return new ChartPointStyle - { - Color = indianRed, - StrokeColor = Color.Transparent, - Size = 8, - StrokeThickness = 0, - Symbol = ChartPointSymbol.Circle - }; - } } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingSurfaceLineSelectionDialog.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r2fc082ea75494a149eca240146035aa8fa7f9e1c --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingSurfaceLineSelectionDialog.cs (.../PipingSurfaceLineSelectionDialog.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingSurfaceLineSelectionDialog.cs (.../PipingSurfaceLineSelectionDialog.cs) (revision 2fc082ea75494a149eca240146035aa8fa7f9e1c) @@ -27,6 +27,7 @@ using Ringtoets.Common.Forms.Views; using Ringtoets.Piping.Forms.Properties; using Ringtoets.Piping.Primitives; +using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.Piping.Forms { @@ -51,7 +52,7 @@ } Text = Resources.PipingSurfaceLineSelectionDialog_Select_SurfaceLines; - InitializeDataGridView(Resources.RingtoetsPipingSurfaceLine_DisplayName); + InitializeDataGridView(RingtoetsCommonFormsResources.SurfaceLine_DisplayName); SetDataSource(surfaceLines.Select(sl => new SelectableRow(sl, sl.Name)).ToArray()); } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r36089e883fc170498c85a840b883f786b96023d8 -r2fc082ea75494a149eca240146035aa8fa7f9e1c --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 36089e883fc170498c85a840b883f786b96023d8) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 2fc082ea75494a149eca240146035aa8fa7f9e1c) @@ -1276,15 +1276,6 @@ } /// - /// Looks up a localized string similar to Profielschematisatie. - /// - public static string RingtoetsPipingSurfaceLine_DisplayName { - get { - return ResourceManager.GetString("RingtoetsPipingSurfaceLine_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to De locatie van het bestand waaruit de profielschematisaties zijn geïmporteerd.. /// public static string RingtoetsPipingSurfaceLineCollection_SourcePath_Description { @@ -1455,14 +1446,5 @@ return ResourceManager.GetString("StochasticSoilProfile_Type_DisplayName", resourceCulture); } } - - /// - /// Looks up a localized string similar to Ondergrondschematisatie. - /// - public static string StochasticSoilProfileProperties_DisplayName { - get { - return ResourceManager.GetString("StochasticSoilProfileProperties_DisplayName", resourceCulture); - } - } } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -r36089e883fc170498c85a840b883f786b96023d8 -r2fc082ea75494a149eca240146035aa8fa7f9e1c --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 36089e883fc170498c85a840b883f786b96023d8) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 2fc082ea75494a149eca240146035aa8fa7f9e1c) @@ -250,9 +250,6 @@ ..\Resources\chart_curve.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Profielschematisatie - De schematisatie van de hoogte van het dwarsprofiel. @@ -274,9 +271,6 @@ Naam - - Ondergrondschematisatie - De niveaus van de bovenkant van de lagen binnen de ondergrondschematisatie. Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/RingtoetsPipingSurfaceLineProperties.cs =================================================================== diff -u -r36089e883fc170498c85a840b883f786b96023d8 -r2fc082ea75494a149eca240146035aa8fa7f9e1c --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/RingtoetsPipingSurfaceLineProperties.cs (.../RingtoetsPipingSurfaceLineProperties.cs) (revision 36089e883fc170498c85a840b883f786b96023d8) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/RingtoetsPipingSurfaceLineProperties.cs (.../RingtoetsPipingSurfaceLineProperties.cs) (revision 2fc082ea75494a149eca240146035aa8fa7f9e1c) @@ -35,7 +35,7 @@ /// /// ViewModel of for properties panel. /// - [ResourcesDisplayName(typeof(Resources), nameof(Resources.RingtoetsPipingSurfaceLine_DisplayName))] + [ResourcesDisplayName(typeof(Resources), nameof(RingtoetsCommonFormsResources.SurfaceLine_DisplayName))] public class RingtoetsPipingSurfaceLineProperties : ObjectProperties { [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))] Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/StochasticSoilProfileProperties.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r2fc082ea75494a149eca240146035aa8fa7f9e1c --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/StochasticSoilProfileProperties.cs (.../StochasticSoilProfileProperties.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/StochasticSoilProfileProperties.cs (.../StochasticSoilProfileProperties.cs) (revision 2fc082ea75494a149eca240146035aa8fa7f9e1c) @@ -37,7 +37,7 @@ /// /// ViewModel of for properties panel. /// - [ResourcesDisplayName(typeof(Resources), nameof(Resources.StochasticSoilProfileProperties_DisplayName))] + [ResourcesDisplayName(typeof(Resources), nameof(RingtoetsCommonFormsResources.StochasticSoilProfileProperties_DisplayName))] [TypeConverter(typeof(ExpandableObjectConverter))] public class StochasticSoilProfileProperties : ObjectProperties { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingInputView.cs =================================================================== diff -u -r7938567fa945e26d2e66bba8101841eb12d01d88 -r2fc082ea75494a149eca240146035aa8fa7f9e1c --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingInputView.cs (.../PipingInputView.cs) (revision 7938567fa945e26d2e66bba8101841eb12d01d88) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingInputView.cs (.../PipingInputView.cs) (revision 2fc082ea75494a149eca240146035aa8fa7f9e1c) @@ -73,12 +73,12 @@ chartDataCollection = new ChartDataCollection(RingtoetsCommonFormsResources.Calculation_Input); soilProfileChartData = RingtoetsChartDataFactory.CreateSoilProfileChartData(); surfaceLineChartData = RingtoetsChartDataFactory.CreateSurfaceLineChartData(); - ditchPolderSideChartData = PipingChartDataFactory.CreateDitchPolderSideChartData(); - bottomDitchPolderSideChartData = PipingChartDataFactory.CreateBottomDitchPolderSideChartData(); - bottomDitchDikeSideChartData = PipingChartDataFactory.CreateBottomDitchDikeSideChartData(); - ditchDikeSideChartData = PipingChartDataFactory.CreateDitchDikeSideChartData(); - dikeToeAtPolderChartData = PipingChartDataFactory.CreateDikeToeAtPolderChartData(); - dikeToeAtRiverChartData = PipingChartDataFactory.CreateDikeToeAtRiverChartData(); + ditchPolderSideChartData = RingtoetsChartDataFactory.CreateDitchPolderSideChartData(); + bottomDitchPolderSideChartData = RingtoetsChartDataFactory.CreateBottomDitchPolderSideChartData(); + bottomDitchDikeSideChartData = RingtoetsChartDataFactory.CreateBottomDitchDikeSideChartData(); + ditchDikeSideChartData = RingtoetsChartDataFactory.CreateDitchDikeSideChartData(); + dikeToeAtPolderChartData = RingtoetsChartDataFactory.CreateDikeToeAtPolderChartData(); + dikeToeAtRiverChartData = RingtoetsChartDataFactory.CreateDikeToeAtRiverChartData(); exitPointChartData = PipingChartDataFactory.CreateExitPointChartData(); entryPointChartData = PipingChartDataFactory.CreateEntryPointChartData(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingChartDataFactoryTest.cs =================================================================== diff -u -r246dc954b190c640ad46a4ea8c7dc53076a45808 -r2fc082ea75494a149eca240146035aa8fa7f9e1c --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingChartDataFactoryTest.cs (.../PipingChartDataFactoryTest.cs) (revision 246dc954b190c640ad46a4ea8c7dc53076a45808) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingChartDataFactoryTest.cs (.../PipingChartDataFactoryTest.cs) (revision 2fc082ea75494a149eca240146035aa8fa7f9e1c) @@ -59,78 +59,6 @@ } [Test] - public void CreateDitchPolderSideChartData_ReturnsEmptyChartPointDataWithDefaultStyling() - { - // Call - ChartPointData data = PipingChartDataFactory.CreateDitchPolderSideChartData(); - - // Assert - Assert.IsEmpty(data.Points); - Assert.AreEqual("Insteek sloot polderzijde", data.Name); - AssertEqualStyle(data.Style, Color.IndianRed, 8, Color.Transparent, 0, ChartPointSymbol.Circle); - } - - [Test] - public void CreateBottomDitchPolderSideChartData_ReturnsEmptyChartPointDataWithDefaultStyling() - { - // Call - ChartPointData data = PipingChartDataFactory.CreateBottomDitchPolderSideChartData(); - - // Assert - Assert.IsEmpty(data.Points); - Assert.AreEqual("Slootbodem polderzijde", data.Name); - AssertEqualStyle(data.Style, Color.Teal, 8, Color.Transparent, 0, ChartPointSymbol.Circle); - } - - [Test] - public void CreateBottomDitchDikeSideChartData_ReturnsEmptyChartPointDataWithDefaultStyling() - { - // Call - ChartPointData data = PipingChartDataFactory.CreateBottomDitchDikeSideChartData(); - - // Assert - Assert.IsEmpty(data.Points); - Assert.AreEqual("Slootbodem dijkzijde", data.Name); - AssertEqualStyle(data.Style, Color.DarkSeaGreen, 8, Color.Transparent, 0, ChartPointSymbol.Circle); - } - - [Test] - public void CreateDitchDikeSideChartData_ReturnsEmptyChartPointDataWithDefaultStyling() - { - // Call - ChartPointData data = PipingChartDataFactory.CreateDitchDikeSideChartData(); - - // Assert - Assert.IsEmpty(data.Points); - Assert.AreEqual("Insteek sloot dijkzijde", data.Name); - AssertEqualStyle(data.Style, Color.MediumPurple, 8, Color.Transparent, 0, ChartPointSymbol.Circle); - } - - [Test] - public void CreateDikeToeAtRiverChartData_ReturnsEmptyChartPointDataWithDefaultStyling() - { - // Call - ChartPointData data = PipingChartDataFactory.CreateDikeToeAtRiverChartData(); - - // Assert - Assert.IsEmpty(data.Points); - Assert.AreEqual("Teen dijk buitenwaarts", data.Name); - AssertEqualStyle(data.Style, Color.DarkBlue, 8, Color.Transparent, 0, ChartPointSymbol.Circle); - } - - [Test] - public void CreateDikeToeAtPolderChartData_ReturnsEmptyChartPointDataWithDefaultStyling() - { - // Call - ChartPointData data = PipingChartDataFactory.CreateDikeToeAtPolderChartData(); - - // Assert - Assert.IsEmpty(data.Points); - Assert.AreEqual("Teen dijk binnenwaarts", data.Name); - AssertEqualStyle(data.Style, Color.SlateGray, 8, Color.Transparent, 0, ChartPointSymbol.Circle); - } - - [Test] public void CreateSoilLayerChartData_SoilProfileNull_ThrowsArgumentNullException() { // Call Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj =================================================================== diff -u -r4a60f6ca9a08736cfaf0fac6e6f2e89e9fa59aae -r2fc082ea75494a149eca240146035aa8fa7f9e1c --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj (.../Ringtoets.Piping.Forms.Test.csproj) (revision 4a60f6ca9a08736cfaf0fac6e6f2e89e9fa59aae) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj (.../Ringtoets.Piping.Forms.Test.csproj) (revision 2fc082ea75494a149eca240146035aa8fa7f9e1c) @@ -117,10 +117,6 @@ {30e4c2ae-719e-4d70-9fa9-668a9767fbfa} Core.Common.Gui - - {f49bd8b2-332a-4c91-a196-8cce0a2c7d98} - Core.Common.Utils - {d749ee4c-ce50-4c17-bf01-9a953028c126} Core.Common.TestUtil