Index: Core/Components/src/Core.Components.OxyPlot.Forms/Core.Components.OxyPlot.Forms.csproj =================================================================== diff -u -r460ed7ba26498668b47780bf1abd8293db3baeff -r9b19f753c055f426fcea7b6c01cdf43c8d9f2468 --- Core/Components/src/Core.Components.OxyPlot.Forms/Core.Components.OxyPlot.Forms.csproj (.../Core.Components.OxyPlot.Forms.csproj) (revision 460ed7ba26498668b47780bf1abd8293db3baeff) +++ Core/Components/src/Core.Components.OxyPlot.Forms/Core.Components.OxyPlot.Forms.csproj (.../Core.Components.OxyPlot.Forms.csproj) (revision 9b19f753c055f426fcea7b6c01cdf43c8d9f2468) @@ -60,6 +60,11 @@ Component + + Resources.resx + True + True + @@ -88,6 +93,13 @@ False + + + PublicResXFileCodeGenerator + Resources.Designer.cs + Designer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + L + + + Hoogte + + \ No newline at end of file Index: Core/Components/src/Core.Components.OxyPlot/Core.Components.OxyPlot.csproj =================================================================== diff -u -r460ed7ba26498668b47780bf1abd8293db3baeff -r9b19f753c055f426fcea7b6c01cdf43c8d9f2468 --- Core/Components/src/Core.Components.OxyPlot/Core.Components.OxyPlot.csproj (.../Core.Components.OxyPlot.csproj) (revision 460ed7ba26498668b47780bf1abd8293db3baeff) +++ Core/Components/src/Core.Components.OxyPlot/Core.Components.OxyPlot.csproj (.../Core.Components.OxyPlot.csproj) (revision 9b19f753c055f426fcea7b6c01cdf43c8d9f2468) @@ -55,25 +55,13 @@ - - True - True - Resources.resx - - - PublicResXFileCodeGenerator - Designer - Resources.Designer.cs - - - {3bbfd65b-b277-4e50-ae6d-bd24c3434609} Core.Common.Base Index: Core/Components/src/Core.Components.OxyPlot/DynamicPlotController.cs =================================================================== diff -u -re5707ddea2c022c6330e93a37e3de89fe5539038 -r9b19f753c055f426fcea7b6c01cdf43c8d9f2468 --- Core/Components/src/Core.Components.OxyPlot/DynamicPlotController.cs (.../DynamicPlotController.cs) (revision e5707ddea2c022c6330e93a37e3de89fe5539038) +++ Core/Components/src/Core.Components.OxyPlot/DynamicPlotController.cs (.../DynamicPlotController.cs) (revision 9b19f753c055f426fcea7b6c01cdf43c8d9f2468) @@ -2,7 +2,7 @@ namespace Core.Components.OxyPlot { - public sealed class DynamicPlotController : ControllerBase, IPlotController + internal sealed class DynamicPlotController : ControllerBase, IPlotController { public bool IsPanningEnabled { get; private set; } public bool IsRectangleZoomingEnabled { get; private set; } Fisheye: Tag 9b19f753c055f426fcea7b6c01cdf43c8d9f2468 refers to a dead (removed) revision in file `Core/Components/src/Core.Components.OxyPlot/Properties/Resources.Designer.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 9b19f753c055f426fcea7b6c01cdf43c8d9f2468 refers to a dead (removed) revision in file `Core/Components/src/Core.Components.OxyPlot/Properties/Resources.resx'. Fisheye: No comparison available. Pass `N' to diff? Index: Core/Components/test/Core.Components.OxyPlot.Forms.Test/Core.Components.OxyPlot.Forms.Test.csproj =================================================================== diff -u -r79c9b71fa0d32c90d568eafea03601edd9578155 -r9b19f753c055f426fcea7b6c01cdf43c8d9f2468 --- Core/Components/test/Core.Components.OxyPlot.Forms.Test/Core.Components.OxyPlot.Forms.Test.csproj (.../Core.Components.OxyPlot.Forms.Test.csproj) (revision 79c9b71fa0d32c90d568eafea03601edd9578155) +++ Core/Components/test/Core.Components.OxyPlot.Forms.Test/Core.Components.OxyPlot.Forms.Test.csproj (.../Core.Components.OxyPlot.Forms.Test.csproj) (revision 9b19f753c055f426fcea7b6c01cdf43c8d9f2468) @@ -42,6 +42,14 @@ ..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll + + False + ..\..\..\..\packages\OxyPlot.Core.1.0.0-unstable1953\lib\net40\OxyPlot.dll + + + False + ..\..\..\..\packages\OxyPlot.WindowsForms.1.0.0-unstable1953\lib\net40\OxyPlot.WindowsForms.dll + ..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll @@ -52,6 +60,7 @@ + Index: Core/Components/test/Core.Components.OxyPlot.Forms.Test/LinearPlotViewTest.cs =================================================================== diff -u --- Core/Components/test/Core.Components.OxyPlot.Forms.Test/LinearPlotViewTest.cs (revision 0) +++ Core/Components/test/Core.Components.OxyPlot.Forms.Test/LinearPlotViewTest.cs (revision 9b19f753c055f426fcea7b6c01cdf43c8d9f2468) @@ -0,0 +1,58 @@ +using System.Linq; +using System.Windows.Forms; +using NUnit.Framework; +using OxyPlot; +using OxyPlot.Axes; +using Core.Components.OxyPlot.Forms.Properties; +using OxyPlot.Series; +using OxyPlot.WindowsForms; +using TickStyle = OxyPlot.Axes.TickStyle; + +namespace Core.Components.OxyPlot.Forms.Test +{ + [TestFixture] + public class LinearPlotViewTest + { + [Test] + public void DefaultConstructor_HasTwoLinearAxes() + { + // Call + var view = new LinearPlotView(); + + // Assert + Assert.IsInstanceOf(view); + Assert.AreEqual(DockStyle.Fill, view.Dock); + + var axes = view.Model.Axes; + Assert.AreEqual(2, axes.Count); + CollectionAssert.AllItemsAreInstancesOfType(axes, typeof(LinearAxis)); + CollectionAssert.AreEqual(new [] {Resources.BaseChart_XAxisTitle, Resources.BaseChart_YAxisTitle} , axes.Select(a => a.Title)); + CollectionAssert.AreEqual(new [] {AxisPosition.Bottom, AxisPosition.Left} , axes.Select(a => a.Position)); + CollectionAssert.AreEqual(new [] {TickStyle.None, TickStyle.None} , axes.Select(a => a.TickStyle)); + CollectionAssert.AreEqual(new [] {new[] { 0.0 }, new[] { 0.0 }} , axes.Select(a => a.ExtraGridlines)); + CollectionAssert.AreEqual(new [] {1, 1} , axes.Select(a => a.ExtraGridlineThickness)); + CollectionAssert.AreEqual(new [] {AxisLayer.AboveSeries, AxisLayer.AboveSeries} , axes.Select(a => a.Layer)); + CollectionAssert.AreEqual(new [] {LineStyle.Solid, LineStyle.Solid} , axes.Select(a => a.MajorGridlineStyle)); + CollectionAssert.AreEqual(new [] {LineStyle.Dot,LineStyle.Dot} , axes.Select(a => a.MinorGridlineStyle)); + } + + [Test] + public void ZoomToAll_Always_InvalidatesView() + { + // Setup + var form = new Form(); + var view = new LinearPlotView(); + form.Controls.Add(view); + var invalidated = 0; + view.Invalidated += (sender, args) => invalidated++; + + form.Show(); + + // Call + view.ZoomToAll(); + + // Assert + Assert.AreEqual(1, invalidated); + } + } +} \ No newline at end of file Index: Core/Components/test/Core.Components.OxyPlot.Forms.Test/packages.config =================================================================== diff -u -r3c816a265bc4ea959ced0376d8b4b0d244e146b3 -r9b19f753c055f426fcea7b6c01cdf43c8d9f2468 --- Core/Components/test/Core.Components.OxyPlot.Forms.Test/packages.config (.../packages.config) (revision 3c816a265bc4ea959ced0376d8b4b0d244e146b3) +++ Core/Components/test/Core.Components.OxyPlot.Forms.Test/packages.config (.../packages.config) (revision 9b19f753c055f426fcea7b6c01cdf43c8d9f2468) @@ -1,5 +1,7 @@  + + \ No newline at end of file Index: Core/Components/test/Core.Components.OxyPlot.Test/Core.Components.OxyPlot.Test.csproj =================================================================== diff -u -reb44708823d5479991162f63376ae85dd944e513 -r9b19f753c055f426fcea7b6c01cdf43c8d9f2468 --- Core/Components/test/Core.Components.OxyPlot.Test/Core.Components.OxyPlot.Test.csproj (.../Core.Components.OxyPlot.Test.csproj) (revision eb44708823d5479991162f63376ae85dd944e513) +++ Core/Components/test/Core.Components.OxyPlot.Test/Core.Components.OxyPlot.Test.csproj (.../Core.Components.OxyPlot.Test.csproj) (revision 9b19f753c055f426fcea7b6c01cdf43c8d9f2468) @@ -54,6 +54,7 @@ + Index: Core/Components/test/Core.Components.OxyPlot.Test/DynamicPlotControllerTest.cs =================================================================== diff -u --- Core/Components/test/Core.Components.OxyPlot.Test/DynamicPlotControllerTest.cs (revision 0) +++ Core/Components/test/Core.Components.OxyPlot.Test/DynamicPlotControllerTest.cs (revision 9b19f753c055f426fcea7b6c01cdf43c8d9f2468) @@ -0,0 +1,76 @@ +using NUnit.Framework; +using OxyPlot; + +namespace Core.Components.OxyPlot.Test +{ + [TestFixture] + public class DynamicPlotControllerTest + { + [Test] + public void DefaultConstructor_ReturnsIPlotController() + { + // Call + var controller = new DynamicPlotController(); + + // Assert + Assert.IsInstanceOf(controller); + Assert.IsInstanceOf(controller); + Assert.IsFalse(controller.IsPanningEnabled); + Assert.IsFalse(controller.IsRectangleZoomingEnabled); + } + + [Test] + public void TogglePanning_PanningDisabled_PanningEnabled() + { + // Setup + var controller = new DynamicPlotController(); + + // Call + controller.TogglePanning(); + + // Assert + Assert.IsTrue(controller.IsPanningEnabled); + } + + [Test] + public void TogglePanning_PanningEnabled_PanningDisabled() + { + // Setup + var controller = new DynamicPlotController(); + controller.TogglePanning(); + + // Call + controller.TogglePanning(); + + // Assert + Assert.IsFalse(controller.IsPanningEnabled); + } + + [Test] + public void ToggleRectangleZooming_RectangleZoomingDisabled_RectangleZoomingEnabled() + { + // Setup + var controller = new DynamicPlotController(); + + // Call + controller.ToggleRectangleZooming(); + + // Assert + Assert.IsTrue(controller.IsRectangleZoomingEnabled); + } + + [Test] + public void ToggleRectangleZooming_RectangleZoomingEnabled_RectangleZoomingDisabled() + { + // Setup + var controller = new DynamicPlotController(); + controller.ToggleRectangleZooming(); + + // Call + controller.ToggleRectangleZooming(); + + // Assert + Assert.IsFalse(controller.IsRectangleZoomingEnabled); + } + } +} \ No newline at end of file