Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rd08c15413bbb6009c6da8ee05833a4c3531b358c -r462a9f89d625ca85e6ce2e2ff628db3d83913b99 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d08c15413bbb6009c6da8ee05833a4c3531b358c) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 462a9f89d625ca85e6ce2e2ff628db3d83913b99) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Runtime Version:4.0.30319.17929 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -741,6 +741,24 @@ } /// + /// Looks up a localized string similar to Afstand [m]. + /// + public static string InputView_Distance_DisplayName { + get { + return ResourceManager.GetString("InputView_Distance_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Hoogte [m+NAP]. + /// + public static string InputView_Height_DisplayName { + get { + return ResourceManager.GetString("InputView_Height_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to De gemiddelde waarde van de lognormale verdeling.. /// public static string LogNormalDistribution_Mean_Description { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx =================================================================== diff -u -rd08c15413bbb6009c6da8ee05833a4c3531b358c -r462a9f89d625ca85e6ce2e2ff628db3d83913b99 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision d08c15413bbb6009c6da8ee05833a4c3531b358c) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 462a9f89d625ca85e6ce2e2ff628db3d83913b99) @@ -424,4 +424,10 @@ Valideer alle berekeningen binnen deze berekeningsmap. + + Afstand [m] + + + Hoogte [m+NAP] + \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Ringtoets.GrassCoverErosionInwards.Forms.csproj =================================================================== diff -u -r8d33f259735b765767405b7691924bc8c0182d72 -r462a9f89d625ca85e6ce2e2ff628db3d83913b99 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Ringtoets.GrassCoverErosionInwards.Forms.csproj (.../Ringtoets.GrassCoverErosionInwards.Forms.csproj) (revision 8d33f259735b765767405b7691924bc8c0182d72) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Ringtoets.GrassCoverErosionInwards.Forms.csproj (.../Ringtoets.GrassCoverErosionInwards.Forms.csproj) (revision 462a9f89d625ca85e6ce2e2ff628db3d83913b99) @@ -32,10 +32,17 @@ AllRules.ruleset + + + + + + + @@ -83,6 +90,12 @@ GrassCoverErosionInwardsDikeProfileSelectionView.cs + + UserControl + + + GrassCoverErosionInwardsInputView.cs + @@ -115,6 +128,11 @@ Core.Common.Version False + + {2465CCA1-C505-4827-9454-4FD5FD9194CD} + Core.Components.Charting.Forms + False + {d4200f43-3f72-4f42-af0a-8ced416a38ec} Ringtoets.Common.Data @@ -148,6 +166,9 @@ GrassCoverErosionInwardsDikeProfileSelectionView.cs + + GrassCoverErosionInwardsInputView.cs + Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsInputView.Designer.cs =================================================================== diff -u --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsInputView.Designer.cs (revision 0) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsInputView.Designer.cs (revision 462a9f89d625ca85e6ce2e2ff628db3d83913b99) @@ -0,0 +1,65 @@ +using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; + +namespace Ringtoets.GrassCoverErosionInwards.Forms.Views +{ + partial class GrassCoverErosionInwardsInputView + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.chartControl = new Core.Components.OxyPlot.Forms.ChartControl(); + this.SuspendLayout(); + // + // chartControl + // + this.chartControl.BottomAxisTitle = "L"; + this.chartControl.ChartTitle = null; + this.chartControl.Dock = System.Windows.Forms.DockStyle.Fill; + this.chartControl.LeftAxisTitle = "Hoogte"; + this.chartControl.Location = new System.Drawing.Point(0, 0); + this.chartControl.MinimumSize = new System.Drawing.Size(50, 75); + this.chartControl.Name = "chartControl"; + this.chartControl.Size = new System.Drawing.Size(150, 150); + this.chartControl.TabIndex = 0; + this.chartControl.Text = "chartControl"; + this.chartControl.BottomAxisTitle = RingtoetsCommonFormsResources.InputView_Distance_DisplayName; + this.chartControl.LeftAxisTitle = RingtoetsCommonFormsResources.InputView_Height_DisplayName; + // + // GrassCoverErosionInwardsInputView + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.chartControl); + this.Name = "GrassCoverErosionInwardsInputView"; + this.ResumeLayout(false); + + } + + #endregion + + private Core.Components.OxyPlot.Forms.ChartControl chartControl; + } +} Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsInputView.cs =================================================================== diff -u --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsInputView.cs (revision 0) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsInputView.cs (revision 462a9f89d625ca85e6ce2e2ff628db3d83913b99) @@ -0,0 +1,50 @@ +// 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.Windows.Forms; +using Core.Components.Charting.Forms; + +namespace Ringtoets.GrassCoverErosionInwards.Forms.Views +{ + /// + /// This class is a view to show the grass cover erosion inwards input. + /// + public partial class GrassCoverErosionInwardsInputView : UserControl, IChartView + { + /// + /// Creates a new instance of . + /// + public GrassCoverErosionInwardsInputView() + { + InitializeComponent(); + } + + public object Data { get; set; } + + public IChartControl Chart + { + get + { + return chartControl; + } + } + } +} Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsInputView.resx =================================================================== diff -u --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsInputView.resx (revision 0) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsInputView.resx (revision 462a9f89d625ca85e6ce2e2ff628db3d83913b99) @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj =================================================================== diff -u -r8d33f259735b765767405b7691924bc8c0182d72 -r462a9f89d625ca85e6ce2e2ff628db3d83913b99 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj (.../Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj) (revision 8d33f259735b765767405b7691924bc8c0182d72) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj (.../Ringtoets.GrassCoverErosionInwards.Forms.Test.csproj) (revision 462a9f89d625ca85e6ce2e2ff628db3d83913b99) @@ -98,6 +98,7 @@ + @@ -134,6 +135,18 @@ {9a2d67e6-26ac-4d17-b11a-2b4372f2f572} Core.Common.Controls + + {2465CCA1-C505-4827-9454-4FD5FD9194CD} + Core.Components.Charting.Forms + + + {516ebc95-b8f2-428c-b7f6-733f01bf8fdd} + Core.Components.Charting + + + {DADAA0A5-288C-49CB-9F08-337F16832C86} + Core.Components.OxyPlot.Forms + {D4200F43-3F72-4F42-AF0A-8CED416A38EC} Ringtoets.Common.Data Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs =================================================================== diff -u --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs (revision 0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs (revision 462a9f89d625ca85e6ce2e2ff628db3d83913b99) @@ -0,0 +1,67 @@ +// 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.Windows.Forms; +using Core.Components.Charting.Forms; +using Core.Components.OxyPlot.Forms; +using NUnit.Framework; +using Ringtoets.GrassCoverErosionInwards.Forms.Views; + +using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; + +namespace Ringtoets.GrassCoverErosionInwards.Forms.Test.Views +{ + [TestFixture] + public class GrassCoverErosionInwardsInputViewTest + { + [Test] + public void DefaultConstructor_DefaultValues() + { + // Call + using (GrassCoverErosionInwardsInputView view = new GrassCoverErosionInwardsInputView()) + { + // Assert + Assert.IsInstanceOf(view); + Assert.IsInstanceOf(view); + Assert.IsNotNull(view.Chart); + Assert.IsNull(view.Data); + } + } + + [Test] + public void DefaultConstructor_Always_AddChartControlWithEmptyCollectionData() + { + // Call + using (GrassCoverErosionInwardsInputView view = new GrassCoverErosionInwardsInputView()) + { + // Assert + Assert.AreEqual(1, view.Controls.Count); + ChartControl chartControl = view.Controls[0] as ChartControl; + Assert.IsNotNull(chartControl); + Assert.AreEqual(DockStyle.Fill, chartControl.Dock); + Assert.IsNotNull(chartControl.Data); + CollectionAssert.IsEmpty(chartControl.Data.List); + Assert.AreEqual(RingtoetsCommonFormsResources.InputView_Distance_DisplayName, chartControl.BottomAxisTitle); + Assert.AreEqual(RingtoetsCommonFormsResources.InputView_Height_DisplayName, chartControl.LeftAxisTitle); + } + } + } +} \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rd08c15413bbb6009c6da8ee05833a4c3531b358c -r462a9f89d625ca85e6ce2e2ff628db3d83913b99 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d08c15413bbb6009c6da8ee05833a4c3531b358c) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 462a9f89d625ca85e6ce2e2ff628db3d83913b99) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Runtime Version:4.0.30319.17929 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -1004,24 +1004,6 @@ } /// - /// Looks up a localized string similar to Afstand [m]. - /// - public static string PipingInputView_Distance_DisplayName { - get { - return ResourceManager.GetString("PipingInputView_Distance_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Hoogte [m+NAP]. - /// - public static string PipingInputView_Height_DisplayName { - get { - return ResourceManager.GetString("PipingInputView_Height_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Heave. /// public static string PipingSemiProbabilisticOutput_Categories_Heave { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -rd08c15413bbb6009c6da8ee05833a4c3531b358c -r462a9f89d625ca85e6ce2e2ff628db3d83913b99 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision d08c15413bbb6009c6da8ee05833a4c3531b358c) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 462a9f89d625ca85e6ce2e2ff628db3d83913b99) @@ -664,10 +664,4 @@ De berekening - - Afstand [m] - - - Hoogte [m+NAP] - \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingInputView.Designer.cs =================================================================== diff -u -r0fdde49cfbdc5a411fac387d6a99484f05112700 -r462a9f89d625ca85e6ce2e2ff628db3d83913b99 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingInputView.Designer.cs (.../PipingInputView.Designer.cs) (revision 0fdde49cfbdc5a411fac387d6a99484f05112700) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingInputView.Designer.cs (.../PipingInputView.Designer.cs) (revision 462a9f89d625ca85e6ce2e2ff628db3d83913b99) @@ -1,4 +1,4 @@ -using Ringtoets.Piping.Forms.Properties; +using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.Piping.Forms.Views { @@ -41,9 +41,9 @@ this.chartControl.Name = "chartControl"; this.chartControl.Size = new System.Drawing.Size(150, 150); this.chartControl.TabIndex = 0; - this.chartControl.Text = "chartControl1"; - this.chartControl.BottomAxisTitle = Resources.PipingInputView_Distance_DisplayName; - this.chartControl.LeftAxisTitle = Resources.PipingInputView_Height_DisplayName; + this.chartControl.Text = "chartControl"; + this.chartControl.BottomAxisTitle = RingtoetsCommonFormsResources.InputView_Distance_DisplayName; + this.chartControl.LeftAxisTitle = RingtoetsCommonFormsResources.InputView_Height_DisplayName; // // PipingInputView // Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs =================================================================== diff -u -r449e2761ad14af6e84ea5c1a56aea71bc535e8f9 -r462a9f89d625ca85e6ce2e2ff628db3d83913b99 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs (.../PipingInputViewTest.cs) (revision 449e2761ad14af6e84ea5c1a56aea71bc535e8f9) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs (.../PipingInputViewTest.cs) (revision 462a9f89d625ca85e6ce2e2ff628db3d83913b99) @@ -22,6 +22,7 @@ using System.Collections.Generic; using System.Linq; using System.Windows.Forms; +using Core.Common.Base; using Core.Common.Base.Geometry; using Core.Components.Charting.Data; using Core.Components.Charting.Forms; @@ -31,6 +32,8 @@ using Ringtoets.Piping.Forms.Properties; using Ringtoets.Piping.Forms.Views; using Ringtoets.Piping.Primitives; + +using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; using PipingDataResources = Ringtoets.Piping.Data.Properties.Resources; namespace Ringtoets.Piping.Forms.Test.Views @@ -47,6 +50,7 @@ // Assert Assert.IsInstanceOf(view); Assert.IsInstanceOf(view); + Assert.IsInstanceOf(view); Assert.IsNotNull(view.Chart); Assert.IsNull(view.Data); } @@ -65,8 +69,8 @@ Assert.AreEqual(DockStyle.Fill, chartControl.Dock); Assert.IsNotNull(chartControl.Data); CollectionAssert.IsEmpty(chartControl.Data.List); - Assert.AreEqual(Resources.PipingInputView_Distance_DisplayName, chartControl.BottomAxisTitle); - Assert.AreEqual(Resources.PipingInputView_Height_DisplayName, chartControl.LeftAxisTitle); + Assert.AreEqual(RingtoetsCommonFormsResources.InputView_Distance_DisplayName, chartControl.BottomAxisTitle); + Assert.AreEqual(RingtoetsCommonFormsResources.InputView_Height_DisplayName, chartControl.LeftAxisTitle); } }