From 5d62b6d76246c6fcdc221998b4e6707bff1b50b2 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Mon, 29 Aug 2011 09:45:57 +1000
Subject: [PATCH] Capped zoom out, and removed default half an hour zoom from
 fully expanded in event flags.

---
 Graphs/gGraphView.cpp | 11 ++++++-----
 Graphs/gGraphView.h   |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp
index ea982dcc..48a412b6 100644
--- a/Graphs/gGraphView.cpp
+++ b/Graphs/gGraphView.cpp
@@ -161,6 +161,7 @@ gGraph::gGraph(gGraphView *graphview,QString title,int height,short group) :
     m_marginleft=5;
     m_marginright=10;
     m_selecting_area=m_blockzoom=false;
+    m_lastx23=0;
 }
 gGraph::~gGraph()
 {
@@ -470,16 +471,16 @@ void gGraph::mouseReleaseEvent(QMouseEvent * event)
             double xmult;
 
             double xx=max_x-min_x;
-            if (xx==qq) xx=1800000;
+            //if (xx==qq) xx=1800000;
 
             xmult=qq/double(w);
-            static int lastx=0;
-            if (x==lastx) {
+            if (x==m_lastx23) {
                 if (event->button() & Qt::RightButton) {
                     xx*=1.33;
                 } else if (event->button() & Qt::LeftButton) {
                     xx*=0.75;
                 }
+                if (xx>qq) xx=qq;
             }
             double j1=xmult*x;
             min_x=rmin_x+j1-(xx/2.0);
@@ -487,13 +488,13 @@ void gGraph::mouseReleaseEvent(QMouseEvent * event)
             if (min_x<rmin_x) {
                 min_x=rmin_x;
                 max_x=rmin_x+xx;
-            }
+            } else
             if (max_x>rmax_x) {
                 max_x=rmax_x;
                 min_x=rmax_x-xx;
             }
             m_graphview->SetXBounds(min_x,max_x,m_group);
-            lastx=x;
+            m_lastx23=x;
         }
     }
     //m_graphview->updateGL();
diff --git a/Graphs/gGraphView.h b/Graphs/gGraphView.h
index d5a982f6..7034789a 100644
--- a/Graphs/gGraphView.h
+++ b/Graphs/gGraphView.h
@@ -194,6 +194,7 @@ protected:
     bool m_selecting_area;
     QPoint m_current;
     short m_group;
+    short m_lastx23;
 };
 
 class gGraphView : public QGLWidget