Oops. Fix grid lock when zoomed in or out.

diff --git a/client/proxguiqt.cpp b/client/proxguiqt.cpp
index 2c6894193ae44f21b12c44b06e5a068b2f2fe955..4e57fecc7ff8754cb46f30f84d64b2decc6daee3 100644 (file)
--- a/client/proxguiqt.cpp
+++ b/client/proxguiqt.cpp
@@ -134,7 +134,7 @@ void ProxWidget::paintEvent(QPaintEvent *event)
         // plot X and Y grid lines
         int i;
         if ((PlotGridX > 0) && ((PlotGridX * GraphPixelsPerPoint) > 1)) {
         // plot X and Y grid lines
         int i;
         if ((PlotGridX > 0) && ((PlotGridX * GraphPixelsPerPoint) > 1)) {

-               for(i = 40 + GridOffset; i < r.right(); i += (int)(PlotGridX * GraphPixelsPerPoint)) {
+               for(i = 40 + (GridOffset * GraphPixelsPerPoint); i < r.right(); i += (int)(PlotGridX * GraphPixelsPerPoint)) {

                        //SelectObject(hdc, GreyPenLite);
                        //MoveToEx(hdc, r.left + i, r.top, NULL);
                        //LineTo(hdc, r.left + i, r.bottom);
                        //SelectObject(hdc, GreyPenLite);
                        //MoveToEx(hdc, r.left + i, r.top, NULL);
                        //LineTo(hdc, r.left + i, r.bottom);


@@ -330,9 +330,9 @@ void ProxWidget::keyPressEvent(QKeyEvent *event)
                                        GridOffset -= (int)(20 / GraphPixelsPerPoint);
                                GraphStart += (int)(20 / GraphPixelsPerPoint);
                        } else {
                                        GridOffset -= (int)(20 / GraphPixelsPerPoint);
                                GraphStart += (int)(20 / GraphPixelsPerPoint);
                        } else {

-                               GraphStart++;

                                if (GridLocked && GraphStart < startMax)
                                        GridOffset--;
                                if (GridLocked && GraphStart < startMax)
                                        GridOffset--;

+                               GraphStart++;

                        }
                        if(GridOffset < 0)
                                GridOffset += PlotGridX;
                        }
                        if(GridOffset < 0)
                                GridOffset += PlotGridX;


@@ -346,9 +346,9 @@ void ProxWidget::keyPressEvent(QKeyEvent *event)
                                        GridOffset += (int)(20 / GraphPixelsPerPoint);
                                GraphStart -= (int)(20 / GraphPixelsPerPoint);
                        } else {
                                        GridOffset += (int)(20 / GraphPixelsPerPoint);
                                GraphStart -= (int)(20 / GraphPixelsPerPoint);
                        } else {

-                               GraphStart--;

                                if (GridLocked && GraphStart > 0)
                                        GridOffset++;
                                if (GridLocked && GraphStart > 0)
                                        GridOffset++;

+                               GraphStart--;

                        }
                        if (PlotGridX)
                                GridOffset %= PlotGridX;
                        }
                        if (PlotGridX)
                                GridOffset %= PlotGridX;