Changeset 4638 for trunk

Timestamp:

10/21/10 17:35:49 (14 years ago)

Author:

epitzer

Message:

Fixed panning (#1237)

File:

• trunk/sources/HeuristicLab.Visualization.ChartControlsExtensions/3.3/EnhancedChart.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Visualization.ChartControlsExtensions/3.3/EnhancedChart.cs

@@ -84 +84 @@
       private Point PixelStartPosition;
       private PointF ChartStartPosition;
-      private SizeF Pixel2ChartScale;
 
       public PanningSupport(Point pixelStartPos, ChartArea chartArea, Size size) {
@@ -92 +91 @@
           (float)chartArea.AxisX.ScaleView.Position,
           (float)chartArea.AxisY.ScaleView.Position);
-        Pixel2ChartScale = new SizeF(
-          (float)chartArea.AxisX.ScaleView.Size /
-            (size.Width * chartArea.Position.Width * chartArea.InnerPlotPosition.Width / 100 / 100),
-          (float)chartArea.AxisY.ScaleView.Size /
-            (size.Height * chartArea.Position.Height * chartArea.InnerPlotPosition.Height / 100 / 100));
       }
 
-      public double ChartX(double pixelX) {
-        return ChartStartPosition.X - (pixelX - PixelStartPosition.X) * Pixel2ChartScale.Width;
+      public double ChartX(double pixelX, int width) {
+        return ChartStartPosition.X - (pixelX - PixelStartPosition.X) * 
+          (ChartArea.AxisX.ScaleView.ViewMaximum - ChartArea.AxisX.ScaleView.ViewMinimum) /
+            (width * ChartArea.Position.Width * ChartArea.InnerPlotPosition.Width / 100 / 100);
       }
-      public double ChartY(double pixelY) {
-        return ChartStartPosition.Y + (pixelY - PixelStartPosition.Y) * Pixel2ChartScale.Height;
+      public double ChartY(double pixelY, int height) {
+        return ChartStartPosition.Y + (pixelY - PixelStartPosition.Y) * 
+          (ChartArea.AxisY.ScaleView.ViewMaximum - ChartArea.AxisY.ScaleView.ViewMinimum) /
+            (height * ChartArea.Position.Height * ChartArea.InnerPlotPosition.Height / 100 / 100);
       }
     }
@@ -126 +124 @@
     protected override void OnMouseMove(MouseEventArgs e) {
       if (panning != null) {
-        double x = panning.ChartX(e.Location.X);
-        double y = panning.ChartY(e.Location.Y);
+        double x = panning.ChartX(e.Location.X, Width);
+        double y = panning.ChartY(e.Location.Y, Height);
         if (panning.ChartArea.CursorX.Interval > 0) {
           x = Math.Round(x * panning.ChartArea.CursorX.Interval) / panning.ChartArea.CursorX.Interval;