Index: Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.Designer.cs
===================================================================
diff -u -r48e634ab3ef98a7eaeec8626d3ce618cf1fcbac1 -r22da5787c0bbdd8f94742b2df2f7c5b6808cfcc7
--- Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.Designer.cs (.../MapControl.Designer.cs) (revision 48e634ab3ef98a7eaeec8626d3ce618cf1fcbac1)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.Designer.cs (.../MapControl.Designer.cs) (revision 22da5787c0bbdd8f94742b2df2f7c5b6808cfcc7)
@@ -66,7 +66,7 @@
this.toolStrip.Location = new System.Drawing.Point(649, 0);
this.toolStrip.Name = "toolStrip";
this.toolStrip.Size = new System.Drawing.Size(48, 611);
- this.toolStrip.TabIndex = 2;
+ this.toolStrip.TabIndex = 0;
//
// panToolStripButton
//
Index: Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.Designer.cs
===================================================================
diff -u -r1b50bfc6093a5676049bc75a1c64a134c760551d -r22da5787c0bbdd8f94742b2df2f7c5b6808cfcc7
--- Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.Designer.cs (.../ChartControl.Designer.cs) (revision 1b50bfc6093a5676049bc75a1c64a134c760551d)
+++ Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.Designer.cs (.../ChartControl.Designer.cs) (revision 22da5787c0bbdd8f94742b2df2f7c5b6808cfcc7)
@@ -1,5 +1,26 @@
-using System.ComponentModel;
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser 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;
+
namespace Core.Components.OxyPlot.Forms
{
partial class ChartControl
@@ -17,10 +38,36 @@
///
private void InitializeComponent()
{
- components = new System.ComponentModel.Container();
+ this.toolStrip = new System.Windows.Forms.ToolStrip();
+ this.SuspendLayout();
+ //
+ // toolStrip
+ //
+
+ this.toolStrip.CanOverflow = false;
+ this.toolStrip.Dock = System.Windows.Forms.DockStyle.Right;
+ this.toolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
+ this.toolStrip.ImageScalingSize = new System.Drawing.Size(24, 24);
+ this.toolStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow;
+ this.toolStrip.Location = new System.Drawing.Point(0, 0);
+ this.toolStrip.Name = "toolStrip";
+ this.toolStrip.Size = new System.Drawing.Size(699, 28);
+ this.toolStrip.TabIndex = 0;
+ //
+ // ChartControl
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.toolStrip);
+ this.Name = "ChartControl";
+ this.Size = new System.Drawing.Size(699, 596);
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
}
#endregion
+
+ private System.Windows.Forms.ToolStrip toolStrip;
}
}
\ No newline at end of file
Index: Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.cs
===================================================================
diff -u -r1b50bfc6093a5676049bc75a1c64a134c760551d -r22da5787c0bbdd8f94742b2df2f7c5b6808cfcc7
--- Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.cs (.../ChartControl.cs) (revision 1b50bfc6093a5676049bc75a1c64a134c760551d)
+++ Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.cs (.../ChartControl.cs) (revision 22da5787c0bbdd8f94742b2df2f7c5b6808cfcc7)
@@ -50,14 +50,30 @@
public ChartControl()
{
InitializeComponent();
-
+
InitializePlotView();
-
+
MinimumSize = new Size(100, 100);
chartDataCollectionObserver = new RecursiveObserver(HandleChartDataCollectionChange, cdc => cdc.Collection);
}
+ public bool IsPanningEnabled
+ {
+ get
+ {
+ return plotController.IsPanningEnabled;
+ }
+ }
+
+ public bool IsRectangleZoomingEnabled
+ {
+ get
+ {
+ return plotController.IsRectangleZoomingEnabled;
+ }
+ }
+
public ChartDataCollection Data
{
get
@@ -120,22 +136,6 @@
}
}
- public bool IsPanningEnabled
- {
- get
- {
- return plotController.IsPanningEnabled;
- }
- }
-
- public bool IsRectangleZoomingEnabled
- {
- get
- {
- return plotController.IsRectangleZoomingEnabled;
- }
- }
-
public void TogglePanning()
{
plotController.TogglePanning();
Index: Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.resx
===================================================================
diff -u
--- Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.resx (revision 0)
+++ Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.resx (revision 22da5787c0bbdd8f94742b2df2f7c5b6808cfcc7)
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
+ 17, 17
+
+
\ No newline at end of file