Index: Core/Components/src/Core.Components.OxyPlot/DynamicPlotController.cs
===================================================================
diff -u -rb743d495d10779d51c8f75b7cb04b5babb4b226f -r4e5669822bdfa3ef7d82bc1bd92eea293784b0ac
--- Core/Components/src/Core.Components.OxyPlot/DynamicPlotController.cs (.../DynamicPlotController.cs) (revision b743d495d10779d51c8f75b7cb04b5babb4b226f)
+++ Core/Components/src/Core.Components.OxyPlot/DynamicPlotController.cs (.../DynamicPlotController.cs) (revision 4e5669822bdfa3ef7d82bc1bd92eea293784b0ac)
@@ -44,17 +44,17 @@
public DynamicPlotController()
{
EnableScrollWheelZooming();
+ TogglePanning();
}
///
/// Toggles panning by click and holding the left mouse button while moving.
///
public void TogglePanning()
{
- var enablePanning = !IsPanningEnabled;
- ResetDefaultInteraction();
- if (enablePanning)
+ if (!IsPanningEnabled)
{
+ ResetDefaultInteraction();
EnablePanning();
}
}
@@ -64,10 +64,9 @@
///
public void ToggleRectangleZooming()
{
- var enableRectangleZoom = !IsRectangleZoomingEnabled;
- ResetDefaultInteraction();
- if (enableRectangleZoom)
+ if (!IsRectangleZoomingEnabled)
{
+ ResetDefaultInteraction();
EnableRectangleZoom();
}
}
Index: Core/Components/test/Core.Components.OxyPlot.Test/DynamicPlotControllerTest.cs
===================================================================
diff -u -r9b19f753c055f426fcea7b6c01cdf43c8d9f2468 -r4e5669822bdfa3ef7d82bc1bd92eea293784b0ac
--- Core/Components/test/Core.Components.OxyPlot.Test/DynamicPlotControllerTest.cs (.../DynamicPlotControllerTest.cs) (revision 9b19f753c055f426fcea7b6c01cdf43c8d9f2468)
+++ Core/Components/test/Core.Components.OxyPlot.Test/DynamicPlotControllerTest.cs (.../DynamicPlotControllerTest.cs) (revision 4e5669822bdfa3ef7d82bc1bd92eea293784b0ac)
@@ -15,7 +15,7 @@
// Assert
Assert.IsInstanceOf(controller);
Assert.IsInstanceOf(controller);
- Assert.IsFalse(controller.IsPanningEnabled);
+ Assert.IsTrue(controller.IsPanningEnabled);
Assert.IsFalse(controller.IsRectangleZoomingEnabled);
}
@@ -30,23 +30,10 @@
// Assert
Assert.IsTrue(controller.IsPanningEnabled);
+ Assert.IsFalse(controller.IsRectangleZoomingEnabled);
}
[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
@@ -57,20 +44,7 @@
// Assert
Assert.IsTrue(controller.IsRectangleZoomingEnabled);
+ Assert.IsFalse(controller.IsPanningEnabled);
}
-
- [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