From b0cafce3b4129a72125be13d12fef5387d2d3949 Mon Sep 17 00:00:00 2001
From: Luke Campagnola <luke.campagnola@gmail.com>
Date: Thu, 30 Jan 2014 10:50:07 -0500
Subject: [PATCH] Basic view limits appear to be working.

---
 examples/SimplePlot.py                     |  6 +++--
 examples/ViewLimits.py                     | 15 ++++++++++++
 pyqtgraph/graphicsItems/ViewBox/ViewBox.py | 28 +++++++++++++++-------
 3 files changed, 38 insertions(+), 11 deletions(-)
 create mode 100644 examples/ViewLimits.py

diff --git a/examples/SimplePlot.py b/examples/SimplePlot.py
index f572743a..cacdbbdc 100644
--- a/examples/SimplePlot.py
+++ b/examples/SimplePlot.py
@@ -2,13 +2,15 @@ import initExample ## Add path to library (just for examples; you do not need th
 
 from pyqtgraph.Qt import QtGui, QtCore
 import pyqtgraph as pg
+import pyqtgraph.exporters
 import numpy as np
 plt = pg.plot(np.random.normal(size=100), title="Simplest possible plotting example")
 plt.getAxis('bottom').setTicks([[(x*20, str(x*20)) for x in range(6)]])
-## Start Qt event loop unless running in interactive mode or using pyside.
-ex = pg.exporters.SVGExporter.SVGExporter(plt.plotItem.scene())
+
+ex = pg.exporters.SVGExporter(plt.plotItem.scene())
 ex.export('/home/luke/tmp/test.svg')
 
+## Start Qt event loop unless running in interactive mode or using pyside.
 if __name__ == '__main__':
     import sys
     if sys.flags.interactive != 1 or not hasattr(QtCore, 'PYQT_VERSION'):
diff --git a/examples/ViewLimits.py b/examples/ViewLimits.py
new file mode 100644
index 00000000..c08bf77c
--- /dev/null
+++ b/examples/ViewLimits.py
@@ -0,0 +1,15 @@
+import initExample ## Add path to library (just for examples; you do not need this)
+
+from pyqtgraph.Qt import QtGui, QtCore
+import pyqtgraph as pg
+import numpy as np
+
+plt = pg.plot(np.random.normal(size=100), title="View limit example")
+plt.centralWidget.vb.setLimits(xRange=[-100, 100], minRange=[0.1, None], maxRange=[50, None])
+
+
+## Start Qt event loop unless running in interactive mode or using pyside.
+if __name__ == '__main__':
+    import sys
+    if sys.flags.interactive != 1 or not hasattr(QtCore, 'PYQT_VERSION'):
+        pg.QtGui.QApplication.exec_()
diff --git a/pyqtgraph/graphicsItems/ViewBox/ViewBox.py b/pyqtgraph/graphicsItems/ViewBox/ViewBox.py
index 845efe43..d4467286 100644
--- a/pyqtgraph/graphicsItems/ViewBox/ViewBox.py
+++ b/pyqtgraph/graphicsItems/ViewBox/ViewBox.py
@@ -597,6 +597,8 @@ class ViewBox(GraphicsWidget):
         yMax        Maximum allowed y-axis range
         =========== ============================================================
         """
+        update = False
+        
         for kwd in ['xRange', 'yRange', 'minRange', 'maxRange']:
             if kwd in kwds and self.state['limits'][kwd] != kwds[kwd]:
                 self.state['limits'][kwd] = kwds[kwd]
@@ -1409,16 +1411,24 @@ class ViewBox(GraphicsWidget):
                 
         # check for any requested limits
         rng = (self.state['limits']['xRange'], self.state['limits']['yRange'])
-        minRng = self.state['limits']['minRange']
-        maxRng = self.state['limits']['maxRange']
+        minRng = self.state['limits']['minRange'][:]
+        maxRng = self.state['limits']['maxRange'][:]
         
         for axis in [0, 1]:
+            if rng[axis][0] is None and rng[axis][1] is None and minRng[axis] is None and maxRng[axis] is None:
+                continue
+            
             # max range cannot be larger than bounds, if they are given
             if rng[axis][0] is not None and rng[axis][1] is not None:
-                maxRng[axis] = min(maxRng[axis], rng[axis][1]-rng[axis][0])
+                if maxRng[axis] is not None:
+                    maxRng[axis] = min(maxRng[axis], rng[axis][1]-rng[axis][0])
+                else:
+                    maxRng[axis] = rng[axis][1]-rng[axis][0]
+            
+            #print "\nLimits for axis %d: range=%s min=%s max=%s" % (axis, rng[axis], minRng[axis], maxRng[axis])
+            #print "Starting range:", viewRange[axis]
             
             diff = viewRange[axis][1] - viewRange[axis][0]
-            print axis, diff, maxRng[axis]
             if maxRng[axis] is not None and diff > maxRng[axis]:
                 delta = maxRng[axis] - diff
                 changed[axis] = True
@@ -1428,9 +1438,10 @@ class ViewBox(GraphicsWidget):
             else:
                 delta = 0
             
-            viewRange[axis][0] -= diff/2.
-            viewRange[axis][1] += diff/2.
-            print viewRange
+            viewRange[axis][0] -= delta/2.
+            viewRange[axis][1] += delta/2.
+            
+            #print "after applying min/max:", viewRange[axis]
                
             mn, mx = rng[axis]
             if mn is not None and viewRange[axis][0] < mn:
@@ -1442,8 +1453,7 @@ class ViewBox(GraphicsWidget):
                 viewRange[axis][0] += delta
                 viewRange[axis][1] += delta
             
-                
-            
+            #print "after applying edge limits:", viewRange[axis]
             
         changed = [(viewRange[i][0] != self.state['viewRange'][i][0]) and (viewRange[i][1] != self.state['viewRange'][i][1]) for i in (0,1)]
         self.state['viewRange'] = viewRange