Index: Core/Components/src/Core.Components.Stack.Forms/Core.Components.Stack.Forms.csproj =================================================================== diff -u -rd98bbe7db9b448a0a61954330f80b1196b2ac760 -ra2a3022ca8b69a87b4afde3727ebc035f132978f --- Core/Components/src/Core.Components.Stack.Forms/Core.Components.Stack.Forms.csproj (.../Core.Components.Stack.Forms.csproj) (revision d98bbe7db9b448a0a61954330f80b1196b2ac760) +++ Core/Components/src/Core.Components.Stack.Forms/Core.Components.Stack.Forms.csproj (.../Core.Components.Stack.Forms.csproj) (revision a2a3022ca8b69a87b4afde3727ebc035f132978f) @@ -45,7 +45,6 @@ Properties\GlobalAssembly.cs - Fisheye: Tag a2a3022ca8b69a87b4afde3727ebc035f132978f refers to a dead (removed) revision in file `Core/Components/src/Core.Components.Stack.Forms/IStackChartView.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Demo/Ringtoets/src/Demo.Ringtoets/Views/StackChartDataView.cs =================================================================== diff -u -rd98bbe7db9b448a0a61954330f80b1196b2ac760 -ra2a3022ca8b69a87b4afde3727ebc035f132978f --- Demo/Ringtoets/src/Demo.Ringtoets/Views/StackChartDataView.cs (.../StackChartDataView.cs) (revision d98bbe7db9b448a0a61954330f80b1196b2ac760) +++ Demo/Ringtoets/src/Demo.Ringtoets/Views/StackChartDataView.cs (.../StackChartDataView.cs) (revision a2a3022ca8b69a87b4afde3727ebc035f132978f) @@ -20,15 +20,15 @@ // All rights reserved. using System.Windows.Forms; +using Core.Common.Controls.Views; using Core.Components.Stack.Data; -using Core.Components.Stack.Forms; namespace Demo.Ringtoets.Views { /// /// This class represents a simple view with a stack chart, to which data can be added. /// - public partial class StackChartDataView : UserControl, IStackChartView + public partial class StackChartDataView : UserControl, IView { /// /// Creates a new instance of . @@ -42,20 +42,12 @@ { get { - return Chart.Data; + return stackChartControl.Data; } set { - Chart.Data = value as StackChartData; + stackChartControl.Data = value as StackChartData; } } - - public IStackChartControl Chart - { - get - { - return stackChartControl; - } - } } } Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Views/StackChartDataViewTest.cs =================================================================== diff -u -rd98bbe7db9b448a0a61954330f80b1196b2ac760 -ra2a3022ca8b69a87b4afde3727ebc035f132978f --- Demo/Ringtoets/test/Demo.Ringtoets.Test/Views/StackChartDataViewTest.cs (.../StackChartDataViewTest.cs) (revision d98bbe7db9b448a0a61954330f80b1196b2ac760) +++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Views/StackChartDataViewTest.cs (.../StackChartDataViewTest.cs) (revision a2a3022ca8b69a87b4afde3727ebc035f132978f) @@ -41,9 +41,8 @@ object chartObject = chartView.Controls[0]; Assert.IsInstanceOf(chartObject); - var chart = (StackChartControl)chartObject; + var chart = (StackChartControl) chartObject; Assert.AreEqual(DockStyle.Fill, chart.Dock); - Assert.NotNull(chartView.Chart); } } @@ -96,4 +95,4 @@ } } } -} +} \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj =================================================================== diff -u -r55ef1e185a9cdaac7edd90877fb57c50370a1140 -ra2a3022ca8b69a87b4afde3727ebc035f132978f --- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision 55ef1e185a9cdaac7edd90877fb57c50370a1140) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision a2a3022ca8b69a87b4afde3727ebc035f132978f) @@ -38,8 +38,10 @@ + + @@ -127,6 +129,12 @@ + + UserControl + + + IllustrationPointsChartControl.cs + UserControl @@ -185,6 +193,9 @@ ScenarioSelectionControl.cs + + IllustrationPointsChartControl.cs + LocationsView.cs @@ -238,7 +249,7 @@ False - {516EBC95-B8F2-428C-B7F6-733F01BF8FDD} + {516ebc95-b8f2-428c-b7f6-733f01bf8fdd} Core.Components.Chart False @@ -257,6 +268,21 @@ Core.Components.Gis False + + {dadaa0a5-288c-49cb-9f08-337f16832c86} + Core.Components.OxyPlot.Forms + False + + + {72109e33-6518-4632-accf-6cbf2a312711} + Core.Components.Stack.Forms + False + + + {6a146889-a3c4-48bf-af53-c0b0cd355be4} + Core.Components.Stack + False + {888d4097-8bc2-4703-9fb1-8744c94d525e} Ringtoets.HydraRing.Calculation Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/IllustrationPointsChartControl.Designer.cs =================================================================== diff -u --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/IllustrationPointsChartControl.Designer.cs (revision 0) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/IllustrationPointsChartControl.Designer.cs (revision a2a3022ca8b69a87b4afde3727ebc035f132978f) @@ -0,0 +1,80 @@ +// 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. + +namespace Ringtoets.Common.Forms.Views +{ + partial class IllustrationPointsChartControl + { + /// + /// 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.stackChartControl = new Core.Components.OxyPlot.Forms.StackChartControl(); + this.SuspendLayout(); + // + // stackChartControl + // + this.stackChartControl.ChartTitle = null; + this.stackChartControl.Data = null; + this.stackChartControl.Dock = System.Windows.Forms.DockStyle.Fill; + this.stackChartControl.Location = new System.Drawing.Point(0, 0); + this.stackChartControl.Name = "stackChartControl"; + this.stackChartControl.Size = new System.Drawing.Size(150, 150); + this.stackChartControl.TabIndex = 0; + this.stackChartControl.Text = "stackChartControl"; + // + // IllustrationPointsChartControl + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.stackChartControl); + this.Name = "IllustrationPointsChartControl"; + this.ResumeLayout(false); + + } + + #endregion + + private Core.Components.OxyPlot.Forms.StackChartControl stackChartControl; + } +} Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/IllustrationPointsChartControl.cs =================================================================== diff -u --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/IllustrationPointsChartControl.cs (revision 0) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/IllustrationPointsChartControl.cs (revision a2a3022ca8b69a87b4afde3727ebc035f132978f) @@ -0,0 +1,38 @@ +// 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.Windows.Forms; + +namespace Ringtoets.Common.Forms.Views +{ + /// + /// Control to show illustration points in a chart view. + /// + public partial class IllustrationPointsChartControl : UserControl + { + public IllustrationPointsChartControl() + { + InitializeComponent(); + } + + public object Data { get; set; } + } +} \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/IllustrationPointsChartControl.resx =================================================================== diff -u --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/IllustrationPointsChartControl.resx (revision 0) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/IllustrationPointsChartControl.resx (revision a2a3022ca8b69a87b4afde3727ebc035f132978f) @@ -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/Common/src/Ringtoets.Common.Forms/Views/LocationsView.Designer.cs =================================================================== diff -u -r7c204cd57395564d817e63d04d712d1190e35f3b -ra2a3022ca8b69a87b4afde3727ebc035f132978f --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/LocationsView.Designer.cs (.../LocationsView.Designer.cs) (revision 7c204cd57395564d817e63d04d712d1190e35f3b) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/LocationsView.Designer.cs (.../LocationsView.Designer.cs) (revision a2a3022ca8b69a87b4afde3727ebc035f132978f) @@ -45,13 +45,15 @@ this.CalculateForSelectedButtonErrorProvider = new System.Windows.Forms.ErrorProvider(this.components); this.verticalSplitContainer = new System.Windows.Forms.SplitContainer(); this.horizontalSplitContainer = new System.Windows.Forms.SplitContainer(); + this.illustrationPointsChartControl1 = new Ringtoets.Common.Forms.Views.IllustrationPointsChartControl(); this.ButtonGroupBox.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.CalculateForSelectedButtonErrorProvider)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.verticalSplitContainer)).BeginInit(); this.verticalSplitContainer.Panel1.SuspendLayout(); this.verticalSplitContainer.Panel2.SuspendLayout(); this.verticalSplitContainer.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.horizontalSplitContainer)).BeginInit(); + this.horizontalSplitContainer.Panel1.SuspendLayout(); this.horizontalSplitContainer.SuspendLayout(); this.SuspendLayout(); // @@ -139,10 +141,22 @@ this.horizontalSplitContainer.Location = new System.Drawing.Point(0, 0); this.horizontalSplitContainer.Name = "horizontalSplitContainer"; this.horizontalSplitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // horizontalSplitContainer.Panel1 + // + this.horizontalSplitContainer.Panel1.Controls.Add(this.illustrationPointsChartControl1); this.horizontalSplitContainer.Size = new System.Drawing.Size(373, 543); this.horizontalSplitContainer.SplitterDistance = 261; this.horizontalSplitContainer.TabIndex = 0; // + // illustrationPointsChartControl1 + // + this.illustrationPointsChartControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.illustrationPointsChartControl1.Location = new System.Drawing.Point(0, 0); + this.illustrationPointsChartControl1.Name = "illustrationPointsChartControl1"; + this.illustrationPointsChartControl1.Size = new System.Drawing.Size(371, 259); + this.illustrationPointsChartControl1.TabIndex = 0; + // // LocationsView // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -158,6 +172,7 @@ this.verticalSplitContainer.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.verticalSplitContainer)).EndInit(); this.verticalSplitContainer.ResumeLayout(false); + this.horizontalSplitContainer.Panel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.horizontalSplitContainer)).EndInit(); this.horizontalSplitContainer.ResumeLayout(false); this.ResumeLayout(false); @@ -174,5 +189,6 @@ private System.Windows.Forms.ErrorProvider CalculateForSelectedButtonErrorProvider; private System.Windows.Forms.SplitContainer verticalSplitContainer; private System.Windows.Forms.SplitContainer horizontalSplitContainer; + private IllustrationPointsChartControl illustrationPointsChartControl1; } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj =================================================================== diff -u -r55ef1e185a9cdaac7edd90877fb57c50370a1140 -ra2a3022ca8b69a87b4afde3727ebc035f132978f --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision 55ef1e185a9cdaac7edd90877fb57c50370a1140) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision a2a3022ca8b69a87b4afde3727ebc035f132978f) @@ -116,6 +116,7 @@ + @@ -176,6 +177,10 @@ {318BA582-88C9-4816-A54A-A7E431461DE3} Core.Components.Gis + + {72109e33-6518-4632-accf-6cbf2a312711} + Core.Components.Stack.Forms + {1081336C-D919-4249-AB33-9AF15F4D19EC} Core.Components.BruTile.TestUtil Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsChartControlTest.cs =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsChartControlTest.cs (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsChartControlTest.cs (revision a2a3022ca8b69a87b4afde3727ebc035f132978f) @@ -0,0 +1,42 @@ +// 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.Windows.Forms; +using NUnit.Framework; +using Ringtoets.Common.Forms.Views; + +namespace Ringtoets.Common.Forms.Test.Views +{ + [TestFixture] + public class IllustrationPointsChartControlTest + { + [Test] + public void Constructor_ExpectedValues() + { + // Call + var chartControl = new IllustrationPointsChartControl(); + + // Assert + Assert.IsInstanceOf(chartControl); + Assert.IsNull(chartControl.Data); + } + } +} \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/LocationsViewTest.cs =================================================================== diff -u -r7c204cd57395564d817e63d04d712d1190e35f3b -ra2a3022ca8b69a87b4afde3727ebc035f132978f --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/LocationsViewTest.cs (.../LocationsViewTest.cs) (revision 7c204cd57395564d817e63d04d712d1190e35f3b) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/LocationsViewTest.cs (.../LocationsViewTest.cs) (revision a2a3022ca8b69a87b4afde3727ebc035f132978f) @@ -75,7 +75,10 @@ var horizontalSplitContainer = verticalSplitContainerPanel2Controls[0] as SplitContainer; Assert.IsNotNull(horizontalSplitContainer); - CollectionAssert.IsEmpty(horizontalSplitContainer.Panel1.Controls); + Control.ControlCollection horizontalSplitContainerPanel1Controls = horizontalSplitContainer.Panel1.Controls; + Assert.AreEqual(1, horizontalSplitContainerPanel1Controls.Count); + Assert.IsInstanceOf(horizontalSplitContainerPanel1Controls[0]); + CollectionAssert.IsEmpty(horizontalSplitContainer.Panel2.Controls); } }