Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r17175eeb6f5f524bfed052792e6997366eecd52e -r89a30d666e2e684db9d72ed16c3be18a6afad391 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 17175eeb6f5f524bfed052792e6997366eecd52e) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 89a30d666e2e684db9d72ed16c3be18a6afad391) @@ -563,199 +563,193 @@ } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// Looks up a localized string similar to Grensspanning op de aangegeven locatie.. /// - public static System.Drawing.Bitmap MacroStabilityInwardsInputIcon { + public static string MacroStabilityInwardsPreconsolidationStress_PreconsolidationStress_Description { get { - object obj = ResourceManager.GetObject("MacroStabilityInwardsInputIcon", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + return ResourceManager.GetString("MacroStabilityInwardsPreconsolidationStress_PreconsolidationStress_Description", resourceCulture); } } /// - /// Looks up a localized string similar to Macrostabiliteit binnenwaarts. + /// Looks up a localized string similar to Grensspanning [kN/m²]. /// - public static string MacroStabilityInwardsOutputContext_Categories_MacroStabilityInwards { + public static string MacroStabilityInwardsPreconsolidationStress_PreconsolidationStress_DisplayName { get { - return ResourceManager.GetString("MacroStabilityInwardsOutputContext_Categories_MacroStabilityInwards", resourceCulture); + return ResourceManager.GetString("MacroStabilityInwardsPreconsolidationStress_PreconsolidationStress_DisplayName", resourceCulture); } } /// - /// Looks up a localized string similar to Het quotiënt van de weerstandbiedende- en aandrijvende krachten langs een glijvlak.. + /// Looks up a localized string similar to Lokale x-coördinaat van het punt waarvoor de grensspanning is opgegeven.. /// - public static string MacroStabilityInwardsOutputContext_FactorOfStability_Description { + public static string MacroStabilityInwardsPreconsolidationStress_XCoordinate_Description { get { - return ResourceManager.GetString("MacroStabilityInwardsOutputContext_FactorOfStability_Description", resourceCulture); + return ResourceManager.GetString("MacroStabilityInwardsPreconsolidationStress_XCoordinate_Description", resourceCulture); } } /// - /// Looks up a localized string similar to Stabiliteitsfactor [-]. + /// Looks up a localized string similar to X [m]. /// - public static string MacroStabilityInwardsOutputContext_FactorOfStability_DisplayName { + public static string MacroStabilityInwardsPreconsolidationStress_XCoordinate_DisplayName { get { - return ResourceManager.GetString("MacroStabilityInwardsOutputContext_FactorOfStability_DisplayName", resourceCulture); + return ResourceManager.GetString("MacroStabilityInwardsPreconsolidationStress_XCoordinate_DisplayName", resourceCulture); } } /// - /// Looks up a localized string similar to De veiligheidsfactor voor deze berekening.. + /// Looks up a localized string similar to Lokale z-coördinaat van het punt waarvoor de grensspanning is opgegeven.. /// - public static string MacroStabilityInwardsOutputContext_MacroStabilityInwardsFactorOfSafety_Description { + public static string MacroStabilityInwardsPreconsolidationStress_ZCoordinate_Description { get { - return ResourceManager.GetString("MacroStabilityInwardsOutputContext_MacroStabilityInwardsFactorOfSafety_Descriptio" + - "n", resourceCulture); + return ResourceManager.GetString("MacroStabilityInwardsPreconsolidationStress_ZCoordinate_Description", resourceCulture); } } /// - /// Looks up a localized string similar to Veiligheidsfactor [-]. + /// Looks up a localized string similar to Z [m+NAP]. /// - public static string MacroStabilityInwardsOutputContext_MacroStabilityInwardsFactorOfSafety_DisplayName { + public static string MacroStabilityInwardsPreconsolidationStress_ZCoordinate_DisplayName { get { - return ResourceManager.GetString("MacroStabilityInwardsOutputContext_MacroStabilityInwardsFactorOfSafety_DisplayNam" + - "e", resourceCulture); + return ResourceManager.GetString("MacroStabilityInwardsPreconsolidationStress_ZCoordinate_DisplayName", resourceCulture); } } /// - /// Looks up a localized string similar to De benaderde kans dat het toetsspoor macrostabiliteit binnenwaarts optreedt voor deze berekening.. + /// Looks up a localized string similar to Faalkans [1/jaar]. /// - public static string MacroStabilityInwardsOutputContext_MacroStabilityInwardsProbability_Description { + public static string MacroStabilityInwardsScenarioView_MacroStabilityInwardsScenarioRow_MacroStabilityInwardsProbability { get { - return ResourceManager.GetString("MacroStabilityInwardsOutputContext_MacroStabilityInwardsProbability_Description", resourceCulture); + return ResourceManager.GetString("MacroStabilityInwardsScenarioView_MacroStabilityInwardsScenarioRow_MacroStability" + + "InwardsProbability", resourceCulture); } } /// - /// Looks up a localized string similar to Benaderde faalkans [1/jaar]. + /// Looks up a localized string similar to Macrostabiliteit binnenwaarts. /// - public static string MacroStabilityInwardsOutputContext_MacroStabilityInwardsProbability_DisplayName { + public static string MacroStabilityInwardsSemiProbabilisticOutput_Categories_MacroStabilityInwards { get { - return ResourceManager.GetString("MacroStabilityInwardsOutputContext_MacroStabilityInwardsProbability_DisplayName", resourceCulture); + return ResourceManager.GetString("MacroStabilityInwardsSemiProbabilisticOutput_Categories_MacroStabilityInwards", resourceCulture); } } /// - /// Looks up a localized string similar to De betrouwbaarheidsindex van de faalkans voor deze berekening.. + /// Looks up a localized string similar to Het quotiënt van de weerstandbiedende- en aandrijvende krachten langs een glijvlak.. /// - public static string MacroStabilityInwardsOutputContext_MacroStabilityInwardsReliability_Description { + public static string MacroStabilityInwardsSemiProbabilisticOutput_FactorOfStability_Description { get { - return ResourceManager.GetString("MacroStabilityInwardsOutputContext_MacroStabilityInwardsReliability_Description", resourceCulture); + return ResourceManager.GetString("MacroStabilityInwardsSemiProbabilisticOutput_FactorOfStability_Description", resourceCulture); } } /// - /// Looks up a localized string similar to Betrouwbaarheidsindex faalkans [-]. + /// Looks up a localized string similar to Stabiliteitsfactor [-]. /// - public static string MacroStabilityInwardsOutputContext_MacroStabilityInwardsReliability_DisplayName { + public static string MacroStabilityInwardsSemiProbabilisticOutput_FactorOfStability_DisplayName { get { - return ResourceManager.GetString("MacroStabilityInwardsOutputContext_MacroStabilityInwardsReliability_DisplayName", resourceCulture); + return ResourceManager.GetString("MacroStabilityInwardsSemiProbabilisticOutput_FactorOfStability_DisplayName", resourceCulture); } } /// - /// Looks up a localized string similar to De maximaal toegestane kans dat het toetsspoor macrostabiliteit binnenwaarts optreedt.. + /// Looks up a localized string similar to De veiligheidsfactor voor deze berekening.. /// - public static string MacroStabilityInwardsOutputContext_RequiredProbability_Description { + public static string MacroStabilityInwardsSemiProbabilisticOutput_MacroStabilityInwardsFactorOfSafety_Description { get { - return ResourceManager.GetString("MacroStabilityInwardsOutputContext_RequiredProbability_Description", resourceCulture); + return ResourceManager.GetString("MacroStabilityInwardsSemiProbabilisticOutput_MacroStabilityInwardsFactorOfSafety_" + + "Description", resourceCulture); } } /// - /// Looks up a localized string similar to Faalkanseis [1/jaar]. + /// Looks up a localized string similar to Veiligheidsfactor [-]. /// - public static string MacroStabilityInwardsOutputContext_RequiredProbability_DisplayName { + public static string MacroStabilityInwardsSemiProbabilisticOutput_MacroStabilityInwardsFactorOfSafety_DisplayName { get { - return ResourceManager.GetString("MacroStabilityInwardsOutputContext_RequiredProbability_DisplayName", resourceCulture); + return ResourceManager.GetString("MacroStabilityInwardsSemiProbabilisticOutput_MacroStabilityInwardsFactorOfSafety_" + + "DisplayName", resourceCulture); } } /// - /// Looks up a localized string similar to De betrouwbaarheidsindex van de faalkanseis voor het toetsspoor macrostabiliteit binnenwaarts.. + /// Looks up a localized string similar to De benaderde kans dat het toetsspoor macrostabiliteit binnenwaarts optreedt voor deze berekening.. /// - public static string MacroStabilityInwardsOutputContext_RequiredReliability_Description { + public static string MacroStabilityInwardsSemiProbabilisticOutput_MacroStabilityInwardsProbability_Description { get { - return ResourceManager.GetString("MacroStabilityInwardsOutputContext_RequiredReliability_Description", resourceCulture); + return ResourceManager.GetString("MacroStabilityInwardsSemiProbabilisticOutput_MacroStabilityInwardsProbability_Des" + + "cription", resourceCulture); } } /// - /// Looks up a localized string similar to Betrouwbaarheidsindex faalkanseis [-]. + /// Looks up a localized string similar to Benaderde faalkans [1/jaar]. /// - public static string MacroStabilityInwardsOutputContext_RequiredReliability_DisplayName { + public static string MacroStabilityInwardsSemiProbabilisticOutput_MacroStabilityInwardsProbability_DisplayName { get { - return ResourceManager.GetString("MacroStabilityInwardsOutputContext_RequiredReliability_DisplayName", resourceCulture); + return ResourceManager.GetString("MacroStabilityInwardsSemiProbabilisticOutput_MacroStabilityInwardsProbability_Dis" + + "playName", resourceCulture); } } /// - /// Looks up a localized string similar to Grensspanning op de aangegeven locatie.. + /// Looks up a localized string similar to De betrouwbaarheidsindex van de faalkans voor deze berekening.. /// - public static string MacroStabilityInwardsPreconsolidationStress_PreconsolidationStress_Description { + public static string MacroStabilityInwardsSemiProbabilisticOutput_MacroStabilityInwardsReliability_Description { get { - return ResourceManager.GetString("MacroStabilityInwardsPreconsolidationStress_PreconsolidationStress_Description", resourceCulture); + return ResourceManager.GetString("MacroStabilityInwardsSemiProbabilisticOutput_MacroStabilityInwardsReliability_Des" + + "cription", resourceCulture); } } /// - /// Looks up a localized string similar to Grensspanning [kN/m²]. + /// Looks up a localized string similar to Betrouwbaarheidsindex faalkans [-]. /// - public static string MacroStabilityInwardsPreconsolidationStress_PreconsolidationStress_DisplayName { + public static string MacroStabilityInwardsSemiProbabilisticOutput_MacroStabilityInwardsReliability_DisplayName { get { - return ResourceManager.GetString("MacroStabilityInwardsPreconsolidationStress_PreconsolidationStress_DisplayName", resourceCulture); + return ResourceManager.GetString("MacroStabilityInwardsSemiProbabilisticOutput_MacroStabilityInwardsReliability_Dis" + + "playName", resourceCulture); } } /// - /// Looks up a localized string similar to Lokale x-coördinaat van het punt waarvoor de grensspanning is opgegeven.. + /// Looks up a localized string similar to De maximaal toegestane kans dat het toetsspoor macrostabiliteit binnenwaarts optreedt.. /// - public static string MacroStabilityInwardsPreconsolidationStress_XCoordinate_Description { + public static string MacroStabilityInwardsSemiProbabilisticOutput_RequiredProbability_Description { get { - return ResourceManager.GetString("MacroStabilityInwardsPreconsolidationStress_XCoordinate_Description", resourceCulture); + return ResourceManager.GetString("MacroStabilityInwardsSemiProbabilisticOutput_RequiredProbability_Description", resourceCulture); } } /// - /// Looks up a localized string similar to X [m]. + /// Looks up a localized string similar to Faalkanseis [1/jaar]. /// - public static string MacroStabilityInwardsPreconsolidationStress_XCoordinate_DisplayName { + public static string MacroStabilityInwardsSemiProbabilisticOutput_RequiredProbability_DisplayName { get { - return ResourceManager.GetString("MacroStabilityInwardsPreconsolidationStress_XCoordinate_DisplayName", resourceCulture); + return ResourceManager.GetString("MacroStabilityInwardsSemiProbabilisticOutput_RequiredProbability_DisplayName", resourceCulture); } } /// - /// Looks up a localized string similar to Lokale z-coördinaat van het punt waarvoor de grensspanning is opgegeven.. + /// Looks up a localized string similar to De betrouwbaarheidsindex van de faalkanseis voor het toetsspoor macrostabiliteit binnenwaarts.. /// - public static string MacroStabilityInwardsPreconsolidationStress_ZCoordinate_Description { + public static string MacroStabilityInwardsSemiProbabilisticOutput_RequiredReliability_Description { get { - return ResourceManager.GetString("MacroStabilityInwardsPreconsolidationStress_ZCoordinate_Description", resourceCulture); + return ResourceManager.GetString("MacroStabilityInwardsSemiProbabilisticOutput_RequiredReliability_Description", resourceCulture); } } /// - /// Looks up a localized string similar to Z [m+NAP]. + /// Looks up a localized string similar to Betrouwbaarheidsindex faalkanseis [-]. /// - public static string MacroStabilityInwardsPreconsolidationStress_ZCoordinate_DisplayName { + public static string MacroStabilityInwardsSemiProbabilisticOutput_RequiredReliability_DisplayName { get { - return ResourceManager.GetString("MacroStabilityInwardsPreconsolidationStress_ZCoordinate_DisplayName", resourceCulture); + return ResourceManager.GetString("MacroStabilityInwardsSemiProbabilisticOutput_RequiredReliability_DisplayName", resourceCulture); } } /// - /// Looks up a localized string similar to Faalkans [1/jaar]. - /// - public static string MacroStabilityInwardsScenarioView_MacroStabilityInwardsScenarioRow_MacroStabilityInwardsProbability { - get { - return ResourceManager.GetString("MacroStabilityInwardsScenarioView_MacroStabilityInwardsScenarioRow_MacroStability" + - "InwardsProbability", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Onverzadigd gewicht [kN/m³]. /// public static string MacroStabilityInwardsSoilLayerDataTable_ColumnHeader_AbovePhreaticLevel { Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx =================================================================== diff -u -r17175eeb6f5f524bfed052792e6997366eecd52e -r89a30d666e2e684db9d72ed16c3be18a6afad391 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 17175eeb6f5f524bfed052792e6997366eecd52e) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 89a30d666e2e684db9d72ed16c3be18a6afad391) @@ -133,9 +133,6 @@ Ondergrondschematisatie - - ..\Resources\blue-document-list.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - De locatie met hydraulische randvoorwaarden waarvan het berekende toetspeil wordt gebruikt. @@ -157,37 +154,37 @@ b [m] - + De veiligheidsfactor voor deze berekening. - + Veiligheidsfactor [-] - + Macrostabiliteit binnenwaarts - + De benaderde kans dat het toetsspoor macrostabiliteit binnenwaarts optreedt voor deze berekening. - + Benaderde faalkans [1/jaar] - + De betrouwbaarheidsindex van de faalkans voor deze berekening. - + Betrouwbaarheidsindex faalkans [-] - + De maximaal toegestane kans dat het toetsspoor macrostabiliteit binnenwaarts optreedt. - + Faalkanseis [1/jaar] - + De betrouwbaarheidsindex van de faalkanseis voor het toetsspoor macrostabiliteit binnenwaarts. - + Betrouwbaarheidsindex faalkanseis [-] @@ -580,10 +577,10 @@ Grensspanningen - + Het quotiënt van de weerstandbiedende- en aandrijvende krachten langs een glijvlak. - + Stabiliteitsfactor [-] Fisheye: Tag 89a30d666e2e684db9d72ed16c3be18a6afad391 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsOutputContextProperties.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSemiProbabilisticOutputProperties.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSemiProbabilisticOutputProperties.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSemiProbabilisticOutputProperties.cs (revision 89a30d666e2e684db9d72ed16c3be18a6afad391) @@ -0,0 +1,132 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using Core.Common.Base.Data; +using Core.Common.Gui.Attributes; +using Core.Common.Gui.PropertyBag; +using Core.Common.Utils.Attributes; +using Ringtoets.Common.Forms.Helpers; +using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Forms.Properties; + +namespace Ringtoets.MacroStabilityInwards.Forms.PropertyClasses +{ + /// + /// ViewModel of for properties panel. + /// + public class MacroStabilityInwardsSemiProbabilisticOutputProperties : ObjectProperties + { + private const int macroStabilityInwardsFactorOfStabilityIndex = 1; + private const int requiredProbabilityIndex = 2; + private const int requiredReliabilityIndex = 3; + private const int macroStabilityInwardsProbabilityIndex = 4; + private const int macroStabilityInwardsReliabilityIndex = 5; + private const int macroStabilityInwardsFactorOfSafetyIndex = 6; + + /// + /// Creates a new instance of . + /// + /// The semi probabilistic output to create the properties for. + /// Thrown when + /// is null. + public MacroStabilityInwardsSemiProbabilisticOutputProperties(MacroStabilityInwardsSemiProbabilisticOutput semiProbabilisticOutput) + { + if (semiProbabilisticOutput == null) + { + throw new ArgumentNullException(nameof(semiProbabilisticOutput)); + } + Data = semiProbabilisticOutput; + } + + [ResourcesCategory(typeof(Resources), nameof(Resources.MacroStabilityInwardsSemiProbabilisticOutput_Categories_MacroStabilityInwards))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.MacroStabilityInwardsSemiProbabilisticOutput_FactorOfStability_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.MacroStabilityInwardsSemiProbabilisticOutput_FactorOfStability_Description))] + [PropertyOrder(macroStabilityInwardsFactorOfStabilityIndex)] + public RoundedDouble MacroStabilityInwardsFactorOfStability + { + get + { + return data.FactorOfStability; + } + } + + [ResourcesCategory(typeof(Resources), nameof(Resources.MacroStabilityInwardsSemiProbabilisticOutput_Categories_MacroStabilityInwards))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.MacroStabilityInwardsSemiProbabilisticOutput_RequiredProbability_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.MacroStabilityInwardsSemiProbabilisticOutput_RequiredProbability_Description))] + [PropertyOrder(requiredProbabilityIndex)] + public string RequiredProbability + { + get + { + return ProbabilityFormattingHelper.Format(data.RequiredProbability); + } + } + + [ResourcesCategory(typeof(Resources), nameof(Resources.MacroStabilityInwardsSemiProbabilisticOutput_Categories_MacroStabilityInwards))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.MacroStabilityInwardsSemiProbabilisticOutput_RequiredReliability_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.MacroStabilityInwardsSemiProbabilisticOutput_RequiredReliability_Description))] + [PropertyOrder(requiredReliabilityIndex)] + public RoundedDouble RequiredReliability + { + get + { + return data.RequiredReliability; + } + } + + [ResourcesCategory(typeof(Resources), nameof(Resources.MacroStabilityInwardsSemiProbabilisticOutput_Categories_MacroStabilityInwards))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.MacroStabilityInwardsSemiProbabilisticOutput_MacroStabilityInwardsProbability_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.MacroStabilityInwardsSemiProbabilisticOutput_MacroStabilityInwardsProbability_Description))] + [PropertyOrder(macroStabilityInwardsProbabilityIndex)] + public string MacroStabilityInwardsProbability + { + get + { + return ProbabilityFormattingHelper.Format(data.MacroStabilityInwardsProbability); + } + } + + [ResourcesCategory(typeof(Resources), nameof(Resources.MacroStabilityInwardsSemiProbabilisticOutput_Categories_MacroStabilityInwards))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.MacroStabilityInwardsSemiProbabilisticOutput_MacroStabilityInwardsReliability_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.MacroStabilityInwardsSemiProbabilisticOutput_MacroStabilityInwardsReliability_Description))] + [PropertyOrder(macroStabilityInwardsReliabilityIndex)] + public RoundedDouble MacroStabilityInwardsReliability + { + get + { + return data.MacroStabilityInwardsReliability; + } + } + + [ResourcesCategory(typeof(Resources), nameof(Resources.MacroStabilityInwardsSemiProbabilisticOutput_Categories_MacroStabilityInwards))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.MacroStabilityInwardsSemiProbabilisticOutput_MacroStabilityInwardsFactorOfSafety_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.MacroStabilityInwardsSemiProbabilisticOutput_MacroStabilityInwardsFactorOfSafety_Description))] + [PropertyOrder(macroStabilityInwardsFactorOfSafetyIndex)] + public RoundedDouble MacroStabilityInwardsFactorOfSafety + { + get + { + return data.MacroStabilityInwardsFactorOfSafety; + } + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Ringtoets.MacroStabilityInwards.Forms.csproj =================================================================== diff -u -rbd0a78dc9dd218a799c43b114725f6efa4da1687 -r89a30d666e2e684db9d72ed16c3be18a6afad391 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Ringtoets.MacroStabilityInwards.Forms.csproj (.../Ringtoets.MacroStabilityInwards.Forms.csproj) (revision bd0a78dc9dd218a799c43b114725f6efa4da1687) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Ringtoets.MacroStabilityInwards.Forms.csproj (.../Ringtoets.MacroStabilityInwards.Forms.csproj) (revision 89a30d666e2e684db9d72ed16c3be18a6afad391) @@ -79,7 +79,7 @@ - + Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsOutputChartControl.cs =================================================================== diff -u -r01e3465b06b53d4447b01d3a9b6befe59a42a292 -r89a30d666e2e684db9d72ed16c3be18a6afad391 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsOutputChartControl.cs (.../MacroStabilityInwardsOutputChartControl.cs) (revision 01e3465b06b53d4447b01d3a9b6befe59a42a292) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsOutputChartControl.cs (.../MacroStabilityInwardsOutputChartControl.cs) (revision 89a30d666e2e684db9d72ed16c3be18a6afad391) @@ -125,9 +125,12 @@ } } + /// + /// Updates the chart data and redraws elements when necessary. + /// public void UpdateChartData() { - if (data != null && data.HasOutput) + if (data?.Output != null) { SetChartData(); } @@ -137,7 +140,7 @@ } chartDataCollection.Collection.ForEachElementDo(cd => cd.NotifyObservers()); - soilProfileChartData.Collection.ForEachElementDo(cd => cd.NotifyObservers()); + soilProfileChartData.Collection.ForEachElementDo(sp => sp.NotifyObservers()); } private void SetChartDataEmpty() Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs =================================================================== diff -u -r7691617baab138d49ebe8a6348f9897582027d6b -r89a30d666e2e684db9d72ed16c3be18a6afad391 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision 7691617baab138d49ebe8a6348f9897582027d6b) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision 89a30d666e2e684db9d72ed16c3be18a6afad391) @@ -75,9 +75,9 @@ { CreateInstance = context => new MacroStabilityInwardsInputContextProperties(context, new ObservablePropertyChangeHandler(context.MacroStabilityInwardsCalculation, context.WrappedData)) }; - yield return new PropertyInfo + yield return new PropertyInfo { - CreateInstance = context => new MacroStabilityInwardsOutputContextProperties(context.WrappedData.SemiProbabilisticOutput) + CreateInstance = context => new MacroStabilityInwardsSemiProbabilisticOutputProperties(context.WrappedData.SemiProbabilisticOutput) }; yield return new PropertyInfo { @@ -232,7 +232,7 @@ { GetViewData = context => context.MacroStabilityInwardsCalculation, GetViewName = (view, input) => RingtoetsCommonFormsResources.Calculation_Input, - Image = MacroStabilityInwardsFormsResources.MacroStabilityInwardsInputIcon, + Image = RingtoetsCommonFormsResources.GenericInputOutputIcon, CloseForData = CloseInputViewForData }; @@ -250,7 +250,7 @@ { GetViewData = context => context.WrappedData, GetViewName = (view, output) => RingtoetsCommonFormsResources.CalculationOutput_DisplayName, - Image = MacroStabilityInwardsFormsResources.MacroStabilityInwardsInputIcon, + Image = RingtoetsCommonFormsResources.GeneralOutputIcon, CloseForData = RingtoetsPluginHelper.ShouldCloseViewWithCalculationData }; } @@ -285,7 +285,7 @@ yield return new TreeNodeInfo { Text = context => RingtoetsCommonFormsResources.Calculation_Input, - Image = context => MacroStabilityInwardsFormsResources.MacroStabilityInwardsInputIcon, + Image = context => RingtoetsCommonFormsResources.GenericInputOutputIcon, ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) .AddOpenItem() .AddSeparator() @@ -748,7 +748,7 @@ { MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario = macroStabilityInwardsCalculationScenarioContext.WrappedData; - var childNodes = new List + return new object[] { macroStabilityInwardsCalculationScenario.Comments, new MacroStabilityInwardsInputContext(macroStabilityInwardsCalculationScenario.InputParameters, @@ -759,8 +759,6 @@ macroStabilityInwardsCalculationScenarioContext.AssessmentSection), new MacroStabilityInwardsOutputContext(macroStabilityInwardsCalculationScenario) }; - - return childNodes.ToArray(); } private static void CalculationContextOnNodeRemoved(MacroStabilityInwardsCalculationScenarioContext macroStabilityInwardsCalculationScenarioContext, object parentNodeData) Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsOutputContextTest.cs =================================================================== diff -u -rea495159c320abdbbd9fe4e4dd37c98672116c6b -r89a30d666e2e684db9d72ed16c3be18a6afad391 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsOutputContextTest.cs (.../MacroStabilityInwardsOutputContextTest.cs) (revision ea495159c320abdbbd9fe4e4dd37c98672116c6b) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsOutputContextTest.cs (.../MacroStabilityInwardsOutputContextTest.cs) (revision 89a30d666e2e684db9d72ed16c3be18a6afad391) @@ -30,7 +30,7 @@ public class MacroStabilityInwardsOutputContextTest { [Test] - public void Constructor_WithOutputParameters_PropertiesSet() + public void Constructor_WithCalculationScenario_PropertiesSet() { // Setup var calculation = new MacroStabilityInwardsCalculationScenario(); Fisheye: Tag 89a30d666e2e684db9d72ed16c3be18a6afad391 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsOutputContextPropertiesTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSemiProbabilisticOutputPropertiesTest.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSemiProbabilisticOutputPropertiesTest.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSemiProbabilisticOutputPropertiesTest.cs (revision 89a30d666e2e684db9d72ed16c3be18a6afad391) @@ -0,0 +1,164 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using System.ComponentModel; +using Core.Common.Gui.PropertyBag; +using Core.Common.TestUtil; +using NUnit.Framework; +using Ringtoets.Common.Data.TestUtil; +using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.TestUtil; +using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses; + +namespace Ringtoets.MacroStabilityInwards.Forms.Test.PropertyClasses +{ + [TestFixture] + public class MacroStabilityInwardsSemiProbabilisticOutputPropertiesTest + { + [Test] + public void Constructor_SemiProbabilisticOutputNull_ThrowsArgumentNullException() + { + // Call + TestDelegate call = () => new MacroStabilityInwardsSemiProbabilisticOutputProperties(null); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("semiProbabilisticOutput", exception.ParamName); + } + + [Test] + public void Constructor_ExpectedValues() + { + // Setup + MacroStabilityInwardsSemiProbabilisticOutput output = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput(); + + // Call + var properties = new MacroStabilityInwardsSemiProbabilisticOutputProperties(output); + + // Assert + Assert.IsInstanceOf>(properties); + Assert.AreSame(output, properties.Data); + } + + [Test] + public void GetProperties_WithData_ReturnExpectedValues() + { + // Setup + var random = new Random(22); + double requiredProbability = random.NextDouble(); + double requiredReliability = random.NextDouble(); + double macroStabilityInwardsProbability = random.NextDouble(); + double macroStabilityInwardsReliability = random.NextDouble(); + double macroStabilityInwardsFactorOfSafety = random.NextDouble(); + double macroStabilityInwardsFactorOfStability = random.NextDouble(); + + var semiProbabilisticOutput = new MacroStabilityInwardsSemiProbabilisticOutput( + macroStabilityInwardsFactorOfStability, + requiredProbability, + requiredReliability, + macroStabilityInwardsProbability, + macroStabilityInwardsReliability, + macroStabilityInwardsFactorOfSafety); + + // Call + var properties = new MacroStabilityInwardsSemiProbabilisticOutputProperties(semiProbabilisticOutput); + + // Assert + Assert.AreEqual(macroStabilityInwardsFactorOfStability, properties.MacroStabilityInwardsFactorOfStability, + properties.MacroStabilityInwardsFactorOfStability.GetAccuracy()); + + const string probabilityFormat = "1/{0:n0}"; + Assert.AreEqual(string.Format(probabilityFormat, 1.0 / requiredProbability), properties.RequiredProbability); + Assert.AreEqual(requiredReliability, properties.RequiredReliability, properties.RequiredReliability.GetAccuracy()); + Assert.AreEqual(string.Format(probabilityFormat, 1.0 / macroStabilityInwardsProbability), properties.MacroStabilityInwardsProbability); + Assert.AreEqual(macroStabilityInwardsReliability, properties.MacroStabilityInwardsReliability, properties.MacroStabilityInwardsReliability.GetAccuracy()); + Assert.AreEqual(macroStabilityInwardsFactorOfSafety, properties.MacroStabilityInwardsFactorOfSafety, properties.MacroStabilityInwardsFactorOfSafety.GetAccuracy()); + } + + [Test] + public void GetProperties_WithZeroValues_ReturnTranslatedFormat() + { + // Call + var properties = new MacroStabilityInwardsSemiProbabilisticOutputProperties(MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()); + + // Assert + const string probability = "1/Oneindig"; + Assert.AreEqual(probability, properties.RequiredProbability); + Assert.AreEqual(probability, properties.MacroStabilityInwardsProbability); + } + + [Test] + public void Constructor_Always_PropertiesHaveExpectedAttributesValues() + { + // Call + var properties = new MacroStabilityInwardsSemiProbabilisticOutputProperties(MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()); + + // Assert + PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); + Assert.AreEqual(6, dynamicProperties.Count); + + const string macroStabilityInwardsCategory = "Macrostabiliteit binnenwaarts"; + + PropertyDescriptor stabilityFactorProperty = dynamicProperties[0]; + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(stabilityFactorProperty, + macroStabilityInwardsCategory, + "Stabiliteitsfactor [-]", + "Het quotiënt van de weerstandbiedende- en aandrijvende krachten langs een glijvlak.", + true); + + PropertyDescriptor requiredProbabilityProperty = dynamicProperties[1]; + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(requiredProbabilityProperty, + macroStabilityInwardsCategory, + "Faalkanseis [1/jaar]", + "De maximaal toegestane kans dat het toetsspoor macrostabiliteit binnenwaarts optreedt.", + true); + + PropertyDescriptor requiredReliabilityProperty = dynamicProperties[2]; + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(requiredReliabilityProperty, + macroStabilityInwardsCategory, + "Betrouwbaarheidsindex faalkanseis [-]", + "De betrouwbaarheidsindex van de faalkanseis voor het toetsspoor macrostabiliteit binnenwaarts.", + true); + + PropertyDescriptor macroStabilityInwardsProbabilityProperty = dynamicProperties[3]; + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(macroStabilityInwardsProbabilityProperty, + macroStabilityInwardsCategory, + "Benaderde faalkans [1/jaar]", + "De benaderde kans dat het toetsspoor macrostabiliteit binnenwaarts optreedt voor deze berekening.", + true); + + PropertyDescriptor macroStabilityInwardsReliabilityProperty = dynamicProperties[4]; + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(macroStabilityInwardsReliabilityProperty, + macroStabilityInwardsCategory, + "Betrouwbaarheidsindex faalkans [-]", + "De betrouwbaarheidsindex van de faalkans voor deze berekening.", + true); + + PropertyDescriptor macroStabilityInwardsFactorOfSafetyProperty = dynamicProperties[5]; + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(macroStabilityInwardsFactorOfSafetyProperty, + macroStabilityInwardsCategory, + "Veiligheidsfactor [-]", + "De veiligheidsfactor voor deze berekening.", + true); + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Ringtoets.MacroStabilityInwards.Forms.Test.csproj =================================================================== diff -u -reaf6ea94fcfc88cf3750bd59e3068795f180e9f7 -r89a30d666e2e684db9d72ed16c3be18a6afad391 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Ringtoets.MacroStabilityInwards.Forms.Test.csproj (.../Ringtoets.MacroStabilityInwards.Forms.Test.csproj) (revision eaf6ea94fcfc88cf3750bd59e3068795f180e9f7) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Ringtoets.MacroStabilityInwards.Forms.Test.csproj (.../Ringtoets.MacroStabilityInwards.Forms.Test.csproj) (revision 89a30d666e2e684db9d72ed16c3be18a6afad391) @@ -75,7 +75,7 @@ - + Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputChartControlTest.cs =================================================================== diff -u -r616947b29acab4b6384abc1c29a61eaf349c7745 -r89a30d666e2e684db9d72ed16c3be18a6afad391 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputChartControlTest.cs (.../MacroStabilityInwardsOutputChartControlTest.cs) (revision 616947b29acab4b6384abc1c29a61eaf349c7745) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputChartControlTest.cs (.../MacroStabilityInwardsOutputChartControlTest.cs) (revision 89a30d666e2e684db9d72ed16c3be18a6afad391) @@ -66,7 +66,7 @@ Assert.AreEqual(DockStyle.Fill, ((Control) chartControl).Dock); Assert.AreEqual("Afstand [m]", chartControl.BottomAxisTitle); Assert.AreEqual("Hoogte [m+NAP]", chartControl.LeftAxisTitle); - MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyChartData(chartControl.Data, true); + MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyChartDataWithoutSoilLayerData(chartControl.Data); } } @@ -158,7 +158,7 @@ control.Data = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); // Assert - MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyChartData(control.Chart.Data, false); + MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyChartDataWithEmptySoilLayerChartData(control.Chart.Data); } } @@ -192,7 +192,7 @@ control.Data = null; // Assert - MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyChartData(control.Chart.Data, false); + MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyChartDataWithEmptySoilLayerChartData(control.Chart.Data); } } @@ -217,7 +217,7 @@ }) { // Precondition - MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyChartData(control.Chart.Data, false); + MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyChartDataWithEmptySoilLayerChartData(control.Chart.Data); calculation.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(); @@ -263,7 +263,7 @@ control.UpdateChartData(); // Assert - MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyChartData(control.Chart.Data, false); + MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyChartDataWithEmptySoilLayerChartData(control.Chart.Data); } } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputViewTest.cs =================================================================== diff -u -r616947b29acab4b6384abc1c29a61eaf349c7745 -r89a30d666e2e684db9d72ed16c3be18a6afad391 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputViewTest.cs (.../MacroStabilityInwardsOutputViewTest.cs) (revision 616947b29acab4b6384abc1c29a61eaf349c7745) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputViewTest.cs (.../MacroStabilityInwardsOutputViewTest.cs) (revision 89a30d666e2e684db9d72ed16c3be18a6afad391) @@ -54,6 +54,7 @@ var splitContainer = view.Controls[0] as SplitContainer; Assert.IsNotNull(splitContainer); Assert.AreEqual(1, splitContainer.Panel1.Controls.Count); + Assert.IsEmpty(splitContainer.Panel2.Controls); Assert.IsInstanceOf(splitContainer.Panel1.Controls[0]); } } @@ -98,7 +99,7 @@ form.Controls.Add(view); form.Show(); - MacroStabilityInwardsOutputChartControl chartControl = ControlTestHelper.GetControls(form, "macroStabilityInwardsOutputChartControl").Single(); + MacroStabilityInwardsOutputChartControl chartControl = GetChartControl(form); MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); calculation.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(); @@ -128,7 +129,7 @@ form.Controls.Add(view); form.Show(); - MacroStabilityInwardsOutputChartControl chartControl = ControlTestHelper.GetControls(form, "macroStabilityInwardsOutputChartControl").Single(); + MacroStabilityInwardsOutputChartControl chartControl = GetChartControl(form); // Precondition Assert.AreSame(calculation, view.Data); @@ -153,7 +154,7 @@ form.Controls.Add(view); form.Show(); - MacroStabilityInwardsOutputChartControl chartControl = ControlTestHelper.GetControls(form, "macroStabilityInwardsOutputChartControl").Single(); + MacroStabilityInwardsOutputChartControl chartControl = GetChartControl(form); MacroStabilityInwardsSurfaceLine surfaceLine = GetSurfaceLineWithGeometry(); MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile = GetStochasticSoilProfile2D(); @@ -180,7 +181,7 @@ calculation.NotifyObservers(); // Then - MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyChartData(chartData, false); + MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyChartDataWithEmptySoilLayerChartData(chartData); } } @@ -194,7 +195,7 @@ form.Controls.Add(view); form.Show(); - MacroStabilityInwardsOutputChartControl chartControl = ControlTestHelper.GetControls(form, "macroStabilityInwardsOutputChartControl").Single(); + MacroStabilityInwardsOutputChartControl chartControl = GetChartControl(form); MacroStabilityInwardsSurfaceLine surfaceLine = GetSurfaceLineWithGeometry(); MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile = GetStochasticSoilProfile2D(); @@ -211,7 +212,7 @@ // Precondition ChartDataCollection chartData = GetChartControl(chartControl).Data; - MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyChartData(chartData, false); + MacroStabilityInwardsOutputViewChartDataAssert.AssertEmptyChartDataWithEmptySoilLayerChartData(chartData); // When calculation.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(); @@ -224,6 +225,11 @@ } } + private static MacroStabilityInwardsOutputChartControl GetChartControl(Form form) + { + return ControlTestHelper.GetControls(form, "macroStabilityInwardsOutputChartControl").Single(); + } + private static IChartControl GetChartControl(MacroStabilityInwardsOutputChartControl view) { return ControlTestHelper.GetControls(view, "chartControl").Single(); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsOutputViewChartDataAssert.cs =================================================================== diff -u -r9cb9840fac1e471c77fde363c7aa51121c1f089a -r89a30d666e2e684db9d72ed16c3be18a6afad391 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsOutputViewChartDataAssert.cs (.../MacroStabilityInwardsOutputViewChartDataAssert.cs) (revision 9cb9840fac1e471c77fde363c7aa51121c1f089a) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsOutputViewChartDataAssert.cs (.../MacroStabilityInwardsOutputViewChartDataAssert.cs) (revision 89a30d666e2e684db9d72ed16c3be18a6afad391) @@ -69,14 +69,49 @@ } /// + /// Asserts whether contains empty data without + /// any soil layer chart data. + /// + /// The actual . + /// Thrown when: + /// + /// is not empty; + /// the soil profile chart data contains chart data. + /// + /// + public static void AssertEmptyChartDataWithoutSoilLayerData(ChartDataCollection chartDataCollection) + { + var soilProfileData = (ChartDataCollection) chartDataCollection.Collection.ElementAt(soilProfileIndex); + CollectionAssert.IsEmpty(soilProfileData.Collection); + AssertEmptyChartData(chartDataCollection); + } + + /// + /// Asserts whether contains empty data and + /// empty soil layer chart data. + /// + /// The actual . + /// Thrown when: + /// + /// is not empty; + /// a soil layer chart data contains data. + /// + /// + public static void AssertEmptyChartDataWithEmptySoilLayerChartData(ChartDataCollection chartDataCollection) + { + var soilProfileData = (ChartDataCollection) chartDataCollection.Collection.ElementAt(soilProfileIndex); + CollectionAssert.IsNotEmpty(soilProfileData.Collection); + Assert.IsFalse(soilProfileData.Collection.Any(c => c.HasData)); + AssertEmptyChartData(chartDataCollection); + } + + /// /// Asserts whether contains empty data. /// /// The actual . - /// Indicator whether the soil profile chart data - /// should be empty. /// Thrown when /// is not empty. - public static void AssertEmptyChartData(ChartDataCollection chartDataCollection, bool soilProfileEmpty) + private static void AssertEmptyChartData(ChartDataCollection chartDataCollection) { Assert.AreEqual("Resultaat", chartDataCollection.Name); @@ -99,14 +134,6 @@ var dikeTopAtRiverData = (ChartPointData) chartDatasList[dikeTopAtRiverIndex]; var surfaceLevelOutsideData = (ChartPointData) chartDatasList[surfaceLevelOutsideIndex]; - if (soilProfileEmpty) - { - CollectionAssert.IsEmpty(soilProfileData.Collection); - } - else - { - Assert.IsFalse(soilProfileData.Collection.Any(c => c.HasData)); - } CollectionAssert.IsEmpty(surfaceLineData.Points); CollectionAssert.IsEmpty(surfaceLevelInsideData.Points); CollectionAssert.IsEmpty(ditchPolderSideData.Points); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsViewChartDataAssert.cs =================================================================== diff -u -r9cb9840fac1e471c77fde363c7aa51121c1f089a -r89a30d666e2e684db9d72ed16c3be18a6afad391 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsViewChartDataAssert.cs (.../MacroStabilityInwardsViewChartDataAssert.cs) (revision 9cb9840fac1e471c77fde363c7aa51121c1f089a) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsViewChartDataAssert.cs (.../MacroStabilityInwardsViewChartDataAssert.cs) (revision 89a30d666e2e684db9d72ed16c3be18a6afad391) @@ -46,8 +46,8 @@ var surfaceLineChartData = (ChartLineData) actual; Assert.AreEqual(original.Points.Length, surfaceLineChartData.Points.Length); - CollectionAssert.AreEqual(original.LocalGeometry, surfaceLineChartData.Points); Assert.AreEqual(original.Name, actual.Name); + CollectionAssert.AreEqual(original.LocalGeometry, surfaceLineChartData.Points); } /// @@ -67,14 +67,14 @@ Assert.AreEqual(expectedLayerCount + 1, soilProfileChartData.Collection.Count()); Assert.AreEqual(original.SoilProfile.Name, soilProfileChartData.Name); - string[] soilLayers = original.SoilProfile.Layers.Select((l, i) => $"{i + 1} {l.Data.MaterialName}").Reverse().ToArray(); + string[] expectedSoilLayerNames = original.SoilProfile.Layers.Select((l, i) => $"{i + 1} {l.Data.MaterialName}").Reverse().ToArray(); for (var i = 0; i < expectedLayerCount; i++) { var chartMultipleAreaData = soilProfileChartData.Collection.ElementAt(i) as ChartMultipleAreaData; Assert.IsNotNull(chartMultipleAreaData); - Assert.AreEqual(soilLayers[i], chartMultipleAreaData.Name); + Assert.AreEqual(expectedSoilLayerNames[i], chartMultipleAreaData.Name); Assert.AreEqual(mapDataShouldContainAreas, chartMultipleAreaData.Areas.Any()); } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/MacroStabilityInwardsPluginTest.cs =================================================================== diff -u -rea495159c320abdbbd9fe4e4dd37c98672116c6b -r89a30d666e2e684db9d72ed16c3be18a6afad391 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/MacroStabilityInwardsPluginTest.cs (.../MacroStabilityInwardsPluginTest.cs) (revision ea495159c320abdbbd9fe4e4dd37c98672116c6b) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/MacroStabilityInwardsPluginTest.cs (.../MacroStabilityInwardsPluginTest.cs) (revision 89a30d666e2e684db9d72ed16c3be18a6afad391) @@ -75,7 +75,7 @@ PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(MacroStabilityInwardsOutputContext), - typeof(MacroStabilityInwardsOutputContextProperties)); + typeof(MacroStabilityInwardsSemiProbabilisticOutputProperties)); PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsOutputContextPropertyInfoTest.cs =================================================================== diff -u -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a -r89a30d666e2e684db9d72ed16c3be18a6afad391 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsOutputContextPropertyInfoTest.cs (.../MacroStabilityInwardsOutputContextPropertyInfoTest.cs) (revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsOutputContextPropertyInfoTest.cs (.../MacroStabilityInwardsOutputContextPropertyInfoTest.cs) (revision 89a30d666e2e684db9d72ed16c3be18a6afad391) @@ -40,7 +40,7 @@ public void SetUp() { plugin = new MacroStabilityInwardsPlugin(); - info = plugin.GetPropertyInfos().First(tni => tni.PropertyObjectType == typeof(MacroStabilityInwardsOutputContextProperties)); + info = plugin.GetPropertyInfos().First(tni => tni.PropertyObjectType == typeof(MacroStabilityInwardsSemiProbabilisticOutputProperties)); } [TearDown] @@ -54,11 +54,11 @@ { // Assert Assert.AreEqual(typeof(MacroStabilityInwardsOutputContext), info.DataType); - Assert.AreEqual(typeof(MacroStabilityInwardsOutputContextProperties), info.PropertyObjectType); + Assert.AreEqual(typeof(MacroStabilityInwardsSemiProbabilisticOutputProperties), info.PropertyObjectType); } [Test] - public void CreateInstance_Always_NewPropertiesWithInputContextAsData() + public void CreateInstance_Always_NewPropertiesWithSemiProbabilisticOutputAsData() { // Setup var scenario = new MacroStabilityInwardsCalculationScenario @@ -72,7 +72,7 @@ IObjectProperties objectProperties = info.CreateInstance(context); // Assert - Assert.IsInstanceOf(objectProperties); + Assert.IsInstanceOf(objectProperties); Assert.AreSame(scenario.SemiProbabilisticOutput, objectProperties.Data); } } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r3ccb9203ba3ede05115a3cf247f2d4960bda59c3 -r89a30d666e2e684db9d72ed16c3be18a6afad391 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs) (revision 3ccb9203ba3ede05115a3cf247f2d4960bda59c3) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs) (revision 89a30d666e2e684db9d72ed16c3be18a6afad391) @@ -108,11 +108,7 @@ public void ChildNodeObjects_Always_ReturnOutputChildNode() { // Setup - var calculation = new MacroStabilityInwardsCalculationScenario - { - Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(), - SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput() - }; + var calculation = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var assessmentSection = mocks.Stub(); @@ -294,10 +290,10 @@ { // Assert TestHelper.AssertContextMenuStripContainsItem(contextMenu, - contextMenuDuplicateIndex, - "D&upliceren", - "Dupliceer dit element.", - RingtoetsCommonFormsResources.CopyHS); + contextMenuDuplicateIndex, + "D&upliceren", + "Dupliceer dit element.", + RingtoetsCommonFormsResources.CopyHS); TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateIndex, Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsInputContextTreeNodeInfoTest.cs =================================================================== diff -u -r3d30a9febb6492e54f2082bf0a21a1602717b098 -r89a30d666e2e684db9d72ed16c3be18a6afad391 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsInputContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsInputContextTreeNodeInfoTest.cs) (revision 3d30a9febb6492e54f2082bf0a21a1602717b098) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsInputContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsInputContextTreeNodeInfoTest.cs) (revision 89a30d666e2e684db9d72ed16c3be18a6afad391) @@ -27,8 +27,8 @@ using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; +using Ringtoets.Common.Forms.Properties; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; -using Ringtoets.MacroStabilityInwards.Forms.Properties; namespace Ringtoets.MacroStabilityInwards.Plugin.Test.TreeNodeInfos { @@ -104,7 +104,7 @@ Image image = info.Image(null); // Assert - TestHelper.AssertImagesAreEqual(Resources.MacroStabilityInwardsInputIcon, image); + TestHelper.AssertImagesAreEqual(Resources.GenericInputOutputIcon, image); } [Test] Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsInputViewInfoTest.cs =================================================================== diff -u -r3d30a9febb6492e54f2082bf0a21a1602717b098 -r89a30d666e2e684db9d72ed16c3be18a6afad391 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsInputViewInfoTest.cs (.../MacroStabilityInwardsInputViewInfoTest.cs) (revision 3d30a9febb6492e54f2082bf0a21a1602717b098) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsInputViewInfoTest.cs (.../MacroStabilityInwardsInputViewInfoTest.cs) (revision 89a30d666e2e684db9d72ed16c3be18a6afad391) @@ -26,12 +26,12 @@ using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Calculation; +using Ringtoets.Common.Forms.Properties; using Ringtoets.MacroStabilityInwards.Data; using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.Forms.Views; using Ringtoets.MacroStabilityInwards.Primitives; -using FormsResources = Ringtoets.MacroStabilityInwards.Forms.Properties.Resources; namespace Ringtoets.MacroStabilityInwards.Plugin.Test.ViewInfos { @@ -62,7 +62,7 @@ // Assert Assert.AreEqual(typeof(MacroStabilityInwardsInputContext), info.DataType); Assert.AreEqual(typeof(MacroStabilityInwardsCalculationScenario), info.ViewDataType); - TestHelper.AssertImagesAreEqual(FormsResources.MacroStabilityInwardsInputIcon, info.Image); + TestHelper.AssertImagesAreEqual(Resources.GenericInputOutputIcon, info.Image); } [Test] Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsOutputViewInfoTest.cs =================================================================== diff -u -r1f3a6a75833727dd690366bcbacaf03f8c7da3be -r89a30d666e2e684db9d72ed16c3be18a6afad391 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsOutputViewInfoTest.cs (.../MacroStabilityInwardsOutputViewInfoTest.cs) (revision 1f3a6a75833727dd690366bcbacaf03f8c7da3be) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsOutputViewInfoTest.cs (.../MacroStabilityInwardsOutputViewInfoTest.cs) (revision 89a30d666e2e684db9d72ed16c3be18a6afad391) @@ -29,18 +29,18 @@ using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.PresentationObjects; +using Ringtoets.Common.Forms.Properties; using Ringtoets.Common.Plugin.TestUtil; using Ringtoets.MacroStabilityInwards.Data; using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; -using Ringtoets.MacroStabilityInwards.Forms.Properties; using Ringtoets.MacroStabilityInwards.Forms.Views; using Ringtoets.MacroStabilityInwards.Primitives; namespace Ringtoets.MacroStabilityInwards.Plugin.Test.ViewInfos { [TestFixture] - public class MacroStabilityInwardsOutputViewInfoTest : ShouldCloseViewWithCalculationDataTester + public class MacroStabilityInwardsOutputViewInfoTest { private MockRepository mocks; private MacroStabilityInwardsPlugin plugin; @@ -66,11 +66,11 @@ // Assert Assert.AreEqual(typeof(MacroStabilityInwardsOutputContext), info.DataType); Assert.AreEqual(typeof(MacroStabilityInwardsCalculationScenario), info.ViewDataType); - TestHelper.AssertImagesAreEqual(Resources.MacroStabilityInwardsInputIcon, info.Image); + TestHelper.AssertImagesAreEqual(Resources.GeneralOutputIcon, info.Image); } [Test] - public void GetViewName_Always_ReturnsInputResourceName() + public void GetViewName_Always_ReturnsOutputResourceName() { // Setup using (var view = new MacroStabilityInwardsOutputView()) @@ -110,62 +110,71 @@ Assert.IsInstanceOf(view); } - protected override bool ShouldCloseMethod(IView view, object o) + [TestFixture] + public class ShouldCloseMacroStabilityInwardsOutputViewTester : ShouldCloseViewWithCalculationDataTester { - return info.CloseForData(view, o); - } + protected override bool ShouldCloseMethod(IView view, object o) + { + using (var plugin = new MacroStabilityInwardsPlugin()) + { + return plugin.GetViewInfos() + .First(tni => tni.ViewType == typeof(MacroStabilityInwardsOutputView)) + .CloseForData(view, o); + } + } - protected override IView GetView() - { - return new MacroStabilityInwardsOutputView(); - } + protected override IView GetView() + { + return new MacroStabilityInwardsOutputView(); + } - protected override ICalculation GetCalculation() - { - return new MacroStabilityInwardsCalculationScenario(); - } + protected override ICalculation GetCalculation() + { + return new MacroStabilityInwardsCalculationScenario(); + } - protected override ICalculationContext GetCalculationContextWithCalculation() - { - return new MacroStabilityInwardsCalculationScenarioContext( - new MacroStabilityInwardsCalculationScenario(), - new CalculationGroup(), - Enumerable.Empty(), - Enumerable.Empty(), - new MacroStabilityInwardsFailureMechanism(), - new ObservableTestAssessmentSectionStub()); - } + protected override ICalculationContext GetCalculationContextWithCalculation() + { + return new MacroStabilityInwardsCalculationScenarioContext( + new MacroStabilityInwardsCalculationScenario(), + new CalculationGroup(), + Enumerable.Empty(), + Enumerable.Empty(), + new MacroStabilityInwardsFailureMechanism(), + new ObservableTestAssessmentSectionStub()); + } - protected override ICalculationContext GetCalculationGroupContextWithCalculation() - { - return new MacroStabilityInwardsCalculationGroupContext( - new CalculationGroup - { - Children = + protected override ICalculationContext GetCalculationGroupContextWithCalculation() + { + return new MacroStabilityInwardsCalculationGroupContext( + new CalculationGroup { - new MacroStabilityInwardsCalculationScenario() - } - }, - null, - Enumerable.Empty(), - Enumerable.Empty(), - new MacroStabilityInwardsFailureMechanism(), - new ObservableTestAssessmentSectionStub()); - } - - protected override IFailureMechanismContext GetFailureMechanismContextWithCalculation() - { - return new MacroStabilityInwardsFailureMechanismContext( - new MacroStabilityInwardsFailureMechanism - { - CalculationsGroup = - { Children = { new MacroStabilityInwardsCalculationScenario() } - } - }, new ObservableTestAssessmentSectionStub()); + }, + null, + Enumerable.Empty(), + Enumerable.Empty(), + new MacroStabilityInwardsFailureMechanism(), + new ObservableTestAssessmentSectionStub()); + } + + protected override IFailureMechanismContext GetFailureMechanismContextWithCalculation() + { + return new MacroStabilityInwardsFailureMechanismContext( + new MacroStabilityInwardsFailureMechanism + { + CalculationsGroup = + { + Children = + { + new MacroStabilityInwardsCalculationScenario() + } + } + }, new ObservableTestAssessmentSectionStub()); + } } } } \ No newline at end of file