Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r3a33e7253e29eb7649dcfc0f675169559b0eefb9 -r5a4e3ce4a8088c1fbb043a029f8081abb4cf1021 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3a33e7253e29eb7649dcfc0f675169559b0eefb9) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 5a4e3ce4a8088c1fbb043a029f8081abb4cf1021) @@ -1584,78 +1584,6 @@ } /// - /// Looks up a localized string similar to Berekende invloedscoëfficiënten voor alle beschouwde stochasten.. - /// - public static string HydraulicBoundaryDatabase_AlphaValues_Description { - get { - return ResourceManager.GetString("HydraulicBoundaryDatabase_AlphaValues_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Alfa's [-]. - /// - public static string HydraulicBoundaryDatabase_AlphaValues_DisplayName { - get { - return ResourceManager.GetString("HydraulicBoundaryDatabase_AlphaValues_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Tijdsduren waarop de stochasten betrekking hebben.. - /// - public static string HydraulicBoundaryDatabase_Durations_Description { - get { - return ResourceManager.GetString("HydraulicBoundaryDatabase_Durations_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Tijdsduren [min]. - /// - public static string HydraulicBoundaryDatabase_Durations_DisplayName { - get { - return ResourceManager.GetString("HydraulicBoundaryDatabase_Durations_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to De windrichting waarvoor de berekende betrouwbaarheidsindex het laagst is.. - /// - public static string HydraulicBoundaryDatabase_GoverningWindDirection_Description { - get { - return ResourceManager.GetString("HydraulicBoundaryDatabase_GoverningWindDirection_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Maatgevende windrichting. - /// - public static string HydraulicBoundaryDatabase_GoverningWindDirection_DisplayName { - get { - return ResourceManager.GetString("HydraulicBoundaryDatabase_GoverningWindDirection_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to De lijst van illustratiepunten voor de berekening.. - /// - public static string HydraulicBoundaryDatabase_IllustrationPoints_Description { - get { - return ResourceManager.GetString("HydraulicBoundaryDatabase_IllustrationPoints_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Illustratiepunten. - /// - public static string HydraulicBoundaryDatabase_IllustrationPoints_DisplayName { - get { - return ResourceManager.GetString("HydraulicBoundaryDatabase_IllustrationPoints_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Coördinaten van de hydraulische randvoorwaardenlocatie.. /// public static string HydraulicBoundaryDatabase_Location_Coordinates_Description { @@ -1791,6 +1719,24 @@ } /// + /// Looks up a localized string similar to Berekende invloedscoëfficiënten voor alle beschouwde stochasten.. + /// + public static string IllustrationPoint_AlphaValues_Description { + get { + return ResourceManager.GetString("IllustrationPoint_AlphaValues_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Alfa's [-]. + /// + public static string IllustrationPoint_AlphaValues_DisplayName { + get { + return ResourceManager.GetString("IllustrationPoint_AlphaValues_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Het sluitscenario waarvoor dit illustratiepunt is berekend.. /// public static string IllustrationPoint_ClosingSituation_Description { @@ -1809,6 +1755,42 @@ } /// + /// Looks up a localized string similar to Tijdsduren waarop de stochasten betrekking hebben.. + /// + public static string IllustrationPoint_Durations_Description { + get { + return ResourceManager.GetString("IllustrationPoint_Durations_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Tijdsduren [min]. + /// + public static string IllustrationPoint_Durations_DisplayName { + get { + return ResourceManager.GetString("IllustrationPoint_Durations_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to De windrichting waarvoor de berekende betrouwbaarheidsindex het laagst is.. + /// + public static string IllustrationPoint_GoverningWindDirection_Description { + get { + return ResourceManager.GetString("IllustrationPoint_GoverningWindDirection_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Maatgevende windrichting. + /// + public static string IllustrationPoint_GoverningWindDirection_DisplayName { + get { + return ResourceManager.GetString("IllustrationPoint_GoverningWindDirection_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Realisaties van de stochasten in het illustratiepunt. /// public static string IllustrationPoint_Realization_Description { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx =================================================================== diff -u -r3a33e7253e29eb7649dcfc0f675169559b0eefb9 -r5a4e3ce4a8088c1fbb043a029f8081abb4cf1021 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 3a33e7253e29eb7649dcfc0f675169559b0eefb9) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 5a4e3ce4a8088c1fbb043a029f8081abb4cf1021) @@ -999,28 +999,22 @@ Illustratiepunten - + Tijdsduren waarop de stochasten betrekking hebben. - + Tijdsduren [min] - + De windrichting waarvoor de berekende betrouwbaarheidsindex het laagst is. - + Maatgevende windrichting - - De lijst van illustratiepunten voor de berekening. - - - Illustratiepunten - - + Berekende invloedscoëfficiënten voor alle beschouwde stochasten. - + Alfa's [-] Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FaultTreeIllustrationPointProperties.cs =================================================================== diff -u -r390c486bb4cd693ae2f2eaf82a30efcb51480048 -r5a4e3ce4a8088c1fbb043a029f8081abb4cf1021 --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FaultTreeIllustrationPointProperties.cs (.../FaultTreeIllustrationPointProperties.cs) (revision 390c486bb4cd693ae2f2eaf82a30efcb51480048) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FaultTreeIllustrationPointProperties.cs (.../FaultTreeIllustrationPointProperties.cs) (revision 5a4e3ce4a8088c1fbb043a029f8081abb4cf1021) @@ -61,8 +61,8 @@ [PropertyOrder(4)] [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_AlphaValues_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_AlphaValues_Description))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_AlphaValues_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPoint_AlphaValues_Description))] [TypeConverter(typeof(KeyValueExpandableArrayConverter))] [KeyValueElement(nameof(Stochast.Name), nameof(Stochast.Alpha))] public Stochast[] AlphaValues @@ -75,8 +75,8 @@ [PropertyOrder(5)] [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_Durations_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_Durations_Description))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_Durations_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPoint_Durations_Description))] [TypeConverter(typeof(KeyValueExpandableArrayConverter))] [KeyValueElement(nameof(Stochast.Name), nameof(Stochast.Duration))] public Stochast[] Durations Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresOutputProperties.cs =================================================================== diff -u -r390c486bb4cd693ae2f2eaf82a30efcb51480048 -r5a4e3ce4a8088c1fbb043a029f8081abb4cf1021 --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresOutputProperties.cs (.../StructuresOutputProperties.cs) (revision 390c486bb4cd693ae2f2eaf82a30efcb51480048) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresOutputProperties.cs (.../StructuresOutputProperties.cs) (revision 5a4e3ce4a8088c1fbb043a029f8081abb4cf1021) @@ -57,8 +57,8 @@ [DynamicVisible] [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints), 2, 2)] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_GoverningWindDirection_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_GoverningWindDirection_Description))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_GoverningWindDirection_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPoint_GoverningWindDirection_Description))] public string WindDirection { get @@ -69,8 +69,8 @@ [DynamicVisible] [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints), 2, 2)] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_AlphaValues_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_AlphaValues_Description))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_AlphaValues_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPoint_AlphaValues_Description))] [TypeConverter(typeof(KeyValueExpandableArrayConverter))] [KeyValueElement(nameof(Stochast.Name), nameof(Stochast.Alpha))] public Stochast[] AlphaValues @@ -83,8 +83,8 @@ [DynamicVisible] [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints), 2, 2)] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_Durations_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_Durations_Description))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_Durations_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPoint_Durations_Description))] [TypeConverter(typeof(KeyValueExpandableArrayConverter))] [KeyValueElement(nameof(Stochast.Name), nameof(Stochast.Duration))] public Stochast[] Durations @@ -104,10 +104,20 @@ { get { - List listOfClosingSituations = data.GeneralResult.TopLevelIllustrationPoints.Select(topLevelFaultTreeIllustrationPoint => - topLevelFaultTreeIllustrationPoint.ClosingSituation).ToList(); + if (!data.HasGeneralResult) + { + return new TopLevelFaultTreeIllustrationPointProperties[0]; + } - return data.GeneralResult.TopLevelIllustrationPoints.Select(point => new TopLevelFaultTreeIllustrationPointProperties(point, listOfClosingSituations)).ToArray(); + IEnumerable listOfClosingSituations = data.GeneralResult + .TopLevelIllustrationPoints + .Select(point => point.ClosingSituation); + + return data.GeneralResult + .TopLevelIllustrationPoints + .Select(point => + new TopLevelFaultTreeIllustrationPointProperties( + point, listOfClosingSituations)).ToArray(); } } Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/SubMechanismIllustrationPointProperties.cs =================================================================== diff -u -r390c486bb4cd693ae2f2eaf82a30efcb51480048 -r5a4e3ce4a8088c1fbb043a029f8081abb4cf1021 --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/SubMechanismIllustrationPointProperties.cs (.../SubMechanismIllustrationPointProperties.cs) (revision 390c486bb4cd693ae2f2eaf82a30efcb51480048) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/SubMechanismIllustrationPointProperties.cs (.../SubMechanismIllustrationPointProperties.cs) (revision 5a4e3ce4a8088c1fbb043a029f8081abb4cf1021) @@ -61,8 +61,8 @@ [PropertyOrder(4)] [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_AlphaValues_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_AlphaValues_Description))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_AlphaValues_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPoint_AlphaValues_Description))] [TypeConverter(typeof(KeyValueExpandableArrayConverter))] [KeyValueElement(nameof(SubMechanismIllustrationPointStochast.Name), nameof(SubMechanismIllustrationPointStochast.Alpha))] public SubMechanismIllustrationPointStochast[] AlphaValues @@ -75,8 +75,8 @@ [PropertyOrder(5)] [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_Durations_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_Durations_Description))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_Durations_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPoint_Durations_Description))] [TypeConverter(typeof(KeyValueExpandableArrayConverter))] [KeyValueElement(nameof(SubMechanismIllustrationPointStochast.Name), nameof(SubMechanismIllustrationPointStochast.Duration))] public SubMechanismIllustrationPointStochast[] Durations Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/TopLevelFaultTreeIllustrationPointProperties.cs =================================================================== diff -u -r390c486bb4cd693ae2f2eaf82a30efcb51480048 -r5a4e3ce4a8088c1fbb043a029f8081abb4cf1021 --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/TopLevelFaultTreeIllustrationPointProperties.cs (.../TopLevelFaultTreeIllustrationPointProperties.cs) (revision 390c486bb4cd693ae2f2eaf82a30efcb51480048) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/TopLevelFaultTreeIllustrationPointProperties.cs (.../TopLevelFaultTreeIllustrationPointProperties.cs) (revision 5a4e3ce4a8088c1fbb043a029f8081abb4cf1021) @@ -112,8 +112,8 @@ } [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_AlphaValues_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_AlphaValues_Description))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_AlphaValues_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPoint_AlphaValues_Description))] [TypeConverter(typeof(KeyValueExpandableArrayConverter))] [KeyValueElement(nameof(Stochast.Name), nameof(Stochast.Alpha))] public Stochast[] AlphaValues @@ -125,8 +125,8 @@ } [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_Durations_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_Durations_Description))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_Durations_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPoint_Durations_Description))] [TypeConverter(typeof(KeyValueExpandableArrayConverter))] [KeyValueElement(nameof(Stochast.Name), nameof(Stochast.Duration))] public Stochast[] Durations Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/TopLevelSubMechanismIllustrationPointProperties.cs =================================================================== diff -u -r3fbb377f0b3df239bfe408f55f45bb67eb5440a2 -r5a4e3ce4a8088c1fbb043a029f8081abb4cf1021 --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/TopLevelSubMechanismIllustrationPointProperties.cs (.../TopLevelSubMechanismIllustrationPointProperties.cs) (revision 3fbb377f0b3df239bfe408f55f45bb67eb5440a2) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/TopLevelSubMechanismIllustrationPointProperties.cs (.../TopLevelSubMechanismIllustrationPointProperties.cs) (revision 5a4e3ce4a8088c1fbb043a029f8081abb4cf1021) @@ -131,8 +131,8 @@ [PropertyOrder(6)] [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_General))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_AlphaValues_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_AlphaValues_Description))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_AlphaValues_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPoint_AlphaValues_Description))] [TypeConverter(typeof(KeyValueExpandableArrayConverter))] [KeyValueElement(nameof(SubMechanismIllustrationPointStochast.Name), nameof(SubMechanismIllustrationPointStochast.Alpha))] public SubMechanismIllustrationPointStochast[] AlphaValues @@ -145,8 +145,8 @@ [PropertyOrder(7)] [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_General))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_Durations_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_Durations_Description))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_Durations_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPoint_Durations_Description))] [TypeConverter(typeof(KeyValueExpandableArrayConverter))] [KeyValueElement(nameof(SubMechanismIllustrationPointStochast.Name), nameof(SubMechanismIllustrationPointStochast.Duration))] public SubMechanismIllustrationPointStochast[] Durations Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/TestFaultTreeIllustrationPoint.cs =================================================================== diff -u -r3a33e7253e29eb7649dcfc0f675169559b0eefb9 -r5a4e3ce4a8088c1fbb043a029f8081abb4cf1021 --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/TestFaultTreeIllustrationPoint.cs (.../TestFaultTreeIllustrationPoint.cs) (revision 3a33e7253e29eb7649dcfc0f675169559b0eefb9) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/TestFaultTreeIllustrationPoint.cs (.../TestFaultTreeIllustrationPoint.cs) (revision 5a4e3ce4a8088c1fbb043a029f8081abb4cf1021) @@ -26,7 +26,7 @@ namespace Ringtoets.Common.Data.TestUtil.IllustrationPoints { /// - /// A simple sub mechanism illustration point that can be used for testing. + /// A simple fault tree illustration point that can be used for testing. /// public class TestFaultTreeIllustrationPoint : FaultTreeIllustrationPoint { Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresOutputPropertiesTest.cs =================================================================== diff -u -r390c486bb4cd693ae2f2eaf82a30efcb51480048 -r5a4e3ce4a8088c1fbb043a029f8081abb4cf1021 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresOutputPropertiesTest.cs (.../StructuresOutputPropertiesTest.cs) (revision 390c486bb4cd693ae2f2eaf82a30efcb51480048) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresOutputPropertiesTest.cs (.../StructuresOutputPropertiesTest.cs) (revision 5a4e3ce4a8088c1fbb043a029f8081abb4cf1021) @@ -102,11 +102,6 @@ var properties = new StructuresOutputProperties(structuresOutput); // Assert - var expectedFaultTreeIllustrationPointProperties = new TopLevelFaultTreeIllustrationPointProperties(generalResult.TopLevelIllustrationPoints.First(), new[] - { - "closing situation" - }); - Assert.AreEqual(ProbabilityFormattingHelper.Format(requiredProbability), properties.RequiredProbability); Assert.AreEqual(requiredReliability, properties.RequiredReliability, properties.RequiredReliability.GetAccuracy()); Assert.AreEqual(ProbabilityFormattingHelper.Format(probability), properties.Probability); @@ -135,16 +130,26 @@ int nrOfExpectedTopLevelIllustrationPoints = generalResult.TopLevelIllustrationPoints.Count(); Assert.AreEqual(nrOfExpectedTopLevelIllustrationPoints, properties.IllustrationPoints.Length); - foreach (TopLevelFaultTreeIllustrationPointProperties topLevelFaultTreeIllustrationPointProperties in properties.IllustrationPoints) - { - Assert.AreEqual(expectedFaultTreeIllustrationPointProperties.WindDirection, topLevelFaultTreeIllustrationPointProperties.WindDirection); - Assert.AreEqual(expectedFaultTreeIllustrationPointProperties.Reliability, topLevelFaultTreeIllustrationPointProperties.Reliability); - Assert.AreEqual(expectedFaultTreeIllustrationPointProperties.CalculatedProbability, expectedFaultTreeIllustrationPointProperties.CalculatedProbability); - Assert.AreEqual(expectedFaultTreeIllustrationPointProperties.ClosingSituation, topLevelFaultTreeIllustrationPointProperties.ClosingSituation); - } + CollectionAssert.AreEqual(generalResult.TopLevelIllustrationPoints, properties.IllustrationPoints.Select(i => i.Data)); } + [Test] + public void IllustrationPoints_HasGeneralResultFalse_ReturnsEmptyTopLevelFaultTreeIllustrationPointPropertiesArray() + { + // Setup + var structuresOutput = new StructuresOutput(new TestProbabilityAssessmentOutput(), null); + var properties = new StructuresOutputProperties(structuresOutput); + + // Call + TopLevelFaultTreeIllustrationPointProperties[] illustrationPoints = properties.IllustrationPoints; + + // Assert + Assert.IsEmpty(illustrationPoints); + + } + + [Test] public void Constructor_HasGeneralResult_PropertiesHaveExpectedAttributesValues() { // Setup Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeHeightOutputProperties.cs =================================================================== diff -u -r390c486bb4cd693ae2f2eaf82a30efcb51480048 -r5a4e3ce4a8088c1fbb043a029f8081abb4cf1021 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeHeightOutputProperties.cs (.../DikeHeightOutputProperties.cs) (revision 390c486bb4cd693ae2f2eaf82a30efcb51480048) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeHeightOutputProperties.cs (.../DikeHeightOutputProperties.cs) (revision 5a4e3ce4a8088c1fbb043a029f8081abb4cf1021) @@ -137,41 +137,41 @@ [DynamicVisible] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_IllustrationPoints), 2, 2)] - [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_GoverningWindDirection_DisplayName))] - [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_GoverningWindDirection_Description))] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_GoverningWindDirection_DisplayName))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_GoverningWindDirection_Description))] public string WindDirection { get { - return data.GeneralResult.GoverningWindDirection.Name; + return data.GeneralResult?.GoverningWindDirection.Name; } } [DynamicVisible] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_IllustrationPoints), 2, 2)] - [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_AlphaValues_DisplayName))] - [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_AlphaValues_Description))] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_AlphaValues_DisplayName))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_AlphaValues_Description))] [TypeConverter(typeof(KeyValueExpandableArrayConverter))] [KeyValueElement(nameof(Stochast.Name), nameof(Stochast.Alpha))] public Stochast[] AlphaValues { get { - return data.GeneralResult.Stochasts.ToArray(); + return data.GeneralResult?.Stochasts.ToArray(); } } [DynamicVisible] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_IllustrationPoints), 2, 2)] - [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_Durations_DisplayName))] - [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_Durations_Description))] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_Durations_DisplayName))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_Durations_Description))] [TypeConverter(typeof(KeyValueExpandableArrayConverter))] [KeyValueElement(nameof(Stochast.Name), nameof(Stochast.Duration))] public Stochast[] Durations { get { - return data.GeneralResult.Stochasts.ToArray(); + return data.GeneralResult?.Stochasts.ToArray(); } } @@ -181,15 +181,24 @@ [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPointProperty_IllustrationPoints_DisplayName))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPointProperty_IllustrationPoints_Description))] [TypeConverter(typeof(ExpandableArrayConverter))] - [KeyValueElement(nameof(TopLevelFaultTreeIllustrationPointProperties.WindDirection), "")] public TopLevelFaultTreeIllustrationPointProperties[] IllustrationPoints { get { - IEnumerable listOfClosingSituations = data.GeneralResult.TopLevelIllustrationPoints.Select(topLevelFaultTreeIllustrationPoint => - topLevelFaultTreeIllustrationPoint.ClosingSituation).ToList(); + if (!data.HasGeneralResult) + { + return new TopLevelFaultTreeIllustrationPointProperties[0]; + } - return data.GeneralResult.TopLevelIllustrationPoints.Select(point => new TopLevelFaultTreeIllustrationPointProperties(point, listOfClosingSituations)).ToArray(); + IEnumerable listOfClosingSituations = data.GeneralResult + .TopLevelIllustrationPoints + .Select(point => point.ClosingSituation); + + return data.GeneralResult + .TopLevelIllustrationPoints + .Select(point => + new TopLevelFaultTreeIllustrationPointProperties( + point, listOfClosingSituations)).ToArray(); } } Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsOutputProperties.cs =================================================================== diff -u -r30713c4473d8e1815ac69cb6e84dc448abffee40 -r5a4e3ce4a8088c1fbb043a029f8081abb4cf1021 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsOutputProperties.cs (.../GrassCoverErosionInwardsOutputProperties.cs) (revision 30713c4473d8e1815ac69cb6e84dc448abffee40) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsOutputProperties.cs (.../GrassCoverErosionInwardsOutputProperties.cs) (revision 5a4e3ce4a8088c1fbb043a029f8081abb4cf1021) @@ -30,8 +30,8 @@ using Ringtoets.Common.Forms.Helpers; using Ringtoets.Common.Forms.TypeConverters; using Ringtoets.GrassCoverErosionInwards.Data; +using Ringtoets.GrassCoverErosionInwards.Forms.Properties; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; -using GrassCoverErosionInwardsFormsResources = Ringtoets.GrassCoverErosionInwards.Forms.Properties.Resources; namespace Ringtoets.GrassCoverErosionInwards.Forms.PropertyClasses { @@ -66,7 +66,7 @@ #region GrassCoverErosionInwards result [PropertyOrder(1)] - [ResourcesCategory(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.Categories_OvertoppingOutput), 1, 3)] + [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_OvertoppingOutput), 1, 3)] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.ProbabilityAssessmentOutput_RequiredProbability_Displayname))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.ProbabilityAssessmentOutput_RequiredProbability_Description))] public string RequiredProbability @@ -78,7 +78,7 @@ } [PropertyOrder(2)] - [ResourcesCategory(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.Categories_OvertoppingOutput), 1, 3)] + [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_OvertoppingOutput), 1, 3)] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.ProbabilityAssessmentOutput_RequiredReliability_Displayname))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.ProbabilityAssessmentOutput_RequiredReliability_Description))] public RoundedDouble RequiredReliability @@ -90,7 +90,7 @@ } [PropertyOrder(3)] - [ResourcesCategory(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.Categories_OvertoppingOutput), 1, 3)] + [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_OvertoppingOutput), 1, 3)] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.ProbabilityAssessmentOutput_Probability_Displayname))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.ProbabilityAssessmentOutput_Probability_Description))] public string Probability @@ -102,7 +102,7 @@ } [PropertyOrder(4)] - [ResourcesCategory(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.Categories_OvertoppingOutput), 1, 3)] + [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_OvertoppingOutput), 1, 3)] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.ProbabilityAssessmentOutput_Reliability_Displayname))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.ProbabilityAssessmentOutput_Reliability_Description))] public RoundedDouble Reliability @@ -114,7 +114,7 @@ } [PropertyOrder(5)] - [ResourcesCategory(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.Categories_OvertoppingOutput), 1, 3)] + [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_OvertoppingOutput), 1, 3)] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.ProbabilityAssessmentOutput_FactorOfSafety_Displayname))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.ProbabilityAssessmentOutput_FactorOfSafety_Description))] public RoundedDouble FactorOfSafety @@ -127,9 +127,9 @@ [PropertyOrder(6)] [DynamicVisible] - [ResourcesCategory(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.Categories_OvertoppingOutput), 1, 3)] - [ResourcesDisplayName(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.GrassCoverErosionInwardsOutput_WaveHeight_Displayname))] - [ResourcesDescription(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.GrassCoverErosionInwardsOutput_WaveHeight_Description))] + [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_OvertoppingOutput), 1, 3)] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.GrassCoverErosionInwardsOutput_WaveHeight_Displayname))] + [ResourcesDescription(typeof(Resources), nameof(Resources.GrassCoverErosionInwardsOutput_WaveHeight_Description))] public RoundedDouble WaveHeight { get @@ -139,9 +139,9 @@ } [PropertyOrder(7)] - [ResourcesCategory(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.Categories_OvertoppingOutput), 1, 3)] - [ResourcesDisplayName(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.GrassCoverErosionInwardsOutput_IsOvertoppingDominant_Displayname))] - [ResourcesDescription(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.GrassCoverErosionInwardsOutput_IsOvertoppingDominant_Description))] + [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_OvertoppingOutput), 1, 3)] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.GrassCoverErosionInwardsOutput_IsOvertoppingDominant_Displayname))] + [ResourcesDescription(typeof(Resources), nameof(Resources.GrassCoverErosionInwardsOutput_IsOvertoppingDominant_Description))] public bool IsOvertoppingDominant { get @@ -156,9 +156,9 @@ [PropertyOrder(8)] [DynamicVisible] - [ResourcesCategory(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.DikeHeight_DisplayName), 2, 3)] - [ResourcesDisplayName(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.GrassCoverErosionInwardsOutput_DikeHeight_DisplayName))] - [ResourcesDescription(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.GrassCoverErosionInwardsOutput_DikeHeight_Description))] + [ResourcesCategory(typeof(Resources), nameof(Resources.DikeHeight_DisplayName), 2, 3)] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.GrassCoverErosionInwardsOutput_DikeHeight_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.GrassCoverErosionInwardsOutput_DikeHeight_Description))] public RoundedDouble DikeHeight { get @@ -170,7 +170,7 @@ [PropertyOrder(9)] [DynamicVisible] - [ResourcesCategory(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.DikeHeight_DisplayName), 2, 3)] + [ResourcesCategory(typeof(Resources), nameof(Resources.DikeHeight_DisplayName), 2, 3)] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CalculationOutput_TargetProbability_DisplayName))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CalculationOutput_TargetProbability_Description))] [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] @@ -185,7 +185,7 @@ [PropertyOrder(10)] [DynamicVisible] - [ResourcesCategory(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.DikeHeight_DisplayName), 2, 3)] + [ResourcesCategory(typeof(Resources), nameof(Resources.DikeHeight_DisplayName), 2, 3)] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CalculationOutput_TargetReliability_DisplayName))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CalculationOutput_TargetReliability_Description))] [TypeConverter(typeof(NoValueRoundedDoubleConverter))] @@ -200,7 +200,7 @@ [PropertyOrder(11)] [DynamicVisible] - [ResourcesCategory(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.DikeHeight_DisplayName), 2, 3)] + [ResourcesCategory(typeof(Resources), nameof(Resources.DikeHeight_DisplayName), 2, 3)] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CalculationOutput_CalculatedProbability_DisplayName))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CalculationOutput_CalculatedProbability_Description))] [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] @@ -215,7 +215,7 @@ [PropertyOrder(12)] [DynamicVisible] - [ResourcesCategory(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.DikeHeight_DisplayName), 2, 3)] + [ResourcesCategory(typeof(Resources), nameof(Resources.DikeHeight_DisplayName), 2, 3)] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CalculationOutput_CalculatedReliability_DisplayName))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CalculationOutput_CalculatedReliability_Description))] [TypeConverter(typeof(NoValueRoundedDoubleConverter))] @@ -230,9 +230,9 @@ [PropertyOrder(13)] [DynamicVisible] - [ResourcesCategory(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.DikeHeight_DisplayName), 2, 3)] + [ResourcesCategory(typeof(Resources), nameof(Resources.DikeHeight_DisplayName), 2, 3)] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CalculationOutput_Convergence_DisplayName))] - [ResourcesDescription(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.DikeHeightOutput_Convergence_Description))] + [ResourcesDescription(typeof(Resources), nameof(Resources.DikeHeightOutput_Convergence_Description))] public string DikeHeightConvergence { get @@ -248,9 +248,9 @@ [PropertyOrder(14)] [DynamicVisible] - [ResourcesCategory(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.OvertoppingRate_DisplayName), 3, 3)] - [ResourcesDisplayName(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.GrassCoverErosionInwardsOutput_OvertoppingRate_DisplayName))] - [ResourcesDescription(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.GrassCoverErosionInwardsOutput_OvertoppingRate_Description))] + [ResourcesCategory(typeof(Resources), nameof(Resources.OvertoppingRate_DisplayName), 3, 3)] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.GrassCoverErosionInwardsOutput_OvertoppingRate_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.GrassCoverErosionInwardsOutput_OvertoppingRate_Description))] public RoundedDouble OvertoppingRate { get @@ -263,7 +263,7 @@ [PropertyOrder(15)] [DynamicVisible] - [ResourcesCategory(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.OvertoppingRate_DisplayName), 3, 3)] + [ResourcesCategory(typeof(Resources), nameof(Resources.OvertoppingRate_DisplayName), 3, 3)] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CalculationOutput_TargetProbability_DisplayName))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CalculationOutput_TargetProbability_Description))] [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] @@ -278,7 +278,7 @@ [PropertyOrder(16)] [DynamicVisible] - [ResourcesCategory(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.OvertoppingRate_DisplayName), 3, 3)] + [ResourcesCategory(typeof(Resources), nameof(Resources.OvertoppingRate_DisplayName), 3, 3)] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CalculationOutput_TargetReliability_DisplayName))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CalculationOutput_TargetReliability_Description))] [TypeConverter(typeof(NoValueRoundedDoubleConverter))] @@ -293,7 +293,7 @@ [PropertyOrder(17)] [DynamicVisible] - [ResourcesCategory(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.OvertoppingRate_DisplayName), 3, 3)] + [ResourcesCategory(typeof(Resources), nameof(Resources.OvertoppingRate_DisplayName), 3, 3)] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CalculationOutput_CalculatedProbability_DisplayName))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CalculationOutput_CalculatedProbability_Description))] [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] @@ -308,7 +308,7 @@ [PropertyOrder(18)] [DynamicVisible] - [ResourcesCategory(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.OvertoppingRate_DisplayName), 3, 3)] + [ResourcesCategory(typeof(Resources), nameof(Resources.OvertoppingRate_DisplayName), 3, 3)] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CalculationOutput_CalculatedReliability_DisplayName))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CalculationOutput_CalculatedReliability_Description))] [TypeConverter(typeof(NoValueRoundedDoubleConverter))] @@ -323,9 +323,9 @@ [PropertyOrder(19)] [DynamicVisible] - [ResourcesCategory(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.OvertoppingRate_DisplayName), 3, 3)] + [ResourcesCategory(typeof(Resources), nameof(Resources.OvertoppingRate_DisplayName), 3, 3)] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CalculationOutput_Convergence_DisplayName))] - [ResourcesDescription(typeof(GrassCoverErosionInwardsFormsResources), nameof(GrassCoverErosionInwardsFormsResources.OvertoppingRateOutput_Convergence_Description))] + [ResourcesDescription(typeof(Resources), nameof(Resources.OvertoppingRateOutput_Convergence_Description))] public string OvertoppingRateConvergence { get Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/OvertoppingOutputProperties.cs =================================================================== diff -u -r390c486bb4cd693ae2f2eaf82a30efcb51480048 -r5a4e3ce4a8088c1fbb043a029f8081abb4cf1021 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/OvertoppingOutputProperties.cs (.../OvertoppingOutputProperties.cs) (revision 390c486bb4cd693ae2f2eaf82a30efcb51480048) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/OvertoppingOutputProperties.cs (.../OvertoppingOutputProperties.cs) (revision 5a4e3ce4a8088c1fbb043a029f8081abb4cf1021) @@ -144,41 +144,41 @@ [DynamicVisible] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_IllustrationPoints), 2, 2)] - [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_GoverningWindDirection_DisplayName))] - [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_GoverningWindDirection_Description))] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_GoverningWindDirection_DisplayName))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_GoverningWindDirection_Description))] public string WindDirection { get { - return data.GeneralResult.GoverningWindDirection.Name; + return data.GeneralResult?.GoverningWindDirection.Name; } } [DynamicVisible] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_IllustrationPoints), 2, 2)] - [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_AlphaValues_DisplayName))] - [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_AlphaValues_Description))] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_AlphaValues_DisplayName))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_AlphaValues_Description))] [TypeConverter(typeof(KeyValueExpandableArrayConverter))] [KeyValueElement(nameof(Stochast.Name), nameof(Stochast.Alpha))] public Stochast[] AlphaValues { get { - return data.GeneralResult.Stochasts.ToArray(); + return data.GeneralResult?.Stochasts.ToArray(); } } [DynamicVisible] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_IllustrationPoints), 2, 2)] - [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_Durations_DisplayName))] - [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_Durations_Description))] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_Durations_DisplayName))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_Durations_Description))] [TypeConverter(typeof(KeyValueExpandableArrayConverter))] [KeyValueElement(nameof(Stochast.Name), nameof(Stochast.Duration))] public Stochast[] Durations { get { - return data.GeneralResult.Stochasts.ToArray(); + return data.GeneralResult?.Stochasts.ToArray(); } } @@ -188,15 +188,24 @@ [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPointProperty_IllustrationPoints_DisplayName))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPointProperty_IllustrationPoints_Description))] [TypeConverter(typeof(ExpandableArrayConverter))] - [KeyValueElement(nameof(TopLevelFaultTreeIllustrationPointProperties.WindDirection), "")] public TopLevelFaultTreeIllustrationPointProperties[] IllustrationPoints { get { - IEnumerable listOfClosingSituations = data.GeneralResult.TopLevelIllustrationPoints.Select(topLevelFaultTreeIllustrationPoint => - topLevelFaultTreeIllustrationPoint.ClosingSituation).ToList(); + if (!data.HasGeneralResult) + { + return new TopLevelFaultTreeIllustrationPointProperties[0]; + } - return data.GeneralResult.TopLevelIllustrationPoints.Select(point => new TopLevelFaultTreeIllustrationPointProperties(point, listOfClosingSituations)).ToArray(); + IEnumerable listOfClosingSituations = data.GeneralResult + .TopLevelIllustrationPoints + .Select(point => point.ClosingSituation); + + return data.GeneralResult + .TopLevelIllustrationPoints + .Select(point => + new TopLevelFaultTreeIllustrationPointProperties( + point, listOfClosingSituations)).ToArray(); } } Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/OvertoppingRateOutputProperties.cs =================================================================== diff -u -r390c486bb4cd693ae2f2eaf82a30efcb51480048 -r5a4e3ce4a8088c1fbb043a029f8081abb4cf1021 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/OvertoppingRateOutputProperties.cs (.../OvertoppingRateOutputProperties.cs) (revision 390c486bb4cd693ae2f2eaf82a30efcb51480048) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/OvertoppingRateOutputProperties.cs (.../OvertoppingRateOutputProperties.cs) (revision 5a4e3ce4a8088c1fbb043a029f8081abb4cf1021) @@ -137,41 +137,41 @@ [DynamicVisible] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_IllustrationPoints), 2, 2)] - [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_GoverningWindDirection_DisplayName))] - [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_GoverningWindDirection_Description))] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_GoverningWindDirection_DisplayName))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_GoverningWindDirection_Description))] public string WindDirection { get { - return data.GeneralResult.GoverningWindDirection.Name; + return data.GeneralResult?.GoverningWindDirection.Name; } } [DynamicVisible] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_IllustrationPoints), 2, 2)] - [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_AlphaValues_DisplayName))] - [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_AlphaValues_Description))] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_AlphaValues_DisplayName))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_AlphaValues_Description))] [TypeConverter(typeof(KeyValueExpandableArrayConverter))] [KeyValueElement(nameof(Stochast.Name), nameof(Stochast.Alpha))] public Stochast[] AlphaValues { get { - return data.GeneralResult.Stochasts.ToArray(); + return data.GeneralResult?.Stochasts.ToArray(); } } [DynamicVisible] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_IllustrationPoints), 2, 2)] - [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_Durations_DisplayName))] - [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_Durations_Description))] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_Durations_DisplayName))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_Durations_Description))] [TypeConverter(typeof(KeyValueExpandableArrayConverter))] [KeyValueElement(nameof(Stochast.Name), nameof(Stochast.Duration))] public Stochast[] Durations { get { - return data.GeneralResult.Stochasts.ToArray(); + return data.GeneralResult?.Stochasts.ToArray(); } } @@ -181,15 +181,24 @@ [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPointProperty_IllustrationPoints_DisplayName))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPointProperty_IllustrationPoints_Description))] [TypeConverter(typeof(ExpandableArrayConverter))] - [KeyValueElement(nameof(TopLevelFaultTreeIllustrationPointProperties.WindDirection), "")] public TopLevelFaultTreeIllustrationPointProperties[] IllustrationPoints { get { - IEnumerable listOfClosingSituations = data.GeneralResult.TopLevelIllustrationPoints.Select(topLevelFaultTreeIllustrationPoint => - topLevelFaultTreeIllustrationPoint.ClosingSituation).ToList(); + if (!data.HasGeneralResult) + { + return new TopLevelFaultTreeIllustrationPointProperties[0]; + } - return data.GeneralResult.TopLevelIllustrationPoints.Select(point => new TopLevelFaultTreeIllustrationPointProperties(point, listOfClosingSituations)).ToArray(); + IEnumerable listOfClosingSituations = data.GeneralResult + .TopLevelIllustrationPoints + .Select(point => point.ClosingSituation); + + return data.GeneralResult + .TopLevelIllustrationPoints + .Select(point => + new TopLevelFaultTreeIllustrationPointProperties( + point, listOfClosingSituations)).ToArray(); } } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeHeightOutputPropertiesTest.cs =================================================================== diff -u -r390c486bb4cd693ae2f2eaf82a30efcb51480048 -r5a4e3ce4a8088c1fbb043a029f8081abb4cf1021 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeHeightOutputPropertiesTest.cs (.../DikeHeightOutputPropertiesTest.cs) (revision 390c486bb4cd693ae2f2eaf82a30efcb51480048) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeHeightOutputPropertiesTest.cs (.../DikeHeightOutputPropertiesTest.cs) (revision 5a4e3ce4a8088c1fbb043a029f8081abb4cf1021) @@ -82,7 +82,7 @@ } [Test] - public void Data_SetNewValue_ReturnCorrectPropertyValues() + public void GetProperties_WithData_ReturnExpectedValues() { // Setup var random = new Random(); @@ -94,10 +94,6 @@ var dikeHeightConvergence = random.NextEnumValue(); var generalResult = new TestGeneralResultFaultTreeIllustrationPoint(); - var expectedFaultTreeIllustrationPointProperties = new TopLevelFaultTreeIllustrationPointProperties(generalResult.TopLevelIllustrationPoints.First(), new[] - { - "closing situation" - }); var dikeHeightOutput = new DikeHeightOutput(dikeHeight, dikeHeightTargetProbability, @@ -151,16 +147,25 @@ int nrOfExpectedTopLevelIllustrationPoints = generalResult.TopLevelIllustrationPoints.Count(); Assert.AreEqual(nrOfExpectedTopLevelIllustrationPoints, properties.IllustrationPoints.Length); - foreach (TopLevelFaultTreeIllustrationPointProperties topLevelFaultTreeIllustrationPointProperties in properties.IllustrationPoints) - { - Assert.AreEqual(expectedFaultTreeIllustrationPointProperties.WindDirection, topLevelFaultTreeIllustrationPointProperties.WindDirection); - Assert.AreEqual(expectedFaultTreeIllustrationPointProperties.Reliability, topLevelFaultTreeIllustrationPointProperties.Reliability); - Assert.AreEqual(expectedFaultTreeIllustrationPointProperties.CalculatedProbability, expectedFaultTreeIllustrationPointProperties.CalculatedProbability); - Assert.AreEqual(expectedFaultTreeIllustrationPointProperties.ClosingSituation, topLevelFaultTreeIllustrationPointProperties.ClosingSituation); - } + CollectionAssert.AreEqual(generalResult.TopLevelIllustrationPoints, properties.IllustrationPoints.Select(i => i.Data)); } [Test] + public void IllustrationPoints_HasGeneralResultFalse_ReturnsEmptyTopLevelFaultTreeIllustrationPointPropertiesArray() + { + // Setup + var dikeHeightOutput = new TestDikeHeightOutput(0.5); + var properties = new DikeHeightOutputProperties(dikeHeightOutput); + + // Call + TopLevelFaultTreeIllustrationPointProperties[] illustrationPoints = properties.IllustrationPoints; + + // Assert + Assert.IsEmpty(illustrationPoints); + + } + + [Test] public void PropertyAttributes_NoGeneralResult_ReturnExpectedValues() { // Setup Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/OvertoppingOutputPropertiesTest.cs =================================================================== diff -u -r390c486bb4cd693ae2f2eaf82a30efcb51480048 -r5a4e3ce4a8088c1fbb043a029f8081abb4cf1021 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/OvertoppingOutputPropertiesTest.cs (.../OvertoppingOutputPropertiesTest.cs) (revision 390c486bb4cd693ae2f2eaf82a30efcb51480048) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/OvertoppingOutputPropertiesTest.cs (.../OvertoppingOutputPropertiesTest.cs) (revision 5a4e3ce4a8088c1fbb043a029f8081abb4cf1021) @@ -82,7 +82,7 @@ } [Test] - public void Data_SetNewValue_ReturnCorrectPropertyValues() + public void GetProperties_WithData_ReturnExpectedValues() { // Setup var random = new Random(); @@ -100,10 +100,6 @@ factorOfSafety); var generalResult = new TestGeneralResultFaultTreeIllustrationPoint(); - var expectedFaultTreeIllustrationPointProperties = new TopLevelFaultTreeIllustrationPointProperties(generalResult.TopLevelIllustrationPoints.First(), new[] - { - "closing situation" - }); var overtoppingOutput = new OvertoppingOutput(waveHeight, isOvertoppingDominant, @@ -148,16 +144,26 @@ int nrOfExpectedTopLevelIllustrationPoints = generalResult.TopLevelIllustrationPoints.Count(); Assert.AreEqual(nrOfExpectedTopLevelIllustrationPoints, properties.IllustrationPoints.Length); - foreach (TopLevelFaultTreeIllustrationPointProperties topLevelFaultTreeIllustrationPointProperties in properties.IllustrationPoints) - { - Assert.AreEqual(expectedFaultTreeIllustrationPointProperties.WindDirection, topLevelFaultTreeIllustrationPointProperties.WindDirection); - Assert.AreEqual(expectedFaultTreeIllustrationPointProperties.Reliability, topLevelFaultTreeIllustrationPointProperties.Reliability); - Assert.AreEqual(expectedFaultTreeIllustrationPointProperties.CalculatedProbability, expectedFaultTreeIllustrationPointProperties.CalculatedProbability); - Assert.AreEqual(expectedFaultTreeIllustrationPointProperties.ClosingSituation, topLevelFaultTreeIllustrationPointProperties.ClosingSituation); - } + + CollectionAssert.AreEqual(generalResult.TopLevelIllustrationPoints, properties.IllustrationPoints.Select(i => i.Data)); } [Test] + public void IllustrationPoints_HasGeneralResultFalse_ReturnsEmptyTopLevelFaultTreeIllustrationPointPropertiesArray() + { + // Setup + var overtoppingOutput = new TestOvertoppingOutput(0.5); + var properties = new OvertoppingOutputProperties(overtoppingOutput); + + // Call + TopLevelFaultTreeIllustrationPointProperties[] illustrationPoints = properties.IllustrationPoints; + + // Assert + Assert.IsEmpty(illustrationPoints); + + } + + [Test] [TestCase(double.NaN)] [TestCase(10)] public void PropertyAttributes_NoGeneralResult_ReturnExpectedValues(double waveHeight) Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/OvertoppingRateOutputPropertiesTest.cs =================================================================== diff -u -r390c486bb4cd693ae2f2eaf82a30efcb51480048 -r5a4e3ce4a8088c1fbb043a029f8081abb4cf1021 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/OvertoppingRateOutputPropertiesTest.cs (.../OvertoppingRateOutputPropertiesTest.cs) (revision 390c486bb4cd693ae2f2eaf82a30efcb51480048) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/OvertoppingRateOutputPropertiesTest.cs (.../OvertoppingRateOutputPropertiesTest.cs) (revision 5a4e3ce4a8088c1fbb043a029f8081abb4cf1021) @@ -82,7 +82,7 @@ } [Test] - public void Data_SetNewInputContextInstance_ReturnCorrectPropertyValues() + public void GetProperties_WithData_ReturnExpectedValues() { // Setup var random = new Random(); @@ -94,10 +94,6 @@ var overtoppingRateConvergence = random.NextEnumValue(); var generalResult = new TestGeneralResultFaultTreeIllustrationPoint(); - var expectedFaultTreeIllustrationPointProperties = new TopLevelFaultTreeIllustrationPointProperties(generalResult.TopLevelIllustrationPoints.First(), new[] - { - "closing situation" - }); var overtoppingRateOutput = new OvertoppingRateOutput(overtoppingRate, overtoppingRateTargetProbability, @@ -151,16 +147,25 @@ int nrOfExpectedTopLevelIllustrationPoints = generalResult.TopLevelIllustrationPoints.Count(); Assert.AreEqual(nrOfExpectedTopLevelIllustrationPoints, properties.IllustrationPoints.Length); - foreach (TopLevelFaultTreeIllustrationPointProperties topLevelFaultTreeIllustrationPointProperties in properties.IllustrationPoints) - { - Assert.AreEqual(expectedFaultTreeIllustrationPointProperties.WindDirection, topLevelFaultTreeIllustrationPointProperties.WindDirection); - Assert.AreEqual(expectedFaultTreeIllustrationPointProperties.Reliability, topLevelFaultTreeIllustrationPointProperties.Reliability); - Assert.AreEqual(expectedFaultTreeIllustrationPointProperties.CalculatedProbability, expectedFaultTreeIllustrationPointProperties.CalculatedProbability); - Assert.AreEqual(expectedFaultTreeIllustrationPointProperties.ClosingSituation, topLevelFaultTreeIllustrationPointProperties.ClosingSituation); - } + CollectionAssert.AreEqual(generalResult.TopLevelIllustrationPoints, properties.IllustrationPoints.Select(i => i.Data)); } [Test] + public void IllustrationPoints_HasGeneralResultFalse_ReturnsEmptyTopLevelFaultTreeIllustrationPointPropertiesArray() + { + // Setup + var overtoppingRateOutput = new TestOvertoppingRateOutput(0.5); + var properties = new OvertoppingRateOutputProperties(overtoppingRateOutput); + + // Call + TopLevelFaultTreeIllustrationPointProperties[] illustrationPoints = properties.IllustrationPoints; + + // Assert + Assert.IsEmpty(illustrationPoints); + + } + + [Test] public void PropertyAttributes_NoGeneralResult_ReturnExpectedValues() { // Setup Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsHydraulicBoundaryLocationContextProperties.cs =================================================================== diff -u -rf7a8b974c53946b8cb443d359e2c6235583dd36f -r5a4e3ce4a8088c1fbb043a029f8081abb4cf1021 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsHydraulicBoundaryLocationContextProperties.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryLocationContextProperties.cs) (revision f7a8b974c53946b8cb443d359e2c6235583dd36f) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsHydraulicBoundaryLocationContextProperties.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryLocationContextProperties.cs) (revision 5a4e3ce4a8088c1fbb043a029f8081abb4cf1021) @@ -111,8 +111,8 @@ [DynamicPropertyOrder] [DynamicVisible] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_IllustrationPoints))] - [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_GoverningWindDirection_DisplayName))] - [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_GoverningWindDirection_Description))] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_GoverningWindDirection_DisplayName))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_GoverningWindDirection_Description))] public string GoverningWindDirection { get @@ -124,8 +124,8 @@ [DynamicPropertyOrder] [DynamicVisible] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_IllustrationPoints))] - [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_AlphaValues_DisplayName))] - [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_AlphaValues_Description))] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_AlphaValues_DisplayName))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_AlphaValues_Description))] [TypeConverter(typeof(KeyValueExpandableArrayConverter))] [KeyValueElement(nameof(Stochast.Name), nameof(Stochast.Alpha))] public Stochast[] AlphaValues @@ -139,8 +139,8 @@ [DynamicPropertyOrder] [DynamicVisible] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_IllustrationPoints))] - [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_Durations_DisplayName))] - [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_Durations_Description))] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_Durations_DisplayName))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_Durations_Description))] [TypeConverter(typeof(KeyValueExpandableArrayConverter))] [KeyValueElement(nameof(Stochast.Name), nameof(Stochast.Duration))] public Stochast[] Durations @@ -154,8 +154,8 @@ [DynamicPropertyOrder] [DynamicVisible] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_IllustrationPoints))] - [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_IllustrationPoints_DisplayName))] - [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_IllustrationPoints_Description))] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPointProperty_IllustrationPoints_DisplayName))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPointProperty_IllustrationPoints_Description))] [TypeConverter(typeof(ExpandableArrayConverter))] public IEnumerable IllustrationPoints { Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryLocationProperties.cs =================================================================== diff -u -rf7a8b974c53946b8cb443d359e2c6235583dd36f -r5a4e3ce4a8088c1fbb043a029f8081abb4cf1021 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryLocationProperties.cs (.../HydraulicBoundaryLocationProperties.cs) (revision f7a8b974c53946b8cb443d359e2c6235583dd36f) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryLocationProperties.cs (.../HydraulicBoundaryLocationProperties.cs) (revision 5a4e3ce4a8088c1fbb043a029f8081abb4cf1021) @@ -23,6 +23,7 @@ using System.ComponentModel; using System.Linq; using Core.Common.Base.Geometry; +using Core.Common.Base.Properties; using Core.Common.Gui.Attributes; using Core.Common.Gui.Converters; using Core.Common.Gui.PropertyBag; @@ -146,8 +147,8 @@ [DynamicPropertyOrder] [DynamicVisible] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_IllustrationPoints))] - [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_GoverningWindDirection_DisplayName))] - [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_GoverningWindDirection_Description))] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_GoverningWindDirection_DisplayName))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_GoverningWindDirection_Description))] public string GoverningWindDirection { get @@ -159,8 +160,8 @@ [DynamicPropertyOrder] [DynamicVisible] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_IllustrationPoints))] - [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_AlphaValues_DisplayName))] - [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_AlphaValues_Description))] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_AlphaValues_DisplayName))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_AlphaValues_Description))] [TypeConverter(typeof(KeyValueExpandableArrayConverter))] [KeyValueElement(nameof(Stochast.Name), nameof(Stochast.Alpha))] public Stochast[] AlphaValues @@ -174,8 +175,8 @@ [DynamicPropertyOrder] [DynamicVisible] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_IllustrationPoints))] - [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_Durations_DisplayName))] - [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_Durations_Description))] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_Durations_DisplayName))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPoint_Durations_Description))] [TypeConverter(typeof(KeyValueExpandableArrayConverter))] [KeyValueElement(nameof(Stochast.Name), nameof(Stochast.Duration))] public Stochast[] Durations @@ -189,8 +190,8 @@ [DynamicPropertyOrder] [DynamicVisible] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_IllustrationPoints))] - [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_IllustrationPoints_DisplayName))] - [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_IllustrationPoints_Description))] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPointProperty_IllustrationPoints_DisplayName))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.IllustrationPointProperty_IllustrationPoints_Description))] [TypeConverter(typeof(ExpandableArrayConverter))] public IEnumerable IllustrationPoints {