Index: Core/Components/src/Core.Components.Chart.Forms/IChartControl.cs
===================================================================
diff -u -ra9234c14f4059dde4be02b47095510971e2d80db -ra18fd6dde75df4a9f6464f77c5af3e47f571328b
--- Core/Components/src/Core.Components.Chart.Forms/IChartControl.cs (.../IChartControl.cs) (revision a9234c14f4059dde4be02b47095510971e2d80db)
+++ Core/Components/src/Core.Components.Chart.Forms/IChartControl.cs (.../IChartControl.cs) (revision a18fd6dde75df4a9f6464f77c5af3e47f571328b)
@@ -55,6 +55,6 @@
/// The data to zoom to.
/// Thrown when
/// is not part of .
- void ZoomToAllVisibleLayers(ChartData layerData);
+ void ZoomToAllVisibleSeries(ChartData layerData);
}
}
\ No newline at end of file
Index: Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.Designer.cs
===================================================================
diff -u -r5795192da01660f752f179d086dfc447dc86d9db -ra18fd6dde75df4a9f6464f77c5af3e47f571328b
--- Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.Designer.cs (.../ChartControl.Designer.cs) (revision 5795192da01660f752f179d086dfc447dc86d9db)
+++ Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.Designer.cs (.../ChartControl.Designer.cs) (revision a18fd6dde75df4a9f6464f77c5af3e47f571328b)
@@ -42,7 +42,7 @@
this.panToolStripButton = new System.Windows.Forms.ToolStripButton();
this.zoomToRectangleToolStripButton = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
- this.zoomToVisibleLayersToolStripButton = new System.Windows.Forms.ToolStripButton();
+ this.zoomToVisibleSeriesToolStripButton = new System.Windows.Forms.ToolStripButton();
this.tableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
this.toolStrip.SuspendLayout();
this.tableLayoutPanel.SuspendLayout();
@@ -58,7 +58,7 @@
this.panToolStripButton,
this.zoomToRectangleToolStripButton,
this.toolStripSeparator1,
- this.zoomToVisibleLayersToolStripButton});
+ this.zoomToVisibleSeriesToolStripButton});
this.toolStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow;
this.toolStrip.Location = new System.Drawing.Point(438, 0);
this.toolStrip.Name = "toolStrip";
@@ -90,15 +90,15 @@
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(26, 6);
//
- // zoomToVisibleLayersToolStripButton
+ // zoomToVisibleSeriesToolStripButton
//
- this.zoomToVisibleLayersToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
- this.zoomToVisibleLayersToolStripButton.Margin = new System.Windows.Forms.Padding(2, 2, 2, 3);
- this.zoomToVisibleLayersToolStripButton.Name = "zoomToVisibleLayersToolStripButton";
- this.zoomToVisibleLayersToolStripButton.Size = new System.Drawing.Size(22, 19);
- this.zoomToVisibleLayersToolStripButton.Text = "";
- this.zoomToVisibleLayersToolStripButton.ToolTipText = global::Core.Components.OxyPlot.Forms.Properties.Resources.ChartControl_ZoomToVisibleLayers;
- this.zoomToVisibleLayersToolStripButton.Click += new System.EventHandler(this.ZoomToAllVisibleLayersToolStripButtonClick);
+ this.zoomToVisibleSeriesToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.zoomToVisibleSeriesToolStripButton.Margin = new System.Windows.Forms.Padding(2, 2, 2, 3);
+ this.zoomToVisibleSeriesToolStripButton.Name = "zoomToVisibleSeriesToolStripButton";
+ this.zoomToVisibleSeriesToolStripButton.Size = new System.Drawing.Size(22, 19);
+ this.zoomToVisibleSeriesToolStripButton.Text = "";
+ this.zoomToVisibleSeriesToolStripButton.ToolTipText = global::Core.Components.OxyPlot.Forms.Properties.Resources.ChartControl_ZoomToVisibleSeries;
+ this.zoomToVisibleSeriesToolStripButton.Click += new System.EventHandler(this.ZoomToAllVisibleSeriesToolStripButtonClick);
//
// tableLayoutPanel
//
@@ -136,7 +136,7 @@
private System.Windows.Forms.ToolStripButton panToolStripButton;
private System.Windows.Forms.ToolStripButton zoomToRectangleToolStripButton;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
- private System.Windows.Forms.ToolStripButton zoomToVisibleLayersToolStripButton;
+ private System.Windows.Forms.ToolStripButton zoomToVisibleSeriesToolStripButton;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel;
}
}
\ No newline at end of file
Index: Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.cs
===================================================================
diff -u -rf1e88640d1a17f847a065f0b8b6b1dccec16da72 -ra18fd6dde75df4a9f6464f77c5af3e47f571328b
--- Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.cs (.../ChartControl.cs) (revision f1e88640d1a17f847a065f0b8b6b1dccec16da72)
+++ Core/Components/src/Core.Components.OxyPlot.Forms/ChartControl.cs (.../ChartControl.cs) (revision a18fd6dde75df4a9f6464f77c5af3e47f571328b)
@@ -126,9 +126,9 @@
}
}
- public void ZoomToAllVisibleLayers(ChartData layerData)
+ public void ZoomToAllVisibleSeries(ChartData layerData)
{
- Extent extent = CreateEnvelopeForAllVisibleLayers(layerData);
+ Extent extent = CreateEnvelopeForAllVisibleSeries(layerData);
if (!extent.IsNaN)
{
@@ -170,7 +170,7 @@
var font = new Font(fonts.Families[0], 14.0F);
panToolStripButton.Font = font;
zoomToRectangleToolStripButton.Font = font;
- zoomToVisibleLayersToolStripButton.Font = font;
+ zoomToVisibleSeriesToolStripButton.Font = font;
}
private void InitializePlotView()
@@ -198,11 +198,11 @@
/// The area definition.
/// Thrown when is
/// not part of the drawn chart data.
- private Extent CreateEnvelopeForAllVisibleLayers(ChartData chartData)
+ private Extent CreateEnvelopeForAllVisibleSeries(ChartData chartData)
{
if (chartData is ChartDataCollection collection)
{
- return CreateEnvelopeForAllVisibleLayers(collection);
+ return CreateEnvelopeForAllVisibleSeries(collection);
}
DrawnChartData drawnChartData = drawnChartDataList.FirstOrDefault(dmd => dmd.ChartData.Equals(chartData));
@@ -232,13 +232,13 @@
/// The area definition.
/// Thrown when or
/// any of its children is not part of the drawn chart data.
- private Extent CreateEnvelopeForAllVisibleLayers(ChartDataCollection chartDataCollection)
+ private Extent CreateEnvelopeForAllVisibleSeries(ChartDataCollection chartDataCollection)
{
var envelope = new Extent();
foreach (ChartData childChartData in chartDataCollection.Collection)
{
- envelope.ExpandToInclude(CreateEnvelopeForAllVisibleLayers(childChartData));
+ envelope.ExpandToInclude(CreateEnvelopeForAllVisibleSeries(childChartData));
}
return envelope;
@@ -377,9 +377,9 @@
zoomToRectangleToolStripButton.Checked = true;
}
- private void ZoomToAllVisibleLayersToolStripButtonClick(object sender, EventArgs e)
+ private void ZoomToAllVisibleSeriesToolStripButtonClick(object sender, EventArgs e)
{
- ZoomToAllVisibleLayers(Data);
+ ZoomToAllVisibleSeries(Data);
}
///
Index: Core/Components/src/Core.Components.OxyPlot.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r77a3ab26a01583b7fb09f9d7843f96d2ec65f9a5 -ra18fd6dde75df4a9f6464f77c5af3e47f571328b
--- Core/Components/src/Core.Components.OxyPlot.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 77a3ab26a01583b7fb09f9d7843f96d2ec65f9a5)
+++ Core/Components/src/Core.Components.OxyPlot.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a18fd6dde75df4a9f6464f77c5af3e47f571328b)
@@ -120,9 +120,9 @@
///
/// Looks up a localized string similar to Zoom naar alles.
///
- internal static string ChartControl_ZoomToVisibleLayers {
+ internal static string ChartControl_ZoomToVisibleSeries {
get {
- return ResourceManager.GetString("ChartControl_ZoomToVisibleLayers", resourceCulture);
+ return ResourceManager.GetString("ChartControl_ZoomToVisibleSeries", resourceCulture);
}
}
Index: Core/Components/src/Core.Components.OxyPlot.Forms/Properties/Resources.resx
===================================================================
diff -u -r77a3ab26a01583b7fb09f9d7843f96d2ec65f9a5 -ra18fd6dde75df4a9f6464f77c5af3e47f571328b
--- Core/Components/src/Core.Components.OxyPlot.Forms/Properties/Resources.resx (.../Resources.resx) (revision 77a3ab26a01583b7fb09f9d7843f96d2ec65f9a5)
+++ Core/Components/src/Core.Components.OxyPlot.Forms/Properties/Resources.resx (.../Resources.resx) (revision a18fd6dde75df4a9f6464f77c5af3e47f571328b)
@@ -129,7 +129,7 @@
Zoom door rechthoek
-
+
Zoom naar alles
Index: Core/Components/test/Core.Components.OxyPlot.Forms.Test/ChartControlTest.cs
===================================================================
diff -u -r5795192da01660f752f179d086dfc447dc86d9db -ra18fd6dde75df4a9f6464f77c5af3e47f571328b
--- Core/Components/test/Core.Components.OxyPlot.Forms.Test/ChartControlTest.cs (.../ChartControlTest.cs) (revision 5795192da01660f752f179d086dfc447dc86d9db)
+++ Core/Components/test/Core.Components.OxyPlot.Forms.Test/ChartControlTest.cs (.../ChartControlTest.cs) (revision a18fd6dde75df4a9f6464f77c5af3e47f571328b)
@@ -373,11 +373,11 @@
return chartControl.Controls[0].Controls.OfType().First();
}
- #region ZoomToAllVisibleLayers
+ #region ZoomToAllVisibleSeries
[Test]
[Apartment(ApartmentState.STA)]
- public void ZoomToAllVisibleLayers_WithNonChildChartData_ThrowArgumentException()
+ public void ZoomToAllVisibleSeries_WithNonChildChartData_ThrowArgumentException()
{
// Setup
using (var chartControl = new ChartControl())
@@ -389,7 +389,7 @@
chartControl.Update();
// Call
- void Call() => chartControl.ZoomToAllVisibleLayers(chartData);
+ void Call() => chartControl.ZoomToAllVisibleSeries(chartData);
// Assert
const string message = "Can only zoom to ChartData that is part of this ChartControls drawn chartData.";
@@ -400,7 +400,7 @@
[Test]
[Apartment(ApartmentState.STA)]
- public void ZoomToAllVisibleLayers_ChartInFormWithEmptyDataSetAndZoomChildChartData_ViewNotInvalidated()
+ public void ZoomToAllVisibleSeries_ChartInFormWithEmptyDataSetAndZoomChildChartData_ViewNotInvalidated()
{
// Setup
using (var form = new Form())
@@ -428,7 +428,7 @@
linearPlotView.Invalidated += (sender, args) => invalidated++;
// Call
- chartControl.ZoomToAllVisibleLayers(chartData);
+ chartControl.ZoomToAllVisibleSeries(chartData);
// Assert
Assert.AreEqual(0, invalidated);
@@ -438,7 +438,7 @@
[Test]
[Apartment(ApartmentState.STA)]
- public void ZoomToAllVisibleLayers_ChartInFormForChildChartData_ViewInvalidatedLayersSame()
+ public void ZoomToAllVisibleSeries_ChartInFormForChildChartData_ViewInvalidatedSeriesSame()
{
// Setup
using (var form = new Form())
@@ -467,7 +467,7 @@
linearPlotView.Invalidated += (sender, args) => invalidated++;
// Call
- chartControl.ZoomToAllVisibleLayers(chartData);
+ chartControl.ZoomToAllVisibleSeries(chartData);
// Assert
Assert.AreEqual(1, invalidated);
@@ -483,7 +483,7 @@
}
[Test]
- public void ZoomToAllVisibleLayers_ForInvisibleChildChartData_DoNotChangeViewExtentsOfChartView()
+ public void ZoomToAllVisibleSeries_ForInvisibleChildChartData_DoNotChangeViewExtentsOfChartView()
{
// Setup
using (var form = new Form())
@@ -515,7 +515,7 @@
linearPlotView.Model.Axes[1].ActualMaximum);
// Call
- chartControl.ZoomToAllVisibleLayers(chartData);
+ chartControl.ZoomToAllVisibleSeries(chartData);
// Assert
AssertExpectedExtent(linearPlotView.Model.Axes, expectedExtent);
Index: Core/Plugins/src/Core.Plugins.Chart/Legend/ChartLegendView.cs
===================================================================
diff -u -rab3938a73513858354f1240bb86c0098f930ef3d -ra18fd6dde75df4a9f6464f77c5af3e47f571328b
--- Core/Plugins/src/Core.Plugins.Chart/Legend/ChartLegendView.cs (.../ChartLegendView.cs) (revision ab3938a73513858354f1240bb86c0098f930ef3d)
+++ Core/Plugins/src/Core.Plugins.Chart/Legend/ChartLegendView.cs (.../ChartLegendView.cs) (revision a18fd6dde75df4a9f6464f77c5af3e47f571328b)
@@ -169,7 +169,7 @@
return new StrictContextMenuItem($"&{ChartResources.Ribbon_ZoomToAll}",
toolTip,
ChartResources.ZoomToAllIcon,
- (sender, args) => ChartControl?.ZoomToAllVisibleLayers(nodeData))
+ (sender, args) => ChartControl?.ZoomToAllVisibleSeries(nodeData))
{
Enabled = isEnabled
};
Index: Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataCollectionTreeNodeInfoTest.cs
===================================================================
diff -u -rab3938a73513858354f1240bb86c0098f930ef3d -ra18fd6dde75df4a9f6464f77c5af3e47f571328b
--- Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataCollectionTreeNodeInfoTest.cs (.../ChartDataCollectionTreeNodeInfoTest.cs) (revision ab3938a73513858354f1240bb86c0098f930ef3d)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataCollectionTreeNodeInfoTest.cs (.../ChartDataCollectionTreeNodeInfoTest.cs) (revision a18fd6dde75df4a9f6464f77c5af3e47f571328b)
@@ -445,7 +445,7 @@
contextMenuBuilderProvider.Expect(p => p.Get(null, null)).IgnoreArguments().Return(builder);
var chartControl = mocks.StrictMock();
chartControl.Expect(c => c.Data).Return(new ChartDataCollection("name"));
- chartControl.Expect(c => c.ZoomToAllVisibleLayers(chartDataCollection));
+ chartControl.Expect(c => c.ZoomToAllVisibleSeries(chartDataCollection));
mocks.ReplayAll();
Index: Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataContextTreeNodeInfoTest.cs
===================================================================
diff -u -rab3938a73513858354f1240bb86c0098f930ef3d -ra18fd6dde75df4a9f6464f77c5af3e47f571328b
--- Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataContextTreeNodeInfoTest.cs (.../ChartDataContextTreeNodeInfoTest.cs) (revision ab3938a73513858354f1240bb86c0098f930ef3d)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataContextTreeNodeInfoTest.cs (.../ChartDataContextTreeNodeInfoTest.cs) (revision a18fd6dde75df4a9f6464f77c5af3e47f571328b)
@@ -631,7 +631,7 @@
contextMenuBuilderProvider.Expect(p => p.Get(null, null)).IgnoreArguments().Return(builder);
var chartControl = mocks.StrictMock();
chartControl.Expect(c => c.Data).Return(new ChartDataCollection("name"));
- chartControl.Expect(c => c.ZoomToAllVisibleLayers(lineData));
+ chartControl.Expect(c => c.ZoomToAllVisibleSeries(lineData));
mocks.ReplayAll();
chartLegendView.ChartControl = chartControl;