Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -re4313e642aa3af2d1f1ced4c397c421579cfb36d -r37213b379dafd60f815fce7cb7fd70e8b85d0ec5 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 37213b379dafd60f815fce7cb7fd70e8b85d0ec5) @@ -464,6 +464,15 @@ } /// + /// Looks up a localized string similar to Modelinstellingen. + /// + public static string Categories_ModelSettings { + get { + return ResourceManager.GetString("Categories_ModelSettings", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Resultaat. /// public static string Categories_Result { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx =================================================================== diff -u -re4313e642aa3af2d1f1ced4c397c421579cfb36d -r37213b379dafd60f815fce7cb7fd70e8b85d0ec5 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 37213b379dafd60f815fce7cb7fd70e8b85d0ec5) @@ -595,4 +595,7 @@ Gebruik + + Modelinstellingen + \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -re4313e642aa3af2d1f1ced4c397c421579cfb36d -r37213b379dafd60f815fce7cb7fd70e8b85d0ec5 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 37213b379dafd60f815fce7cb7fd70e8b85d0ec5) @@ -109,15 +109,6 @@ } /// - /// Looks up a localized string similar to Modelinstellingen. - /// - public static string Categories_ModelSettings { - get { - return ResourceManager.GetString("Categories_ModelSettings", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Terugschrijdende erosie (Sellmeijer). /// public static string Categories_Sellmeijer { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -re4313e642aa3af2d1f1ced4c397c421579cfb36d -r37213b379dafd60f815fce7cb7fd70e8b85d0ec5 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 37213b379dafd60f815fce7cb7fd70e8b85d0ec5) @@ -442,9 +442,6 @@ b [m] - - Modelinstellingen - De veiligheidsfactor voor deze berekening. Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r6300c24a20d2bc8bf9d2e66b727d8fc8e5d2ff54 -r37213b379dafd60f815fce7cb7fd70e8b85d0ec5 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6300c24a20d2bc8bf9d2e66b727d8fc8e5d2ff54) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 37213b379dafd60f815fce7cb7fd70e8b85d0ec5) @@ -22,7 +22,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -82,6 +82,60 @@ } /// + /// Looks up a localized string similar to De waarde van de parameter 'a' in de berekening voor golf condities.. + /// + internal static string GeneralWaveConditionsInput_A_Description { + get { + return ResourceManager.GetString("GeneralWaveConditionsInput_A_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to a. + /// + internal static string GeneralWaveConditionsInput_A_DisplayName { + get { + return ResourceManager.GetString("GeneralWaveConditionsInput_A_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to De waarde van de parameter 'b' in de berekening voor golf condities.. + /// + internal static string GeneralWaveConditionsInput_B_Description { + get { + return ResourceManager.GetString("GeneralWaveConditionsInput_B_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to b. + /// + internal static string GeneralWaveConditionsInput_B_DisplayName { + get { + return ResourceManager.GetString("GeneralWaveConditionsInput_B_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to De waarde van de parameter 'c' in de berekening voor golf condities.. + /// + internal static string GeneralWaveConditionsInput_C_Description { + get { + return ResourceManager.GetString("GeneralWaveConditionsInput_C_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to c. + /// + internal static string GeneralWaveConditionsInput_C_DisplayName { + get { + return ResourceManager.GetString("GeneralWaveConditionsInput_C_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Berekende waterstand. /// internal static string WaveConditionsOutput_WaterLevel_Description { Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.resx =================================================================== diff -u -r6300c24a20d2bc8bf9d2e66b727d8fc8e5d2ff54 -r37213b379dafd60f815fce7cb7fd70e8b85d0ec5 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.resx (.../Resources.resx) (revision 6300c24a20d2bc8bf9d2e66b727d8fc8e5d2ff54) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.resx (.../Resources.resx) (revision 37213b379dafd60f815fce7cb7fd70e8b85d0ec5) @@ -117,6 +117,24 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + De waarde van de parameter 'a' in de berekening voor golf condities. + + + a + + + De waarde van de parameter 'b' in de berekening voor golf condities. + + + b + + + De waarde van de parameter 'c' in de berekening voor golf condities. + + + c + Berekende waterstand Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/GeneralWaveConditionsInputProperties.cs =================================================================== diff -u --- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/GeneralWaveConditionsInputProperties.cs (revision 0) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/GeneralWaveConditionsInputProperties.cs (revision 37213b379dafd60f815fce7cb7fd70e8b85d0ec5) @@ -0,0 +1,71 @@ +// Copyright (C) Stichting Deltares 2016. 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.ComponentModel; +using Core.Common.Gui.PropertyBag; +using Core.Common.Utils.Attributes; +using Ringtoets.Revetment.Data; +using Ringtoets.Revetment.Forms.Properties; + +namespace Ringtoets.Revetment.Forms.PropertyClasses +{ + /// + /// ViewModel of for properties panel. + /// + [DisplayName("")] + public class GeneralWaveConditionsInputProperties : ObjectProperties + { + [ResourcesDisplayName(typeof(Resources), "GeneralWaveConditionsInput_A_DisplayName")] + [ResourcesDescription(typeof(Resources), "GeneralWaveConditionsInput_A_Description")] + public double A + { + get + { + return data.A; + } + } + + [ResourcesDisplayName(typeof(Resources), "GeneralWaveConditionsInput_B_DisplayName")] + [ResourcesDescription(typeof(Resources), "GeneralWaveConditionsInput_B_Description")] + public double B + { + get + { + return data.B; + } + } + + [ResourcesDisplayName(typeof(Resources), "GeneralWaveConditionsInput_C_DisplayName")] + [ResourcesDescription(typeof(Resources), "GeneralWaveConditionsInput_C_Description")] + public double C + { + get + { + return data.C; + } + } + + public override string ToString() + { + return ""; + } + } +} \ No newline at end of file Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Ringtoets.Revetment.Forms.csproj =================================================================== diff -u -re4313e642aa3af2d1f1ced4c397c421579cfb36d -r37213b379dafd60f815fce7cb7fd70e8b85d0ec5 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Ringtoets.Revetment.Forms.csproj (.../Ringtoets.Revetment.Forms.csproj) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Ringtoets.Revetment.Forms.csproj (.../Ringtoets.Revetment.Forms.csproj) (revision 37213b379dafd60f815fce7cb7fd70e8b85d0ec5) @@ -40,6 +40,7 @@ Properties\GlobalAssembly.cs + True Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/GeneralWaveConditionsInputPropertiesTest.cs =================================================================== diff -u --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/GeneralWaveConditionsInputPropertiesTest.cs (revision 0) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/GeneralWaveConditionsInputPropertiesTest.cs (revision 37213b379dafd60f815fce7cb7fd70e8b85d0ec5) @@ -0,0 +1,100 @@ +// Copyright (C) Stichting Deltares 2016. 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 NUnit.Framework; +using Rhino.Mocks; +using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.Revetment.Data; +using Ringtoets.Revetment.Forms.PropertyClasses; + +namespace Ringtoets.Revetment.Forms.Test.PropertyClasses +{ + [TestFixture] + public class GeneralWaveConditionsInputPropertiesTest + { + + [Test] + public void Constructor_ExpectedValues() + { + // Call + var properties = new GeneralWaveConditionsInputProperties(); + + // Assert + Assert.IsInstanceOf>(properties); + Assert.IsEmpty(properties.ToString()); + } + + [Test] + public void Data_SetNewStabilityStoneCoverFailureMechanismContext_ReturnCorrectPropertyValues() + { + // Setup + var properties = new GeneralWaveConditionsInputProperties(); + var random = new Random(21); + double a = random.NextDouble(); + double b = random.NextDouble(); + double c = random.NextDouble(); + + // Call + properties.Data = new GeneralWaveConditionsInput(a, b, c); + + // Assert + Assert.AreEqual(a, properties.A); + Assert.AreEqual(b, properties.B); + Assert.AreEqual(c, properties.C); + } + + [Test] + public void PropertyAttributes_ReturnExpectedValues() + { + // Call + var properties = new GeneralWaveConditionsInputProperties + { + Data = new GeneralWaveConditionsInput(0.1, 0.2, 0.3) + }; + + // Assert + var dynamicPropertyBag = new DynamicPropertyBag(properties); + PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties(new Attribute[] + { + BrowsableAttribute.Yes + }); + Assert.AreEqual(3, dynamicProperties.Count); + + PropertyDescriptor nameProperty = dynamicProperties[0]; + Assert.IsTrue(nameProperty.IsReadOnly); + Assert.AreEqual("a", nameProperty.DisplayName); + Assert.AreEqual("De waarde van de parameter 'a' in de berekening voor golf condities.", nameProperty.Description); + + PropertyDescriptor codeProperty = dynamicProperties[1]; + Assert.IsTrue(codeProperty.IsReadOnly); + Assert.AreEqual("b", codeProperty.DisplayName); + Assert.AreEqual("De waarde van de parameter 'b' in de berekening voor golf condities.", codeProperty.Description); + + PropertyDescriptor blocksProperty = dynamicProperties[2]; + Assert.IsTrue(blocksProperty.IsReadOnly); + Assert.AreEqual("c", blocksProperty.DisplayName); + Assert.AreEqual("De waarde van de parameter 'c' in de berekening voor golf condities.", blocksProperty.Description); + } + } +} \ No newline at end of file Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Ringtoets.Revetment.Forms.Test.csproj =================================================================== diff -u -rc3774262c25fe46b9305d788c5743eab5f714800 -r37213b379dafd60f815fce7cb7fd70e8b85d0ec5 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Ringtoets.Revetment.Forms.Test.csproj (.../Ringtoets.Revetment.Forms.Test.csproj) (revision c3774262c25fe46b9305d788c5743eab5f714800) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Ringtoets.Revetment.Forms.Test.csproj (.../Ringtoets.Revetment.Forms.Test.csproj) (revision 37213b379dafd60f815fce7cb7fd70e8b85d0ec5) @@ -53,6 +53,7 @@ Properties\GlobalAssembly.cs + Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r6300c24a20d2bc8bf9d2e66b727d8fc8e5d2ff54 -r37213b379dafd60f815fce7cb7fd70e8b85d0ec5 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6300c24a20d2bc8bf9d2e66b727d8fc8e5d2ff54) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 37213b379dafd60f815fce7cb7fd70e8b85d0ec5) @@ -22,7 +22,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -137,6 +137,24 @@ } /// + /// Looks up a localized string similar to Blokken. + /// + public static string StabilityStoneCoverWaveConditions_Blocks_DisplayName { + get { + return ResourceManager.GetString("StabilityStoneCoverWaveConditions_Blocks_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Zuilen. + /// + public static string StabilityStoneCoverWaveConditions_Columns_DisplayName { + get { + return ResourceManager.GetString("StabilityStoneCoverWaveConditions_Columns_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Ondergrens tot waaraan de bekleding loopt.. /// public static string StabilityStoneCoverWaveConditionsCalculationInput_LowerBoundaryRevetment_Description { @@ -291,38 +309,38 @@ } /// - /// Looks up a localized string similar to Berekende resultaten voor blokken. + /// Looks up a localized string similar to De modelinstellingen voor het berekenen van golfcondities voor blokken.. /// - public static string StabilityStoneCoverWaveConditionsOutputProperties_Blocks_Description { + public static string StabilityStoneCoverWaveConditionsFailureMechanism_Blocks_Description { get { - return ResourceManager.GetString("StabilityStoneCoverWaveConditionsOutputProperties_Blocks_Description", resourceCulture); + return ResourceManager.GetString("StabilityStoneCoverWaveConditionsFailureMechanism_Blocks_Description", resourceCulture); } } /// - /// Looks up a localized string similar to Blokken. + /// Looks up a localized string similar to De modelinstellingen voor het berekenen van golfcondities voor zuilen.. /// - public static string StabilityStoneCoverWaveConditionsOutputProperties_Blocks_DisplayName { + public static string StabilityStoneCoverWaveConditionsFailureMechanism_Columns_Description { get { - return ResourceManager.GetString("StabilityStoneCoverWaveConditionsOutputProperties_Blocks_DisplayName", resourceCulture); + return ResourceManager.GetString("StabilityStoneCoverWaveConditionsFailureMechanism_Columns_Description", resourceCulture); } } /// - /// Looks up a localized string similar to Berekende resultaten voor zuilen. + /// Looks up a localized string similar to Berekende resultaten voor blokken. /// - public static string StabilityStoneCoverWaveConditionsOutputProperties_Columns_Description { + public static string StabilityStoneCoverWaveConditionsOutputProperties_Blocks_Description { get { - return ResourceManager.GetString("StabilityStoneCoverWaveConditionsOutputProperties_Columns_Description", resourceCulture); + return ResourceManager.GetString("StabilityStoneCoverWaveConditionsOutputProperties_Blocks_Description", resourceCulture); } } /// - /// Looks up a localized string similar to Zuilen. + /// Looks up a localized string similar to Berekende resultaten voor zuilen. /// - public static string StabilityStoneCoverWaveConditionsOutputProperties_Columns_DisplayName { + public static string StabilityStoneCoverWaveConditionsOutputProperties_Columns_Description { get { - return ResourceManager.GetString("StabilityStoneCoverWaveConditionsOutputProperties_Columns_DisplayName", resourceCulture); + return ResourceManager.GetString("StabilityStoneCoverWaveConditionsOutputProperties_Columns_Description", resourceCulture); } } } Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Properties/Resources.resx =================================================================== diff -u -r6300c24a20d2bc8bf9d2e66b727d8fc8e5d2ff54 -r37213b379dafd60f815fce7cb7fd70e8b85d0ec5 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Properties/Resources.resx (.../Resources.resx) (revision 6300c24a20d2bc8bf9d2e66b727d8fc8e5d2ff54) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Properties/Resources.resx (.../Resources.resx) (revision 37213b379dafd60f815fce7cb7fd70e8b85d0ec5) @@ -178,10 +178,10 @@ Steen (blokken en zuilen) - + Blokken - + Zuilen @@ -196,4 +196,10 @@ Berekende resultaten voor zuilen + + De modelinstellingen voor het berekenen van golfcondities voor blokken. + + + De modelinstellingen voor het berekenen van golfcondities voor zuilen. + \ No newline at end of file Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverFailureMechanismContextProperties.cs =================================================================== diff -u -rc43715cf3e6dce0c427b10c4852d5ae54e6d668d -r37213b379dafd60f815fce7cb7fd70e8b85d0ec5 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverFailureMechanismContextProperties.cs (.../StabilityStoneCoverFailureMechanismContextProperties.cs) (revision c43715cf3e6dce0c427b10c4852d5ae54e6d668d) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverFailureMechanismContextProperties.cs (.../StabilityStoneCoverFailureMechanismContextProperties.cs) (revision 37213b379dafd60f815fce7cb7fd70e8b85d0ec5) @@ -19,14 +19,20 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System.ComponentModel; using Core.Common.Gui.Attributes; using Core.Common.Gui.PropertyBag; using Core.Common.Utils.Attributes; +using Ringtoets.Revetment.Forms.PropertyClasses; using Ringtoets.StabilityStoneCover.Forms.PresentationObjects; +using Ringtoets.StabilityStoneCover.Forms.Properties; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.StabilityStoneCover.Forms.PropertyClasses { + /// + /// ViewModel of for properties panel. + /// public class StabilityStoneCoverFailureMechanismContextProperties : ObjectProperties { #region General @@ -56,5 +62,41 @@ } #endregion + + #region Model settings + + [PropertyOrder(3)] + [TypeConverter(typeof(ExpandableObjectConverter))] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_ModelSettings")] + [ResourcesDisplayName(typeof(Resources), "StabilityStoneCoverWaveConditions_Blocks_DisplayName")] + [ResourcesDescription(typeof(Resources), "StabilityStoneCoverWaveConditionsFailureMechanism_Blocks_Description")] + public GeneralWaveConditionsInputProperties Blocks + { + get + { + return new GeneralWaveConditionsInputProperties + { + Data = data.WrappedData.GeneralInput.GeneralBlocksWaveConditionsInput + }; + } + } + + [PropertyOrder(4)] + [TypeConverter(typeof(ExpandableObjectConverter))] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_ModelSettings")] + [ResourcesDisplayName(typeof(Resources), "StabilityStoneCoverWaveConditions_Columns_DisplayName")] + [ResourcesDescription(typeof(Resources), "StabilityStoneCoverWaveConditionsFailureMechanism_Columns_Description")] + public GeneralWaveConditionsInputProperties Columns + { + get + { + return new GeneralWaveConditionsInputProperties + { + Data = data.WrappedData.GeneralInput.GeneralColumnsWaveConditionsInput + }; + } + } + + #endregion } } \ No newline at end of file Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverWaveConditionsCalculationInputContextProperties.cs =================================================================== diff -u -r8efe4bdfd7e47208edb8585a8ac32ebcd56635c0 -r37213b379dafd60f815fce7cb7fd70e8b85d0ec5 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverWaveConditionsCalculationInputContextProperties.cs (.../StabilityStoneCoverWaveConditionsCalculationInputContextProperties.cs) (revision 8efe4bdfd7e47208edb8585a8ac32ebcd56635c0) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverWaveConditionsCalculationInputContextProperties.cs (.../StabilityStoneCoverWaveConditionsCalculationInputContextProperties.cs) (revision 37213b379dafd60f815fce7cb7fd70e8b85d0ec5) @@ -43,6 +43,9 @@ namespace Ringtoets.StabilityStoneCover.Forms.PropertyClasses { + /// + /// ViewModel of for properties panel. + /// public class StabilityStoneCoverWaveConditionsCalculationInputContextProperties : ObjectProperties { private const int hydraulicBoundaryLocationPropertyIndex = 0; Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverWaveConditionsOutputProperties.cs =================================================================== diff -u -r6300c24a20d2bc8bf9d2e66b727d8fc8e5d2ff54 -r37213b379dafd60f815fce7cb7fd70e8b85d0ec5 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverWaveConditionsOutputProperties.cs (.../StabilityStoneCoverWaveConditionsOutputProperties.cs) (revision 6300c24a20d2bc8bf9d2e66b727d8fc8e5d2ff54) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverWaveConditionsOutputProperties.cs (.../StabilityStoneCoverWaveConditionsOutputProperties.cs) (revision 37213b379dafd60f815fce7cb7fd70e8b85d0ec5) @@ -39,7 +39,7 @@ { [TypeConverter(typeof(ExpandableArrayConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Result")] - [ResourcesDisplayName(typeof(Resources), "StabilityStoneCoverWaveConditionsOutputProperties_Blocks_DisplayName")] + [ResourcesDisplayName(typeof(Resources), "StabilityStoneCoverWaveConditions_Blocks_DisplayName")] [ResourcesDescription(typeof(Resources), "StabilityStoneCoverWaveConditionsOutputProperties_Blocks_Description")] public WaveConditionsOutputProperties[] Blocks { @@ -54,7 +54,7 @@ [TypeConverter(typeof(ExpandableArrayConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Result")] - [ResourcesDisplayName(typeof(Resources), "StabilityStoneCoverWaveConditionsOutputProperties_Columns_DisplayName")] + [ResourcesDisplayName(typeof(Resources), "StabilityStoneCoverWaveConditions_Columns_DisplayName")] [ResourcesDescription(typeof(Resources), "StabilityStoneCoverWaveConditionsOutputProperties_Columns_Description")] public WaveConditionsOutputProperties[] Columns { Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverFailureMechanismContextPropertiesTest.cs =================================================================== diff -u -r2177c6d6b789144bf2a7fb4b492d8d3e23e134a7 -r37213b379dafd60f815fce7cb7fd70e8b85d0ec5 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverFailureMechanismContextPropertiesTest.cs (.../StabilityStoneCoverFailureMechanismContextPropertiesTest.cs) (revision 2177c6d6b789144bf2a7fb4b492d8d3e23e134a7) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverFailureMechanismContextPropertiesTest.cs (.../StabilityStoneCoverFailureMechanismContextPropertiesTest.cs) (revision 37213b379dafd60f815fce7cb7fd70e8b85d0ec5) @@ -61,6 +61,8 @@ // Assert Assert.AreEqual(failureMechanism.Name, properties.Name); Assert.AreEqual(failureMechanism.Code, properties.Code); + Assert.AreSame(failureMechanism.GeneralInput.GeneralBlocksWaveConditionsInput, properties.Blocks.Data); + Assert.AreSame(failureMechanism.GeneralInput.GeneralColumnsWaveConditionsInput, properties.Columns.Data); mockRepository.VerifyAll(); } @@ -86,7 +88,7 @@ { BrowsableAttribute.Yes }); - Assert.AreEqual(2, dynamicProperties.Count); + Assert.AreEqual(4, dynamicProperties.Count); PropertyDescriptor nameProperty = dynamicProperties[0]; Assert.IsTrue(nameProperty.IsReadOnly); @@ -99,6 +101,20 @@ Assert.AreEqual("Algemeen", codeProperty.Category); Assert.AreEqual("Label", codeProperty.DisplayName); Assert.AreEqual("Het label van het toetsspoor.", codeProperty.Description); + + PropertyDescriptor blocksProperty = dynamicProperties[2]; + Assert.IsTrue(blocksProperty.IsReadOnly); + Assert.IsInstanceOf(blocksProperty.Converter); + Assert.AreEqual("Modelinstellingen", blocksProperty.Category); + Assert.AreEqual("Blokken", blocksProperty.DisplayName); + Assert.AreEqual("De modelinstellingen voor het berekenen van golfcondities voor blokken.", blocksProperty.Description); + + PropertyDescriptor columnsProperty = dynamicProperties[3]; + Assert.IsTrue(columnsProperty.IsReadOnly); + Assert.IsInstanceOf(columnsProperty.Converter); + Assert.AreEqual("Modelinstellingen", columnsProperty.Category); + Assert.AreEqual("Zuilen", columnsProperty.DisplayName); + Assert.AreEqual("De modelinstellingen voor het berekenen van golfcondities voor zuilen.", columnsProperty.Description); mockRepository.VerifyAll(); } }