# HG changeset patch
# User moel.mich
# Date 1370711238 0
# Node ID 896a57d2d32ace1c864fada2b02208cc9ea065b4
# Parent 4b43228a989469b5c006b0e9d98b67105405dbbd
Some modifications to the OxyPlot library to simplify the use in the Open Hardware Monitor.
diff -r 4b43228a9894 -r 896a57d2d32a External/OxyPlot/OxyPlot.WindowsForms/Plot.cs
--- a/External/OxyPlot/OxyPlot.WindowsForms/Plot.cs Sat Jun 08 17:06:00 2013 +0000
+++ b/External/OxyPlot/OxyPlot.WindowsForms/Plot.cs Sat Jun 08 17:07:18 2013 +0000
@@ -841,24 +841,23 @@
bool xb2 = e.Button == MouseButtons.XButton2;
// MMB / control RMB / control+alt LMB
- if (mmb || (control && rmb) || (control && alt && lmb))
+ if (mmb || (control && lmb) || (control && alt && rmb))
+ {
+ return new ZoomRectangleManipulator(this);
+ }
+
+ // Right mouse button / alt+left mouse button
+ if (lmb || (rmb && alt))
{
if (e.Clicks == 2)
{
return new ResetManipulator(this);
}
-
- return new ZoomRectangleManipulator(this);
- }
-
- // Right mouse button / alt+left mouse button
- if (rmb || (lmb && alt))
- {
return new PanManipulator(this);
}
// Left mouse button
- if (lmb)
+ if (rmb)
{
return new TrackerManipulator(this) { Snap = !control, PointsOnly = shift };
}
diff -r 4b43228a9894 -r 896a57d2d32a External/OxyPlot/OxyPlot/Axes/Axis.cs
--- a/External/OxyPlot/OxyPlot/Axes/Axis.cs Sat Jun 08 17:06:00 2013 +0000
+++ b/External/OxyPlot/OxyPlot/Axes/Axis.cs Sat Jun 08 17:07:18 2013 +0000
@@ -703,13 +703,13 @@
/// Gets or sets the current view's maximum. This value is used when the user zooms or pans.
///
/// The view maximum.
- protected double ViewMaximum { get; set; }
+ public double ViewMaximum { get; protected set; }
///
/// Gets or sets the current view's minimum. This value is used when the user zooms or pans.
///
/// The view minimum.
- protected double ViewMinimum { get; set; }
+ public double ViewMinimum { get; protected set; }
///
/// Transforms the specified point to screen coordinates.