Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverFailureMechanismContextProperties.cs =================================================================== diff -u -r944d2501b3f780d208e00015a1b850afad4c3aa8 -re42e4a7194308cf8d5ac461cc219cb21f699b96e --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverFailureMechanismContextProperties.cs (.../WaveImpactAsphaltCoverFailureMechanismContextProperties.cs) (revision 944d2501b3f780d208e00015a1b850afad4c3aa8) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverFailureMechanismContextProperties.cs (.../WaveImpactAsphaltCoverFailureMechanismContextProperties.cs) (revision e42e4a7194308cf8d5ac461cc219cb21f699b96e) @@ -19,11 +19,13 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using Core.Common.Base.Data; using Core.Common.Gui.Attributes; using Core.Common.Gui.PropertyBag; using Core.Common.Utils.Attributes; using Ringtoets.WaveImpactAsphaltCover.Forms.PresentationObjects; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; +using RingtoetsRevetmentFormsResources = Ringtoets.Revetment.Forms.Properties.Resources; namespace Ringtoets.WaveImpactAsphaltCover.Forms.PropertyClasses { @@ -59,5 +61,45 @@ } #endregion + + #region Model settings + + [PropertyOrder(3)] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_ModelSettings")] + [ResourcesDisplayName(typeof(RingtoetsRevetmentFormsResources), "GeneralWaveConditionsInput_A_DisplayName")] + [ResourcesDescription(typeof(RingtoetsRevetmentFormsResources), "GeneralWaveConditionsInput_A_Description")] + public RoundedDouble A + { + get + { + return data.WrappedData.GeneralInput.A; + } + } + + [PropertyOrder(4)] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_ModelSettings")] + [ResourcesDisplayName(typeof(RingtoetsRevetmentFormsResources), "GeneralWaveConditionsInput_B_DisplayName")] + [ResourcesDescription(typeof(RingtoetsRevetmentFormsResources), "GeneralWaveConditionsInput_B_Description")] + public RoundedDouble B + { + get + { + return data.WrappedData.GeneralInput.B; + } + } + + [PropertyOrder(5)] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_ModelSettings")] + [ResourcesDisplayName(typeof(RingtoetsRevetmentFormsResources), "GeneralWaveConditionsInput_C_DisplayName")] + [ResourcesDescription(typeof(RingtoetsRevetmentFormsResources), "GeneralWaveConditionsInput_C_Description")] + public RoundedDouble C + { + get + { + return data.WrappedData.GeneralInput.C; + } + } + + #endregion } } \ No newline at end of file Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Ringtoets.WaveImpactAsphaltCover.Forms.csproj =================================================================== diff -u -r68579356ae04086051adec7a13109406a2e0614d -re42e4a7194308cf8d5ac461cc219cb21f699b96e --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Ringtoets.WaveImpactAsphaltCover.Forms.csproj (.../Ringtoets.WaveImpactAsphaltCover.Forms.csproj) (revision 68579356ae04086051adec7a13109406a2e0614d) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Ringtoets.WaveImpactAsphaltCover.Forms.csproj (.../Ringtoets.WaveImpactAsphaltCover.Forms.csproj) (revision e42e4a7194308cf8d5ac461cc219cb21f699b96e) @@ -112,6 +112,11 @@ Ringtoets.Revetment.Data False + + {af1acfa2-aee5-4db7-98ca-8b3720e46ad9} + Ringtoets.Revetment.Forms + False + {567E0B69-5280-41CE-ADD6-443725A61C86} Ringtoets.WaveImpactAsphaltCover.Data Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverFailureMechanismContextPropertiesTest.cs =================================================================== diff -u -r944d2501b3f780d208e00015a1b850afad4c3aa8 -re42e4a7194308cf8d5ac461cc219cb21f699b96e --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverFailureMechanismContextPropertiesTest.cs (.../WaveImpactAsphaltCoverFailureMechanismContextPropertiesTest.cs) (revision 944d2501b3f780d208e00015a1b850afad4c3aa8) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverFailureMechanismContextPropertiesTest.cs (.../WaveImpactAsphaltCoverFailureMechanismContextPropertiesTest.cs) (revision e42e4a7194308cf8d5ac461cc219cb21f699b96e) @@ -86,7 +86,7 @@ { BrowsableAttribute.Yes }); - Assert.AreEqual(2, dynamicProperties.Count); + Assert.AreEqual(5, dynamicProperties.Count); PropertyDescriptor nameProperty = dynamicProperties[0]; Assert.IsTrue(nameProperty.IsReadOnly); @@ -99,6 +99,27 @@ Assert.AreEqual("Algemeen", codeProperty.Category); Assert.AreEqual("Label", codeProperty.DisplayName); Assert.AreEqual("Het label van het toetsspoor.", codeProperty.Description); + + PropertyDescriptor aProperty = dynamicProperties[2]; + Assert.IsNotNull(aProperty); + Assert.IsTrue(aProperty.IsReadOnly); + Assert.AreEqual("Modelinstellingen", aProperty.Category); + Assert.AreEqual("a", aProperty.DisplayName); + Assert.AreEqual("De waarde van de parameter 'a' in de berekening voor golf condities.", aProperty.Description); + + PropertyDescriptor bProperty = dynamicProperties[3]; + Assert.IsNotNull(bProperty); + Assert.IsTrue(bProperty.IsReadOnly); + Assert.AreEqual("Modelinstellingen", bProperty.Category); + Assert.AreEqual("b", bProperty.DisplayName); + Assert.AreEqual("De waarde van de parameter 'b' in de berekening voor golf condities.", bProperty.Description); + + PropertyDescriptor cProperty = dynamicProperties[4]; + Assert.IsNotNull(cProperty); + Assert.IsTrue(cProperty.IsReadOnly); + Assert.AreEqual("Modelinstellingen", cProperty.Category); + Assert.AreEqual("c", cProperty.DisplayName); + Assert.AreEqual("De waarde van de parameter 'c' in de berekening voor golf condities.", cProperty.Description); } } } \ No newline at end of file