Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresCalculation.cs =================================================================== diff -u -rb04aec5d2e0dbedb3badb9aee6cb533f1efbf543 -r20231cfee041a316978347564bd1fddbb41b9ffc --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresCalculation.cs (.../HeightStructuresCalculation.cs) (revision b04aec5d2e0dbedb3badb9aee6cb533f1efbf543) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresCalculation.cs (.../HeightStructuresCalculation.cs) (revision 20231cfee041a316978347564bd1fddbb41b9ffc) @@ -29,6 +29,19 @@ /// public class HeightStructuresCalculation : Observable, ICalculation { + /// + /// Creates a new instance of . + /// + public HeightStructuresCalculation() + { + InputParameters = new HeightStructuresInput(); + } + + /// + /// Gets the input parameters to perform a height structures calculation with. + /// + public HeightStructuresInput InputParameters { get; private set; } + public string Name { get; set; } public string Comments { get; set; } Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs =================================================================== diff -u --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs (revision 0) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs (revision 20231cfee041a316978347564bd1fddbb41b9ffc) @@ -0,0 +1,31 @@ +// 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 Core.Common.Base; +using Ringtoets.Common.Data.Calculation; + +namespace Ringtoets.HeightStructures.Data +{ + /// + /// Class that holds all height structures calculation specific input parameters. + /// + public class HeightStructuresInput : Observable, ICalculationInput {} +} \ No newline at end of file Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Ringtoets.HeightStructures.Data.csproj =================================================================== diff -u -rb04aec5d2e0dbedb3badb9aee6cb533f1efbf543 -r20231cfee041a316978347564bd1fddbb41b9ffc --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Ringtoets.HeightStructures.Data.csproj (.../Ringtoets.HeightStructures.Data.csproj) (revision b04aec5d2e0dbedb3badb9aee6cb533f1efbf543) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Ringtoets.HeightStructures.Data.csproj (.../Ringtoets.HeightStructures.Data.csproj) (revision 20231cfee041a316978347564bd1fddbb41b9ffc) @@ -41,6 +41,7 @@ + True Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresInputContext.cs =================================================================== diff -u --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresInputContext.cs (revision 0) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresInputContext.cs (revision 20231cfee041a316978347564bd1fddbb41b9ffc) @@ -0,0 +1,66 @@ +// 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 Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.Common.Data.Calculation; +using Ringtoets.HeightStructures.Data; +using Ringtoets.HeightStructures.Forms.Properties; + +namespace Ringtoets.HeightStructures.Forms.PresentationObjects +{ + /// + /// Presentation object for all data required to configure an instance of + /// in order to be able to configure height structures calculations. + /// + public class HeightStructuresInputContext : HeightStructuresContext + { + /// + /// Creates a new instance of . + /// + /// The height structures input instance wrapped by this context object. + /// The calculation item which the belongs to. + /// The failure mechanism which the context belongs to. + /// The assessment section which the context belongs to. + /// Thrown when any input parameter is null. + public HeightStructuresInputContext(HeightStructuresInput input, + ICalculation calculation, + HeightStructuresFailureMechanism failureMechanism, + IAssessmentSection assessmentSection) + : base(input, failureMechanism, assessmentSection) + { + if (calculation == null) + { + var message = String.Format(Resources.HeightStructuresContext_AssertInputsAreNotNull_DataDescription_0_cannot_be_null, + Resources.HeightStructuresInputContext_DataDescription_HeightStructuresInputCalculationItem); + + throw new ArgumentNullException("calculation", message); + } + + Calculation = calculation; + } + + /// + /// Gets the calculation item which the context belongs to. + /// + public ICalculation Calculation { get; private set; } + } +} Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r29fc3cf43f0885270cca5b57c8bf17e347ae9609 -r20231cfee041a316978347564bd1fddbb41b9ffc --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 29fc3cf43f0885270cca5b57c8bf17e347ae9609) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 20231cfee041a316978347564bd1fddbb41b9ffc) @@ -22,7 +22,7 @@ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { + public class Resources { private static global::System.Resources.ResourceManager resourceMan; @@ -36,7 +36,7 @@ /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { + public static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Ringtoets.HeightStructures.Forms.Properties.Resources", typeof(Resources).Assembly); @@ -51,7 +51,7 @@ /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { + public static global::System.Globalization.CultureInfo Culture { get { return resourceCulture; } @@ -61,9 +61,19 @@ } /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap CalculationIcon { + get { + object obj = ResourceManager.GetObject("CalculationIcon", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// /// Looks up a localized string similar to {0} mag niet 'null' zijn.. /// - internal static string HeightStructuresContext_AssertInputsAreNotNull_DataDescription_0_cannot_be_null { + public static string HeightStructuresContext_AssertInputsAreNotNull_DataDescription_0_cannot_be_null { get { return ResourceManager.GetString("HeightStructuresContext_AssertInputsAreNotNull_DataDescription_0_cannot_be_null", resourceCulture); } @@ -72,7 +82,7 @@ /// /// Looks up a localized string similar to Het traject. /// - internal static string HeightStructuresContext_DataDescription_AssessmentSection { + public static string HeightStructuresContext_DataDescription_AssessmentSection { get { return ResourceManager.GetString("HeightStructuresContext_DataDescription_AssessmentSection", resourceCulture); } @@ -81,10 +91,20 @@ /// /// Looks up a localized string similar to Het hoogte kunstwerk toetsspoor. /// - internal static string HeightStructuresContext_DataDescription_HeightStructuresFailureMechanism { + public static string HeightStructuresContext_DataDescription_HeightStructuresFailureMechanism { get { return ResourceManager.GetString("HeightStructuresContext_DataDescription_HeightStructuresFailureMechanism", resourceCulture); } } + + /// + /// Looks up a localized string similar to De berekening. + /// + public static string HeightStructuresInputContext_DataDescription_HeightStructuresInputCalculationItem { + get { + return ResourceManager.GetString("HeightStructuresInputContext_DataDescription_HeightStructuresInputCalculationItem" + + "", resourceCulture); + } + } } } Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx =================================================================== diff -u -r00f13c6362323400cc61fa99d6b197b7085088e3 -r20231cfee041a316978347564bd1fddbb41b9ffc --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision 00f13c6362323400cc61fa99d6b197b7085088e3) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision 20231cfee041a316978347564bd1fddbb41b9ffc) @@ -1,103 +1,122 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 1.3 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + {0} mag niet 'null' zijn. @@ -107,4 +126,11 @@ Het traject + + De berekening + + + + ..\Resources\control_equalizer_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Resources/control_equalizer_blue.png =================================================================== diff -u Binary files differ Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Ringtoets.HeightStructures.Forms.csproj =================================================================== diff -u -rb04aec5d2e0dbedb3badb9aee6cb533f1efbf543 -r20231cfee041a316978347564bd1fddbb41b9ffc --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Ringtoets.HeightStructures.Forms.csproj (.../Ringtoets.HeightStructures.Forms.csproj) (revision b04aec5d2e0dbedb3badb9aee6cb533f1efbf543) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Ringtoets.HeightStructures.Forms.csproj (.../Ringtoets.HeightStructures.Forms.csproj) (revision 20231cfee041a316978347564bd1fddbb41b9ffc) @@ -34,6 +34,7 @@ + @@ -43,6 +44,7 @@ + True @@ -88,10 +90,14 @@ - ResXFileCodeGenerator + PublicResXFileCodeGenerator Resources.Designer.cs + Designer + + +