diff --git a/README.md b/README.md
index f7b9cee8ae4f85db5e98524a146ed1091ccd90d9..10674533e9b896cb7ffeedcb760d99f412afeeab 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,48 @@
 # README #
 
-The SenseCarbon Time Series Viewer is a graphical user interface to visualize time series (TS) of remote sensing data.
-Major aims are 
+The SenseCarbon Time Series Viewer can be used to visualize time series of remote sensing data.
+Its major aims are: 
 
-(i) to support a [Quantum GIS (QGIS)](www.qgis.org) based labeling of TS data, 
+(i) to support a [Quantum GIS (QGIS)](www.qgis.org) based labeling of time series data, 
 
-(ii) to use remote sensing data "as is" and 
+(ii) to use the remote sensing imagery "as is" 
 
-(iii) to avoid a complicated installation process.
+(iii) to avoid a complicated installation process
 
 
-The viewer requires runs with python packages that are also part of a standard [Quantum GIS (QGIS)](www.qgis.org) installation. Basically only [PyQt](https://riverbankcomputing.com/software/pyqt/download) is required additionally to the standard python libraries.
+The viewer works with the python packages that are part of the most recent [Quantum GIS (QGIS)](www.qgis.org) 
+installation. 
 
 ![Screenshot](Screenshot.png "Screenshot SenseCarbon Time Series Viewer")
 
+
+## Features ##
++ Uses the [Geospatial Data Abstraction Library (GDAL)](www.gdal.org), which supports up to 142 raster image [formats](http://www.gdal.org/formats_list.html)
++ Recognizes the temporal order of input images implicitly. Date-time information is extracted automatically: 
+by evaluating each images meta data, the image filename or the entire file path to find a date-time stamp. 
++ Supports different spatial projections: There is no need to warp the image data into one projection.  
++ Supports different sensors: images similar in its spectral and spatial configuration are assumed to be taken by the same "sensor". 
++ Visualizes multiple band combinations, separated by sensor
++ Spatial extends of image chips can be specified in QGIS by selection of single coodinate or rectangle
++ Color scaling is applied to the entire time series, e.g. to visualize and compare surface reflectance data
+  
+ 
+
+## Missing Features / ToDo's ##
+
+Several. It try to keep an updates list in the [issue section](https://bitbucket.org/jakimowb/sensecarbontsviewer/issues).
+Some of them:
+
++ on-the-fly calculation of (simple) spectral indices
++ colorbar/gradient visualization of single bands 
++ support of mask information
++ temporal & spectral profiles
++ drag 'n drop interactivity
++ python2 and python 3 interoperability
+
+Your feedback (wishes, comments, bugs, ...) is always welcome: [benjamin.jakimow@geo.hu-berlin.de](benjamin.jakimow@geo.hu-berlin.de).
+
+
 ## Installation ##
 You really want to use [git](https://en.wikipedia.org/wiki/Git_%28software%29) to install and update the viewer. 
 
@@ -34,24 +63,6 @@ If git is not available in your shell, you can download it from [https://git-scm
         git pull
 
 
-## Features ##
-+ RS data can be simply added to specify a time series. Observation dates are extracted automatically by evaluating the meta data, file base name or entire file path
-+ spatial extends of image chips can be specified in QGIS by selection of single coodinate or rectangle
-+ multiple band combination can be used to visualize the time series
-+ color scaling is applied to the entire time series, e.g. to visualize and compare surface reflectance data
-+ uses python packages shipped with the most-recent standard QGIS installation. I hope this way the SenseCarbon Time Series Viewer runs on different plattforms 
-without too many complications.
-+ uses the [Geospatial Data Abstraction Library (GDAL)](www.gdal.org) that supports up to 142 [raster image formats](http://www.gdal.org/formats_list.html)  
-+ python2 and python 3 interoperability 
-
-## Missing Features / ToDo's ##
-
-Many. 
-
-Your feedback (wishes, comments, bugs, ...) is always welcome. Write it into  the [issue section](https://bitbucket.org/jakimowb/sensecarbontsviewer/issues)
-or send me personally to [benjamin.jakimow@geo.hu-berlin.de](benjamin.jakimow@geo.hu-berlin.de).
-
-
 ## Licence and Use ##
 
 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
\ No newline at end of file
diff --git a/bandviewsettings_widget_base.ui b/bandviewsettings_widget_base.ui
new file mode 100644
index 0000000000000000000000000000000000000000..36cc7eae92c871631f3f8059893e43f5fd2dbbba
--- /dev/null
+++ b/bandviewsettings_widget_base.ui
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>BandViewSettings</class>
+ <widget class="QGroupBox" name="BandViewSettings">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>274</width>
+    <height>71</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>GroupBox</string>
+  </property>
+  <property name="title">
+   <string>Sensor</string>
+  </property>
+  <property name="flat">
+   <bool>true</bool>
+  </property>
+  <property name="checkable">
+   <bool>false</bool>
+  </property>
+  <layout class="QFormLayout" name="formLayout">
+   <property name="sizeConstraint">
+    <enum>QLayout::SetMinimumSize</enum>
+   </property>
+   <property name="fieldGrowthPolicy">
+    <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+   </property>
+   <property name="horizontalSpacing">
+    <number>2</number>
+   </property>
+   <property name="verticalSpacing">
+    <number>2</number>
+   </property>
+   <property name="margin">
+    <number>2</number>
+   </property>
+   <item row="0" column="0">
+    <widget class="QLabel" name="label_r">
+     <property name="text">
+      <string>RGB</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <widget class="QComboBox" name="cb_r">
+       <property name="minimumSize">
+        <size>
+         <width>75</width>
+         <height>21</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="cb_g">
+       <property name="minimumSize">
+        <size>
+         <width>75</width>
+         <height>21</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="cb_b">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>75</width>
+         <height>21</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_g">
+     <property name="text">
+      <string>Range</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <item>
+      <widget class="QLineEdit" name="tb_range_min">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip">
+        <string>Minimum data value to show</string>
+       </property>
+       <property name="text">
+        <string>0</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="tb_range_max">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip">
+        <string>Maximum data value to show.</string>
+       </property>
+       <property name="text">
+        <string>5000</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/imagechipviewsettings_widget_base.ui b/imagechipviewsettings_widget_base.ui
index 005abf82c1164b43f860d84a160e6550f66c75c0..69123a651bd4b9cca679e4ee810eb0d3dc1ecf83 100644
--- a/imagechipviewsettings_widget_base.ui
+++ b/imagechipviewsettings_widget_base.ui
@@ -206,6 +206,17 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>cb_r</tabstop>
+  <tabstop>tb_range_r_min</tabstop>
+  <tabstop>tb_range_r_max</tabstop>
+  <tabstop>cb_g</tabstop>
+  <tabstop>tb_range_g_min</tabstop>
+  <tabstop>tb_range_g_max</tabstop>
+  <tabstop>cb_b</tabstop>
+  <tabstop>tb_range_b_min</tabstop>
+  <tabstop>tb_range_b_max</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/libs/pyqtgraph/GraphicsScene/GraphicsScene.py b/libs/pyqtgraph/GraphicsScene/GraphicsScene.py
new file mode 100644
index 0000000000000000000000000000000000000000..6f5354dca47552b0b6e0e9e225798ae0aecea604
--- /dev/null
+++ b/libs/pyqtgraph/GraphicsScene/GraphicsScene.py
@@ -0,0 +1,553 @@
+from ..Qt import QtCore, QtGui
+from ..python2_3 import sortList
+import weakref
+from ..Point import Point
+from .. import functions as fn
+from .. import ptime as ptime
+from .mouseEvents import *
+from .. import debug as debug
+
+if hasattr(QtCore, 'PYQT_VERSION'):
+    try:
+        import sip
+        HAVE_SIP = True
+    except ImportError:
+        HAVE_SIP = False
+else:
+    HAVE_SIP = False
+
+
+__all__ = ['GraphicsScene']
+
+class GraphicsScene(QtGui.QGraphicsScene):
+    """
+    Extension of QGraphicsScene that implements a complete, parallel mouse event system.
+    (It would have been preferred to just alter the way QGraphicsScene creates and delivers 
+    events, but this turned out to be impossible because the constructor for QGraphicsMouseEvent
+    is private)
+    
+    *  Generates MouseClicked events in addition to the usual press/move/release events. 
+       (This works around a problem where it is impossible to have one item respond to a 
+       drag if another is watching for a click.)
+    *  Adjustable radius around click that will catch objects so you don't have to click *exactly* over small/thin objects
+    *  Global context menu--if an item implements a context menu, then its parent(s) may also add items to the menu.
+    *  Allows items to decide _before_ a mouse click which item will be the recipient of mouse events.
+       This lets us indicate unambiguously to the user which item they are about to click/drag on
+    *  Eats mouseMove events that occur too soon after a mouse press.
+    *  Reimplements items() and itemAt() to circumvent PyQt bug
+    
+    Mouse interaction is as follows:
+    
+    1) Every time the mouse moves, the scene delivers both the standard hoverEnter/Move/LeaveEvents 
+       as well as custom HoverEvents. 
+    2) Items are sent HoverEvents in Z-order and each item may optionally call event.acceptClicks(button), 
+       acceptDrags(button) or both. If this method call returns True, this informs the item that _if_ 
+       the user clicks/drags the specified mouse button, the item is guaranteed to be the 
+       recipient of click/drag events (the item may wish to change its appearance to indicate this).
+       If the call to acceptClicks/Drags returns False, then the item is guaranteed to *not* receive
+       the requested event (because another item has already accepted it). 
+    3) If the mouse is clicked, a mousePressEvent is generated as usual. If any items accept this press event, then
+       No click/drag events will be generated and mouse interaction proceeds as defined by Qt. This allows
+       items to function properly if they are expecting the usual press/move/release sequence of events.
+       (It is recommended that items do NOT accept press events, and instead use click/drag events)
+       Note: The default implementation of QGraphicsItem.mousePressEvent will *accept* the event if the 
+       item is has its Selectable or Movable flags enabled. You may need to override this behavior.
+    4) If no item accepts the mousePressEvent, then the scene will begin delivering mouseDrag and/or mouseClick events.
+       If the mouse is moved a sufficient distance (or moved slowly enough) before the button is released, 
+       then a mouseDragEvent is generated.
+       If no drag events are generated before the button is released, then a mouseClickEvent is generated. 
+    5) Click/drag events are delivered to the item that called acceptClicks/acceptDrags on the HoverEvent
+       in step 1. If no such items exist, then the scene attempts to deliver the events to items near the event. 
+       ClickEvents may be delivered in this way even if no
+       item originally claimed it could accept the click. DragEvents may only be delivered this way if it is the initial
+       move in a drag.
+    """
+    
+    sigMouseHover = QtCore.Signal(object)   ## emits a list of objects hovered over
+    sigMouseMoved = QtCore.Signal(object)   ## emits position of mouse on every move
+    sigMouseClicked = QtCore.Signal(object)   ## emitted when mouse is clicked. Check for event.isAccepted() to see whether the event has already been acted on.
+    
+    sigPrepareForPaint = QtCore.Signal()  ## emitted immediately before the scene is about to be rendered
+    
+    _addressCache = weakref.WeakValueDictionary()
+    
+    ExportDirectory = None
+    
+    @classmethod
+    def registerObject(cls, obj):
+        """
+        Workaround for PyQt bug in qgraphicsscene.items()
+        All subclasses of QGraphicsObject must register themselves with this function.
+        (otherwise, mouse interaction with those objects will likely fail)
+        """
+        if HAVE_SIP and isinstance(obj, sip.wrapper):
+            cls._addressCache[sip.unwrapinstance(sip.cast(obj, QtGui.QGraphicsItem))] = obj
+            
+            
+    def __init__(self, clickRadius=2, moveDistance=5, parent=None):
+        QtGui.QGraphicsScene.__init__(self, parent)
+        self.setClickRadius(clickRadius)
+        self.setMoveDistance(moveDistance)
+        self.exportDirectory = None
+        
+        self.clickEvents = []
+        self.dragButtons = []
+        self.mouseGrabber = None
+        self.dragItem = None
+        self.lastDrag = None
+        self.hoverItems = weakref.WeakKeyDictionary()
+        self.lastHoverEvent = None
+        
+        self.contextMenu = [QtGui.QAction("Export...", self)]
+        self.contextMenu[0].triggered.connect(self.showExportDialog)
+        
+        self.exportDialog = None
+        
+    def render(self, *args):
+        self.prepareForPaint()
+        return QtGui.QGraphicsScene.render(self, *args)
+
+    def prepareForPaint(self):
+        """Called before every render. This method will inform items that the scene is about to
+        be rendered by emitting sigPrepareForPaint.
+        
+        This allows items to delay expensive processing until they know a paint will be required."""
+        self.sigPrepareForPaint.emit()
+    
+
+    def setClickRadius(self, r):
+        """
+        Set the distance away from mouse clicks to search for interacting items.
+        When clicking, the scene searches first for items that directly intersect the click position
+        followed by any other items that are within a rectangle that extends r pixels away from the 
+        click position. 
+        """
+        self._clickRadius = r
+        
+    def setMoveDistance(self, d):
+        """
+        Set the distance the mouse must move after a press before mouseMoveEvents will be delivered.
+        This ensures that clicks with a small amount of movement are recognized as clicks instead of
+        drags.
+        """
+        self._moveDistance = d
+
+    def mousePressEvent(self, ev):
+        #print 'scenePress'
+        QtGui.QGraphicsScene.mousePressEvent(self, ev)
+        if self.mouseGrabberItem() is None:  ## nobody claimed press; we are free to generate drag/click events
+            if self.lastHoverEvent is not None:
+                # If the mouse has moved since the last hover event, send a new one.
+                # This can happen if a context menu is open while the mouse is moving.
+                if ev.scenePos() != self.lastHoverEvent.scenePos():
+                    self.sendHoverEvents(ev)
+            
+            self.clickEvents.append(MouseClickEvent(ev))
+            
+            ## set focus on the topmost focusable item under this click
+            items = self.items(ev.scenePos())
+            for i in items:
+                if i.isEnabled() and i.isVisible() and int(i.flags() & i.ItemIsFocusable) > 0:
+                    i.setFocus(QtCore.Qt.MouseFocusReason)
+                    break
+        
+    def mouseMoveEvent(self, ev):
+        self.sigMouseMoved.emit(ev.scenePos())
+        
+        ## First allow QGraphicsScene to deliver hoverEnter/Move/ExitEvents
+        QtGui.QGraphicsScene.mouseMoveEvent(self, ev)
+        
+        ## Next deliver our own HoverEvents
+        self.sendHoverEvents(ev)
+        
+        if int(ev.buttons()) != 0:  ## button is pressed; send mouseMoveEvents and mouseDragEvents
+            QtGui.QGraphicsScene.mouseMoveEvent(self, ev)
+            if self.mouseGrabberItem() is None:
+                now = ptime.time()
+                init = False
+                ## keep track of which buttons are involved in dragging
+                for btn in [QtCore.Qt.LeftButton, QtCore.Qt.MidButton, QtCore.Qt.RightButton]:
+                    if int(ev.buttons() & btn) == 0:
+                        continue
+                    if int(btn) not in self.dragButtons:  ## see if we've dragged far enough yet
+                        cev = [e for e in self.clickEvents if int(e.button()) == int(btn)][0]
+                        dist = Point(ev.screenPos() - cev.screenPos())
+                        if dist.length() < self._moveDistance and now - cev.time() < 0.5:
+                            continue
+                        init = init or (len(self.dragButtons) == 0)  ## If this is the first button to be dragged, then init=True
+                        self.dragButtons.append(int(btn))
+                        
+                ## If we have dragged buttons, deliver a drag event
+                if len(self.dragButtons) > 0:
+                    if self.sendDragEvent(ev, init=init):
+                        ev.accept()
+                
+    def leaveEvent(self, ev):  ## inform items that mouse is gone
+        if len(self.dragButtons) == 0:
+            self.sendHoverEvents(ev, exitOnly=True)
+        
+                
+    def mouseReleaseEvent(self, ev):
+        #print 'sceneRelease'
+        if self.mouseGrabberItem() is None:
+            if ev.button() in self.dragButtons:
+                if self.sendDragEvent(ev, final=True):
+                    #print "sent drag event"
+                    ev.accept()
+                self.dragButtons.remove(ev.button())
+            else:
+                cev = [e for e in self.clickEvents if int(e.button()) == int(ev.button())]
+                if self.sendClickEvent(cev[0]):
+                    #print "sent click event"
+                    ev.accept()
+                self.clickEvents.remove(cev[0])
+                
+        if int(ev.buttons()) == 0:
+            self.dragItem = None
+            self.dragButtons = []
+            self.clickEvents = []
+            self.lastDrag = None
+        QtGui.QGraphicsScene.mouseReleaseEvent(self, ev)
+        
+        self.sendHoverEvents(ev)  ## let items prepare for next click/drag
+
+    def mouseDoubleClickEvent(self, ev):
+        QtGui.QGraphicsScene.mouseDoubleClickEvent(self, ev)
+        if self.mouseGrabberItem() is None:  ## nobody claimed press; we are free to generate drag/click events
+            self.clickEvents.append(MouseClickEvent(ev, double=True))
+        
+    def sendHoverEvents(self, ev, exitOnly=False):
+        ## if exitOnly, then just inform all previously hovered items that the mouse has left.
+        
+        if exitOnly:
+            acceptable=False
+            items = []
+            event = HoverEvent(None, acceptable)
+        else:
+            acceptable = int(ev.buttons()) == 0  ## if we are in mid-drag, do not allow items to accept the hover event.
+            event = HoverEvent(ev, acceptable)
+            items = self.itemsNearEvent(event, hoverable=True)
+            self.sigMouseHover.emit(items)
+            
+        prevItems = list(self.hoverItems.keys())
+            
+        #print "hover prev items:", prevItems
+        #print "hover test items:", items
+        for item in items:
+            if hasattr(item, 'hoverEvent'):
+                event.currentItem = item
+                if item not in self.hoverItems:
+                    self.hoverItems[item] = None
+                    event.enter = True
+                else:
+                    prevItems.remove(item)
+                    event.enter = False
+                    
+                try:
+                    item.hoverEvent(event)
+                except:
+                    debug.printExc("Error sending hover event:")
+                    
+        event.enter = False
+        event.exit = True
+        #print "hover exit items:", prevItems
+        for item in prevItems:
+            event.currentItem = item
+            try:
+                item.hoverEvent(event)
+            except:
+                debug.printExc("Error sending hover exit event:")
+            finally:
+                del self.hoverItems[item]
+        
+        # Update last hover event unless:
+        #   - mouse is dragging (move+buttons); in this case we want the dragged
+        #     item to continue receiving events until the drag is over
+        #   - event is not a mouse event (QEvent.Leave sometimes appears here)
+        if (ev.type() == ev.GraphicsSceneMousePress or 
+            (ev.type() == ev.GraphicsSceneMouseMove and int(ev.buttons()) == 0)):
+            self.lastHoverEvent = event  ## save this so we can ask about accepted events later.
+
+    def sendDragEvent(self, ev, init=False, final=False):
+        ## Send a MouseDragEvent to the current dragItem or to 
+        ## items near the beginning of the drag
+        event = MouseDragEvent(ev, self.clickEvents[0], self.lastDrag, start=init, finish=final)
+        #print "dragEvent: init=", init, 'final=', final, 'self.dragItem=', self.dragItem
+        if init and self.dragItem is None:
+            if self.lastHoverEvent is not None:
+                acceptedItem = self.lastHoverEvent.dragItems().get(event.button(), None)
+            else:
+                acceptedItem = None
+                
+            if acceptedItem is not None:
+                #print "Drag -> pre-selected item:", acceptedItem
+                self.dragItem = acceptedItem
+                event.currentItem = self.dragItem
+                try:
+                    self.dragItem.mouseDragEvent(event)
+                except:
+                    debug.printExc("Error sending drag event:")
+                    
+            else:
+                #print "drag -> new item"
+                for item in self.itemsNearEvent(event):
+                    #print "check item:", item
+                    if not item.isVisible() or not item.isEnabled():
+                        continue
+                    if hasattr(item, 'mouseDragEvent'):
+                        event.currentItem = item
+                        try:
+                            item.mouseDragEvent(event)
+                        except:
+                            debug.printExc("Error sending drag event:")
+                        if event.isAccepted():
+                            #print "   --> accepted"
+                            self.dragItem = item
+                            if int(item.flags() & item.ItemIsFocusable) > 0:
+                                item.setFocus(QtCore.Qt.MouseFocusReason)
+                            break
+        elif self.dragItem is not None:
+            event.currentItem = self.dragItem
+            try:
+                self.dragItem.mouseDragEvent(event)
+            except:
+                debug.printExc("Error sending hover exit event:")
+            
+        self.lastDrag = event
+        
+        return event.isAccepted()
+            
+        
+    def sendClickEvent(self, ev):
+        ## if we are in mid-drag, click events may only go to the dragged item.
+        if self.dragItem is not None and hasattr(self.dragItem, 'mouseClickEvent'):
+            ev.currentItem = self.dragItem
+            self.dragItem.mouseClickEvent(ev)
+            
+        ## otherwise, search near the cursor
+        else:
+            if self.lastHoverEvent is not None:
+                acceptedItem = self.lastHoverEvent.clickItems().get(ev.button(), None)
+            else:
+                acceptedItem = None
+            if acceptedItem is not None:
+                ev.currentItem = acceptedItem
+                try:
+                    acceptedItem.mouseClickEvent(ev)
+                except:
+                    debug.printExc("Error sending click event:")
+            else:
+                for item in self.itemsNearEvent(ev):
+                    if not item.isVisible() or not item.isEnabled():
+                        continue
+                    if hasattr(item, 'mouseClickEvent'):
+                        ev.currentItem = item
+                        try:
+                            item.mouseClickEvent(ev)
+                        except:
+                            debug.printExc("Error sending click event:")
+                            
+                        if ev.isAccepted():
+                            if int(item.flags() & item.ItemIsFocusable) > 0:
+                                item.setFocus(QtCore.Qt.MouseFocusReason)
+                            break
+        self.sigMouseClicked.emit(ev)
+        return ev.isAccepted()
+        
+    def items(self, *args):
+        #print 'args:', args
+        items = QtGui.QGraphicsScene.items(self, *args)
+        ## PyQt bug: items() returns a list of QGraphicsItem instances. If the item is subclassed from QGraphicsObject,
+        ## then the object returned will be different than the actual item that was originally added to the scene
+        items2 = list(map(self.translateGraphicsItem, items))
+        #if HAVE_SIP and isinstance(self, sip.wrapper):
+            #items2 = []
+            #for i in items:
+                #addr = sip.unwrapinstance(sip.cast(i, QtGui.QGraphicsItem))
+                #i2 = GraphicsScene._addressCache.get(addr, i)
+                ##print i, "==>", i2
+                #items2.append(i2)
+        #print 'items:', items
+        return items2
+    
+    def selectedItems(self, *args):
+        items = QtGui.QGraphicsScene.selectedItems(self, *args)
+        ## PyQt bug: items() returns a list of QGraphicsItem instances. If the item is subclassed from QGraphicsObject,
+        ## then the object returned will be different than the actual item that was originally added to the scene
+        #if HAVE_SIP and isinstance(self, sip.wrapper):
+            #items2 = []
+            #for i in items:
+                #addr = sip.unwrapinstance(sip.cast(i, QtGui.QGraphicsItem))
+                #i2 = GraphicsScene._addressCache.get(addr, i)
+                ##print i, "==>", i2
+                #items2.append(i2)
+        items2 = list(map(self.translateGraphicsItem, items))
+
+        #print 'items:', items
+        return items2
+
+    def itemAt(self, *args):
+        item = QtGui.QGraphicsScene.itemAt(self, *args)
+        
+        ## PyQt bug: items() returns a list of QGraphicsItem instances. If the item is subclassed from QGraphicsObject,
+        ## then the object returned will be different than the actual item that was originally added to the scene
+        #if HAVE_SIP and isinstance(self, sip.wrapper):
+            #addr = sip.unwrapinstance(sip.cast(item, QtGui.QGraphicsItem))
+            #item = GraphicsScene._addressCache.get(addr, item)
+        #return item
+        return self.translateGraphicsItem(item)
+
+    def itemsNearEvent(self, event, selMode=QtCore.Qt.IntersectsItemShape, sortOrder=QtCore.Qt.DescendingOrder, hoverable=False):
+        """
+        Return an iterator that iterates first through the items that directly intersect point (in Z order)
+        followed by any other items that are within the scene's click radius.
+        """
+        #tr = self.getViewWidget(event.widget()).transform()
+        view = self.views()[0]
+        tr = view.viewportTransform()
+        r = self._clickRadius
+        rect = view.mapToScene(QtCore.QRect(0, 0, 2*r, 2*r)).boundingRect()
+        
+        seen = set()
+        if hasattr(event, 'buttonDownScenePos'):
+            point = event.buttonDownScenePos()
+        else:
+            point = event.scenePos()
+        w = rect.width()
+        h = rect.height()
+        rgn = QtCore.QRectF(point.x()-w, point.y()-h, 2*w, 2*h)
+        #self.searchRect.setRect(rgn)
+
+
+        items = self.items(point, selMode, sortOrder, tr)
+        
+        ## remove items whose shape does not contain point (scene.items() apparently sucks at this)
+        items2 = []
+        for item in items:
+            if hoverable and not hasattr(item, 'hoverEvent'):
+                continue
+            shape = item.shape() # Note: default shape() returns boundingRect()
+            if shape is None:
+                continue
+            if shape.contains(item.mapFromScene(point)):
+                items2.append(item)
+        
+        ## Sort by descending Z-order (don't trust scene.itms() to do this either)
+        ## use 'absolute' z value, which is the sum of all item/parent ZValues
+        def absZValue(item):
+            if item is None:
+                return 0
+            return item.zValue() + absZValue(item.parentItem())
+        
+        sortList(items2, lambda a,b: cmp(absZValue(b), absZValue(a)))
+        
+        return items2
+        
+        #for item in items:
+            ##seen.add(item)
+
+            #shape = item.mapToScene(item.shape())
+            #if not shape.contains(point):
+                #continue
+            #yield item
+        #for item in self.items(rgn, selMode, sortOrder, tr):
+            ##if item not in seen:
+            #yield item
+        
+    def getViewWidget(self):
+        return self.views()[0]
+    
+    #def getViewWidget(self, widget):
+        ### same pyqt bug -- mouseEvent.widget() doesn't give us the original python object.
+        ### [[doesn't seem to work correctly]]
+        #if HAVE_SIP and isinstance(self, sip.wrapper):
+            #addr = sip.unwrapinstance(sip.cast(widget, QtGui.QWidget))
+            ##print "convert", widget, addr
+            #for v in self.views():
+                #addr2 = sip.unwrapinstance(sip.cast(v, QtGui.QWidget))
+                ##print "   check:", v, addr2
+                #if addr2 == addr:
+                    #return v
+        #else:
+            #return widget
+
+    def addParentContextMenus(self, item, menu, event):
+        """
+        Can be called by any item in the scene to expand its context menu to include parent context menus.
+        Parents may implement getContextMenus to add new menus / actions to the existing menu.
+        getContextMenus must accept 1 argument (the event that generated the original menu) and
+        return a single QMenu or a list of QMenus.
+        
+        The final menu will look like:
+        
+            |    Original Item 1
+            |    Original Item 2
+            |    ...
+            |    Original Item N
+            |    ------------------
+            |    Parent Item 1
+            |    Parent Item 2
+            |    ...
+            |    Grandparent Item 1
+            |    ...
+            
+        
+        ==============  ==================================================
+        **Arguments:**
+        item            The item that initially created the context menu 
+                        (This is probably the item making the call to this function)
+        menu            The context menu being shown by the item
+        event           The original event that triggered the menu to appear.
+        ==============  ==================================================
+        """
+
+        menusToAdd = []
+        while item is not self:
+            item = item.parentItem()
+            if item is None:
+                item = self
+            if not hasattr(item, "getContextMenus"):
+                continue
+            subMenus = item.getContextMenus(event) or []
+            if isinstance(subMenus, list): ## so that some items (like FlowchartViewBox) can return multiple menus
+                menusToAdd.extend(subMenus)
+            else:
+                menusToAdd.append(subMenus)
+
+        if menusToAdd:
+            menu.addSeparator()
+
+        for m in menusToAdd:
+            if isinstance(m, QtGui.QMenu):
+                menu.addMenu(m)
+            elif isinstance(m, QtGui.QAction):
+                menu.addAction(m)
+            else:
+                raise Exception("Cannot add object %s (type=%s) to QMenu." % (str(m), str(type(m))))
+            
+        return menu
+
+    def getContextMenus(self, event):
+        self.contextMenuItem = event.acceptedItem
+        return self.contextMenu
+
+    def showExportDialog(self):
+        if self.exportDialog is None:
+            from . import exportDialog
+            self.exportDialog = exportDialog.ExportDialog(self)
+        self.exportDialog.show(self.contextMenuItem)
+
+    @staticmethod
+    def translateGraphicsItem(item):
+        ## for fixing pyqt bugs where the wrong item is returned
+        if HAVE_SIP and isinstance(item, sip.wrapper):
+            addr = sip.unwrapinstance(sip.cast(item, QtGui.QGraphicsItem))
+            item = GraphicsScene._addressCache.get(addr, item)
+        return item
+
+    @staticmethod
+    def translateGraphicsItems(items):
+        return list(map(GraphicsScene.translateGraphicsItem, items))
+
+
+
diff --git a/libs/pyqtgraph/GraphicsScene/__init__.py b/libs/pyqtgraph/GraphicsScene/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..abe42c6f0b1c82353a65fcebdd7d7c5408151e83
--- /dev/null
+++ b/libs/pyqtgraph/GraphicsScene/__init__.py
@@ -0,0 +1 @@
+from .GraphicsScene import *
diff --git a/libs/pyqtgraph/GraphicsScene/exportDialog.py b/libs/pyqtgraph/GraphicsScene/exportDialog.py
new file mode 100644
index 0000000000000000000000000000000000000000..eebf5999fa213d2f2c065b4774e8639edf3dc0f6
--- /dev/null
+++ b/libs/pyqtgraph/GraphicsScene/exportDialog.py
@@ -0,0 +1,143 @@
+from ..Qt import QtCore, QtGui, USE_PYSIDE, USE_PYQT5
+from .. import exporters as exporters
+from .. import functions as fn
+from ..graphicsItems.ViewBox import ViewBox
+from ..graphicsItems.PlotItem import PlotItem
+
+if USE_PYSIDE:
+    from . import exportDialogTemplate_pyside as exportDialogTemplate
+elif USE_PYQT5:
+    from . import exportDialogTemplate_pyqt5 as exportDialogTemplate
+else:
+    from . import exportDialogTemplate_pyqt as exportDialogTemplate
+
+
+class ExportDialog(QtGui.QWidget):
+    def __init__(self, scene):
+        QtGui.QWidget.__init__(self)
+        self.setVisible(False)
+        self.setWindowTitle("Export")
+        self.shown = False
+        self.currentExporter = None
+        self.scene = scene
+            
+        self.selectBox = QtGui.QGraphicsRectItem()
+        self.selectBox.setPen(fn.mkPen('y', width=3, style=QtCore.Qt.DashLine))
+        self.selectBox.hide()
+        self.scene.addItem(self.selectBox)
+        
+        self.ui = exportDialogTemplate.Ui_Form()
+        self.ui.setupUi(self)
+        
+        self.ui.closeBtn.clicked.connect(self.close)
+        self.ui.exportBtn.clicked.connect(self.exportClicked)
+        self.ui.copyBtn.clicked.connect(self.copyClicked)
+        self.ui.itemTree.currentItemChanged.connect(self.exportItemChanged)
+        self.ui.formatList.currentItemChanged.connect(self.exportFormatChanged)
+        
+
+    def show(self, item=None):
+        if item is not None:
+            ## Select next exportable parent of the item originally clicked on
+            while not isinstance(item, ViewBox) and not isinstance(item, PlotItem) and item is not None:
+                item = item.parentItem()
+            ## if this is a ViewBox inside a PlotItem, select the parent instead.
+            if isinstance(item, ViewBox) and isinstance(item.parentItem(), PlotItem):
+                item = item.parentItem()
+            self.updateItemList(select=item)
+        self.setVisible(True)
+        self.activateWindow()
+        self.raise_()
+        self.selectBox.setVisible(True)
+        
+        if not self.shown:
+            self.shown = True
+            vcenter = self.scene.getViewWidget().geometry().center()
+            self.setGeometry(vcenter.x()-self.width()/2, vcenter.y()-self.height()/2, self.width(), self.height())
+        
+    def updateItemList(self, select=None):
+        self.ui.itemTree.clear()
+        si = QtGui.QTreeWidgetItem(["Entire Scene"])
+        si.gitem = self.scene
+        self.ui.itemTree.addTopLevelItem(si)
+        self.ui.itemTree.setCurrentItem(si)
+        si.setExpanded(True)
+        for child in self.scene.items():
+            if child.parentItem() is None:
+                self.updateItemTree(child, si, select=select)
+                
+    def updateItemTree(self, item, treeItem, select=None):
+        si = None
+        if isinstance(item, ViewBox):
+            si = QtGui.QTreeWidgetItem(['ViewBox'])
+        elif isinstance(item, PlotItem):
+            si = QtGui.QTreeWidgetItem(['Plot'])
+            
+        if si is not None:
+            si.gitem = item
+            treeItem.addChild(si)
+            treeItem = si
+            if si.gitem is select:
+                self.ui.itemTree.setCurrentItem(si)
+            
+        for ch in item.childItems():
+            self.updateItemTree(ch, treeItem, select=select)
+        
+            
+    def exportItemChanged(self, item, prev):
+        if item is None:
+            return
+        if item.gitem is self.scene:
+            newBounds = self.scene.views()[0].viewRect()
+        else:
+            newBounds = item.gitem.sceneBoundingRect()
+        self.selectBox.setRect(newBounds)
+        self.selectBox.show()
+        self.updateFormatList()
+        
+    def updateFormatList(self):
+        current = self.ui.formatList.currentItem()
+        if current is not None:
+            current = str(current.text())
+        self.ui.formatList.clear()
+        self.exporterClasses = {}
+        gotCurrent = False
+        for exp in exporters.listExporters():
+            self.ui.formatList.addItem(exp.Name)
+            self.exporterClasses[exp.Name] = exp
+            if exp.Name == current:
+                self.ui.formatList.setCurrentRow(self.ui.formatList.count()-1)
+                gotCurrent = True
+                
+        if not gotCurrent:
+            self.ui.formatList.setCurrentRow(0)
+        
+    def exportFormatChanged(self, item, prev):
+        if item is None:
+            self.currentExporter = None
+            self.ui.paramTree.clear()
+            return
+        expClass = self.exporterClasses[str(item.text())]
+        exp = expClass(item=self.ui.itemTree.currentItem().gitem)
+        params = exp.parameters()
+        if params is None:
+            self.ui.paramTree.clear()
+        else:
+            self.ui.paramTree.setParameters(params)
+        self.currentExporter = exp
+        self.ui.copyBtn.setEnabled(exp.allowCopy)
+        
+    def exportClicked(self):
+        self.selectBox.hide()
+        self.currentExporter.export()
+        
+    def copyClicked(self):
+        self.selectBox.hide()
+        self.currentExporter.export(copy=True)
+        
+    def close(self):
+        self.selectBox.setVisible(False)
+        self.setVisible(False)
+
+
+    
diff --git a/libs/pyqtgraph/GraphicsScene/exportDialogTemplate.ui b/libs/pyqtgraph/GraphicsScene/exportDialogTemplate.ui
new file mode 100644
index 0000000000000000000000000000000000000000..eacacd88d6eba81f07d5034c06fcde69cba9e8af
--- /dev/null
+++ b/libs/pyqtgraph/GraphicsScene/exportDialogTemplate.ui
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>241</width>
+    <height>367</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Export</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <item row="0" column="0" colspan="3">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Item to export:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="3">
+    <widget class="QTreeWidget" name="itemTree">
+     <attribute name="headerVisible">
+      <bool>false</bool>
+     </attribute>
+     <column>
+      <property name="text">
+       <string notr="true">1</string>
+      </property>
+     </column>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="3">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Export format</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="3">
+    <widget class="QListWidget" name="formatList"/>
+   </item>
+   <item row="6" column="1">
+    <widget class="QPushButton" name="exportBtn">
+     <property name="text">
+      <string>Export</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="2">
+    <widget class="QPushButton" name="closeBtn">
+     <property name="text">
+      <string>Close</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0" colspan="3">
+    <widget class="ParameterTree" name="paramTree">
+     <attribute name="headerVisible">
+      <bool>false</bool>
+     </attribute>
+     <column>
+      <property name="text">
+       <string notr="true">1</string>
+      </property>
+     </column>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="3">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Export options</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0">
+    <widget class="QPushButton" name="copyBtn">
+     <property name="text">
+      <string>Copy</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ParameterTree</class>
+   <extends>QTreeWidget</extends>
+   <header>..parametertree</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/libs/pyqtgraph/GraphicsScene/exportDialogTemplate_pyqt.py b/libs/pyqtgraph/GraphicsScene/exportDialogTemplate_pyqt.py
new file mode 100644
index 0000000000000000000000000000000000000000..ad7361ab7851a3683651e1291ecbe2fa5380659a
--- /dev/null
+++ b/libs/pyqtgraph/GraphicsScene/exportDialogTemplate_pyqt.py
@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file './pyqtgraph/GraphicsScene/exportDialogTemplate.ui'
+#
+# Created: Mon Dec 23 10:10:52 2013
+#      by: PyQt4 UI code generator 4.10
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt4 import QtCore, QtGui
+
+try:
+    _fromUtf8 = QtCore.QString.fromUtf8
+except AttributeError:
+    def _fromUtf8(s):
+        return s
+
+try:
+    _encoding = QtGui.QApplication.UnicodeUTF8
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig, _encoding)
+except AttributeError:
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig)
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName(_fromUtf8("Form"))
+        Form.resize(241, 367)
+        self.gridLayout = QtGui.QGridLayout(Form)
+        self.gridLayout.setSpacing(0)
+        self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
+        self.label = QtGui.QLabel(Form)
+        self.label.setObjectName(_fromUtf8("label"))
+        self.gridLayout.addWidget(self.label, 0, 0, 1, 3)
+        self.itemTree = QtGui.QTreeWidget(Form)
+        self.itemTree.setObjectName(_fromUtf8("itemTree"))
+        self.itemTree.headerItem().setText(0, _fromUtf8("1"))
+        self.itemTree.header().setVisible(False)
+        self.gridLayout.addWidget(self.itemTree, 1, 0, 1, 3)
+        self.label_2 = QtGui.QLabel(Form)
+        self.label_2.setObjectName(_fromUtf8("label_2"))
+        self.gridLayout.addWidget(self.label_2, 2, 0, 1, 3)
+        self.formatList = QtGui.QListWidget(Form)
+        self.formatList.setObjectName(_fromUtf8("formatList"))
+        self.gridLayout.addWidget(self.formatList, 3, 0, 1, 3)
+        self.exportBtn = QtGui.QPushButton(Form)
+        self.exportBtn.setObjectName(_fromUtf8("exportBtn"))
+        self.gridLayout.addWidget(self.exportBtn, 6, 1, 1, 1)
+        self.closeBtn = QtGui.QPushButton(Form)
+        self.closeBtn.setObjectName(_fromUtf8("closeBtn"))
+        self.gridLayout.addWidget(self.closeBtn, 6, 2, 1, 1)
+        self.paramTree = ParameterTree(Form)
+        self.paramTree.setObjectName(_fromUtf8("paramTree"))
+        self.paramTree.headerItem().setText(0, _fromUtf8("1"))
+        self.paramTree.header().setVisible(False)
+        self.gridLayout.addWidget(self.paramTree, 5, 0, 1, 3)
+        self.label_3 = QtGui.QLabel(Form)
+        self.label_3.setObjectName(_fromUtf8("label_3"))
+        self.gridLayout.addWidget(self.label_3, 4, 0, 1, 3)
+        self.copyBtn = QtGui.QPushButton(Form)
+        self.copyBtn.setObjectName(_fromUtf8("copyBtn"))
+        self.gridLayout.addWidget(self.copyBtn, 6, 0, 1, 1)
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        Form.setWindowTitle(_translate("Form", "Export", None))
+        self.label.setText(_translate("Form", "Item to export:", None))
+        self.label_2.setText(_translate("Form", "Export format", None))
+        self.exportBtn.setText(_translate("Form", "Export", None))
+        self.closeBtn.setText(_translate("Form", "Close", None))
+        self.label_3.setText(_translate("Form", "Export options", None))
+        self.copyBtn.setText(_translate("Form", "Copy", None))
+
+from ..parametertree import ParameterTree
diff --git a/libs/pyqtgraph/GraphicsScene/exportDialogTemplate_pyqt5.py b/libs/pyqtgraph/GraphicsScene/exportDialogTemplate_pyqt5.py
new file mode 100644
index 0000000000000000000000000000000000000000..418fd0f0c6fb759024aed74c93f404cb9f092b58
--- /dev/null
+++ b/libs/pyqtgraph/GraphicsScene/exportDialogTemplate_pyqt5.py
@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file './pyqtgraph/GraphicsScene/exportDialogTemplate.ui'
+#
+# Created: Wed Mar 26 15:09:29 2014
+#      by: PyQt5 UI code generator 5.0.1
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt5 import QtCore, QtGui, QtWidgets
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName("Form")
+        Form.resize(241, 367)
+        self.gridLayout = QtWidgets.QGridLayout(Form)
+        self.gridLayout.setSpacing(0)
+        self.gridLayout.setObjectName("gridLayout")
+        self.label = QtWidgets.QLabel(Form)
+        self.label.setObjectName("label")
+        self.gridLayout.addWidget(self.label, 0, 0, 1, 3)
+        self.itemTree = QtWidgets.QTreeWidget(Form)
+        self.itemTree.setObjectName("itemTree")
+        self.itemTree.headerItem().setText(0, "1")
+        self.itemTree.header().setVisible(False)
+        self.gridLayout.addWidget(self.itemTree, 1, 0, 1, 3)
+        self.label_2 = QtWidgets.QLabel(Form)
+        self.label_2.setObjectName("label_2")
+        self.gridLayout.addWidget(self.label_2, 2, 0, 1, 3)
+        self.formatList = QtWidgets.QListWidget(Form)
+        self.formatList.setObjectName("formatList")
+        self.gridLayout.addWidget(self.formatList, 3, 0, 1, 3)
+        self.exportBtn = QtWidgets.QPushButton(Form)
+        self.exportBtn.setObjectName("exportBtn")
+        self.gridLayout.addWidget(self.exportBtn, 6, 1, 1, 1)
+        self.closeBtn = QtWidgets.QPushButton(Form)
+        self.closeBtn.setObjectName("closeBtn")
+        self.gridLayout.addWidget(self.closeBtn, 6, 2, 1, 1)
+        self.paramTree = ParameterTree(Form)
+        self.paramTree.setObjectName("paramTree")
+        self.paramTree.headerItem().setText(0, "1")
+        self.paramTree.header().setVisible(False)
+        self.gridLayout.addWidget(self.paramTree, 5, 0, 1, 3)
+        self.label_3 = QtWidgets.QLabel(Form)
+        self.label_3.setObjectName("label_3")
+        self.gridLayout.addWidget(self.label_3, 4, 0, 1, 3)
+        self.copyBtn = QtWidgets.QPushButton(Form)
+        self.copyBtn.setObjectName("copyBtn")
+        self.gridLayout.addWidget(self.copyBtn, 6, 0, 1, 1)
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        _translate = QtCore.QCoreApplication.translate
+        Form.setWindowTitle(_translate("Form", "Export"))
+        self.label.setText(_translate("Form", "Item to export:"))
+        self.label_2.setText(_translate("Form", "Export format"))
+        self.exportBtn.setText(_translate("Form", "Export"))
+        self.closeBtn.setText(_translate("Form", "Close"))
+        self.label_3.setText(_translate("Form", "Export options"))
+        self.copyBtn.setText(_translate("Form", "Copy"))
+
+from ..parametertree import ParameterTree
diff --git a/libs/pyqtgraph/GraphicsScene/exportDialogTemplate_pyside.py b/libs/pyqtgraph/GraphicsScene/exportDialogTemplate_pyside.py
new file mode 100644
index 0000000000000000000000000000000000000000..f2e8dc705e705460aba3434285431fc15cb6109b
--- /dev/null
+++ b/libs/pyqtgraph/GraphicsScene/exportDialogTemplate_pyside.py
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file './pyqtgraph/GraphicsScene/exportDialogTemplate.ui'
+#
+# Created: Mon Dec 23 10:10:53 2013
+#      by: pyside-uic 0.2.14 running on PySide 1.1.2
+#
+# WARNING! All changes made in this file will be lost!
+
+from PySide import QtCore, QtGui
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName("Form")
+        Form.resize(241, 367)
+        self.gridLayout = QtGui.QGridLayout(Form)
+        self.gridLayout.setSpacing(0)
+        self.gridLayout.setObjectName("gridLayout")
+        self.label = QtGui.QLabel(Form)
+        self.label.setObjectName("label")
+        self.gridLayout.addWidget(self.label, 0, 0, 1, 3)
+        self.itemTree = QtGui.QTreeWidget(Form)
+        self.itemTree.setObjectName("itemTree")
+        self.itemTree.headerItem().setText(0, "1")
+        self.itemTree.header().setVisible(False)
+        self.gridLayout.addWidget(self.itemTree, 1, 0, 1, 3)
+        self.label_2 = QtGui.QLabel(Form)
+        self.label_2.setObjectName("label_2")
+        self.gridLayout.addWidget(self.label_2, 2, 0, 1, 3)
+        self.formatList = QtGui.QListWidget(Form)
+        self.formatList.setObjectName("formatList")
+        self.gridLayout.addWidget(self.formatList, 3, 0, 1, 3)
+        self.exportBtn = QtGui.QPushButton(Form)
+        self.exportBtn.setObjectName("exportBtn")
+        self.gridLayout.addWidget(self.exportBtn, 6, 1, 1, 1)
+        self.closeBtn = QtGui.QPushButton(Form)
+        self.closeBtn.setObjectName("closeBtn")
+        self.gridLayout.addWidget(self.closeBtn, 6, 2, 1, 1)
+        self.paramTree = ParameterTree(Form)
+        self.paramTree.setObjectName("paramTree")
+        self.paramTree.headerItem().setText(0, "1")
+        self.paramTree.header().setVisible(False)
+        self.gridLayout.addWidget(self.paramTree, 5, 0, 1, 3)
+        self.label_3 = QtGui.QLabel(Form)
+        self.label_3.setObjectName("label_3")
+        self.gridLayout.addWidget(self.label_3, 4, 0, 1, 3)
+        self.copyBtn = QtGui.QPushButton(Form)
+        self.copyBtn.setObjectName("copyBtn")
+        self.gridLayout.addWidget(self.copyBtn, 6, 0, 1, 1)
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        Form.setWindowTitle(QtGui.QApplication.translate("Form", "Export", None, QtGui.QApplication.UnicodeUTF8))
+        self.label.setText(QtGui.QApplication.translate("Form", "Item to export:", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_2.setText(QtGui.QApplication.translate("Form", "Export format", None, QtGui.QApplication.UnicodeUTF8))
+        self.exportBtn.setText(QtGui.QApplication.translate("Form", "Export", None, QtGui.QApplication.UnicodeUTF8))
+        self.closeBtn.setText(QtGui.QApplication.translate("Form", "Close", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_3.setText(QtGui.QApplication.translate("Form", "Export options", None, QtGui.QApplication.UnicodeUTF8))
+        self.copyBtn.setText(QtGui.QApplication.translate("Form", "Copy", None, QtGui.QApplication.UnicodeUTF8))
+
+from ..parametertree import ParameterTree
diff --git a/libs/pyqtgraph/GraphicsScene/mouseEvents.py b/libs/pyqtgraph/GraphicsScene/mouseEvents.py
new file mode 100644
index 0000000000000000000000000000000000000000..2e472e04d1e9a832a4be7b014c9255968d46fe63
--- /dev/null
+++ b/libs/pyqtgraph/GraphicsScene/mouseEvents.py
@@ -0,0 +1,382 @@
+from ..Point import Point
+from ..Qt import QtCore, QtGui
+import weakref
+from .. import ptime as ptime
+
+class MouseDragEvent(object):
+    """
+    Instances of this class are delivered to items in a :class:`GraphicsScene <pyqtgraph.GraphicsScene>` via their mouseDragEvent() method when the item is being mouse-dragged. 
+    
+    """
+    
+    
+    
+    def __init__(self, moveEvent, pressEvent, lastEvent, start=False, finish=False):
+        self.start = start
+        self.finish = finish
+        self.accepted = False
+        self.currentItem = None
+        self._buttonDownScenePos = {}
+        self._buttonDownScreenPos = {}
+        for btn in [QtCore.Qt.LeftButton, QtCore.Qt.MidButton, QtCore.Qt.RightButton]:
+            self._buttonDownScenePos[int(btn)] = moveEvent.buttonDownScenePos(btn)
+            self._buttonDownScreenPos[int(btn)] = moveEvent.buttonDownScreenPos(btn)
+        self._scenePos = moveEvent.scenePos()
+        self._screenPos = moveEvent.screenPos()
+        if lastEvent is None:
+            self._lastScenePos = pressEvent.scenePos()
+            self._lastScreenPos = pressEvent.screenPos()
+        else:
+            self._lastScenePos = lastEvent.scenePos()
+            self._lastScreenPos = lastEvent.screenPos()
+        self._buttons = moveEvent.buttons()
+        self._button = pressEvent.button()
+        self._modifiers = moveEvent.modifiers()
+        self.acceptedItem = None
+        
+    def accept(self):
+        """An item should call this method if it can handle the event. This will prevent the event being delivered to any other items."""
+        self.accepted = True
+        self.acceptedItem = self.currentItem
+        
+    def ignore(self):
+        """An item should call this method if it cannot handle the event. This will allow the event to be delivered to other items."""
+        self.accepted = False
+    
+    def isAccepted(self):
+        return self.accepted
+    
+    def scenePos(self):
+        """Return the current scene position of the mouse."""
+        return Point(self._scenePos)
+    
+    def screenPos(self):
+        """Return the current screen position (pixels relative to widget) of the mouse."""
+        return Point(self._screenPos)
+    
+    def buttonDownScenePos(self, btn=None):
+        """
+        Return the scene position of the mouse at the time *btn* was pressed.
+        If *btn* is omitted, then the button that initiated the drag is assumed.
+        """
+        if btn is None:
+            btn = self.button()
+        return Point(self._buttonDownScenePos[int(btn)])
+    
+    def buttonDownScreenPos(self, btn=None):
+        """
+        Return the screen position (pixels relative to widget) of the mouse at the time *btn* was pressed.
+        If *btn* is omitted, then the button that initiated the drag is assumed.
+        """
+        if btn is None:
+            btn = self.button()
+        return Point(self._buttonDownScreenPos[int(btn)])
+    
+    def lastScenePos(self):
+        """
+        Return the scene position of the mouse immediately prior to this event.
+        """
+        return Point(self._lastScenePos)
+    
+    def lastScreenPos(self):
+        """
+        Return the screen position of the mouse immediately prior to this event.
+        """
+        return Point(self._lastScreenPos)
+    
+    def buttons(self):
+        """
+        Return the buttons currently pressed on the mouse.
+        (see QGraphicsSceneMouseEvent::buttons in the Qt documentation)
+        """
+        return self._buttons
+        
+    def button(self):
+        """Return the button that initiated the drag (may be different from the buttons currently pressed)
+        (see QGraphicsSceneMouseEvent::button in the Qt documentation)
+        
+        """
+        return self._button
+        
+    def pos(self):
+        """
+        Return the current position of the mouse in the coordinate system of the item
+        that the event was delivered to.
+        """
+        return Point(self.currentItem.mapFromScene(self._scenePos))
+    
+    def lastPos(self):
+        """
+        Return the previous position of the mouse in the coordinate system of the item
+        that the event was delivered to.
+        """
+        return Point(self.currentItem.mapFromScene(self._lastScenePos))
+        
+    def buttonDownPos(self, btn=None):
+        """
+        Return the position of the mouse at the time the drag was initiated
+        in the coordinate system of the item that the event was delivered to.
+        """
+        if btn is None:
+            btn = self.button()
+        return Point(self.currentItem.mapFromScene(self._buttonDownScenePos[int(btn)]))
+    
+    def isStart(self):
+        """Returns True if this event is the first since a drag was initiated."""
+        return self.start
+        
+    def isFinish(self):
+        """Returns False if this is the last event in a drag. Note that this
+        event will have the same position as the previous one."""
+        return self.finish
+
+    def __repr__(self):
+        if self.currentItem is None:
+            lp = self._lastScenePos
+            p = self._scenePos
+        else:
+            lp = self.lastPos()
+            p = self.pos()
+        return "<MouseDragEvent (%g,%g)->(%g,%g) buttons=%d start=%s finish=%s>" % (lp.x(), lp.y(), p.x(), p.y(), int(self.buttons()), str(self.isStart()), str(self.isFinish()))
+        
+    def modifiers(self):
+        """Return any keyboard modifiers currently pressed.
+        (see QGraphicsSceneMouseEvent::modifiers in the Qt documentation)
+        
+        """
+        return self._modifiers
+
+
+
+class MouseClickEvent(object):
+    """
+    Instances of this class are delivered to items in a :class:`GraphicsScene <pyqtgraph.GraphicsScene>` via their mouseClickEvent() method when the item is clicked. 
+    
+    
+    """
+    
+    def __init__(self, pressEvent, double=False):
+        self.accepted = False
+        self.currentItem = None
+        self._double = double
+        self._scenePos = pressEvent.scenePos()
+        self._screenPos = pressEvent.screenPos()
+        self._button = pressEvent.button()
+        self._buttons = pressEvent.buttons()
+        self._modifiers = pressEvent.modifiers()
+        self._time = ptime.time()
+        self.acceptedItem = None
+        
+    def accept(self):
+        """An item should call this method if it can handle the event. This will prevent the event being delivered to any other items."""
+        self.accepted = True
+        self.acceptedItem = self.currentItem
+        
+    def ignore(self):
+        """An item should call this method if it cannot handle the event. This will allow the event to be delivered to other items."""
+        self.accepted = False
+    
+    def isAccepted(self):
+        return self.accepted
+    
+    def scenePos(self):
+        """Return the current scene position of the mouse."""
+        return Point(self._scenePos)
+    
+    def screenPos(self):
+        """Return the current screen position (pixels relative to widget) of the mouse."""
+        return Point(self._screenPos)
+    
+    def buttons(self):
+        """
+        Return the buttons currently pressed on the mouse.
+        (see QGraphicsSceneMouseEvent::buttons in the Qt documentation)
+        """
+        return self._buttons
+    
+    def button(self):
+        """Return the mouse button that generated the click event.
+        (see QGraphicsSceneMouseEvent::button in the Qt documentation)
+        """
+        return self._button
+    
+    def double(self):
+        """Return True if this is a double-click."""
+        return self._double
+
+    def pos(self):
+        """
+        Return the current position of the mouse in the coordinate system of the item
+        that the event was delivered to.
+        """
+        return Point(self.currentItem.mapFromScene(self._scenePos))
+    
+    def lastPos(self):
+        """
+        Return the previous position of the mouse in the coordinate system of the item
+        that the event was delivered to.
+        """
+        return Point(self.currentItem.mapFromScene(self._lastScenePos))
+        
+    def modifiers(self):
+        """Return any keyboard modifiers currently pressed.
+        (see QGraphicsSceneMouseEvent::modifiers in the Qt documentation)        
+        """
+        return self._modifiers
+
+    def __repr__(self):
+        try:
+            if self.currentItem is None:
+                p = self._scenePos
+            else:
+                p = self.pos()
+            return "<MouseClickEvent (%g,%g) button=%d>" % (p.x(), p.y(), int(self.button()))
+        except:
+            return "<MouseClickEvent button=%d>" % (int(self.button()))
+
+    def time(self):
+        return self._time
+
+
+
+class HoverEvent(object):
+    """
+    Instances of this class are delivered to items in a :class:`GraphicsScene <pyqtgraph.GraphicsScene>` via their hoverEvent() method when the mouse is hovering over the item.
+    This event class both informs items that the mouse cursor is nearby and allows items to 
+    communicate with one another about whether each item will accept *potential* mouse events. 
+    
+    It is common for multiple overlapping items to receive hover events and respond by changing 
+    their appearance. This can be misleading to the user since, in general, only one item will
+    respond to mouse events. To avoid this, items make calls to event.acceptClicks(button) 
+    and/or acceptDrags(button).
+    
+    Each item may make multiple calls to acceptClicks/Drags, each time for a different button. 
+    If the method returns True, then the item is guaranteed to be
+    the recipient of the claimed event IF the user presses the specified mouse button before
+    moving. If claimEvent returns False, then this item is guaranteed NOT to get the specified
+    event (because another has already claimed it) and the item should change its appearance 
+    accordingly.
+    
+    event.isEnter() returns True if the mouse has just entered the item's shape;
+    event.isExit() returns True if the mouse has just left.
+    """
+    def __init__(self, moveEvent, acceptable):
+        self.enter = False
+        self.acceptable = acceptable
+        self.exit = False
+        self.__clickItems = weakref.WeakValueDictionary()
+        self.__dragItems = weakref.WeakValueDictionary()
+        self.currentItem = None
+        if moveEvent is not None:
+            self._scenePos = moveEvent.scenePos()
+            self._screenPos = moveEvent.screenPos()
+            self._lastScenePos = moveEvent.lastScenePos()
+            self._lastScreenPos = moveEvent.lastScreenPos()
+            self._buttons = moveEvent.buttons()
+            self._modifiers = moveEvent.modifiers()
+        else:
+            self.exit = True
+            
+        
+        
+    def isEnter(self):
+        """Returns True if the mouse has just entered the item's shape"""
+        return self.enter
+        
+    def isExit(self):
+        """Returns True if the mouse has just exited the item's shape"""
+        return self.exit
+        
+    def acceptClicks(self, button):
+        """Inform the scene that the item (that the event was delivered to)
+        would accept a mouse click event if the user were to click before
+        moving the mouse again.
+        
+        Returns True if the request is successful, otherwise returns False (indicating
+        that some other item would receive an incoming click).
+        """
+        if not self.acceptable:
+            return False
+        if button not in self.__clickItems:
+            self.__clickItems[button] = self.currentItem
+            return True
+        return False
+        
+    def acceptDrags(self, button):
+        """Inform the scene that the item (that the event was delivered to)
+        would accept a mouse drag event if the user were to drag before
+        the next hover event.
+        
+        Returns True if the request is successful, otherwise returns False (indicating
+        that some other item would receive an incoming drag event).
+        """
+        if not self.acceptable:
+            return False
+        if button not in self.__dragItems:
+            self.__dragItems[button] = self.currentItem
+            return True
+        return False
+        
+    def scenePos(self):
+        """Return the current scene position of the mouse."""
+        return Point(self._scenePos)
+    
+    def screenPos(self):
+        """Return the current screen position of the mouse."""
+        return Point(self._screenPos)
+    
+    def lastScenePos(self):
+        """Return the previous scene position of the mouse."""
+        return Point(self._lastScenePos)
+    
+    def lastScreenPos(self):
+        """Return the previous screen position of the mouse."""
+        return Point(self._lastScreenPos)
+    
+    def buttons(self):
+        """
+        Return the buttons currently pressed on the mouse.
+        (see QGraphicsSceneMouseEvent::buttons in the Qt documentation)
+        """
+        return self._buttons
+        
+    def pos(self):
+        """
+        Return the current position of the mouse in the coordinate system of the item
+        that the event was delivered to.
+        """
+        return Point(self.currentItem.mapFromScene(self._scenePos))
+    
+    def lastPos(self):
+        """
+        Return the previous position of the mouse in the coordinate system of the item
+        that the event was delivered to.
+        """
+        return Point(self.currentItem.mapFromScene(self._lastScenePos))
+
+    def __repr__(self):
+        if self.exit:
+            return "<HoverEvent exit=True>"
+        
+        if self.currentItem is None:
+            lp = self._lastScenePos
+            p = self._scenePos
+        else:
+            lp = self.lastPos()
+            p = self.pos()
+        return "<HoverEvent (%g,%g)->(%g,%g) buttons=%d enter=%s exit=%s>" % (lp.x(), lp.y(), p.x(), p.y(), int(self.buttons()), str(self.isEnter()), str(self.isExit()))
+        
+    def modifiers(self):
+        """Return any keyboard modifiers currently pressed.
+        (see QGraphicsSceneMouseEvent::modifiers in the Qt documentation)        
+        """
+        return self._modifiers
+    
+    def clickItems(self):
+        return self.__clickItems
+        
+    def dragItems(self):
+        return self.__dragItems
+        
+    
+    
\ No newline at end of file
diff --git a/libs/pyqtgraph/PlotData.py b/libs/pyqtgraph/PlotData.py
new file mode 100644
index 0000000000000000000000000000000000000000..e5faadda028b7bf54d348f7c27b3faf79631b29d
--- /dev/null
+++ b/libs/pyqtgraph/PlotData.py
@@ -0,0 +1,56 @@
+
+
+class PlotData(object):
+    """
+    Class used for managing plot data
+      - allows data sharing between multiple graphics items (curve, scatter, graph..)
+      - each item may define the columns it needs
+      - column groupings ('pos' or x, y, z)
+      - efficiently appendable 
+      - log, fft transformations
+      - color mode conversion (float/byte/qcolor)
+      - pen/brush conversion
+      - per-field cached masking
+        - allows multiple masking fields (different graphics need to mask on different criteria) 
+        - removal of nan/inf values
+      - option for single value shared by entire column
+      - cached downsampling
+      - cached min / max / hasnan / isuniform
+    """
+    def __init__(self):
+        self.fields = {}
+        
+        self.maxVals = {}  ## cache for max/min
+        self.minVals = {}
+
+    def addFields(self, **fields):
+        for f in fields:
+            if f not in self.fields:
+                self.fields[f] = None
+
+    def hasField(self, f):
+        return f in self.fields
+
+    def __getitem__(self, field):
+        return self.fields[field]
+    
+    def __setitem__(self, field, val):
+        self.fields[field] = val
+    
+    def max(self, field):
+        mx = self.maxVals.get(field, None)
+        if mx is None:
+            mx = np.max(self[field])
+            self.maxVals[field] = mx
+        return mx
+    
+    def min(self, field):
+        mn = self.minVals.get(field, None)
+        if mn is None:
+            mn = np.min(self[field])
+            self.minVals[field] = mn
+        return mn
+    
+    
+    
+    
\ No newline at end of file
diff --git a/libs/pyqtgraph/Point.py b/libs/pyqtgraph/Point.py
new file mode 100644
index 0000000000000000000000000000000000000000..4d04f01c1125a4755d0e7908483064dfcdfe3c8b
--- /dev/null
+++ b/libs/pyqtgraph/Point.py
@@ -0,0 +1,155 @@
+# -*- coding: utf-8 -*-
+"""
+Point.py -  Extension of QPointF which adds a few missing methods.
+Copyright 2010  Luke Campagnola
+Distributed under MIT/X11 license. See license.txt for more infomation.
+"""
+
+from .Qt import QtCore
+import numpy as np
+
+def clip(x, mn, mx):
+    if x > mx:
+        return mx
+    if x < mn:
+        return mn
+    return x
+
+class Point(QtCore.QPointF):
+    """Extension of QPointF which adds a few missing methods."""
+    
+    def __init__(self, *args):
+        if len(args) == 1:
+            if isinstance(args[0], QtCore.QSizeF):
+                QtCore.QPointF.__init__(self, float(args[0].width()), float(args[0].height()))
+                return
+            elif isinstance(args[0], float) or isinstance(args[0], int):
+                QtCore.QPointF.__init__(self, float(args[0]), float(args[0]))
+                return
+            elif hasattr(args[0], '__getitem__'):
+                QtCore.QPointF.__init__(self, float(args[0][0]), float(args[0][1]))
+                return
+        elif len(args) == 2:
+            QtCore.QPointF.__init__(self, args[0], args[1])
+            return
+        QtCore.QPointF.__init__(self, *args)
+        
+    def __len__(self):
+        return 2
+        
+    def __reduce__(self):
+        return (Point, (self.x(), self.y()))
+        
+    def __getitem__(self, i):
+        if i == 0:
+            return self.x()
+        elif i == 1:
+            return self.y()
+        else:
+            raise IndexError("Point has no index %s" % str(i))
+        
+    def __setitem__(self, i, x):
+        if i == 0:
+            return self.setX(x)
+        elif i == 1:
+            return self.setY(x)
+        else:
+            raise IndexError("Point has no index %s" % str(i))
+        
+    def __radd__(self, a):
+        return self._math_('__radd__', a)
+    
+    def __add__(self, a):
+        return self._math_('__add__', a)
+    
+    def __rsub__(self, a):
+        return self._math_('__rsub__', a)
+    
+    def __sub__(self, a):
+        return self._math_('__sub__', a)
+    
+    def __rmul__(self, a):
+        return self._math_('__rmul__', a)
+    
+    def __mul__(self, a):
+        return self._math_('__mul__', a)
+    
+    def __rdiv__(self, a):
+        return self._math_('__rdiv__', a)
+    
+    def __div__(self, a):
+        return self._math_('__div__', a)
+    
+    def __truediv__(self, a):
+        return self._math_('__truediv__', a)
+    
+    def __rtruediv__(self, a):
+        return self._math_('__rtruediv__', a)
+    
+    def __rpow__(self, a):
+        return self._math_('__rpow__', a)
+    
+    def __pow__(self, a):
+        return self._math_('__pow__', a)
+    
+    def _math_(self, op, x):
+        #print "point math:", op
+        #try:
+            #fn  = getattr(QtCore.QPointF, op)
+            #pt = fn(self, x)
+            #print fn, pt, self, x
+            #return Point(pt)
+        #except AttributeError:
+        x = Point(x)
+        return Point(getattr(self[0], op)(x[0]), getattr(self[1], op)(x[1]))
+    
+    def length(self):
+        """Returns the vector length of this Point."""
+        return (self[0]**2 + self[1]**2) ** 0.5
+    
+    def norm(self):
+        """Returns a vector in the same direction with unit length."""
+        return self / self.length()
+    
+    def angle(self, a):
+        """Returns the angle in degrees between this vector and the vector a."""
+        n1 = self.length()
+        n2 = a.length()
+        if n1 == 0. or n2 == 0.:
+            return None
+        ## Probably this should be done with arctan2 instead..
+        ang = np.arccos(clip(self.dot(a) / (n1 * n2), -1.0, 1.0)) ### in radians
+        c = self.cross(a)
+        if c > 0:
+            ang *= -1.
+        return ang * 180. / np.pi
+    
+    def dot(self, a):
+        """Returns the dot product of a and this Point."""
+        a = Point(a)
+        return self[0]*a[0] + self[1]*a[1]
+    
+    def cross(self, a):
+        a = Point(a)
+        return self[0]*a[1] - self[1]*a[0]
+        
+    def proj(self, b):
+        """Return the projection of this vector onto the vector b"""
+        b1 = b / b.length()
+        return self.dot(b1) * b1
+    
+    def __repr__(self):
+        return "Point(%f, %f)" % (self[0], self[1])
+    
+    
+    def min(self):
+        return min(self[0], self[1])
+    
+    def max(self):
+        return max(self[0], self[1])
+        
+    def copy(self):
+        return Point(self)
+        
+    def toQPoint(self):
+        return QtCore.QPoint(*self)
diff --git a/libs/pyqtgraph/Qt.py b/libs/pyqtgraph/Qt.py
new file mode 100644
index 0000000000000000000000000000000000000000..0dc6eeb03b2da0bbce27b462eb0e7ebdb80d714b
--- /dev/null
+++ b/libs/pyqtgraph/Qt.py
@@ -0,0 +1,206 @@
+"""
+This module exists to smooth out some of the differences between PySide and PyQt4:
+
+* Automatically import either PyQt4 or PySide depending on availability
+* Allow to import QtCore/QtGui pyqtgraph.Qt without specifying which Qt wrapper
+  you want to use.
+* Declare QtCore.Signal, .Slot in PyQt4  
+* Declare loadUiType function for Pyside
+
+"""
+
+import sys, re
+
+from .python2_3 import asUnicode
+
+PYSIDE = 'PySide'
+PYQT4 = 'PyQt4'
+PYQT5 = 'PyQt5'
+
+QT_LIB = None
+
+## Automatically determine whether to use PyQt or PySide. 
+## This is done by first checking to see whether one of the libraries
+## is already imported. If not, then attempt to import PyQt4, then PySide.
+libOrder = [PYQT4, PYSIDE, PYQT5]
+
+for lib in libOrder:
+    if lib in sys.modules:
+        QT_LIB = lib
+        break
+
+if QT_LIB is None:
+    for lib in libOrder:
+        try:
+            __import__(lib)
+            QT_LIB = lib
+            break
+        except ImportError:
+            pass
+
+if QT_LIB == None:
+    raise Exception("PyQtGraph requires one of PyQt4, PyQt5 or PySide; none of these packages could be imported.")
+
+if QT_LIB == PYSIDE:
+    from PySide import QtGui, QtCore, QtOpenGL, QtSvg
+    try:
+        from PySide import QtTest
+    except ImportError:
+        pass
+    import PySide
+    try:
+        from PySide import shiboken
+        isQObjectAlive = shiboken.isValid
+    except ImportError:
+        def isQObjectAlive(obj):
+            try:
+                if hasattr(obj, 'parent'):
+                    obj.parent()
+                elif hasattr(obj, 'parentItem'):
+                    obj.parentItem()
+                else:
+                    raise Exception("Cannot determine whether Qt object %s is still alive." % obj)
+            except RuntimeError:
+                return False
+            else:
+                return True
+    
+    VERSION_INFO = 'PySide ' + PySide.__version__
+    
+    # Make a loadUiType function like PyQt has
+    
+    # Credit: 
+    # http://stackoverflow.com/questions/4442286/python-code-genration-with-pyside-uic/14195313#14195313
+
+    class StringIO(object):
+        """Alternative to built-in StringIO needed to circumvent unicode/ascii issues"""
+        def __init__(self):
+            self.data = []
+        
+        def write(self, data):
+            self.data.append(data)
+            
+        def getvalue(self):
+            return ''.join(map(asUnicode, self.data)).encode('utf8')
+        
+    def loadUiType(uiFile):
+        """
+        Pyside "loadUiType" command like PyQt4 has one, so we have to convert the ui file to py code in-memory first    and then execute it in a special frame to retrieve the form_class.
+        """
+        import pysideuic
+        import xml.etree.ElementTree as xml
+        #from io import StringIO
+        
+        parsed = xml.parse(uiFile)
+        widget_class = parsed.find('widget').get('class')
+        form_class = parsed.find('class').text
+        
+        with open(uiFile, 'r') as f:
+            o = StringIO()
+            frame = {}
+
+            pysideuic.compileUi(f, o, indent=0)
+            pyc = compile(o.getvalue(), '<string>', 'exec')
+            exec(pyc, frame)
+
+            #Fetch the base_class and form class based on their type in the xml from designer
+            form_class = frame['Ui_%s'%form_class]
+            base_class = eval('QtGui.%s'%widget_class)
+
+        return form_class, base_class
+
+elif QT_LIB == PYQT4:
+
+    from PyQt4 import QtGui, QtCore, uic
+    try:
+        from PyQt4 import QtSvg
+    except ImportError:
+        pass
+    try:
+        from PyQt4 import QtOpenGL
+    except ImportError:
+        pass
+    try:
+        from PyQt4 import QtTest
+    except ImportError:
+        pass
+
+    VERSION_INFO = 'PyQt4 ' + QtCore.PYQT_VERSION_STR + ' Qt ' + QtCore.QT_VERSION_STR
+
+elif QT_LIB == PYQT5:
+    
+    # We're using PyQt5 which has a different structure so we're going to use a shim to
+    # recreate the Qt4 structure for Qt5
+    from PyQt5 import QtGui, QtCore, QtWidgets, Qt, uic
+    try:
+        from PyQt5 import QtSvg
+    except ImportError:
+        pass
+    try:
+        from PyQt5 import QtOpenGL
+    except ImportError:
+        pass
+
+    # Re-implement deprecated APIs
+    def scale(self, sx, sy):
+        tr = self.transform()
+        tr.scale(sx, sy)
+        self.setTransform(tr)
+    QtWidgets.QGraphicsItem.scale = scale
+
+    def rotate(self, angle):
+        tr = self.transform()
+        tr.rotate(angle)
+        self.setTransform(tr)
+    QtWidgets.QGraphicsItem.rotate = rotate
+
+    def translate(self, dx, dy):
+        tr = self.transform()
+        tr.translate(dx, dy)
+        self.setTransform(tr)
+    QtWidgets.QGraphicsItem.translate = translate
+
+    def setMargin(self, i):
+        self.setContentsMargins(i, i, i, i)
+    QtWidgets.QGridLayout.setMargin = setMargin
+
+    def setResizeMode(self, mode):
+        self.setSectionResizeMode(mode)
+    QtWidgets.QHeaderView.setResizeMode = setResizeMode
+
+    
+    QtGui.QApplication = QtWidgets.QApplication
+    QtGui.QGraphicsScene = QtWidgets.QGraphicsScene
+    QtGui.QGraphicsObject = QtWidgets.QGraphicsObject
+    QtGui.QGraphicsWidget = QtWidgets.QGraphicsWidget
+
+    QtGui.QApplication.setGraphicsSystem = None
+    
+    # Import all QtWidgets objects into QtGui
+    for o in dir(QtWidgets):
+        if o.startswith('Q'):
+            setattr(QtGui, o, getattr(QtWidgets,o) )
+    
+    VERSION_INFO = 'PyQt5 ' + QtCore.PYQT_VERSION_STR + ' Qt ' + QtCore.QT_VERSION_STR
+
+# Common to PyQt4 and 5
+if QT_LIB.startswith('PyQt'):
+    import sip
+    def isQObjectAlive(obj):
+        return not sip.isdeleted(obj)
+    loadUiType = uic.loadUiType
+
+    QtCore.Signal = QtCore.pyqtSignal
+    
+
+    
+## Make sure we have Qt >= 4.7
+versionReq = [4, 7]
+USE_PYSIDE = QT_LIB == PYSIDE
+USE_PYQT4 = QT_LIB == PYQT4
+USE_PYQT5 = QT_LIB == PYQT5
+QtVersion = PySide.QtCore.__version__ if QT_LIB == PYSIDE else QtCore.QT_VERSION_STR
+m = re.match(r'(\d+)\.(\d+).*', QtVersion)
+if m is not None and list(map(int, m.groups())) < versionReq:
+    print(list(map(int, m.groups())))
+    raise Exception('pyqtgraph requires Qt version >= %d.%d  (your version is %s)' % (versionReq[0], versionReq[1], QtVersion))
diff --git a/libs/pyqtgraph/SRTTransform.py b/libs/pyqtgraph/SRTTransform.py
new file mode 100644
index 0000000000000000000000000000000000000000..23281343f9a4f5a8b88190db2b8e82230a61d061
--- /dev/null
+++ b/libs/pyqtgraph/SRTTransform.py
@@ -0,0 +1,258 @@
+# -*- coding: utf-8 -*-
+from .Qt import QtCore, QtGui
+from .Point import Point
+import numpy as np
+
+class SRTTransform(QtGui.QTransform):
+    """Transform that can always be represented as a combination of 3 matrices: scale * rotate * translate
+    This transform has no shear; angles are always preserved.
+    """
+    def __init__(self, init=None):
+        QtGui.QTransform.__init__(self)
+        self.reset()
+        
+        if init is None:
+            return
+        elif isinstance(init, dict):
+            self.restoreState(init)
+        elif isinstance(init, SRTTransform):
+            self._state = {
+                'pos': Point(init._state['pos']),
+                'scale': Point(init._state['scale']),
+                'angle': init._state['angle']
+            }
+            self.update()
+        elif isinstance(init, QtGui.QTransform):
+            self.setFromQTransform(init)
+        elif isinstance(init, QtGui.QMatrix4x4):
+            self.setFromMatrix4x4(init)
+        else:
+            raise Exception("Cannot create SRTTransform from input type: %s" % str(type(init)))
+
+        
+    def getScale(self):
+        return self._state['scale']
+        
+    def getAngle(self):  
+        ## deprecated; for backward compatibility
+        return self.getRotation()
+        
+    def getRotation(self):
+        return self._state['angle']
+        
+    def getTranslation(self):
+        return self._state['pos']
+    
+    def reset(self):
+        self._state = {
+            'pos': Point(0,0),
+            'scale': Point(1,1),
+            'angle': 0.0  ## in degrees
+        }
+        self.update()
+        
+    def setFromQTransform(self, tr):
+        p1 = Point(tr.map(0., 0.))
+        p2 = Point(tr.map(1., 0.))
+        p3 = Point(tr.map(0., 1.))
+        
+        dp2 = Point(p2-p1)
+        dp3 = Point(p3-p1)
+        
+        ## detect flipped axes
+        if dp2.angle(dp3) > 0:
+            #da = 180
+            da = 0
+            sy = -1.0
+        else:
+            da = 0
+            sy = 1.0
+            
+        self._state = {
+            'pos': Point(p1),
+            'scale': Point(dp2.length(), dp3.length() * sy),
+            'angle': (np.arctan2(dp2[1], dp2[0]) * 180. / np.pi) + da
+        }
+        self.update()
+        
+    def setFromMatrix4x4(self, m):
+        m = SRTTransform3D(m)
+        angle, axis = m.getRotation()
+        if angle != 0 and (axis[0] != 0 or axis[1] != 0 or axis[2] != 1):
+            print("angle: %s  axis: %s" % (str(angle), str(axis)))
+            raise Exception("Can only convert 4x4 matrix to 3x3 if rotation is around Z-axis.")
+        self._state = {
+            'pos': Point(m.getTranslation()),
+            'scale': Point(m.getScale()),
+            'angle': angle
+        }
+        self.update()
+        
+    def translate(self, *args):
+        """Acceptable arguments are: 
+           x, y
+           [x, y]
+           Point(x,y)"""
+        t = Point(*args)
+        self.setTranslate(self._state['pos']+t)
+        
+    def setTranslate(self, *args):
+        """Acceptable arguments are: 
+           x, y
+           [x, y]
+           Point(x,y)"""
+        self._state['pos'] = Point(*args)
+        self.update()
+        
+    def scale(self, *args):
+        """Acceptable arguments are: 
+           x, y
+           [x, y]
+           Point(x,y)"""
+        s = Point(*args)
+        self.setScale(self._state['scale'] * s)
+        
+    def setScale(self, *args):
+        """Acceptable arguments are: 
+           x, y
+           [x, y]
+           Point(x,y)"""
+        self._state['scale'] = Point(*args)
+        self.update()
+        
+    def rotate(self, angle):
+        """Rotate the transformation by angle (in degrees)"""
+        self.setRotate(self._state['angle'] + angle)
+        
+    def setRotate(self, angle):
+        """Set the transformation rotation to angle (in degrees)"""
+        self._state['angle'] = angle
+        self.update()
+
+    def __truediv__(self, t):
+        """A / B  ==  B^-1 * A"""
+        dt = t.inverted()[0] * self
+        return SRTTransform(dt)
+        
+    def __div__(self, t):
+        return self.__truediv__(t)
+        
+    def __mul__(self, t):
+        return SRTTransform(QtGui.QTransform.__mul__(self, t))
+
+    def saveState(self):
+        p = self._state['pos']
+        s = self._state['scale']
+        #if s[0] == 0:
+            #raise Exception('Invalid scale: %s' % str(s))
+        return {'pos': (p[0], p[1]), 'scale': (s[0], s[1]), 'angle': self._state['angle']}
+
+    def restoreState(self, state):
+        self._state['pos'] = Point(state.get('pos', (0,0)))
+        self._state['scale'] = Point(state.get('scale', (1.,1.)))
+        self._state['angle'] = state.get('angle', 0)
+        self.update()
+
+    def update(self):
+        QtGui.QTransform.reset(self)
+        ## modifications to the transform are multiplied on the right, so we need to reverse order here.
+        QtGui.QTransform.translate(self, *self._state['pos'])
+        QtGui.QTransform.rotate(self, self._state['angle'])
+        QtGui.QTransform.scale(self, *self._state['scale'])
+
+    def __repr__(self):
+        return str(self.saveState())
+        
+    def matrix(self):
+        return np.array([[self.m11(), self.m12(), self.m13()],[self.m21(), self.m22(), self.m23()],[self.m31(), self.m32(), self.m33()]])
+        
+if __name__ == '__main__':
+    from . import widgets
+    import GraphicsView
+    from .functions import *
+    app = QtGui.QApplication([])
+    win = QtGui.QMainWindow()
+    win.show()
+    cw = GraphicsView.GraphicsView()
+    #cw.enableMouse()  
+    win.setCentralWidget(cw)
+    s = QtGui.QGraphicsScene()
+    cw.setScene(s)
+    win.resize(600,600)
+    cw.enableMouse()
+    cw.setRange(QtCore.QRectF(-100., -100., 200., 200.))
+    
+    class Item(QtGui.QGraphicsItem):
+        def __init__(self):
+            QtGui.QGraphicsItem.__init__(self)
+            self.b = QtGui.QGraphicsRectItem(20, 20, 20, 20, self)
+            self.b.setPen(QtGui.QPen(mkPen('y')))
+            self.t1 = QtGui.QGraphicsTextItem(self)
+            self.t1.setHtml('<span style="color: #F00">R</span>')
+            self.t1.translate(20, 20)
+            self.l1 = QtGui.QGraphicsLineItem(10, 0, -10, 0, self)
+            self.l2 = QtGui.QGraphicsLineItem(0, 10, 0, -10, self)
+            self.l1.setPen(QtGui.QPen(mkPen('y')))
+            self.l2.setPen(QtGui.QPen(mkPen('y')))
+        def boundingRect(self):
+            return QtCore.QRectF()
+        def paint(self, *args):
+            pass
+            
+    #s.addItem(b)
+    #s.addItem(t1)
+    item = Item()
+    s.addItem(item)
+    l1 = QtGui.QGraphicsLineItem(10, 0, -10, 0)
+    l2 = QtGui.QGraphicsLineItem(0, 10, 0, -10)
+    l1.setPen(QtGui.QPen(mkPen('r')))
+    l2.setPen(QtGui.QPen(mkPen('r')))
+    s.addItem(l1)
+    s.addItem(l2)
+    
+    tr1 = SRTTransform()
+    tr2 = SRTTransform()
+    tr3 = QtGui.QTransform()
+    tr3.translate(20, 0)
+    tr3.rotate(45)
+    print("QTransform -> Transform:", SRTTransform(tr3))
+    
+    print("tr1:", tr1)
+    
+    tr2.translate(20, 0)
+    tr2.rotate(45)
+    print("tr2:", tr2)
+    
+    dt = tr2/tr1
+    print("tr2 / tr1 = ", dt)
+    
+    print("tr2 * tr1 = ", tr2*tr1)
+    
+    tr4 = SRTTransform()
+    tr4.scale(-1, 1)
+    tr4.rotate(30)
+    print("tr1 * tr4 = ", tr1*tr4)
+    
+    w1 = widgets.TestROI((19,19), (22, 22), invertible=True)
+    #w2 = widgets.TestROI((0,0), (150, 150))
+    w1.setZValue(10)
+    s.addItem(w1)
+    #s.addItem(w2)
+    w1Base = w1.getState()
+    #w2Base = w2.getState()
+    def update():
+        tr1 = w1.getGlobalTransform(w1Base)
+        #tr2 = w2.getGlobalTransform(w2Base)
+        item.setTransform(tr1)
+        
+    #def update2():
+        #tr1 = w1.getGlobalTransform(w1Base)
+        #tr2 = w2.getGlobalTransform(w2Base)
+        #t1.setTransform(tr1)
+        #w1.setState(w1Base)
+        #w1.applyGlobalTransform(tr2)
+        
+    w1.sigRegionChanged.connect(update)
+    #w2.sigRegionChanged.connect(update2)
+    
+from .SRTTransform3D import SRTTransform3D
diff --git a/libs/pyqtgraph/SRTTransform3D.py b/libs/pyqtgraph/SRTTransform3D.py
new file mode 100644
index 0000000000000000000000000000000000000000..9b54843b94bca481eee9324a7a2c43311f5b0620
--- /dev/null
+++ b/libs/pyqtgraph/SRTTransform3D.py
@@ -0,0 +1,315 @@
+# -*- coding: utf-8 -*-
+from .Qt import QtCore, QtGui
+from .Vector import Vector
+from .Transform3D import Transform3D
+from .Vector import Vector
+import numpy as np
+
+class SRTTransform3D(Transform3D):
+    """4x4 Transform matrix that can always be represented as a combination of 3 matrices: scale * rotate * translate
+    This transform has no shear; angles are always preserved.
+    """
+    def __init__(self, init=None):
+        Transform3D.__init__(self)
+        self.reset()
+        if init is None:
+            return
+        if init.__class__ is QtGui.QTransform:
+            init = SRTTransform(init)
+        
+        if isinstance(init, dict):
+            self.restoreState(init)
+        elif isinstance(init, SRTTransform3D):
+            self._state = {
+                'pos': Vector(init._state['pos']),
+                'scale': Vector(init._state['scale']),
+                'angle': init._state['angle'],
+                'axis': Vector(init._state['axis']),
+            }
+            self.update()
+        elif isinstance(init, SRTTransform):
+            self._state = {
+                'pos': Vector(init._state['pos']),
+                'scale': Vector(init._state['scale']),
+                'angle': init._state['angle'],
+                'axis': Vector(0, 0, 1),
+            }
+            self._state['scale'][2] = 1.0
+            self.update()
+        elif isinstance(init, QtGui.QMatrix4x4):
+            self.setFromMatrix(init)
+        else:
+            raise Exception("Cannot build SRTTransform3D from argument type:", type(init))
+
+        
+    def getScale(self):
+        return Vector(self._state['scale'])
+        
+    def getRotation(self):
+        """Return (angle, axis) of rotation"""
+        return self._state['angle'], Vector(self._state['axis'])
+        
+    def getTranslation(self):
+        return Vector(self._state['pos'])
+    
+    def reset(self):
+        self._state = {
+            'pos': Vector(0,0,0),
+            'scale': Vector(1,1,1),
+            'angle': 0.0,  ## in degrees
+            'axis': (0, 0, 1)
+        }
+        self.update()
+        
+    def translate(self, *args):
+        """Adjust the translation of this transform"""
+        t = Vector(*args)
+        self.setTranslate(self._state['pos']+t)
+        
+    def setTranslate(self, *args):
+        """Set the translation of this transform"""
+        self._state['pos'] = Vector(*args)
+        self.update()
+        
+    def scale(self, *args):
+        """adjust the scale of this transform"""
+        ## try to prevent accidentally setting 0 scale on z axis
+        if len(args) == 1 and hasattr(args[0], '__len__'):
+            args = args[0]
+        if len(args) == 2:
+            args = args + (1,)
+            
+        s = Vector(*args)
+        self.setScale(self._state['scale'] * s)
+        
+    def setScale(self, *args):
+        """Set the scale of this transform"""
+        if len(args) == 1 and hasattr(args[0], '__len__'):
+            args = args[0]
+        if len(args) == 2:
+            args = args + (1,)
+        self._state['scale'] = Vector(*args)
+        self.update()
+        
+    def rotate(self, angle, axis=(0,0,1)):
+        """Adjust the rotation of this transform"""
+        origAxis = self._state['axis']
+        if axis[0] == origAxis[0] and axis[1] == origAxis[1] and axis[2] == origAxis[2]:
+            self.setRotate(self._state['angle'] + angle)
+        else:
+            m = QtGui.QMatrix4x4()
+            m.translate(*self._state['pos'])
+            m.rotate(self._state['angle'], *self._state['axis'])
+            m.rotate(angle, *axis)
+            m.scale(*self._state['scale'])
+            self.setFromMatrix(m)
+        
+    def setRotate(self, angle, axis=(0,0,1)):
+        """Set the transformation rotation to angle (in degrees)"""
+        
+        self._state['angle'] = angle
+        self._state['axis'] = Vector(axis)
+        self.update()
+    
+    def setFromMatrix(self, m):
+        """
+        Set this transform mased on the elements of *m*
+        The input matrix must be affine AND have no shear,
+        otherwise the conversion will most likely fail.
+        """
+        import numpy.linalg
+        for i in range(4):
+            self.setRow(i, m.row(i))
+        m = self.matrix().reshape(4,4)
+        ## translation is 4th column
+        self._state['pos'] = m[:3,3]
+        
+        ## scale is vector-length of first three columns
+        scale = (m[:3,:3]**2).sum(axis=0)**0.5
+        ## see whether there is an inversion
+        z = np.cross(m[0, :3], m[1, :3])
+        if np.dot(z, m[2, :3]) < 0:
+            scale[1] *= -1  ## doesn't really matter which axis we invert
+        self._state['scale'] = scale
+        
+        ## rotation axis is the eigenvector with eigenvalue=1
+        r = m[:3, :3] / scale[np.newaxis, :]
+        try:
+            evals, evecs = numpy.linalg.eig(r)
+        except:
+            print("Rotation matrix: %s" % str(r))
+            print("Scale: %s" % str(scale))
+            print("Original matrix: %s" % str(m))
+            raise
+        eigIndex = np.argwhere(np.abs(evals-1) < 1e-6)
+        if len(eigIndex) < 1:
+            print("eigenvalues: %s" % str(evals))
+            print("eigenvectors: %s" % str(evecs))
+            print("index: %s, %s" % (str(eigIndex), str(evals-1)))
+            raise Exception("Could not determine rotation axis.")
+        axis = evecs[:,eigIndex[0,0]].real
+        axis /= ((axis**2).sum())**0.5
+        self._state['axis'] = axis
+        
+        ## trace(r) == 2 cos(angle) + 1, so:
+        cos = (r.trace()-1)*0.5  ## this only gets us abs(angle)
+        
+        ## The off-diagonal values can be used to correct the angle ambiguity, 
+        ## but we need to figure out which element to use:
+        axisInd = np.argmax(np.abs(axis))
+        rInd,sign = [((1,2), -1), ((0,2), 1), ((0,1), -1)][axisInd]
+        
+        ## Then we have r-r.T = sin(angle) * 2 * sign * axis[axisInd];
+        ## solve for sin(angle)
+        sin = (r-r.T)[rInd] / (2. * sign * axis[axisInd])
+        
+        ## finally, we get the complete angle from arctan(sin/cos)
+        self._state['angle'] = np.arctan2(sin, cos) * 180 / np.pi
+        if self._state['angle'] == 0:
+            self._state['axis'] = (0,0,1)
+        
+    def as2D(self):
+        """Return a QTransform representing the x,y portion of this transform (if possible)"""
+        return SRTTransform(self)
+
+    #def __div__(self, t):
+        #"""A / B  ==  B^-1 * A"""
+        #dt = t.inverted()[0] * self
+        #return SRTTransform(dt)
+        
+    #def __mul__(self, t):
+        #return SRTTransform(QtGui.QTransform.__mul__(self, t))
+
+    def saveState(self):
+        p = self._state['pos']
+        s = self._state['scale']
+        ax = self._state['axis']
+        #if s[0] == 0:
+            #raise Exception('Invalid scale: %s' % str(s))
+        return {
+            'pos': (p[0], p[1], p[2]), 
+            'scale': (s[0], s[1], s[2]), 
+            'angle': self._state['angle'], 
+            'axis': (ax[0], ax[1], ax[2])
+        }
+
+    def restoreState(self, state):
+        self._state['pos'] = Vector(state.get('pos', (0.,0.,0.)))
+        scale = state.get('scale', (1.,1.,1.))
+        scale = tuple(scale) + (1.,) * (3-len(scale))
+        self._state['scale'] = Vector(scale)
+        self._state['angle'] = state.get('angle', 0.)
+        self._state['axis'] = state.get('axis', (0, 0, 1))
+        self.update()
+
+    def update(self):
+        Transform3D.setToIdentity(self)
+        ## modifications to the transform are multiplied on the right, so we need to reverse order here.
+        Transform3D.translate(self, *self._state['pos'])
+        Transform3D.rotate(self, self._state['angle'], *self._state['axis'])
+        Transform3D.scale(self, *self._state['scale'])
+
+    def __repr__(self):
+        return str(self.saveState())
+        
+    def matrix(self, nd=3):
+        if nd == 3:
+            return np.array(self.copyDataTo()).reshape(4,4)
+        elif nd == 2:
+            m = np.array(self.copyDataTo()).reshape(4,4)
+            m[2] = m[3]
+            m[:,2] = m[:,3]
+            return m[:3,:3]
+        else:
+            raise Exception("Argument 'nd' must be 2 or 3")
+        
+if __name__ == '__main__':
+    import widgets
+    import GraphicsView
+    from functions import *
+    app = QtGui.QApplication([])
+    win = QtGui.QMainWindow()
+    win.show()
+    cw = GraphicsView.GraphicsView()
+    #cw.enableMouse()  
+    win.setCentralWidget(cw)
+    s = QtGui.QGraphicsScene()
+    cw.setScene(s)
+    win.resize(600,600)
+    cw.enableMouse()
+    cw.setRange(QtCore.QRectF(-100., -100., 200., 200.))
+    
+    class Item(QtGui.QGraphicsItem):
+        def __init__(self):
+            QtGui.QGraphicsItem.__init__(self)
+            self.b = QtGui.QGraphicsRectItem(20, 20, 20, 20, self)
+            self.b.setPen(QtGui.QPen(mkPen('y')))
+            self.t1 = QtGui.QGraphicsTextItem(self)
+            self.t1.setHtml('<span style="color: #F00">R</span>')
+            self.t1.translate(20, 20)
+            self.l1 = QtGui.QGraphicsLineItem(10, 0, -10, 0, self)
+            self.l2 = QtGui.QGraphicsLineItem(0, 10, 0, -10, self)
+            self.l1.setPen(QtGui.QPen(mkPen('y')))
+            self.l2.setPen(QtGui.QPen(mkPen('y')))
+        def boundingRect(self):
+            return QtCore.QRectF()
+        def paint(self, *args):
+            pass
+            
+    #s.addItem(b)
+    #s.addItem(t1)
+    item = Item()
+    s.addItem(item)
+    l1 = QtGui.QGraphicsLineItem(10, 0, -10, 0)
+    l2 = QtGui.QGraphicsLineItem(0, 10, 0, -10)
+    l1.setPen(QtGui.QPen(mkPen('r')))
+    l2.setPen(QtGui.QPen(mkPen('r')))
+    s.addItem(l1)
+    s.addItem(l2)
+    
+    tr1 = SRTTransform()
+    tr2 = SRTTransform()
+    tr3 = QtGui.QTransform()
+    tr3.translate(20, 0)
+    tr3.rotate(45)
+    print("QTransform -> Transform: %s" % str(SRTTransform(tr3)))
+    
+    print("tr1: %s" % str(tr1))
+    
+    tr2.translate(20, 0)
+    tr2.rotate(45)
+    print("tr2: %s" % str(tr2))
+    
+    dt = tr2/tr1
+    print("tr2 / tr1 = %s" % str(dt))
+    
+    print("tr2 * tr1 = %s" % str(tr2*tr1))
+    
+    tr4 = SRTTransform()
+    tr4.scale(-1, 1)
+    tr4.rotate(30)
+    print("tr1 * tr4 = %s" % str(tr1*tr4))
+    
+    w1 = widgets.TestROI((19,19), (22, 22), invertible=True)
+    #w2 = widgets.TestROI((0,0), (150, 150))
+    w1.setZValue(10)
+    s.addItem(w1)
+    #s.addItem(w2)
+    w1Base = w1.getState()
+    #w2Base = w2.getState()
+    def update():
+        tr1 = w1.getGlobalTransform(w1Base)
+        #tr2 = w2.getGlobalTransform(w2Base)
+        item.setTransform(tr1)
+        
+    #def update2():
+        #tr1 = w1.getGlobalTransform(w1Base)
+        #tr2 = w2.getGlobalTransform(w2Base)
+        #t1.setTransform(tr1)
+        #w1.setState(w1Base)
+        #w1.applyGlobalTransform(tr2)
+        
+    w1.sigRegionChanged.connect(update)
+    #w2.sigRegionChanged.connect(update2)
+    
+from .SRTTransform import SRTTransform
diff --git a/libs/pyqtgraph/SignalProxy.py b/libs/pyqtgraph/SignalProxy.py
new file mode 100644
index 0000000000000000000000000000000000000000..d36282fa3954ceab125882e1f061b4281e15c49b
--- /dev/null
+++ b/libs/pyqtgraph/SignalProxy.py
@@ -0,0 +1,119 @@
+# -*- coding: utf-8 -*-
+from .Qt import QtCore
+from .ptime import time
+from . import ThreadsafeTimer
+import weakref
+
+__all__ = ['SignalProxy']
+
+class SignalProxy(QtCore.QObject):
+    """Object which collects rapid-fire signals and condenses them
+    into a single signal or a rate-limited stream of signals. 
+    Used, for example, to prevent a SpinBox from generating multiple 
+    signals when the mouse wheel is rolled over it.
+    
+    Emits sigDelayed after input signals have stopped for a certain period of time.
+    """
+    
+    sigDelayed = QtCore.Signal(object)
+    
+    def __init__(self, signal, delay=0.3, rateLimit=0, slot=None):
+        """Initialization arguments:
+        signal - a bound Signal or pyqtSignal instance
+        delay - Time (in seconds) to wait for signals to stop before emitting (default 0.3s)
+        slot - Optional function to connect sigDelayed to.
+        rateLimit - (signals/sec) if greater than 0, this allows signals to stream out at a 
+                    steady rate while they are being received.
+        """
+        
+        QtCore.QObject.__init__(self)
+        signal.connect(self.signalReceived)
+        self.signal = signal
+        self.delay = delay
+        self.rateLimit = rateLimit
+        self.args = None
+        self.timer = ThreadsafeTimer.ThreadsafeTimer()
+        self.timer.timeout.connect(self.flush)
+        self.block = False
+        self.slot = weakref.ref(slot)
+        self.lastFlushTime = None
+        if slot is not None:
+            self.sigDelayed.connect(slot)
+        
+    def setDelay(self, delay):
+        self.delay = delay
+        
+    def signalReceived(self, *args):
+        """Received signal. Cancel previous timer and store args to be forwarded later."""
+        if self.block:
+            return
+        self.args = args
+        if self.rateLimit == 0:
+            self.timer.stop()
+            self.timer.start((self.delay*1000)+1)
+        else:
+            now = time()
+            if self.lastFlushTime is None:
+                leakTime = 0
+            else:
+                lastFlush = self.lastFlushTime
+                leakTime = max(0, (lastFlush + (1.0 / self.rateLimit)) - now)
+                
+            self.timer.stop()
+            self.timer.start((min(leakTime, self.delay)*1000)+1)
+            
+        
+    def flush(self):
+        """If there is a signal queued up, send it now."""
+        if self.args is None or self.block:
+            return False
+        #self.emit(self.signal, *self.args)
+        self.sigDelayed.emit(self.args)
+        self.args = None
+        self.timer.stop()
+        self.lastFlushTime = time()
+        return True
+        
+    def disconnect(self):
+        self.block = True
+        try:
+            self.signal.disconnect(self.signalReceived)
+        except:
+            pass
+        try:
+            self.sigDelayed.disconnect(self.slot())
+        except:
+            pass
+   
+   
+
+#def proxyConnect(source, signal, slot, delay=0.3):
+    #"""Connect a signal to a slot with delay. Returns the SignalProxy
+    #object that was created. Be sure to store this object so it is not
+    #garbage-collected immediately."""
+    #sp = SignalProxy(source, signal, delay)
+    #if source is None:
+        #sp.connect(sp, QtCore.SIGNAL('signal'), slot)
+    #else:
+        #sp.connect(sp, signal, slot)
+    #return sp
+    
+    
+if __name__ == '__main__':
+    from .Qt import QtGui
+    app = QtGui.QApplication([])
+    win = QtGui.QMainWindow()
+    spin = QtGui.QSpinBox()
+    win.setCentralWidget(spin)
+    win.show()
+    
+    def fn(*args):
+        print("Raw signal:", args)
+    def fn2(*args):
+        print("Delayed signal:", args)
+    
+    
+    spin.valueChanged.connect(fn)
+    #proxy = proxyConnect(spin, QtCore.SIGNAL('valueChanged(int)'), fn)
+    proxy = SignalProxy(spin.valueChanged, delay=0.5, slot=fn2)
+        
\ No newline at end of file
diff --git a/libs/pyqtgraph/ThreadsafeTimer.py b/libs/pyqtgraph/ThreadsafeTimer.py
new file mode 100644
index 0000000000000000000000000000000000000000..201469de31b61a6b9b533b9182d511986e701931
--- /dev/null
+++ b/libs/pyqtgraph/ThreadsafeTimer.py
@@ -0,0 +1,41 @@
+from .Qt import QtCore, QtGui
+
+class ThreadsafeTimer(QtCore.QObject):
+    """
+    Thread-safe replacement for QTimer.
+    """
+    
+    timeout = QtCore.Signal()
+    sigTimerStopRequested = QtCore.Signal()
+    sigTimerStartRequested = QtCore.Signal(object)
+    
+    def __init__(self):
+        QtCore.QObject.__init__(self)
+        self.timer = QtCore.QTimer()
+        self.timer.timeout.connect(self.timerFinished)
+        self.timer.moveToThread(QtCore.QCoreApplication.instance().thread())
+        self.moveToThread(QtCore.QCoreApplication.instance().thread())
+        self.sigTimerStopRequested.connect(self.stop, QtCore.Qt.QueuedConnection)
+        self.sigTimerStartRequested.connect(self.start, QtCore.Qt.QueuedConnection)
+        
+        
+    def start(self, timeout):
+        isGuiThread = QtCore.QThread.currentThread() == QtCore.QCoreApplication.instance().thread()
+        if isGuiThread:
+            #print "start timer", self, "from gui thread"
+            self.timer.start(timeout)
+        else:
+            #print "start timer", self, "from remote thread"
+            self.sigTimerStartRequested.emit(timeout)
+        
+    def stop(self):
+        isGuiThread = QtCore.QThread.currentThread() == QtCore.QCoreApplication.instance().thread()
+        if isGuiThread:
+            #print "stop timer", self, "from gui thread"
+            self.timer.stop()
+        else:
+            #print "stop timer", self, "from remote thread"
+            self.sigTimerStopRequested.emit()
+        
+    def timerFinished(self):
+        self.timeout.emit()
\ No newline at end of file
diff --git a/libs/pyqtgraph/Transform3D.py b/libs/pyqtgraph/Transform3D.py
new file mode 100644
index 0000000000000000000000000000000000000000..43b12de305c9d009a3fea0bdf7e949bafb30fd42
--- /dev/null
+++ b/libs/pyqtgraph/Transform3D.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+from .Qt import QtCore, QtGui
+from . import functions as fn
+import numpy as np
+
+class Transform3D(QtGui.QMatrix4x4):
+    """
+    Extension of QMatrix4x4 with some helpful methods added.
+    """
+    def __init__(self, *args):
+        QtGui.QMatrix4x4.__init__(self, *args)
+        
+    def matrix(self, nd=3):
+        if nd == 3:
+            return np.array(self.copyDataTo()).reshape(4,4)
+        elif nd == 2:
+            m = np.array(self.copyDataTo()).reshape(4,4)
+            m[2] = m[3]
+            m[:,2] = m[:,3]
+            return m[:3,:3]
+        else:
+            raise Exception("Argument 'nd' must be 2 or 3")
+        
+    def map(self, obj):
+        """
+        Extends QMatrix4x4.map() to allow mapping (3, ...) arrays of coordinates
+        """
+        if isinstance(obj, np.ndarray) and obj.ndim >= 2 and obj.shape[0] in (2,3):
+            return fn.transformCoordinates(self, obj)
+        else:
+            return QtGui.QMatrix4x4.map(self, obj)
+            
+    def inverted(self):
+        inv, b = QtGui.QMatrix4x4.inverted(self)
+        return Transform3D(inv), b
\ No newline at end of file
diff --git a/libs/pyqtgraph/Vector.py b/libs/pyqtgraph/Vector.py
new file mode 100644
index 0000000000000000000000000000000000000000..f2898e80b030ae0d98ee75b187f817cb622dac18
--- /dev/null
+++ b/libs/pyqtgraph/Vector.py
@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+"""
+Vector.py -  Extension of QVector3D which adds a few missing methods.
+Copyright 2010  Luke Campagnola
+Distributed under MIT/X11 license. See license.txt for more infomation.
+"""
+
+from .Qt import QtGui, QtCore, USE_PYSIDE
+import numpy as np
+
+class Vector(QtGui.QVector3D):
+    """Extension of QVector3D which adds a few helpful methods."""
+    
+    def __init__(self, *args):
+        if len(args) == 1:
+            if isinstance(args[0], QtCore.QSizeF):
+                QtGui.QVector3D.__init__(self, float(args[0].width()), float(args[0].height()), 0)
+                return
+            elif isinstance(args[0], QtCore.QPoint) or isinstance(args[0], QtCore.QPointF):
+                QtGui.QVector3D.__init__(self, float(args[0].x()), float(args[0].y()), 0)
+            elif hasattr(args[0], '__getitem__'):
+                vals = list(args[0])
+                if len(vals) == 2:
+                    vals.append(0)
+                if len(vals) != 3:
+                    raise Exception('Cannot init Vector with sequence of length %d' % len(args[0]))
+                QtGui.QVector3D.__init__(self, *vals)
+                return
+        elif len(args) == 2:
+            QtGui.QVector3D.__init__(self, args[0], args[1], 0)
+            return
+        QtGui.QVector3D.__init__(self, *args)
+
+    def __len__(self):
+        return 3
+
+    def __add__(self, b):
+        # workaround for pyside bug. see https://bugs.launchpad.net/pyqtgraph/+bug/1223173
+        if USE_PYSIDE and isinstance(b, QtGui.QVector3D):
+            b = Vector(b)
+        return QtGui.QVector3D.__add__(self, b)
+    
+    #def __reduce__(self):
+        #return (Point, (self.x(), self.y()))
+        
+    def __getitem__(self, i):
+        if i == 0:
+            return self.x()
+        elif i == 1:
+            return self.y()
+        elif i == 2:
+            return self.z()
+        else:
+            raise IndexError("Point has no index %s" % str(i))
+        
+    def __setitem__(self, i, x):
+        if i == 0:
+            return self.setX(x)
+        elif i == 1:
+            return self.setY(x)
+        elif i == 2:
+            return self.setZ(x)
+        else:
+            raise IndexError("Point has no index %s" % str(i))
+        
+    def __iter__(self):
+        yield(self.x())
+        yield(self.y())
+        yield(self.z())
+
+    def angle(self, a):
+        """Returns the angle in degrees between this vector and the vector a."""
+        n1 = self.length()
+        n2 = a.length()
+        if n1 == 0. or n2 == 0.:
+            return None
+        ## Probably this should be done with arctan2 instead..
+        ang = np.arccos(np.clip(QtGui.QVector3D.dotProduct(self, a) / (n1 * n2), -1.0, 1.0)) ### in radians
+#        c = self.crossProduct(a)
+#        if c > 0:
+#            ang *= -1.
+        return ang * 180. / np.pi
+
+    def __abs__(self):
+        return Vector(abs(self.x()), abs(self.y()), abs(self.z()))
+        
+        
\ No newline at end of file
diff --git a/libs/pyqtgraph/WidgetGroup.py b/libs/pyqtgraph/WidgetGroup.py
new file mode 100644
index 0000000000000000000000000000000000000000..d7e265c5faa41d4551ecf7ae0db3789fe81e58ce
--- /dev/null
+++ b/libs/pyqtgraph/WidgetGroup.py
@@ -0,0 +1,286 @@
+# -*- coding: utf-8 -*-
+"""
+WidgetGroup.py -  WidgetGroup class for easily managing lots of Qt widgets
+Copyright 2010  Luke Campagnola
+Distributed under MIT/X11 license. See license.txt for more infomation.
+
+This class addresses the problem of having to save and restore the state
+of a large group of widgets. 
+"""
+
+from .Qt import QtCore, QtGui, USE_PYQT5
+import weakref, inspect
+from .python2_3 import asUnicode
+
+
+__all__ = ['WidgetGroup']
+
+def splitterState(w):
+    s = str(w.saveState().toPercentEncoding())
+    return s
+    
+def restoreSplitter(w, s):
+    if type(s) is list:
+        w.setSizes(s)
+    elif type(s) is str:
+        w.restoreState(QtCore.QByteArray.fromPercentEncoding(s))
+    else:
+        print("Can't configure QSplitter using object of type", type(s))
+    if w.count() > 0:   ## make sure at least one item is not collapsed
+        for i in w.sizes():
+            if i > 0:
+                return
+        w.setSizes([50] * w.count())
+        
+def comboState(w):
+    ind = w.currentIndex()
+    data = w.itemData(ind)
+    #if not data.isValid():
+    if data is not None:
+        try:
+            if not data.isValid():
+                data = None
+            else:
+                data = data.toInt()[0]
+        except AttributeError:
+            pass
+    if data is None:
+        return asUnicode(w.itemText(ind))
+    else:
+        return data
+    
+def setComboState(w, v):
+    if type(v) is int:
+        #ind = w.findData(QtCore.QVariant(v))
+        ind = w.findData(v)
+        if ind > -1:
+            w.setCurrentIndex(ind)
+            return
+    w.setCurrentIndex(w.findText(str(v)))
+        
+
+class WidgetGroup(QtCore.QObject):
+    """This class takes a list of widgets and keeps an internal record of their
+    state that is always up to date. 
+    
+    Allows reading and writing from groups of widgets simultaneously.
+    """
+    
+    ## List of widget types that can be handled by WidgetGroup.
+    ## The value for each type is a tuple (change signal function, get function, set function, [auto-add children])
+    ## The change signal function that takes an object and returns a signal that is emitted any time the state of the widget changes, not just 
+    ##   when it is changed by user interaction. (for example, 'clicked' is not a valid signal here)
+    ## If the change signal is None, the value of the widget is not cached.
+    ## Custom widgets not in this list can be made to work with WidgetGroup by giving them a 'widgetGroupInterface' method
+    ##   which returns the tuple.
+    classes = {
+        QtGui.QSpinBox: 
+            (lambda w: w.valueChanged, 
+            QtGui.QSpinBox.value, 
+            QtGui.QSpinBox.setValue),
+        QtGui.QDoubleSpinBox: 
+            (lambda w: w.valueChanged, 
+            QtGui.QDoubleSpinBox.value, 
+            QtGui.QDoubleSpinBox.setValue),
+        QtGui.QSplitter: 
+            (None, 
+            splitterState,
+            restoreSplitter,
+            True),
+        QtGui.QCheckBox: 
+            (lambda w: w.stateChanged,
+            QtGui.QCheckBox.isChecked,
+            QtGui.QCheckBox.setChecked),
+        QtGui.QComboBox:
+            (lambda w: w.currentIndexChanged,
+            comboState,
+            setComboState),
+        QtGui.QGroupBox:
+            (lambda w: w.toggled,
+            QtGui.QGroupBox.isChecked,
+            QtGui.QGroupBox.setChecked,
+            True),
+        QtGui.QLineEdit:
+            (lambda w: w.editingFinished,
+            lambda w: str(w.text()),
+            QtGui.QLineEdit.setText),
+        QtGui.QRadioButton:
+            (lambda w: w.toggled,
+            QtGui.QRadioButton.isChecked,
+            QtGui.QRadioButton.setChecked),
+        QtGui.QSlider:
+            (lambda w: w.valueChanged,
+            QtGui.QSlider.value,
+            QtGui.QSlider.setValue),
+    }
+    
+    sigChanged = QtCore.Signal(str, object)
+    
+    
+    def __init__(self, widgetList=None):
+        """Initialize WidgetGroup, adding specified widgets into this group.
+        widgetList can be: 
+         - a list of widget specifications (widget, [name], [scale])
+         - a dict of name: widget pairs
+         - any QObject, and all compatible child widgets will be added recursively.
+        
+        The 'scale' parameter for each widget allows QSpinBox to display a different value than the value recorded
+        in the group state (for example, the program may set a spin box value to 100e-6 and have it displayed as 100 to the user)
+        """
+        QtCore.QObject.__init__(self)
+        self.widgetList = weakref.WeakKeyDictionary() # Make sure widgets don't stick around just because they are listed here
+        self.scales = weakref.WeakKeyDictionary()
+        self.cache = {}  ## name:value pairs
+        self.uncachedWidgets = weakref.WeakKeyDictionary()
+        if isinstance(widgetList, QtCore.QObject):
+            self.autoAdd(widgetList)
+        elif isinstance(widgetList, list):
+            for w in widgetList:
+                self.addWidget(*w)
+        elif isinstance(widgetList, dict):
+            for name, w in widgetList.items():
+                self.addWidget(w, name)
+        elif widgetList is None:
+            return
+        else:
+            raise Exception("Wrong argument type %s" % type(widgetList))
+        
+    def addWidget(self, w, name=None, scale=None):
+        if not self.acceptsType(w):
+            raise Exception("Widget type %s not supported by WidgetGroup" % type(w))
+        if name is None:
+            name = str(w.objectName())
+        if name == '':
+            raise Exception("Cannot add widget '%s' without a name." % str(w))
+        self.widgetList[w] = name
+        self.scales[w] = scale
+        self.readWidget(w)
+            
+        if type(w) in WidgetGroup.classes:
+            signal = WidgetGroup.classes[type(w)][0]
+        else:
+            signal = w.widgetGroupInterface()[0]
+            
+        if signal is not None:
+            if inspect.isfunction(signal) or inspect.ismethod(signal):
+                signal = signal(w)
+            signal.connect(self.mkChangeCallback(w))
+        else:
+            self.uncachedWidgets[w] = None
+       
+    def findWidget(self, name):
+        for w in self.widgetList:
+            if self.widgetList[w] == name:
+                return w
+        return None
+       
+    def interface(self, obj):
+        t = type(obj)
+        if t in WidgetGroup.classes:
+            return WidgetGroup.classes[t]
+        else:
+            return obj.widgetGroupInterface()
+
+    def checkForChildren(self, obj):
+        """Return true if we should automatically search the children of this object for more."""
+        iface = self.interface(obj)
+        return (len(iface) > 3 and iface[3])
+       
+    def autoAdd(self, obj):
+        ## Find all children of this object and add them if possible.
+        accepted = self.acceptsType(obj)
+        if accepted:
+            #print "%s  auto add %s" % (self.objectName(), obj.objectName())
+            self.addWidget(obj)
+            
+        if not accepted or self.checkForChildren(obj):
+            for c in obj.children():
+                self.autoAdd(c)
+
+    def acceptsType(self, obj):
+        for c in WidgetGroup.classes:
+            if isinstance(obj, c):
+                return True
+        if hasattr(obj, 'widgetGroupInterface'):
+            return True
+        return False
+
+    def setScale(self, widget, scale):
+        val = self.readWidget(widget)
+        self.scales[widget] = scale
+        self.setWidget(widget, val)
+
+    def mkChangeCallback(self, w):
+        return lambda *args: self.widgetChanged(w, *args)
+        
+    def widgetChanged(self, w, *args):
+        n = self.widgetList[w]
+        v1 = self.cache[n]
+        v2 = self.readWidget(w)
+        if v1 != v2:
+            if not USE_PYQT5:
+                # Old signal kept for backward compatibility.
+                self.emit(QtCore.SIGNAL('changed'), self.widgetList[w], v2)
+            self.sigChanged.emit(self.widgetList[w], v2)
+        
+    def state(self):
+        for w in self.uncachedWidgets:
+            self.readWidget(w)
+        return self.cache.copy()
+
+    def setState(self, s):
+        for w in self.widgetList:
+            n = self.widgetList[w]
+            if n not in s:
+                continue
+            self.setWidget(w, s[n])
+
+    def readWidget(self, w):
+        if type(w) in WidgetGroup.classes:
+            getFunc = WidgetGroup.classes[type(w)][1]
+        else:
+            getFunc = w.widgetGroupInterface()[1]
+        
+        if getFunc is None:
+            return None
+            
+        ## if the getter function provided in the interface is a bound method,
+        ## then just call the method directly. Otherwise, pass in the widget as the first arg
+        ## to the function.
+        if inspect.ismethod(getFunc) and getFunc.__self__ is not None:  
+            val = getFunc()
+        else:
+            val = getFunc(w)
+            
+        if self.scales[w] is not None:
+            val /= self.scales[w]
+        #if isinstance(val, QtCore.QString):
+            #val = str(val)
+        n = self.widgetList[w]
+        self.cache[n] = val
+        return val
+
+    def setWidget(self, w, v):
+        v1 = v
+        if self.scales[w] is not None:
+            v *= self.scales[w]
+        
+        if type(w) in WidgetGroup.classes:
+            setFunc = WidgetGroup.classes[type(w)][2]
+        else:
+            setFunc = w.widgetGroupInterface()[2]
+            
+        ## if the setter function provided in the interface is a bound method,
+        ## then just call the method directly. Otherwise, pass in the widget as the first arg
+        ## to the function.
+        if inspect.ismethod(setFunc) and setFunc.__self__ is not None:  
+            setFunc(v)
+        else:
+            setFunc(w, v)
+            
+        #name = self.widgetList[w]
+        #if name in self.cache and (self.cache[name] != v1):
+            #print "%s: Cached value %s != set value %s" % (name, str(self.cache[name]), str(v1))
+
+        
+        
\ No newline at end of file
diff --git a/libs/pyqtgraph/__init__.py b/libs/pyqtgraph/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..687208f83e372fc6212b6a470bbe572e448fb1df
--- /dev/null
+++ b/libs/pyqtgraph/__init__.py
@@ -0,0 +1,439 @@
+# -*- coding: utf-8 -*-
+"""
+PyQtGraph - Scientific Graphics and GUI Library for Python
+www.pyqtgraph.org
+"""
+
+__version__ = '0.9.10'
+
+### import all the goodies and add some helper functions for easy CLI use
+
+## 'Qt' is a local module; it is intended mainly to cover up the differences
+## between PyQt4 and PySide.
+from .Qt import QtGui
+
+## not really safe--If we accidentally create another QApplication, the process hangs (and it is very difficult to trace the cause)
+#if QtGui.QApplication.instance() is None:
+    #app = QtGui.QApplication([])
+
+import numpy  ## pyqtgraph requires numpy
+              ## (import here to avoid massive error dump later on if numpy is not available)
+
+import os, sys
+
+## check python version
+## Allow anything >= 2.7
+if sys.version_info[0] < 2 or (sys.version_info[0] == 2 and sys.version_info[1] < 6):
+    raise Exception("Pyqtgraph requires Python version 2.6 or greater (this is %d.%d)" % (sys.version_info[0], sys.version_info[1]))
+
+## helpers for 2/3 compatibility
+from . import python2_3
+
+## install workarounds for numpy bugs
+from . import numpy_fix
+
+## in general openGL is poorly supported with Qt+GraphicsView.
+## we only enable it where the performance benefit is critical.
+## Note this only applies to 2D graphics; 3D graphics always use OpenGL.
+if 'linux' in sys.platform:  ## linux has numerous bugs in opengl implementation
+    useOpenGL = False
+elif 'darwin' in sys.platform: ## openGL can have a major impact on mac, but also has serious bugs
+    useOpenGL = False
+    if QtGui.QApplication.instance() is not None:
+        print('Warning: QApplication was created before pyqtgraph was imported; there may be problems (to avoid bugs, call QApplication.setGraphicsSystem("raster") before the QApplication is created).')
+    if QtGui.QApplication.setGraphicsSystem:
+        QtGui.QApplication.setGraphicsSystem('raster')  ## work around a variety of bugs in the native graphics system 
+else:
+    useOpenGL = False  ## on windows there's a more even performance / bugginess tradeoff. 
+                
+CONFIG_OPTIONS = {
+    'useOpenGL': useOpenGL, ## by default, this is platform-dependent (see widgets/GraphicsView). Set to True or False to explicitly enable/disable opengl.
+    'leftButtonPan': True,  ## if false, left button drags a rubber band for zooming in viewbox
+    'foreground': 'd',  ## default foreground color for axes, labels, etc.
+    'background': 'k',        ## default background for GraphicsWidget
+    'antialias': False,
+    'editorCommand': None,  ## command used to invoke code editor from ConsoleWidgets
+    'useWeave': False,       ## Use weave to speed up some operations, if it is available
+    'weaveDebug': False,    ## Print full error message if weave compile fails
+    'exitCleanup': True,    ## Attempt to work around some exit crash bugs in PyQt and PySide
+    'enableExperimental': False, ## Enable experimental features (the curious can search for this key in the code)
+    'crashWarning': False,  # If True, print warnings about situations that may result in a crash
+} 
+
+
+def setConfigOption(opt, value):
+    CONFIG_OPTIONS[opt] = value
+
+def setConfigOptions(**opts):
+    CONFIG_OPTIONS.update(opts)
+
+def getConfigOption(opt):
+    return CONFIG_OPTIONS[opt]
+
+
+def systemInfo():
+    print("sys.platform: %s" % sys.platform)
+    print("sys.version: %s" % sys.version)
+    from .Qt import VERSION_INFO
+    print("qt bindings: %s" % VERSION_INFO)
+    
+    global __version__
+    rev = None
+    if __version__ is None:  ## this code was probably checked out from bzr; look up the last-revision file
+        lastRevFile = os.path.join(os.path.dirname(__file__), '..', '.bzr', 'branch', 'last-revision')
+        if os.path.exists(lastRevFile):
+            rev = open(lastRevFile, 'r').read().strip()
+    
+    print("pyqtgraph: %s; %s" % (__version__, rev))
+    print("config:")
+    import pprint
+    pprint.pprint(CONFIG_OPTIONS)
+
+## Rename orphaned .pyc files. This is *probably* safe :)
+## We only do this if __version__ is None, indicating the code was probably pulled
+## from the repository. 
+def renamePyc(startDir):
+    ### Used to rename orphaned .pyc files
+    ### When a python file changes its location in the repository, usually the .pyc file
+    ### is left behind, possibly causing mysterious and difficult to track bugs. 
+
+    ### Note that this is no longer necessary for python 3.2; from PEP 3147:
+    ### "If the py source file is missing, the pyc file inside __pycache__ will be ignored. 
+    ### This eliminates the problem of accidental stale pyc file imports."
+    
+    printed = False
+    startDir = os.path.abspath(startDir)
+    for path, dirs, files in os.walk(startDir):
+        if '__pycache__' in path:
+            continue
+        for f in files:
+            fileName = os.path.join(path, f)
+            base, ext = os.path.splitext(fileName)
+            py = base + ".py"
+            if ext == '.pyc' and not os.path.isfile(py):
+                if not printed:
+                    print("NOTE: Renaming orphaned .pyc files:")
+                    printed = True
+                n = 1
+                while True:
+                    name2 = fileName + ".renamed%d" % n
+                    if not os.path.exists(name2):
+                        break
+                    n += 1
+                print("  " + fileName + "  ==>")
+                print("  " + name2)
+                os.rename(fileName, name2)
+                
+path = os.path.split(__file__)[0]
+if __version__ is None and not hasattr(sys, 'frozen') and sys.version_info[0] == 2: ## If we are frozen, there's a good chance we don't have the original .py files anymore.
+    renamePyc(path)
+
+
+## Import almost everything to make it available from a single namespace
+## don't import the more complex systems--canvas, parametertree, flowchart, dockarea
+## these must be imported separately.
+#from . import frozenSupport
+#def importModules(path, globals, locals, excludes=()):
+    #"""Import all modules residing within *path*, return a dict of name: module pairs.
+    
+    #Note that *path* MUST be relative to the module doing the import.    
+    #"""
+    #d = os.path.join(os.path.split(globals['__file__'])[0], path)
+    #files = set()
+    #for f in frozenSupport.listdir(d):
+        #if frozenSupport.isdir(os.path.join(d, f)) and f not in ['__pycache__', 'tests']:
+            #files.add(f)
+        #elif f[-3:] == '.py' and f != '__init__.py':
+            #files.add(f[:-3])
+        #elif f[-4:] == '.pyc' and f != '__init__.pyc':
+            #files.add(f[:-4])
+        
+    #mods = {}
+    #path = path.replace(os.sep, '.')
+    #for modName in files:
+        #if modName in excludes:
+            #continue
+        #try:
+            #if len(path) > 0:
+                #modName = path + '.' + modName
+            #print( "from .%s import * " % modName)
+            #mod = __import__(modName, globals, locals, ['*'], 1)
+            #mods[modName] = mod
+        #except:
+            #import traceback
+            #traceback.print_stack()
+            #sys.excepthook(*sys.exc_info())
+            #print("[Error importing module: %s]" % modName)
+            
+    #return mods
+
+#def importAll(path, globals, locals, excludes=()):
+    #"""Given a list of modules, import all names from each module into the global namespace."""
+    #mods = importModules(path, globals, locals, excludes)
+    #for mod in mods.values():
+        #if hasattr(mod, '__all__'):
+            #names = mod.__all__
+        #else:
+            #names = [n for n in dir(mod) if n[0] != '_']
+        #for k in names:
+            #if hasattr(mod, k):
+                #globals[k] = getattr(mod, k)
+
+# Dynamic imports are disabled. This causes too many problems.
+#importAll('graphicsItems', globals(), locals())
+#importAll('widgets', globals(), locals(),
+          #excludes=['MatplotlibWidget', 'RawImageWidget', 'RemoteGraphicsView'])
+
+from .graphicsItems.VTickGroup import * 
+from .graphicsItems.GraphicsWidget import * 
+from .graphicsItems.ScaleBar import * 
+from .graphicsItems.PlotDataItem import * 
+from .graphicsItems.GraphItem import * 
+from .graphicsItems.TextItem import * 
+from .graphicsItems.GraphicsLayout import * 
+from .graphicsItems.UIGraphicsItem import * 
+from .graphicsItems.GraphicsObject import * 
+from .graphicsItems.PlotItem import * 
+from .graphicsItems.ROI import * 
+from .graphicsItems.InfiniteLine import * 
+from .graphicsItems.HistogramLUTItem import * 
+from .graphicsItems.GridItem import * 
+from .graphicsItems.GradientLegend import * 
+from .graphicsItems.GraphicsItem import * 
+from .graphicsItems.BarGraphItem import * 
+from .graphicsItems.ViewBox import * 
+from .graphicsItems.ArrowItem import * 
+from .graphicsItems.ImageItem import * 
+from .graphicsItems.AxisItem import * 
+from .graphicsItems.LabelItem import * 
+from .graphicsItems.CurvePoint import * 
+from .graphicsItems.GraphicsWidgetAnchor import * 
+from .graphicsItems.PlotCurveItem import * 
+from .graphicsItems.ButtonItem import * 
+from .graphicsItems.GradientEditorItem import * 
+from .graphicsItems.MultiPlotItem import * 
+from .graphicsItems.ErrorBarItem import * 
+from .graphicsItems.IsocurveItem import * 
+from .graphicsItems.LinearRegionItem import * 
+from .graphicsItems.FillBetweenItem import * 
+from .graphicsItems.LegendItem import * 
+from .graphicsItems.ScatterPlotItem import * 
+from .graphicsItems.ItemGroup import * 
+
+from .widgets.MultiPlotWidget import * 
+from .widgets.ScatterPlotWidget import * 
+from .widgets.ColorMapWidget import * 
+from .widgets.FileDialog import * 
+from .widgets.ValueLabel import * 
+from .widgets.HistogramLUTWidget import * 
+from .widgets.CheckTable import * 
+from .widgets.BusyCursor import * 
+from .widgets.PlotWidget import * 
+from .widgets.ComboBox import * 
+from .widgets.GradientWidget import * 
+from .widgets.DataFilterWidget import * 
+from .widgets.SpinBox import * 
+from .widgets.JoystickButton import * 
+from .widgets.GraphicsLayoutWidget import * 
+from .widgets.TreeWidget import * 
+from .widgets.PathButton import * 
+from .widgets.VerticalLabel import * 
+from .widgets.FeedbackButton import * 
+from .widgets.ColorButton import * 
+from .widgets.DataTreeWidget import * 
+from .widgets.GraphicsView import * 
+from .widgets.LayoutWidget import * 
+from .widgets.TableWidget import * 
+from .widgets.ProgressDialog import *
+
+from .imageview import *
+from .WidgetGroup import *
+from .Point import Point
+from .Vector import Vector
+from .SRTTransform import SRTTransform
+from .Transform3D import Transform3D
+from .SRTTransform3D import SRTTransform3D
+from .functions import *
+from .graphicsWindows import *
+from .SignalProxy import *
+from .colormap import *
+from .ptime import time
+from .Qt import isQObjectAlive
+
+
+##############################################################
+## PyQt and PySide both are prone to crashing on exit. 
+## There are two general approaches to dealing with this:
+##  1. Install atexit handlers that assist in tearing down to avoid crashes.
+##     This helps, but is never perfect.
+##  2. Terminate the process before python starts tearing down
+##     This is potentially dangerous
+
+## Attempts to work around exit crashes:
+import atexit
+_cleanupCalled = False
+def cleanup():
+    global _cleanupCalled
+    if _cleanupCalled:
+        return
+    
+    if not getConfigOption('exitCleanup'):
+        return
+    
+    ViewBox.quit()  ## tell ViewBox that it doesn't need to deregister views anymore.
+    
+    ## Workaround for Qt exit crash:
+    ## ALL QGraphicsItems must have a scene before they are deleted.
+    ## This is potentially very expensive, but preferred over crashing.
+    ## Note: this appears to be fixed in PySide as of 2012.12, but it should be left in for a while longer..
+    if QtGui.QApplication.instance() is None:
+        return
+    import gc
+    s = QtGui.QGraphicsScene()
+    for o in gc.get_objects():
+        try:
+            if isinstance(o, QtGui.QGraphicsItem) and isQObjectAlive(o) and o.scene() is None:
+                if getConfigOption('crashWarning'):
+                    sys.stderr.write('Error: graphics item without scene. '
+                        'Make sure ViewBox.close() and GraphicsView.close() '
+                        'are properly called before app shutdown (%s)\n' % (o,))
+                
+                s.addItem(o)
+        except RuntimeError:  ## occurs if a python wrapper no longer has its underlying C++ object
+            continue
+    _cleanupCalled = True
+
+atexit.register(cleanup)
+
+# Call cleanup when QApplication quits. This is necessary because sometimes
+# the QApplication will quit before the atexit callbacks are invoked.
+# Note: cannot connect this function until QApplication has been created, so
+# instead we have GraphicsView.__init__ call this for us.
+_cleanupConnected = False
+def _connectCleanup():
+    global _cleanupConnected
+    if _cleanupConnected:
+        return
+    QtGui.QApplication.instance().aboutToQuit.connect(cleanup)
+    _cleanupConnected = True
+
+
+## Optional function for exiting immediately (with some manual teardown)
+def exit():
+    """
+    Causes python to exit without garbage-collecting any objects, and thus avoids
+    calling object destructor methods. This is a sledgehammer workaround for 
+    a variety of bugs in PyQt and Pyside that cause crashes on exit.
+    
+    This function does the following in an attempt to 'safely' terminate
+    the process:
+    
+    * Invoke atexit callbacks
+    * Close all open file handles
+    * os._exit()
+    
+    Note: there is some potential for causing damage with this function if you
+    are using objects that _require_ their destructors to be called (for example,
+    to properly terminate log files, disconnect from devices, etc). Situations
+    like this are probably quite rare, but use at your own risk.
+    """
+    
+    ## first disable our own cleanup function; won't be needing it.
+    setConfigOptions(exitCleanup=False)
+    
+    ## invoke atexit callbacks
+    atexit._run_exitfuncs()
+    
+    ## close file handles
+    if sys.platform == 'darwin':
+        for fd in xrange(3, 4096):
+            if fd not in [7]:  # trying to close 7 produces an illegal instruction on the Mac.
+                os.close(fd)
+    else:
+        os.closerange(3, 4096) ## just guessing on the maximum descriptor count..
+
+    os._exit(0)
+    
+
+
+## Convenience functions for command-line use
+
+plots = []
+images = []
+QAPP = None
+
+def plot(*args, **kargs):
+    """
+    Create and return a :class:`PlotWindow <pyqtgraph.PlotWindow>` 
+    (this is just a window with :class:`PlotWidget <pyqtgraph.PlotWidget>` inside), plot data in it.
+    Accepts a *title* argument to set the title of the window.
+    All other arguments are used to plot data. (see :func:`PlotItem.plot() <pyqtgraph.PlotItem.plot>`)
+    """
+    mkQApp()
+    #if 'title' in kargs:
+        #w = PlotWindow(title=kargs['title'])
+        #del kargs['title']
+    #else:
+        #w = PlotWindow()
+    #if len(args)+len(kargs) > 0:
+        #w.plot(*args, **kargs)
+        
+    pwArgList = ['title', 'labels', 'name', 'left', 'right', 'top', 'bottom', 'background']
+    pwArgs = {}
+    dataArgs = {}
+    for k in kargs:
+        if k in pwArgList:
+            pwArgs[k] = kargs[k]
+        else:
+            dataArgs[k] = kargs[k]
+        
+    w = PlotWindow(**pwArgs)
+    if len(args) > 0 or len(dataArgs) > 0:
+        w.plot(*args, **dataArgs)
+    plots.append(w)
+    w.show()
+    return w
+    
+def image(*args, **kargs):
+    """
+    Create and return an :class:`ImageWindow <pyqtgraph.ImageWindow>` 
+    (this is just a window with :class:`ImageView <pyqtgraph.ImageView>` widget inside), show image data inside.
+    Will show 2D or 3D image data.
+    Accepts a *title* argument to set the title of the window.
+    All other arguments are used to show data. (see :func:`ImageView.setImage() <pyqtgraph.ImageView.setImage>`)
+    """
+    mkQApp()
+    w = ImageWindow(*args, **kargs)
+    images.append(w)
+    w.show()
+    return w
+show = image  ## for backward compatibility
+
+def dbg(*args, **kwds):
+    """
+    Create a console window and begin watching for exceptions.
+    
+    All arguments are passed to :func:`ConsoleWidget.__init__() <pyqtgraph.console.ConsoleWidget.__init__>`.
+    """
+    mkQApp()
+    from . import console
+    c = console.ConsoleWidget(*args, **kwds)
+    c.catchAllExceptions()
+    c.show()
+    global consoles
+    try:
+        consoles.append(c)
+    except NameError:
+        consoles = [c]
+    return c
+    
+    
+def mkQApp():
+    global QAPP
+    inst = QtGui.QApplication.instance()
+    if inst is None:
+        QAPP = QtGui.QApplication([])
+    else:
+        QAPP = inst
+    return QAPP
+        
diff --git a/libs/pyqtgraph/canvas/Canvas.py b/libs/pyqtgraph/canvas/Canvas.py
new file mode 100644
index 0000000000000000000000000000000000000000..4de891f795e26fe44e2cdcd6b191d8504799cf77
--- /dev/null
+++ b/libs/pyqtgraph/canvas/Canvas.py
@@ -0,0 +1,604 @@
+# -*- coding: utf-8 -*-
+if __name__ == '__main__':
+    import sys, os
+    md = os.path.dirname(os.path.abspath(__file__))
+    sys.path = [os.path.dirname(md), os.path.join(md, '..', '..', '..')] + sys.path
+
+from ..Qt import QtGui, QtCore, USE_PYSIDE
+from ..graphicsItems.ROI import ROI
+from ..graphicsItems.ViewBox import ViewBox
+from ..graphicsItems.GridItem import GridItem
+
+if USE_PYSIDE:
+    from .CanvasTemplate_pyside import *
+else:
+    from .CanvasTemplate_pyqt import *
+    
+import numpy as np
+from .. import debug
+import weakref
+from .CanvasManager import CanvasManager
+from .CanvasItem import CanvasItem, GroupCanvasItem
+
+class Canvas(QtGui.QWidget):
+    
+    sigSelectionChanged = QtCore.Signal(object, object)
+    sigItemTransformChanged = QtCore.Signal(object, object)
+    sigItemTransformChangeFinished = QtCore.Signal(object, object)
+    
+    def __init__(self, parent=None, allowTransforms=True, hideCtrl=False, name=None):
+        QtGui.QWidget.__init__(self, parent)
+        self.ui = Ui_Form()
+        self.ui.setupUi(self)
+        #self.view = self.ui.view
+        self.view = ViewBox()
+        self.ui.view.setCentralItem(self.view)
+        self.itemList = self.ui.itemList
+        self.itemList.setSelectionMode(self.itemList.ExtendedSelection)
+        self.allowTransforms = allowTransforms
+        self.multiSelectBox = SelectBox()
+        self.view.addItem(self.multiSelectBox)
+        self.multiSelectBox.hide()
+        self.multiSelectBox.setZValue(1e6)
+        self.ui.mirrorSelectionBtn.hide()
+        self.ui.reflectSelectionBtn.hide()
+        self.ui.resetTransformsBtn.hide()
+        
+        self.redirect = None  ## which canvas to redirect items to
+        self.items = []
+        
+        #self.view.enableMouse()
+        self.view.setAspectLocked(True)
+        #self.view.invertY()
+        
+        grid = GridItem()
+        self.grid = CanvasItem(grid, name='Grid', movable=False)
+        self.addItem(self.grid)
+        
+        self.hideBtn = QtGui.QPushButton('>', self)
+        self.hideBtn.setFixedWidth(20)
+        self.hideBtn.setFixedHeight(20)
+        self.ctrlSize = 200
+        self.sizeApplied = False
+        self.hideBtn.clicked.connect(self.hideBtnClicked)
+        self.ui.splitter.splitterMoved.connect(self.splitterMoved)
+        
+        self.ui.itemList.itemChanged.connect(self.treeItemChanged)
+        self.ui.itemList.sigItemMoved.connect(self.treeItemMoved)
+        self.ui.itemList.itemSelectionChanged.connect(self.treeItemSelected)
+        self.ui.autoRangeBtn.clicked.connect(self.autoRange)
+        #self.ui.storeSvgBtn.clicked.connect(self.storeSvg)
+        #self.ui.storePngBtn.clicked.connect(self.storePng)
+        self.ui.redirectCheck.toggled.connect(self.updateRedirect)
+        self.ui.redirectCombo.currentIndexChanged.connect(self.updateRedirect)
+        self.multiSelectBox.sigRegionChanged.connect(self.multiSelectBoxChanged)
+        self.multiSelectBox.sigRegionChangeFinished.connect(self.multiSelectBoxChangeFinished)
+        self.ui.mirrorSelectionBtn.clicked.connect(self.mirrorSelectionClicked)
+        self.ui.reflectSelectionBtn.clicked.connect(self.reflectSelectionClicked)
+        self.ui.resetTransformsBtn.clicked.connect(self.resetTransformsClicked)
+        
+        self.resizeEvent()
+        if hideCtrl:
+            self.hideBtnClicked()
+            
+        if name is not None:
+            self.registeredName = CanvasManager.instance().registerCanvas(self, name)
+            self.ui.redirectCombo.setHostName(self.registeredName)
+            
+        self.menu = QtGui.QMenu()
+        #self.menu.setTitle("Image")
+        remAct = QtGui.QAction("Remove item", self.menu)
+        remAct.triggered.connect(self.removeClicked)
+        self.menu.addAction(remAct)
+        self.menu.remAct = remAct
+        self.ui.itemList.contextMenuEvent = self.itemListContextMenuEvent
+            
+
+    #def storeSvg(self):
+        #from pyqtgraph.GraphicsScene.exportDialog import ExportDialog
+        #ex = ExportDialog(self.ui.view)
+        #ex.show()
+
+    #def storePng(self):
+        #self.ui.view.writeImage()
+
+    def splitterMoved(self):
+        self.resizeEvent()
+
+    def hideBtnClicked(self):
+        ctrlSize = self.ui.splitter.sizes()[1]
+        if ctrlSize == 0:
+            cs = self.ctrlSize
+            w = self.ui.splitter.size().width()
+            if cs > w:
+                cs = w - 20
+            self.ui.splitter.setSizes([w-cs, cs])
+            self.hideBtn.setText('>')
+        else:
+            self.ctrlSize = ctrlSize
+            self.ui.splitter.setSizes([100, 0])
+            self.hideBtn.setText('<')
+        self.resizeEvent()
+
+    def autoRange(self):
+        self.view.autoRange()
+
+    def resizeEvent(self, ev=None):
+        if ev is not None:
+            QtGui.QWidget.resizeEvent(self, ev)
+        self.hideBtn.move(self.ui.view.size().width() - self.hideBtn.width(), 0)
+        
+        if not self.sizeApplied:
+            self.sizeApplied = True
+            s = min(self.width(), max(100, min(200, self.width()*0.25)))
+            s2 = self.width()-s
+            self.ui.splitter.setSizes([s2, s])
+
+    
+    def updateRedirect(self, *args):
+        ### Decide whether/where to redirect items and make it so
+        cname = str(self.ui.redirectCombo.currentText())
+        man = CanvasManager.instance()
+        if self.ui.redirectCheck.isChecked() and cname != '':
+            redirect = man.getCanvas(cname)
+        else:
+            redirect = None
+            
+        if self.redirect is redirect:
+            return
+            
+        self.redirect = redirect
+        if redirect is None:
+            self.reclaimItems()
+        else:
+            self.redirectItems(redirect)
+
+    
+    def redirectItems(self, canvas):
+        for i in self.items:
+            if i is self.grid:
+                continue
+            li = i.listItem
+            parent = li.parent()
+            if parent is None:
+                tree = li.treeWidget()
+                if tree is None:
+                    print("Skipping item", i, i.name)
+                    continue
+                tree.removeTopLevelItem(li)
+            else:
+                parent.removeChild(li)
+            canvas.addItem(i)
+            
+
+    def reclaimItems(self):
+        items = self.items
+        #self.items = {'Grid': items['Grid']}
+        #del items['Grid']
+        self.items = [self.grid]
+        items.remove(self.grid)
+        
+        for i in items:
+            i.canvas.removeItem(i)
+            self.addItem(i)
+
+    def treeItemChanged(self, item, col):
+        #gi = self.items.get(item.name, None)
+        #if gi is None:
+            #return
+        try:
+            citem = item.canvasItem()
+        except AttributeError:
+            return
+        if item.checkState(0) == QtCore.Qt.Checked:
+            for i in range(item.childCount()):
+                item.child(i).setCheckState(0, QtCore.Qt.Checked)
+            citem.show()
+        else:
+            for i in range(item.childCount()):
+                item.child(i).setCheckState(0, QtCore.Qt.Unchecked)
+            citem.hide()
+
+    def treeItemSelected(self):
+        sel = self.selectedItems()
+        #sel = []
+        #for listItem in self.itemList.selectedItems():
+            #if hasattr(listItem, 'canvasItem') and listItem.canvasItem is not None:
+                #sel.append(listItem.canvasItem)
+        #sel = [self.items[item.name] for item in sel]
+        
+        if len(sel) == 0:
+            #self.selectWidget.hide()
+            return
+            
+        multi = len(sel) > 1
+        for i in self.items:
+            #i.ctrlWidget().hide()
+            ## updated the selected state of every item
+            i.selectionChanged(i in sel, multi)
+            
+        if len(sel)==1:
+            #item = sel[0]
+            #item.ctrlWidget().show()
+            self.multiSelectBox.hide()
+            self.ui.mirrorSelectionBtn.hide()
+            self.ui.reflectSelectionBtn.hide()
+            self.ui.resetTransformsBtn.hide()
+        elif len(sel) > 1:
+            self.showMultiSelectBox()
+        
+        #if item.isMovable():
+            #self.selectBox.setPos(item.item.pos())
+            #self.selectBox.setSize(item.item.sceneBoundingRect().size())
+            #self.selectBox.show()
+        #else:
+            #self.selectBox.hide()
+        
+        #self.emit(QtCore.SIGNAL('itemSelected'), self, item)
+        self.sigSelectionChanged.emit(self, sel)
+        
+    def selectedItems(self):
+        """
+        Return list of all selected canvasItems
+        """
+        return [item.canvasItem() for item in self.itemList.selectedItems() if item.canvasItem() is not None]
+        
+    #def selectedItem(self):
+        #sel = self.itemList.selectedItems()
+        #if sel is None or len(sel) < 1:
+            #return
+        #return self.items.get(sel[0].name, None)
+
+    def selectItem(self, item):
+        li = item.listItem
+        #li = self.getListItem(item.name())
+        #print "select", li
+        self.itemList.setCurrentItem(li)
+
+        
+        
+    def showMultiSelectBox(self):
+        ## Get list of selected canvas items
+        items = self.selectedItems()
+        
+        rect = self.view.itemBoundingRect(items[0].graphicsItem())
+        for i in items:
+            if not i.isMovable():  ## all items in selection must be movable
+                return
+            br = self.view.itemBoundingRect(i.graphicsItem())
+            rect = rect|br
+            
+        self.multiSelectBox.blockSignals(True)
+        self.multiSelectBox.setPos([rect.x(), rect.y()])
+        self.multiSelectBox.setSize(rect.size())
+        self.multiSelectBox.setAngle(0)
+        self.multiSelectBox.blockSignals(False)
+        
+        self.multiSelectBox.show()
+        
+        self.ui.mirrorSelectionBtn.show()
+        self.ui.reflectSelectionBtn.show()
+        self.ui.resetTransformsBtn.show()
+        #self.multiSelectBoxBase = self.multiSelectBox.getState().copy()
+
+    def mirrorSelectionClicked(self):
+        for ci in self.selectedItems():
+            ci.mirrorY()
+        self.showMultiSelectBox()
+
+    def reflectSelectionClicked(self):
+        for ci in self.selectedItems():
+            ci.mirrorXY()
+        self.showMultiSelectBox()
+            
+    def resetTransformsClicked(self):
+        for i in self.selectedItems():
+            i.resetTransformClicked()
+        self.showMultiSelectBox()
+
+    def multiSelectBoxChanged(self):
+        self.multiSelectBoxMoved()
+        
+    def multiSelectBoxChangeFinished(self):
+        for ci in self.selectedItems():
+            ci.applyTemporaryTransform()
+            ci.sigTransformChangeFinished.emit(ci)
+        
+    def multiSelectBoxMoved(self):
+        transform = self.multiSelectBox.getGlobalTransform()
+        for ci in self.selectedItems():
+            ci.setTemporaryTransform(transform)
+            ci.sigTransformChanged.emit(ci)
+        
+
+    def addGraphicsItem(self, item, **opts):
+        """Add a new GraphicsItem to the scene at pos.
+        Common options are name, pos, scale, and z
+        """
+        citem = CanvasItem(item, **opts)
+        item._canvasItem = citem
+        self.addItem(citem)
+        return citem
+            
+
+    def addGroup(self, name, **kargs):
+        group = GroupCanvasItem(name=name)
+        self.addItem(group, **kargs)
+        return group
+        
+
+    def addItem(self, citem):
+        """
+        Add an item to the canvas. 
+        """
+        
+        ## Check for redirections
+        if self.redirect is not None:
+            name = self.redirect.addItem(citem)
+            self.items.append(citem)
+            return name
+
+        if not self.allowTransforms:
+            citem.setMovable(False)
+
+        citem.sigTransformChanged.connect(self.itemTransformChanged)
+        citem.sigTransformChangeFinished.connect(self.itemTransformChangeFinished)
+        citem.sigVisibilityChanged.connect(self.itemVisibilityChanged)
+
+        
+        ## Determine name to use in the item list
+        name = citem.opts['name']
+        if name is None:
+            name = 'item'
+        newname = name
+
+        ## If name already exists, append a number to the end
+        ## NAH. Let items have the same name if they really want.
+        #c=0
+        #while newname in self.items:
+            #c += 1
+            #newname = name + '_%03d' %c
+        #name = newname
+            
+        ## find parent and add item to tree
+        #currentNode = self.itemList.invisibleRootItem()
+        insertLocation = 0
+        #print "Inserting node:", name
+        
+            
+        ## determine parent list item where this item should be inserted
+        parent = citem.parentItem()
+        if parent in (None, self.view.childGroup):
+            parent = self.itemList.invisibleRootItem()
+        else:
+            parent = parent.listItem
+        
+        ## set Z value above all other siblings if none was specified
+        siblings = [parent.child(i).canvasItem() for i in range(parent.childCount())]
+        z = citem.zValue()
+        if z is None:
+            zvals = [i.zValue() for i in siblings]
+            if parent == self.itemList.invisibleRootItem():
+                if len(zvals) == 0:
+                    z = 0
+                else:
+                    z = max(zvals)+10
+            else:
+                if len(zvals) == 0:
+                    z = parent.canvasItem().zValue()
+                else:
+                    z = max(zvals)+1
+            citem.setZValue(z)
+            
+        ## determine location to insert item relative to its siblings
+        for i in range(parent.childCount()):
+            ch = parent.child(i)
+            zval = ch.canvasItem().graphicsItem().zValue()  ## should we use CanvasItem.zValue here?
+            if zval < z:
+                insertLocation = i
+                break
+            else:
+                insertLocation = i+1
+                
+        node = QtGui.QTreeWidgetItem([name])
+        flags = node.flags() | QtCore.Qt.ItemIsUserCheckable | QtCore.Qt.ItemIsDragEnabled
+        if not isinstance(citem, GroupCanvasItem):
+            flags = flags & ~QtCore.Qt.ItemIsDropEnabled
+        node.setFlags(flags)
+        if citem.opts['visible']:
+            node.setCheckState(0, QtCore.Qt.Checked)
+        else:
+            node.setCheckState(0, QtCore.Qt.Unchecked)
+        
+        node.name = name
+        #if citem.opts['parent'] != None:
+            ## insertLocation is incorrect in this case
+        parent.insertChild(insertLocation, node)
+        #else:    
+            #root.insertChild(insertLocation, node)
+        
+        citem.name = name
+        citem.listItem = node
+        node.canvasItem = weakref.ref(citem)
+        self.items.append(citem)
+
+        ctrl = citem.ctrlWidget()
+        ctrl.hide()
+        self.ui.ctrlLayout.addWidget(ctrl)
+        
+        ## inform the canvasItem that its parent canvas has changed
+        citem.setCanvas(self)
+
+        ## Autoscale to fit the first item added (not including the grid).
+        if len(self.items) == 2:
+            self.autoRange()
+            
+        
+        #for n in name:
+            #nextnode = None
+            #for x in range(currentNode.childCount()):
+                #ch = currentNode.child(x)
+                #if hasattr(ch, 'name'):    ## check Z-value of current item to determine insert location
+                    #zval = ch.canvasItem.zValue()
+                    #if zval > z:
+                        ###print "  ->", x
+                        #insertLocation = x+1
+                #if n == ch.text(0):
+                    #nextnode = ch
+                    #break
+            #if nextnode is None:  ## If name doesn't exist, create it
+                #nextnode = QtGui.QTreeWidgetItem([n])
+                #nextnode.setFlags((nextnode.flags() | QtCore.Qt.ItemIsUserCheckable) & ~QtCore.Qt.ItemIsDropEnabled)
+                #nextnode.setCheckState(0, QtCore.Qt.Checked)
+                ### Add node to correct position in list by Z-value
+                ###print "  ==>", insertLocation
+                #currentNode.insertChild(insertLocation, nextnode)
+                
+                #if n == name[-1]:   ## This is the leaf; add some extra properties.
+                    #nextnode.name = name
+                
+                #if n == name[0]:   ## This is the root; make the item movable
+                    #nextnode.setFlags(nextnode.flags() | QtCore.Qt.ItemIsDragEnabled)
+                #else:
+                    #nextnode.setFlags(nextnode.flags() & ~QtCore.Qt.ItemIsDragEnabled)
+                    
+            #currentNode = nextnode
+        return citem
+
+    def treeItemMoved(self, item, parent, index):
+        ##Item moved in tree; update Z values
+        if parent is self.itemList.invisibleRootItem():
+            item.canvasItem().setParentItem(self.view.childGroup)
+        else:
+            item.canvasItem().setParentItem(parent.canvasItem())
+        siblings = [parent.child(i).canvasItem() for i in range(parent.childCount())]
+        
+        zvals = [i.zValue() for i in siblings]
+        zvals.sort(reverse=True)
+        
+        for i in range(len(siblings)):
+            item = siblings[i]
+            item.setZValue(zvals[i])
+            #item = self.itemList.topLevelItem(i)
+            
+            ##ci = self.items[item.name]
+            #ci = item.canvasItem
+            #if ci is None:
+                #continue
+            #if ci.zValue() != zvals[i]:
+                #ci.setZValue(zvals[i])
+        
+        #if self.itemList.topLevelItemCount() < 2:
+            #return
+        #name = item.name
+        #gi = self.items[name]
+        #if index == 0:   
+            #next = self.itemList.topLevelItem(1)
+            #z = self.items[next.name].zValue()+1
+        #else:
+            #prev = self.itemList.topLevelItem(index-1)
+            #z = self.items[prev.name].zValue()-1
+        #gi.setZValue(z)
+
+
+
+
+
+        
+    def itemVisibilityChanged(self, item):
+        listItem = item.listItem
+        checked = listItem.checkState(0) == QtCore.Qt.Checked
+        vis = item.isVisible()
+        if vis != checked:
+            if vis:
+                listItem.setCheckState(0, QtCore.Qt.Checked)
+            else:
+                listItem.setCheckState(0, QtCore.Qt.Unchecked)
+
+    def removeItem(self, item):
+        if isinstance(item, QtGui.QTreeWidgetItem):
+            item = item.canvasItem()
+            
+            
+        if isinstance(item, CanvasItem):
+            item.setCanvas(None)
+            listItem = item.listItem
+            listItem.canvasItem = None
+            item.listItem = None
+            self.itemList.removeTopLevelItem(listItem)
+            self.items.remove(item)
+            ctrl = item.ctrlWidget()
+            ctrl.hide()
+            self.ui.ctrlLayout.removeWidget(ctrl)
+        else:
+            if hasattr(item, '_canvasItem'):
+                self.removeItem(item._canvasItem)
+            else:
+                self.view.removeItem(item)
+        
+        ## disconnect signals, remove from list, etc..
+        
+    def clear(self):
+        while len(self.items) > 0:
+            self.removeItem(self.items[0])
+        
+
+    def addToScene(self, item):
+        self.view.addItem(item)
+        
+    def removeFromScene(self, item):
+        self.view.removeItem(item)
+
+    
+    def listItems(self):
+        """Return a dictionary of name:item pairs"""
+        return self.items
+        
+    def getListItem(self, name):
+        return self.items[name]
+        
+    #def scene(self):
+        #return self.view.scene()
+        
+    def itemTransformChanged(self, item):
+        #self.emit(QtCore.SIGNAL('itemTransformChanged'), self, item)
+        self.sigItemTransformChanged.emit(self, item)
+    
+    def itemTransformChangeFinished(self, item):
+        #self.emit(QtCore.SIGNAL('itemTransformChangeFinished'), self, item)
+        self.sigItemTransformChangeFinished.emit(self, item)
+        
+    def itemListContextMenuEvent(self, ev):
+        self.menuItem = self.itemList.itemAt(ev.pos())
+        self.menu.popup(ev.globalPos())
+        
+    def removeClicked(self):
+        #self.removeItem(self.menuItem)
+        for item in self.selectedItems():
+            self.removeItem(item)
+        self.menuItem = None
+        import gc
+        gc.collect()
+
+class SelectBox(ROI):
+    def __init__(self, scalable=False):
+        #QtGui.QGraphicsRectItem.__init__(self, 0, 0, size[0], size[1])
+        ROI.__init__(self, [0,0], [1,1])
+        center = [0.5, 0.5]
+            
+        if scalable:
+            self.addScaleHandle([1, 1], center, lockAspect=True)
+            self.addScaleHandle([0, 0], center, lockAspect=True)
+        self.addRotateHandle([0, 1], center)
+        self.addRotateHandle([1, 0], center)
+
+
+
+
+
+
+
+
+
+
+    
diff --git a/libs/pyqtgraph/canvas/CanvasItem.py b/libs/pyqtgraph/canvas/CanvasItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..b6ecbb396b53cad80256d04c4fc7fa6cc6ca1aa0
--- /dev/null
+++ b/libs/pyqtgraph/canvas/CanvasItem.py
@@ -0,0 +1,512 @@
+# -*- coding: utf-8 -*-
+from ..Qt import QtGui, QtCore, QtSvg, USE_PYSIDE
+from ..graphicsItems.ROI import ROI
+from .. import SRTTransform, ItemGroup
+if USE_PYSIDE:
+    from . import TransformGuiTemplate_pyside as TransformGuiTemplate
+else:
+    from . import TransformGuiTemplate_pyqt as TransformGuiTemplate
+
+from .. import debug
+
+class SelectBox(ROI):
+    def __init__(self, scalable=False, rotatable=True):
+        #QtGui.QGraphicsRectItem.__init__(self, 0, 0, size[0], size[1])
+        ROI.__init__(self, [0,0], [1,1], invertible=True)
+        center = [0.5, 0.5]
+            
+        if scalable:
+            self.addScaleHandle([1, 1], center, lockAspect=True)
+            self.addScaleHandle([0, 0], center, lockAspect=True)
+        if rotatable:
+            self.addRotateHandle([0, 1], center)
+            self.addRotateHandle([1, 0], center)
+
+class CanvasItem(QtCore.QObject):
+    
+    sigResetUserTransform = QtCore.Signal(object)
+    sigTransformChangeFinished = QtCore.Signal(object)
+    sigTransformChanged = QtCore.Signal(object)
+    
+    """CanvasItem takes care of managing an item's state--alpha, visibility, z-value, transformations, etc. and
+    provides a control widget"""
+    
+    sigVisibilityChanged = QtCore.Signal(object)
+    transformCopyBuffer = None
+    
+    def __init__(self, item, **opts):
+        defOpts = {'name': None, 'z': None, 'movable': True, 'scalable': False, 'rotatable': True, 'visible': True, 'parent':None} #'pos': [0,0], 'scale': [1,1], 'angle':0,
+        defOpts.update(opts)
+        self.opts = defOpts
+        self.selectedAlone = False  ## whether this item is the only one selected
+        
+        QtCore.QObject.__init__(self)
+        self.canvas = None
+        self._graphicsItem = item
+        
+        parent = self.opts['parent']
+        if parent is not None:
+            self._graphicsItem.setParentItem(parent.graphicsItem())
+            self._parentItem = parent
+        else:
+            self._parentItem = None
+        
+        z = self.opts['z']
+        if z is not None:
+            item.setZValue(z)
+
+        self.ctrl = QtGui.QWidget()
+        self.layout = QtGui.QGridLayout()
+        self.layout.setSpacing(0)
+        self.layout.setContentsMargins(0,0,0,0)
+        self.ctrl.setLayout(self.layout)
+        
+        self.alphaLabel = QtGui.QLabel("Alpha")
+        self.alphaSlider = QtGui.QSlider()
+        self.alphaSlider.setMaximum(1023)
+        self.alphaSlider.setOrientation(QtCore.Qt.Horizontal)
+        self.alphaSlider.setValue(1023)
+        self.layout.addWidget(self.alphaLabel, 0, 0)
+        self.layout.addWidget(self.alphaSlider, 0, 1)
+        self.resetTransformBtn = QtGui.QPushButton('Reset Transform')
+        self.copyBtn = QtGui.QPushButton('Copy')
+        self.pasteBtn = QtGui.QPushButton('Paste')
+        
+        self.transformWidget = QtGui.QWidget()
+        self.transformGui = TransformGuiTemplate.Ui_Form()
+        self.transformGui.setupUi(self.transformWidget)
+        self.layout.addWidget(self.transformWidget, 3, 0, 1, 2)
+        self.transformGui.mirrorImageBtn.clicked.connect(self.mirrorY)
+        self.transformGui.reflectImageBtn.clicked.connect(self.mirrorXY)
+        
+        self.layout.addWidget(self.resetTransformBtn, 1, 0, 1, 2)
+        self.layout.addWidget(self.copyBtn, 2, 0, 1, 1)
+        self.layout.addWidget(self.pasteBtn, 2, 1, 1, 1)
+        self.alphaSlider.valueChanged.connect(self.alphaChanged)
+        self.alphaSlider.sliderPressed.connect(self.alphaPressed)
+        self.alphaSlider.sliderReleased.connect(self.alphaReleased)
+        #self.canvas.sigSelectionChanged.connect(self.selectionChanged)
+        self.resetTransformBtn.clicked.connect(self.resetTransformClicked)
+        self.copyBtn.clicked.connect(self.copyClicked)
+        self.pasteBtn.clicked.connect(self.pasteClicked)
+        
+        self.setMovable(self.opts['movable'])  ## update gui to reflect this option
+
+
+        if 'transform' in self.opts:
+            self.baseTransform = self.opts['transform']
+        else:
+            self.baseTransform = SRTTransform()
+            if 'pos' in self.opts and self.opts['pos'] is not None:
+                self.baseTransform.translate(self.opts['pos'])
+            if 'angle' in self.opts and self.opts['angle'] is not None:
+                self.baseTransform.rotate(self.opts['angle'])
+            if 'scale' in self.opts and self.opts['scale'] is not None:
+                self.baseTransform.scale(self.opts['scale'])
+
+        ## create selection box (only visible when selected)
+        tr = self.baseTransform.saveState()
+        if 'scalable' not in opts and tr['scale'] == (1,1):
+            self.opts['scalable'] = True
+            
+        ## every CanvasItem implements its own individual selection box 
+        ## so that subclasses are free to make their own.
+        self.selectBox = SelectBox(scalable=self.opts['scalable'], rotatable=self.opts['rotatable'])
+        #self.canvas.scene().addItem(self.selectBox)
+        self.selectBox.hide()
+        self.selectBox.setZValue(1e6)
+        self.selectBox.sigRegionChanged.connect(self.selectBoxChanged)  ## calls selectBoxMoved
+        self.selectBox.sigRegionChangeFinished.connect(self.selectBoxChangeFinished)
+
+        ## set up the transformations that will be applied to the item
+        ## (It is not safe to use item.setTransform, since the item might count on that not changing)
+        self.itemRotation = QtGui.QGraphicsRotation()
+        self.itemScale = QtGui.QGraphicsScale()
+        self._graphicsItem.setTransformations([self.itemRotation, self.itemScale])
+        
+        self.tempTransform = SRTTransform() ## holds the additional transform that happens during a move - gets added to the userTransform when move is done.
+        self.userTransform = SRTTransform() ## stores the total transform of the object
+        self.resetUserTransform() 
+        
+        ## now happens inside resetUserTransform -> selectBoxToItem
+        # self.selectBoxBase = self.selectBox.getState().copy()
+        
+                
+        #print "Created canvas item", self
+        #print "  base:", self.baseTransform
+        #print "  user:", self.userTransform
+        #print "  temp:", self.tempTransform
+        #print "  bounds:", self.item.sceneBoundingRect()
+        
+    def setMovable(self, m):
+        self.opts['movable'] = m
+        
+        if m:
+            self.resetTransformBtn.show()
+            self.copyBtn.show()
+            self.pasteBtn.show()
+        else:
+            self.resetTransformBtn.hide()
+            self.copyBtn.hide()
+            self.pasteBtn.hide()
+
+    def setCanvas(self, canvas):
+        ## Called by canvas whenever the item is added.
+        ## It is our responsibility to add all graphicsItems to the canvas's scene
+        ## The canvas will automatically add our graphicsitem, 
+        ## so we just need to take care of the selectbox.
+        if canvas is self.canvas:
+            return
+            
+        if canvas is None:
+            self.canvas.removeFromScene(self._graphicsItem)
+            self.canvas.removeFromScene(self.selectBox)
+        else:
+            canvas.addToScene(self._graphicsItem)
+            canvas.addToScene(self.selectBox)
+        self.canvas = canvas
+
+    def graphicsItem(self):
+        """Return the graphicsItem for this canvasItem."""
+        return self._graphicsItem
+        
+    def parentItem(self):
+        return self._parentItem
+
+    def setParentItem(self, parent):
+        self._parentItem = parent
+        if parent is not None:
+            if isinstance(parent, CanvasItem):
+                parent = parent.graphicsItem()
+        self.graphicsItem().setParentItem(parent)
+
+    #def name(self):
+        #return self.opts['name']
+    
+    def copyClicked(self):
+        CanvasItem.transformCopyBuffer = self.saveTransform()
+        
+    def pasteClicked(self):
+        t = CanvasItem.transformCopyBuffer
+        if t is None:
+            return
+        else:
+            self.restoreTransform(t)
+            
+    def mirrorY(self):
+        if not self.isMovable():
+            return
+        
+        #flip = self.transformGui.mirrorImageCheck.isChecked()
+        #tr = self.userTransform.saveState()
+        
+        inv = SRTTransform()
+        inv.scale(-1, 1)
+        self.userTransform = self.userTransform * inv
+        self.updateTransform()
+        self.selectBoxFromUser()
+        self.sigTransformChangeFinished.emit(self)
+        #if flip:
+            #if tr['scale'][0] < 0 xor tr['scale'][1] < 0:
+                #return
+            #else:
+                #self.userTransform.setScale([-tr['scale'][0], tr['scale'][1]])
+                #self.userTransform.setTranslate([-tr['pos'][0], tr['pos'][1]])
+                #self.userTransform.setRotate(-tr['angle'])
+                #self.updateTransform()
+                #self.selectBoxFromUser()
+                #return
+        #elif not flip:
+            #if tr['scale'][0] > 0 and tr['scale'][1] > 0:
+                #return
+            #else:
+                #self.userTransform.setScale([-tr['scale'][0], tr['scale'][1]])
+                #self.userTransform.setTranslate([-tr['pos'][0], tr['pos'][1]])
+                #self.userTransform.setRotate(-tr['angle'])
+                #self.updateTransform()
+                #self.selectBoxFromUser()
+                #return
+
+    def mirrorXY(self):
+        if not self.isMovable():
+            return
+        self.rotate(180.)
+        # inv = SRTTransform()
+        # inv.scale(-1, -1)
+        # self.userTransform = self.userTransform * inv #flip lr/ud
+        # s=self.updateTransform()
+        # self.setTranslate(-2*s['pos'][0], -2*s['pos'][1])
+        # self.selectBoxFromUser()
+        
+ 
+    def hasUserTransform(self):
+        #print self.userRotate, self.userTranslate
+        return not self.userTransform.isIdentity()
+
+    def ctrlWidget(self):
+        return self.ctrl
+        
+    def alphaChanged(self, val):
+        alpha = val / 1023.
+        self._graphicsItem.setOpacity(alpha)
+        
+    def isMovable(self):
+        return self.opts['movable']
+        
+        
+    def selectBoxMoved(self):
+        """The selection box has moved; get its transformation information and pass to the graphics item"""
+        self.userTransform = self.selectBox.getGlobalTransform(relativeTo=self.selectBoxBase)
+        self.updateTransform()
+
+    def scale(self, x, y):
+        self.userTransform.scale(x, y)
+        self.selectBoxFromUser()
+        self.updateTransform()
+        
+    def rotate(self, ang):
+        self.userTransform.rotate(ang)
+        self.selectBoxFromUser()
+        self.updateTransform()
+        
+    def translate(self, x, y):
+        self.userTransform.translate(x, y)
+        self.selectBoxFromUser()
+        self.updateTransform()
+        
+    def setTranslate(self, x, y):
+        self.userTransform.setTranslate(x, y)
+        self.selectBoxFromUser()
+        self.updateTransform()
+        
+    def setRotate(self, angle):
+        self.userTransform.setRotate(angle)
+        self.selectBoxFromUser()
+        self.updateTransform()
+        
+    def setScale(self, x, y):
+        self.userTransform.setScale(x, y)
+        self.selectBoxFromUser()
+        self.updateTransform()
+        
+
+    def setTemporaryTransform(self, transform):
+        self.tempTransform = transform
+        self.updateTransform()
+    
+    def applyTemporaryTransform(self):
+        """Collapses tempTransform into UserTransform, resets tempTransform"""
+        self.userTransform = self.userTransform * self.tempTransform ## order is important!
+        self.resetTemporaryTransform()
+        self.selectBoxFromUser()  ## update the selection box to match the new userTransform
+
+        #st = self.userTransform.saveState()
+        
+        #self.userTransform = self.userTransform * self.tempTransform ## order is important!
+        
+        #### matrix multiplication affects the scale factors, need to reset
+        #if st['scale'][0] < 0 or st['scale'][1] < 0:
+            #nst = self.userTransform.saveState()
+            #self.userTransform.setScale([-nst['scale'][0], -nst['scale'][1]])
+        
+        #self.resetTemporaryTransform()
+        #self.selectBoxFromUser()
+        #self.selectBoxChangeFinished()
+
+
+
+    def resetTemporaryTransform(self):
+        self.tempTransform = SRTTransform()  ## don't use Transform.reset()--this transform might be used elsewhere.
+        self.updateTransform()
+        
+    def transform(self): 
+        return self._graphicsItem.transform()
+
+    def updateTransform(self):
+        """Regenerate the item position from the base, user, and temp transforms"""
+        transform = self.baseTransform * self.userTransform * self.tempTransform ## order is important
+        s = transform.saveState()
+        self._graphicsItem.setPos(*s['pos'])
+        
+        self.itemRotation.setAngle(s['angle'])
+        self.itemScale.setXScale(s['scale'][0])
+        self.itemScale.setYScale(s['scale'][1])
+
+        self.displayTransform(transform)
+        return(s) # return the transform state
+        
+    def displayTransform(self, transform):
+        """Updates transform numbers in the ctrl widget."""
+        
+        tr = transform.saveState()
+        
+        self.transformGui.translateLabel.setText("Translate: (%f, %f)" %(tr['pos'][0], tr['pos'][1]))
+        self.transformGui.rotateLabel.setText("Rotate: %f degrees" %tr['angle'])
+        self.transformGui.scaleLabel.setText("Scale: (%f, %f)" %(tr['scale'][0], tr['scale'][1]))
+        #self.transformGui.mirrorImageCheck.setChecked(False)
+        #if tr['scale'][0] < 0:
+        #    self.transformGui.mirrorImageCheck.setChecked(True)
+
+
+    def resetUserTransform(self):
+        #self.userRotate = 0
+        #self.userTranslate = pg.Point(0,0)
+        self.userTransform.reset()
+        self.updateTransform()
+        
+        self.selectBox.blockSignals(True)
+        self.selectBoxToItem()
+        self.selectBox.blockSignals(False)
+        self.sigTransformChanged.emit(self)
+        self.sigTransformChangeFinished.emit(self)
+       
+    def resetTransformClicked(self):
+        self.resetUserTransform()
+        self.sigResetUserTransform.emit(self)
+        
+    def restoreTransform(self, tr):
+        try:
+            #self.userTranslate = pg.Point(tr['trans'])
+            #self.userRotate = tr['rot']
+            self.userTransform = SRTTransform(tr)
+            self.updateTransform()
+            
+            self.selectBoxFromUser() ## move select box to match
+            self.sigTransformChanged.emit(self)
+            self.sigTransformChangeFinished.emit(self)
+        except:
+            #self.userTranslate = pg.Point([0,0])
+            #self.userRotate = 0
+            self.userTransform = SRTTransform()
+            debug.printExc("Failed to load transform:")
+        #print "set transform", self, self.userTranslate
+        
+    def saveTransform(self):
+        """Return a dict containing the current user transform"""
+        #print "save transform", self, self.userTranslate
+        #return {'trans': list(self.userTranslate), 'rot': self.userRotate}
+        return self.userTransform.saveState()
+        
+    def selectBoxFromUser(self):
+        """Move the selection box to match the current userTransform"""
+        ## user transform
+        #trans = QtGui.QTransform()
+        #trans.translate(*self.userTranslate)
+        #trans.rotate(-self.userRotate)
+        
+        #x2, y2 = trans.map(*self.selectBoxBase['pos'])
+        
+        self.selectBox.blockSignals(True)
+        self.selectBox.setState(self.selectBoxBase)
+        self.selectBox.applyGlobalTransform(self.userTransform)
+        #self.selectBox.setAngle(self.userRotate)
+        #self.selectBox.setPos([x2, y2])
+        self.selectBox.blockSignals(False)
+        
+
+    def selectBoxToItem(self):
+        """Move/scale the selection box so it fits the item's bounding rect. (assumes item is not rotated)"""
+        self.itemRect = self._graphicsItem.boundingRect()
+        rect = self._graphicsItem.mapRectToParent(self.itemRect)
+        self.selectBox.blockSignals(True)
+        self.selectBox.setPos([rect.x(), rect.y()])
+        self.selectBox.setSize(rect.size())
+        self.selectBox.setAngle(0)
+        self.selectBoxBase = self.selectBox.getState().copy()
+        self.selectBox.blockSignals(False)
+
+    def zValue(self):
+        return self.opts['z']
+        
+    def setZValue(self, z):
+        self.opts['z'] = z
+        if z is not None:
+            self._graphicsItem.setZValue(z)
+        
+    #def selectionChanged(self, canvas, items):
+        #self.selected = len(items) == 1 and (items[0] is self) 
+        #self.showSelectBox()
+           
+           
+    def selectionChanged(self, sel, multi):
+        """
+        Inform the item that its selection state has changed. 
+        ============== =========================================================
+        **Arguments:**
+        sel            (bool) whether the item is currently selected
+        multi          (bool) whether there are multiple items currently 
+                       selected
+        ============== =========================================================
+        """
+        self.selectedAlone = sel and not multi
+        self.showSelectBox()
+        if self.selectedAlone:
+            self.ctrlWidget().show()
+        else:
+            self.ctrlWidget().hide()
+        
+    def showSelectBox(self):
+        """Display the selection box around this item if it is selected and movable"""
+        if self.selectedAlone and self.isMovable() and self.isVisible():  #and len(self.canvas.itemList.selectedItems())==1:
+            self.selectBox.show()
+        else:
+            self.selectBox.hide()
+        
+    def hideSelectBox(self):
+        self.selectBox.hide()
+        
+                
+    def selectBoxChanged(self):
+        self.selectBoxMoved()
+        #self.updateTransform(self.selectBox)
+        #self.emit(QtCore.SIGNAL('transformChanged'), self)
+        self.sigTransformChanged.emit(self)
+        
+    def selectBoxChangeFinished(self):
+        #self.emit(QtCore.SIGNAL('transformChangeFinished'), self)
+        self.sigTransformChangeFinished.emit(self)
+
+    def alphaPressed(self):
+        """Hide selection box while slider is moving"""
+        self.hideSelectBox()
+        
+    def alphaReleased(self):
+        self.showSelectBox()
+        
+    def show(self):
+        if self.opts['visible']:
+            return
+        self.opts['visible'] = True
+        self._graphicsItem.show()
+        self.showSelectBox()
+        self.sigVisibilityChanged.emit(self)
+        
+    def hide(self):
+        if not self.opts['visible']:
+            return
+        self.opts['visible'] = False
+        self._graphicsItem.hide()
+        self.hideSelectBox()
+        self.sigVisibilityChanged.emit(self)
+
+    def setVisible(self, vis):
+        if vis:
+            self.show()
+        else:
+            self.hide()
+
+    def isVisible(self):
+        return self.opts['visible']
+
+
+class GroupCanvasItem(CanvasItem):
+    """
+    Canvas item used for grouping others
+    """
+    
+    def __init__(self, **opts):
+        defOpts = {'movable': False, 'scalable': False}
+        defOpts.update(opts)
+        item = ItemGroup()
+        CanvasItem.__init__(self, item, **defOpts)
+    
diff --git a/libs/pyqtgraph/canvas/CanvasManager.py b/libs/pyqtgraph/canvas/CanvasManager.py
new file mode 100644
index 0000000000000000000000000000000000000000..28188039de11a2a324ae76e3ebd6eff225ed146b
--- /dev/null
+++ b/libs/pyqtgraph/canvas/CanvasManager.py
@@ -0,0 +1,76 @@
+# -*- coding: utf-8 -*-
+from ..Qt import QtCore, QtGui
+if not hasattr(QtCore, 'Signal'):
+    QtCore.Signal = QtCore.pyqtSignal
+import weakref
+
+class CanvasManager(QtCore.QObject):
+    SINGLETON = None
+    
+    sigCanvasListChanged = QtCore.Signal()
+    
+    def __init__(self):
+        if CanvasManager.SINGLETON is not None:
+            raise Exception("Can only create one canvas manager.")
+        CanvasManager.SINGLETON = self
+        QtCore.QObject.__init__(self)
+        self.canvases = weakref.WeakValueDictionary()
+
+    @classmethod
+    def instance(cls):
+        return CanvasManager.SINGLETON
+        
+    def registerCanvas(self, canvas, name):
+        n2 = name
+        i = 0
+        while n2 in self.canvases:
+            n2 = "%s_%03d" % (name, i)
+            i += 1
+        self.canvases[n2] = canvas
+        self.sigCanvasListChanged.emit()
+        return n2
+        
+    def unregisterCanvas(self, name):
+        c = self.canvases[name]
+        del self.canvases[name]
+        self.sigCanvasListChanged.emit()
+        
+    def listCanvases(self):
+        return list(self.canvases.keys())
+        
+    def getCanvas(self, name):
+        return self.canvases[name]
+        
+    
+manager = CanvasManager()
+
+
+class CanvasCombo(QtGui.QComboBox):
+    def __init__(self, parent=None):
+        QtGui.QComboBox.__init__(self, parent)
+        man = CanvasManager.instance()
+        man.sigCanvasListChanged.connect(self.updateCanvasList)
+        self.hostName = None
+        self.updateCanvasList()
+        
+    def updateCanvasList(self):
+        canvases = CanvasManager.instance().listCanvases()
+        canvases.insert(0, "")
+        if self.hostName in canvases:
+            canvases.remove(self.hostName)
+            
+        sel = self.currentText()
+        if sel in canvases:
+            self.blockSignals(True)  ## change does not affect current selection; block signals during update
+        self.clear()
+        for i in canvases:
+            self.addItem(i)
+            if i == sel:
+                self.setCurrentIndex(self.count())
+            
+        self.blockSignals(False)
+        
+    def setHostName(self, name):
+        self.hostName = name
+        self.updateCanvasList()
+
diff --git a/libs/pyqtgraph/canvas/CanvasTemplate.ui b/libs/pyqtgraph/canvas/CanvasTemplate.ui
new file mode 100644
index 0000000000000000000000000000000000000000..9bea8f89218b533063b37bee5e18e7fc1404b09a
--- /dev/null
+++ b/libs/pyqtgraph/canvas/CanvasTemplate.ui
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>490</width>
+    <height>414</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <item row="0" column="0">
+    <widget class="QSplitter" name="splitter">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <widget class="GraphicsView" name="view"/>
+     <widget class="QWidget" name="layoutWidget">
+      <layout class="QGridLayout" name="gridLayout_2">
+       <item row="2" column="0" colspan="2">
+        <widget class="QPushButton" name="autoRangeBtn">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>1</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Auto Range</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0" colspan="2">
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <property name="spacing">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QCheckBox" name="redirectCheck">
+           <property name="toolTip">
+            <string>Check to display all local items in a remote canvas.</string>
+           </property>
+           <property name="text">
+            <string>Redirect</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="CanvasCombo" name="redirectCombo"/>
+         </item>
+        </layout>
+       </item>
+       <item row="6" column="0" colspan="2">
+        <widget class="TreeWidget" name="itemList">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>100</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="headerHidden">
+          <bool>true</bool>
+         </property>
+         <column>
+          <property name="text">
+           <string notr="true">1</string>
+          </property>
+         </column>
+        </widget>
+       </item>
+       <item row="10" column="0" colspan="2">
+        <layout class="QGridLayout" name="ctrlLayout">
+         <property name="spacing">
+          <number>0</number>
+         </property>
+        </layout>
+       </item>
+       <item row="7" column="0">
+        <widget class="QPushButton" name="resetTransformsBtn">
+         <property name="text">
+          <string>Reset Transforms</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0">
+        <widget class="QPushButton" name="mirrorSelectionBtn">
+         <property name="text">
+          <string>Mirror Selection</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QPushButton" name="reflectSelectionBtn">
+         <property name="text">
+          <string>MirrorXY</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>TreeWidget</class>
+   <extends>QTreeWidget</extends>
+   <header>..widgets.TreeWidget</header>
+  </customwidget>
+  <customwidget>
+   <class>GraphicsView</class>
+   <extends>QGraphicsView</extends>
+   <header>..widgets.GraphicsView</header>
+  </customwidget>
+  <customwidget>
+   <class>CanvasCombo</class>
+   <extends>QComboBox</extends>
+   <header>CanvasManager</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/libs/pyqtgraph/canvas/CanvasTemplate_pyqt.py b/libs/pyqtgraph/canvas/CanvasTemplate_pyqt.py
new file mode 100644
index 0000000000000000000000000000000000000000..557354e0a821582486c861d9d36838c626e11e82
--- /dev/null
+++ b/libs/pyqtgraph/canvas/CanvasTemplate_pyqt.py
@@ -0,0 +1,92 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'acq4/pyqtgraph/canvas/CanvasTemplate.ui'
+#
+# Created: Thu Jan  2 11:13:07 2014
+#      by: PyQt4 UI code generator 4.9
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt4 import QtCore, QtGui
+
+try:
+    _fromUtf8 = QtCore.QString.fromUtf8
+except AttributeError:
+    _fromUtf8 = lambda s: s
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName(_fromUtf8("Form"))
+        Form.resize(490, 414)
+        self.gridLayout = QtGui.QGridLayout(Form)
+        self.gridLayout.setMargin(0)
+        self.gridLayout.setSpacing(0)
+        self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
+        self.splitter = QtGui.QSplitter(Form)
+        self.splitter.setOrientation(QtCore.Qt.Horizontal)
+        self.splitter.setObjectName(_fromUtf8("splitter"))
+        self.view = GraphicsView(self.splitter)
+        self.view.setObjectName(_fromUtf8("view"))
+        self.layoutWidget = QtGui.QWidget(self.splitter)
+        self.layoutWidget.setObjectName(_fromUtf8("layoutWidget"))
+        self.gridLayout_2 = QtGui.QGridLayout(self.layoutWidget)
+        self.gridLayout_2.setMargin(0)
+        self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2"))
+        self.autoRangeBtn = QtGui.QPushButton(self.layoutWidget)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(1)
+        sizePolicy.setHeightForWidth(self.autoRangeBtn.sizePolicy().hasHeightForWidth())
+        self.autoRangeBtn.setSizePolicy(sizePolicy)
+        self.autoRangeBtn.setObjectName(_fromUtf8("autoRangeBtn"))
+        self.gridLayout_2.addWidget(self.autoRangeBtn, 2, 0, 1, 2)
+        self.horizontalLayout = QtGui.QHBoxLayout()
+        self.horizontalLayout.setSpacing(0)
+        self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
+        self.redirectCheck = QtGui.QCheckBox(self.layoutWidget)
+        self.redirectCheck.setObjectName(_fromUtf8("redirectCheck"))
+        self.horizontalLayout.addWidget(self.redirectCheck)
+        self.redirectCombo = CanvasCombo(self.layoutWidget)
+        self.redirectCombo.setObjectName(_fromUtf8("redirectCombo"))
+        self.horizontalLayout.addWidget(self.redirectCombo)
+        self.gridLayout_2.addLayout(self.horizontalLayout, 5, 0, 1, 2)
+        self.itemList = TreeWidget(self.layoutWidget)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(100)
+        sizePolicy.setHeightForWidth(self.itemList.sizePolicy().hasHeightForWidth())
+        self.itemList.setSizePolicy(sizePolicy)
+        self.itemList.setHeaderHidden(True)
+        self.itemList.setObjectName(_fromUtf8("itemList"))
+        self.itemList.headerItem().setText(0, _fromUtf8("1"))
+        self.gridLayout_2.addWidget(self.itemList, 6, 0, 1, 2)
+        self.ctrlLayout = QtGui.QGridLayout()
+        self.ctrlLayout.setSpacing(0)
+        self.ctrlLayout.setObjectName(_fromUtf8("ctrlLayout"))
+        self.gridLayout_2.addLayout(self.ctrlLayout, 10, 0, 1, 2)
+        self.resetTransformsBtn = QtGui.QPushButton(self.layoutWidget)
+        self.resetTransformsBtn.setObjectName(_fromUtf8("resetTransformsBtn"))
+        self.gridLayout_2.addWidget(self.resetTransformsBtn, 7, 0, 1, 1)
+        self.mirrorSelectionBtn = QtGui.QPushButton(self.layoutWidget)
+        self.mirrorSelectionBtn.setObjectName(_fromUtf8("mirrorSelectionBtn"))
+        self.gridLayout_2.addWidget(self.mirrorSelectionBtn, 3, 0, 1, 1)
+        self.reflectSelectionBtn = QtGui.QPushButton(self.layoutWidget)
+        self.reflectSelectionBtn.setObjectName(_fromUtf8("reflectSelectionBtn"))
+        self.gridLayout_2.addWidget(self.reflectSelectionBtn, 3, 1, 1, 1)
+        self.gridLayout.addWidget(self.splitter, 0, 0, 1, 1)
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        Form.setWindowTitle(QtGui.QApplication.translate("Form", "Form", None, QtGui.QApplication.UnicodeUTF8))
+        self.autoRangeBtn.setText(QtGui.QApplication.translate("Form", "Auto Range", None, QtGui.QApplication.UnicodeUTF8))
+        self.redirectCheck.setToolTip(QtGui.QApplication.translate("Form", "Check to display all local items in a remote canvas.", None, QtGui.QApplication.UnicodeUTF8))
+        self.redirectCheck.setText(QtGui.QApplication.translate("Form", "Redirect", None, QtGui.QApplication.UnicodeUTF8))
+        self.resetTransformsBtn.setText(QtGui.QApplication.translate("Form", "Reset Transforms", None, QtGui.QApplication.UnicodeUTF8))
+        self.mirrorSelectionBtn.setText(QtGui.QApplication.translate("Form", "Mirror Selection", None, QtGui.QApplication.UnicodeUTF8))
+        self.reflectSelectionBtn.setText(QtGui.QApplication.translate("Form", "MirrorXY", None, QtGui.QApplication.UnicodeUTF8))
+
+from ..widgets.TreeWidget import TreeWidget
+from CanvasManager import CanvasCombo
+from ..widgets.GraphicsView import GraphicsView
diff --git a/libs/pyqtgraph/canvas/CanvasTemplate_pyqt5.py b/libs/pyqtgraph/canvas/CanvasTemplate_pyqt5.py
new file mode 100644
index 0000000000000000000000000000000000000000..13b0c83cb28f340d394039a3059aee0d6e7f96fc
--- /dev/null
+++ b/libs/pyqtgraph/canvas/CanvasTemplate_pyqt5.py
@@ -0,0 +1,96 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file './pyqtgraph/canvas/CanvasTemplate.ui'
+#
+# Created: Wed Mar 26 15:09:28 2014
+#      by: PyQt5 UI code generator 5.0.1
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt5 import QtCore, QtGui, QtWidgets
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName("Form")
+        Form.resize(490, 414)
+        self.gridLayout = QtWidgets.QGridLayout(Form)
+        self.gridLayout.setContentsMargins(0, 0, 0, 0)
+        self.gridLayout.setSpacing(0)
+        self.gridLayout.setObjectName("gridLayout")
+        self.splitter = QtWidgets.QSplitter(Form)
+        self.splitter.setOrientation(QtCore.Qt.Horizontal)
+        self.splitter.setObjectName("splitter")
+        self.view = GraphicsView(self.splitter)
+        self.view.setObjectName("view")
+        self.layoutWidget = QtWidgets.QWidget(self.splitter)
+        self.layoutWidget.setObjectName("layoutWidget")
+        self.gridLayout_2 = QtWidgets.QGridLayout(self.layoutWidget)
+        self.gridLayout_2.setContentsMargins(0, 0, 0, 0)
+        self.gridLayout_2.setObjectName("gridLayout_2")
+        self.storeSvgBtn = QtWidgets.QPushButton(self.layoutWidget)
+        self.storeSvgBtn.setObjectName("storeSvgBtn")
+        self.gridLayout_2.addWidget(self.storeSvgBtn, 1, 0, 1, 1)
+        self.storePngBtn = QtWidgets.QPushButton(self.layoutWidget)
+        self.storePngBtn.setObjectName("storePngBtn")
+        self.gridLayout_2.addWidget(self.storePngBtn, 1, 1, 1, 1)
+        self.autoRangeBtn = QtWidgets.QPushButton(self.layoutWidget)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(1)
+        sizePolicy.setHeightForWidth(self.autoRangeBtn.sizePolicy().hasHeightForWidth())
+        self.autoRangeBtn.setSizePolicy(sizePolicy)
+        self.autoRangeBtn.setObjectName("autoRangeBtn")
+        self.gridLayout_2.addWidget(self.autoRangeBtn, 3, 0, 1, 2)
+        self.horizontalLayout = QtWidgets.QHBoxLayout()
+        self.horizontalLayout.setSpacing(0)
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.redirectCheck = QtWidgets.QCheckBox(self.layoutWidget)
+        self.redirectCheck.setObjectName("redirectCheck")
+        self.horizontalLayout.addWidget(self.redirectCheck)
+        self.redirectCombo = CanvasCombo(self.layoutWidget)
+        self.redirectCombo.setObjectName("redirectCombo")
+        self.horizontalLayout.addWidget(self.redirectCombo)
+        self.gridLayout_2.addLayout(self.horizontalLayout, 6, 0, 1, 2)
+        self.itemList = TreeWidget(self.layoutWidget)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(100)
+        sizePolicy.setHeightForWidth(self.itemList.sizePolicy().hasHeightForWidth())
+        self.itemList.setSizePolicy(sizePolicy)
+        self.itemList.setHeaderHidden(True)
+        self.itemList.setObjectName("itemList")
+        self.itemList.headerItem().setText(0, "1")
+        self.gridLayout_2.addWidget(self.itemList, 7, 0, 1, 2)
+        self.ctrlLayout = QtWidgets.QGridLayout()
+        self.ctrlLayout.setSpacing(0)
+        self.ctrlLayout.setObjectName("ctrlLayout")
+        self.gridLayout_2.addLayout(self.ctrlLayout, 11, 0, 1, 2)
+        self.resetTransformsBtn = QtWidgets.QPushButton(self.layoutWidget)
+        self.resetTransformsBtn.setObjectName("resetTransformsBtn")
+        self.gridLayout_2.addWidget(self.resetTransformsBtn, 8, 0, 1, 1)
+        self.mirrorSelectionBtn = QtWidgets.QPushButton(self.layoutWidget)
+        self.mirrorSelectionBtn.setObjectName("mirrorSelectionBtn")
+        self.gridLayout_2.addWidget(self.mirrorSelectionBtn, 4, 0, 1, 1)
+        self.reflectSelectionBtn = QtWidgets.QPushButton(self.layoutWidget)
+        self.reflectSelectionBtn.setObjectName("reflectSelectionBtn")
+        self.gridLayout_2.addWidget(self.reflectSelectionBtn, 4, 1, 1, 1)
+        self.gridLayout.addWidget(self.splitter, 0, 0, 1, 1)
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        _translate = QtCore.QCoreApplication.translate
+        Form.setWindowTitle(_translate("Form", "Form"))
+        self.storeSvgBtn.setText(_translate("Form", "Store SVG"))
+        self.storePngBtn.setText(_translate("Form", "Store PNG"))
+        self.autoRangeBtn.setText(_translate("Form", "Auto Range"))
+        self.redirectCheck.setToolTip(_translate("Form", "Check to display all local items in a remote canvas."))
+        self.redirectCheck.setText(_translate("Form", "Redirect"))
+        self.resetTransformsBtn.setText(_translate("Form", "Reset Transforms"))
+        self.mirrorSelectionBtn.setText(_translate("Form", "Mirror Selection"))
+        self.reflectSelectionBtn.setText(_translate("Form", "MirrorXY"))
+
+from ..widgets.GraphicsView import GraphicsView
+from ..widgets.TreeWidget import TreeWidget
+from CanvasManager import CanvasCombo
diff --git a/libs/pyqtgraph/canvas/CanvasTemplate_pyside.py b/libs/pyqtgraph/canvas/CanvasTemplate_pyside.py
new file mode 100644
index 0000000000000000000000000000000000000000..56d1ff47cb21bc0c9f279e98531aa94c9e085e99
--- /dev/null
+++ b/libs/pyqtgraph/canvas/CanvasTemplate_pyside.py
@@ -0,0 +1,95 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file './pyqtgraph/canvas/CanvasTemplate.ui'
+#
+# Created: Mon Dec 23 10:10:52 2013
+#      by: pyside-uic 0.2.14 running on PySide 1.1.2
+#
+# WARNING! All changes made in this file will be lost!
+
+from PySide import QtCore, QtGui
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName("Form")
+        Form.resize(490, 414)
+        self.gridLayout = QtGui.QGridLayout(Form)
+        self.gridLayout.setContentsMargins(0, 0, 0, 0)
+        self.gridLayout.setSpacing(0)
+        self.gridLayout.setObjectName("gridLayout")
+        self.splitter = QtGui.QSplitter(Form)
+        self.splitter.setOrientation(QtCore.Qt.Horizontal)
+        self.splitter.setObjectName("splitter")
+        self.view = GraphicsView(self.splitter)
+        self.view.setObjectName("view")
+        self.layoutWidget = QtGui.QWidget(self.splitter)
+        self.layoutWidget.setObjectName("layoutWidget")
+        self.gridLayout_2 = QtGui.QGridLayout(self.layoutWidget)
+        self.gridLayout_2.setContentsMargins(0, 0, 0, 0)
+        self.gridLayout_2.setObjectName("gridLayout_2")
+        self.storeSvgBtn = QtGui.QPushButton(self.layoutWidget)
+        self.storeSvgBtn.setObjectName("storeSvgBtn")
+        self.gridLayout_2.addWidget(self.storeSvgBtn, 1, 0, 1, 1)
+        self.storePngBtn = QtGui.QPushButton(self.layoutWidget)
+        self.storePngBtn.setObjectName("storePngBtn")
+        self.gridLayout_2.addWidget(self.storePngBtn, 1, 1, 1, 1)
+        self.autoRangeBtn = QtGui.QPushButton(self.layoutWidget)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(1)
+        sizePolicy.setHeightForWidth(self.autoRangeBtn.sizePolicy().hasHeightForWidth())
+        self.autoRangeBtn.setSizePolicy(sizePolicy)
+        self.autoRangeBtn.setObjectName("autoRangeBtn")
+        self.gridLayout_2.addWidget(self.autoRangeBtn, 3, 0, 1, 2)
+        self.horizontalLayout = QtGui.QHBoxLayout()
+        self.horizontalLayout.setSpacing(0)
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.redirectCheck = QtGui.QCheckBox(self.layoutWidget)
+        self.redirectCheck.setObjectName("redirectCheck")
+        self.horizontalLayout.addWidget(self.redirectCheck)
+        self.redirectCombo = CanvasCombo(self.layoutWidget)
+        self.redirectCombo.setObjectName("redirectCombo")
+        self.horizontalLayout.addWidget(self.redirectCombo)
+        self.gridLayout_2.addLayout(self.horizontalLayout, 6, 0, 1, 2)
+        self.itemList = TreeWidget(self.layoutWidget)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(100)
+        sizePolicy.setHeightForWidth(self.itemList.sizePolicy().hasHeightForWidth())
+        self.itemList.setSizePolicy(sizePolicy)
+        self.itemList.setHeaderHidden(True)
+        self.itemList.setObjectName("itemList")
+        self.itemList.headerItem().setText(0, "1")
+        self.gridLayout_2.addWidget(self.itemList, 7, 0, 1, 2)
+        self.ctrlLayout = QtGui.QGridLayout()
+        self.ctrlLayout.setSpacing(0)
+        self.ctrlLayout.setObjectName("ctrlLayout")
+        self.gridLayout_2.addLayout(self.ctrlLayout, 11, 0, 1, 2)
+        self.resetTransformsBtn = QtGui.QPushButton(self.layoutWidget)
+        self.resetTransformsBtn.setObjectName("resetTransformsBtn")
+        self.gridLayout_2.addWidget(self.resetTransformsBtn, 8, 0, 1, 1)
+        self.mirrorSelectionBtn = QtGui.QPushButton(self.layoutWidget)
+        self.mirrorSelectionBtn.setObjectName("mirrorSelectionBtn")
+        self.gridLayout_2.addWidget(self.mirrorSelectionBtn, 4, 0, 1, 1)
+        self.reflectSelectionBtn = QtGui.QPushButton(self.layoutWidget)
+        self.reflectSelectionBtn.setObjectName("reflectSelectionBtn")
+        self.gridLayout_2.addWidget(self.reflectSelectionBtn, 4, 1, 1, 1)
+        self.gridLayout.addWidget(self.splitter, 0, 0, 1, 1)
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        Form.setWindowTitle(QtGui.QApplication.translate("Form", "Form", None, QtGui.QApplication.UnicodeUTF8))
+        self.storeSvgBtn.setText(QtGui.QApplication.translate("Form", "Store SVG", None, QtGui.QApplication.UnicodeUTF8))
+        self.storePngBtn.setText(QtGui.QApplication.translate("Form", "Store PNG", None, QtGui.QApplication.UnicodeUTF8))
+        self.autoRangeBtn.setText(QtGui.QApplication.translate("Form", "Auto Range", None, QtGui.QApplication.UnicodeUTF8))
+        self.redirectCheck.setToolTip(QtGui.QApplication.translate("Form", "Check to display all local items in a remote canvas.", None, QtGui.QApplication.UnicodeUTF8))
+        self.redirectCheck.setText(QtGui.QApplication.translate("Form", "Redirect", None, QtGui.QApplication.UnicodeUTF8))
+        self.resetTransformsBtn.setText(QtGui.QApplication.translate("Form", "Reset Transforms", None, QtGui.QApplication.UnicodeUTF8))
+        self.mirrorSelectionBtn.setText(QtGui.QApplication.translate("Form", "Mirror Selection", None, QtGui.QApplication.UnicodeUTF8))
+        self.reflectSelectionBtn.setText(QtGui.QApplication.translate("Form", "MirrorXY", None, QtGui.QApplication.UnicodeUTF8))
+
+from ..widgets.TreeWidget import TreeWidget
+from CanvasManager import CanvasCombo
+from ..widgets.GraphicsView import GraphicsView
diff --git a/libs/pyqtgraph/canvas/TransformGuiTemplate.ui b/libs/pyqtgraph/canvas/TransformGuiTemplate.ui
new file mode 100644
index 0000000000000000000000000000000000000000..d8312388192821ca190bdee52ca21fc99f699308
--- /dev/null
+++ b/libs/pyqtgraph/canvas/TransformGuiTemplate.ui
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>224</width>
+    <height>117</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>1</number>
+   </property>
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="translateLabel">
+     <property name="text">
+      <string>Translate:</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="rotateLabel">
+     <property name="text">
+      <string>Rotate:</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="scaleLabel">
+     <property name="text">
+      <string>Scale:</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QPushButton" name="mirrorImageBtn">
+       <property name="toolTip">
+        <string extracomment="Mirror the item across the global Y axis"/>
+       </property>
+       <property name="text">
+        <string>Mirror</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="reflectImageBtn">
+       <property name="text">
+        <string>Reflect</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/libs/pyqtgraph/canvas/TransformGuiTemplate_pyqt.py b/libs/pyqtgraph/canvas/TransformGuiTemplate_pyqt.py
new file mode 100644
index 0000000000000000000000000000000000000000..75c694c074fde0794806e335b33c29994fe45899
--- /dev/null
+++ b/libs/pyqtgraph/canvas/TransformGuiTemplate_pyqt.py
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file './pyqtgraph/canvas/TransformGuiTemplate.ui'
+#
+# Created: Mon Dec 23 10:10:52 2013
+#      by: PyQt4 UI code generator 4.10
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt4 import QtCore, QtGui
+
+try:
+    _fromUtf8 = QtCore.QString.fromUtf8
+except AttributeError:
+    def _fromUtf8(s):
+        return s
+
+try:
+    _encoding = QtGui.QApplication.UnicodeUTF8
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig, _encoding)
+except AttributeError:
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig)
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName(_fromUtf8("Form"))
+        Form.resize(224, 117)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(Form.sizePolicy().hasHeightForWidth())
+        Form.setSizePolicy(sizePolicy)
+        self.verticalLayout = QtGui.QVBoxLayout(Form)
+        self.verticalLayout.setSpacing(1)
+        self.verticalLayout.setMargin(0)
+        self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
+        self.translateLabel = QtGui.QLabel(Form)
+        self.translateLabel.setObjectName(_fromUtf8("translateLabel"))
+        self.verticalLayout.addWidget(self.translateLabel)
+        self.rotateLabel = QtGui.QLabel(Form)
+        self.rotateLabel.setObjectName(_fromUtf8("rotateLabel"))
+        self.verticalLayout.addWidget(self.rotateLabel)
+        self.scaleLabel = QtGui.QLabel(Form)
+        self.scaleLabel.setObjectName(_fromUtf8("scaleLabel"))
+        self.verticalLayout.addWidget(self.scaleLabel)
+        self.horizontalLayout = QtGui.QHBoxLayout()
+        self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
+        self.mirrorImageBtn = QtGui.QPushButton(Form)
+        self.mirrorImageBtn.setToolTip(_fromUtf8(""))
+        self.mirrorImageBtn.setObjectName(_fromUtf8("mirrorImageBtn"))
+        self.horizontalLayout.addWidget(self.mirrorImageBtn)
+        self.reflectImageBtn = QtGui.QPushButton(Form)
+        self.reflectImageBtn.setObjectName(_fromUtf8("reflectImageBtn"))
+        self.horizontalLayout.addWidget(self.reflectImageBtn)
+        self.verticalLayout.addLayout(self.horizontalLayout)
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        Form.setWindowTitle(_translate("Form", "Form", None))
+        self.translateLabel.setText(_translate("Form", "Translate:", None))
+        self.rotateLabel.setText(_translate("Form", "Rotate:", None))
+        self.scaleLabel.setText(_translate("Form", "Scale:", None))
+        self.mirrorImageBtn.setText(_translate("Form", "Mirror", None))
+        self.reflectImageBtn.setText(_translate("Form", "Reflect", None))
+
diff --git a/libs/pyqtgraph/canvas/TransformGuiTemplate_pyqt5.py b/libs/pyqtgraph/canvas/TransformGuiTemplate_pyqt5.py
new file mode 100644
index 0000000000000000000000000000000000000000..549f300844554f2e0d4d653d9bf668ff7c2ef436
--- /dev/null
+++ b/libs/pyqtgraph/canvas/TransformGuiTemplate_pyqt5.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file './pyqtgraph/canvas/TransformGuiTemplate.ui'
+#
+# Created: Wed Mar 26 15:09:28 2014
+#      by: PyQt5 UI code generator 5.0.1
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt5 import QtCore, QtGui, QtWidgets
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName("Form")
+        Form.resize(224, 117)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(Form.sizePolicy().hasHeightForWidth())
+        Form.setSizePolicy(sizePolicy)
+        self.verticalLayout = QtWidgets.QVBoxLayout(Form)
+        self.verticalLayout.setSpacing(1)
+        self.verticalLayout.setContentsMargins(0, 0, 0, 0)
+        self.verticalLayout.setObjectName("verticalLayout")
+        self.translateLabel = QtWidgets.QLabel(Form)
+        self.translateLabel.setObjectName("translateLabel")
+        self.verticalLayout.addWidget(self.translateLabel)
+        self.rotateLabel = QtWidgets.QLabel(Form)
+        self.rotateLabel.setObjectName("rotateLabel")
+        self.verticalLayout.addWidget(self.rotateLabel)
+        self.scaleLabel = QtWidgets.QLabel(Form)
+        self.scaleLabel.setObjectName("scaleLabel")
+        self.verticalLayout.addWidget(self.scaleLabel)
+        self.horizontalLayout = QtWidgets.QHBoxLayout()
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.mirrorImageBtn = QtWidgets.QPushButton(Form)
+        self.mirrorImageBtn.setToolTip("")
+        self.mirrorImageBtn.setObjectName("mirrorImageBtn")
+        self.horizontalLayout.addWidget(self.mirrorImageBtn)
+        self.reflectImageBtn = QtWidgets.QPushButton(Form)
+        self.reflectImageBtn.setObjectName("reflectImageBtn")
+        self.horizontalLayout.addWidget(self.reflectImageBtn)
+        self.verticalLayout.addLayout(self.horizontalLayout)
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        _translate = QtCore.QCoreApplication.translate
+        Form.setWindowTitle(_translate("Form", "Form"))
+        self.translateLabel.setText(_translate("Form", "Translate:"))
+        self.rotateLabel.setText(_translate("Form", "Rotate:"))
+        self.scaleLabel.setText(_translate("Form", "Scale:"))
+        self.mirrorImageBtn.setText(_translate("Form", "Mirror"))
+        self.reflectImageBtn.setText(_translate("Form", "Reflect"))
+
diff --git a/libs/pyqtgraph/canvas/TransformGuiTemplate_pyside.py b/libs/pyqtgraph/canvas/TransformGuiTemplate_pyside.py
new file mode 100644
index 0000000000000000000000000000000000000000..bce7b511df43bf8c4c9ad84018f7b25d21f61236
--- /dev/null
+++ b/libs/pyqtgraph/canvas/TransformGuiTemplate_pyside.py
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file './pyqtgraph/canvas/TransformGuiTemplate.ui'
+#
+# Created: Mon Dec 23 10:10:52 2013
+#      by: pyside-uic 0.2.14 running on PySide 1.1.2
+#
+# WARNING! All changes made in this file will be lost!
+
+from PySide import QtCore, QtGui
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName("Form")
+        Form.resize(224, 117)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(Form.sizePolicy().hasHeightForWidth())
+        Form.setSizePolicy(sizePolicy)
+        self.verticalLayout = QtGui.QVBoxLayout(Form)
+        self.verticalLayout.setSpacing(1)
+        self.verticalLayout.setContentsMargins(0, 0, 0, 0)
+        self.verticalLayout.setObjectName("verticalLayout")
+        self.translateLabel = QtGui.QLabel(Form)
+        self.translateLabel.setObjectName("translateLabel")
+        self.verticalLayout.addWidget(self.translateLabel)
+        self.rotateLabel = QtGui.QLabel(Form)
+        self.rotateLabel.setObjectName("rotateLabel")
+        self.verticalLayout.addWidget(self.rotateLabel)
+        self.scaleLabel = QtGui.QLabel(Form)
+        self.scaleLabel.setObjectName("scaleLabel")
+        self.verticalLayout.addWidget(self.scaleLabel)
+        self.horizontalLayout = QtGui.QHBoxLayout()
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.mirrorImageBtn = QtGui.QPushButton(Form)
+        self.mirrorImageBtn.setToolTip("")
+        self.mirrorImageBtn.setObjectName("mirrorImageBtn")
+        self.horizontalLayout.addWidget(self.mirrorImageBtn)
+        self.reflectImageBtn = QtGui.QPushButton(Form)
+        self.reflectImageBtn.setObjectName("reflectImageBtn")
+        self.horizontalLayout.addWidget(self.reflectImageBtn)
+        self.verticalLayout.addLayout(self.horizontalLayout)
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        Form.setWindowTitle(QtGui.QApplication.translate("Form", "Form", None, QtGui.QApplication.UnicodeUTF8))
+        self.translateLabel.setText(QtGui.QApplication.translate("Form", "Translate:", None, QtGui.QApplication.UnicodeUTF8))
+        self.rotateLabel.setText(QtGui.QApplication.translate("Form", "Rotate:", None, QtGui.QApplication.UnicodeUTF8))
+        self.scaleLabel.setText(QtGui.QApplication.translate("Form", "Scale:", None, QtGui.QApplication.UnicodeUTF8))
+        self.mirrorImageBtn.setText(QtGui.QApplication.translate("Form", "Mirror", None, QtGui.QApplication.UnicodeUTF8))
+        self.reflectImageBtn.setText(QtGui.QApplication.translate("Form", "Reflect", None, QtGui.QApplication.UnicodeUTF8))
+
diff --git a/libs/pyqtgraph/canvas/__init__.py b/libs/pyqtgraph/canvas/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..f649d0a114e77a1d0d88e48231c000fa7233a318
--- /dev/null
+++ b/libs/pyqtgraph/canvas/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+from .Canvas import *
+from .CanvasItem import *
\ No newline at end of file
diff --git a/libs/pyqtgraph/colormap.py b/libs/pyqtgraph/colormap.py
new file mode 100644
index 0000000000000000000000000000000000000000..c0033708298e3bcc6de2f75ee94cd3d9e54244fd
--- /dev/null
+++ b/libs/pyqtgraph/colormap.py
@@ -0,0 +1,250 @@
+import numpy as np
+from .Qt import QtGui, QtCore
+
+class ColorMap(object):
+    """
+    A ColorMap defines a relationship between a scalar value and a range of colors. 
+    ColorMaps are commonly used for false-coloring monochromatic images, coloring 
+    scatter-plot points, and coloring surface plots by height. 
+    
+    Each color map is defined by a set of colors, each corresponding to a
+    particular scalar value. For example:
+    
+        | 0.0  -> black
+        | 0.2  -> red
+        | 0.6  -> yellow
+        | 1.0  -> white
+        
+    The colors for intermediate values are determined by interpolating between 
+    the two nearest colors in either RGB or HSV color space.
+    
+    To provide user-defined color mappings, see :class:`GradientWidget <pyqtgraph.GradientWidget>`.
+    """
+    
+    
+    ## color interpolation modes
+    RGB = 1
+    HSV_POS = 2
+    HSV_NEG = 3
+    
+    ## boundary modes
+    CLIP = 1
+    REPEAT = 2
+    MIRROR = 3
+    
+    ## return types
+    BYTE = 1
+    FLOAT = 2
+    QCOLOR = 3
+    
+    enumMap = {
+        'rgb': RGB,
+        'hsv+': HSV_POS,
+        'hsv-': HSV_NEG,
+        'clip': CLIP,
+        'repeat': REPEAT,
+        'mirror': MIRROR,
+        'byte': BYTE,
+        'float': FLOAT,
+        'qcolor': QCOLOR,
+    }
+    
+    def __init__(self, pos, color, mode=None):
+        """
+        ===============     ==============================================================
+        **Arguments:**
+        pos                 Array of positions where each color is defined
+        color               Array of RGBA colors.
+                            Integer data types are interpreted as 0-255; float data types
+                            are interpreted as 0.0-1.0
+        mode                Array of color modes (ColorMap.RGB, HSV_POS, or HSV_NEG)
+                            indicating the color space that should be used when
+                            interpolating between stops. Note that the last mode value is
+                            ignored. By default, the mode is entirely RGB.
+        ===============     ==============================================================
+        """
+        self.pos = np.array(pos)
+        self.color = np.array(color)
+        if mode is None:
+            mode = np.ones(len(pos))
+        self.mode = mode
+        self.stopsCache = {}
+        
+    def map(self, data, mode='byte'):
+        """
+        Return an array of colors corresponding to the values in *data*. 
+        Data must be either a scalar position or an array (any shape) of positions.
+        
+        The *mode* argument determines the type of data returned:
+        
+        =========== ===============================================================
+        byte        (default) Values are returned as 0-255 unsigned bytes.
+        float       Values are returned as 0.0-1.0 floats. 
+        qcolor      Values are returned as an array of QColor objects.
+        =========== ===============================================================
+        """
+        if isinstance(mode, basestring):
+            mode = self.enumMap[mode.lower()]
+            
+        if mode == self.QCOLOR:
+            pos, color = self.getStops(self.BYTE)
+        else:
+            pos, color = self.getStops(mode)
+            
+        # don't need this--np.interp takes care of it.
+        #data = np.clip(data, pos.min(), pos.max())
+            
+        # Interpolate
+        # TODO: is griddata faster?
+        #          interp = scipy.interpolate.griddata(pos, color, data)
+        if np.isscalar(data):
+            interp = np.empty((color.shape[1],), dtype=color.dtype)
+        else:
+            if not isinstance(data, np.ndarray):
+                data = np.array(data)
+            interp = np.empty(data.shape + (color.shape[1],), dtype=color.dtype)
+        for i in range(color.shape[1]):
+            interp[...,i] = np.interp(data, pos, color[:,i])
+
+        # Convert to QColor if requested
+        if mode == self.QCOLOR:
+            if np.isscalar(data):
+                return QtGui.QColor(*interp)
+            else:
+                return [QtGui.QColor(*x) for x in interp]
+        else:
+            return interp
+        
+    def mapToQColor(self, data):
+        """Convenience function; see :func:`map() <pyqtgraph.ColorMap.map>`."""
+        return self.map(data, mode=self.QCOLOR)
+
+    def mapToByte(self, data):
+        """Convenience function; see :func:`map() <pyqtgraph.ColorMap.map>`."""
+        return self.map(data, mode=self.BYTE)
+
+    def mapToFloat(self, data):
+        """Convenience function; see :func:`map() <pyqtgraph.ColorMap.map>`."""
+        return self.map(data, mode=self.FLOAT)
+    
+    def getGradient(self, p1=None, p2=None):
+        """Return a QLinearGradient object spanning from QPoints p1 to p2."""
+        if p1 == None:
+            p1 = QtCore.QPointF(0,0)
+        if p2 == None:
+            p2 = QtCore.QPointF(self.pos.max()-self.pos.min(),0)
+        g = QtGui.QLinearGradient(p1, p2)
+        
+        pos, color = self.getStops(mode=self.BYTE)
+        color = [QtGui.QColor(*x) for x in color]
+        g.setStops(zip(pos, color))
+        
+        #if self.colorMode == 'rgb':
+            #ticks = self.listTicks()
+            #g.setStops([(x, QtGui.QColor(t.color)) for t,x in ticks])
+        #elif self.colorMode == 'hsv':  ## HSV mode is approximated for display by interpolating 10 points between each stop
+            #ticks = self.listTicks()
+            #stops = []
+            #stops.append((ticks[0][1], ticks[0][0].color))
+            #for i in range(1,len(ticks)):
+                #x1 = ticks[i-1][1]
+                #x2 = ticks[i][1]
+                #dx = (x2-x1) / 10.
+                #for j in range(1,10):
+                    #x = x1 + dx*j
+                    #stops.append((x, self.getColor(x)))
+                #stops.append((x2, self.getColor(x2)))
+            #g.setStops(stops)
+        return g
+    
+    def getColors(self, mode=None):
+        """Return list of all color stops converted to the specified mode.
+        If mode is None, then no conversion is done."""
+        if isinstance(mode, basestring):
+            mode = self.enumMap[mode.lower()]
+        
+        color = self.color
+        if mode in [self.BYTE, self.QCOLOR] and color.dtype.kind == 'f':
+            color = (color * 255).astype(np.ubyte)
+        elif mode == self.FLOAT and color.dtype.kind != 'f':
+            color = color.astype(float) / 255.
+            
+        if mode == self.QCOLOR:
+            color = [QtGui.QColor(*x) for x in color]
+            
+        return color
+        
+    def getStops(self, mode):
+        ## Get fully-expanded set of RGBA stops in either float or byte mode.
+        if mode not in self.stopsCache:
+            color = self.color
+            if mode == self.BYTE and color.dtype.kind == 'f':
+                color = (color * 255).astype(np.ubyte)
+            elif mode == self.FLOAT and color.dtype.kind != 'f':
+                color = color.astype(float) / 255.
+        
+            ## to support HSV mode, we need to do a little more work..
+            #stops = []
+            #for i in range(len(self.pos)):
+                #pos = self.pos[i]
+                #color = color[i]
+                
+                #imode = self.mode[i]
+                #if imode == self.RGB:
+                    #stops.append((x,color)) 
+                #else:
+                    #ns = 
+            self.stopsCache[mode] = (self.pos, color)
+        return self.stopsCache[mode]
+        
+    def getLookupTable(self, start=0.0, stop=1.0, nPts=512, alpha=None, mode='byte'):
+        """
+        Return an RGB(A) lookup table (ndarray). 
+        
+        ===============   =============================================================================
+        **Arguments:**
+        start             The starting value in the lookup table (default=0.0)
+        stop              The final value in the lookup table (default=1.0)
+        nPts              The number of points in the returned lookup table.
+        alpha             True, False, or None - Specifies whether or not alpha values are included
+                          in the table. If alpha is None, it will be automatically determined.
+        mode              Determines return type: 'byte' (0-255), 'float' (0.0-1.0), or 'qcolor'.
+                          See :func:`map() <pyqtgraph.ColorMap.map>`.
+        ===============   =============================================================================
+        """
+        if isinstance(mode, basestring):
+            mode = self.enumMap[mode.lower()]
+        
+        if alpha is None:
+            alpha = self.usesAlpha()
+            
+        x = np.linspace(start, stop, nPts)
+        table = self.map(x, mode)
+        
+        if not alpha:
+            return table[:,:3]
+        else:
+            return table
+    
+    def usesAlpha(self):
+        """Return True if any stops have an alpha < 255"""
+        max = 1.0 if self.color.dtype.kind == 'f' else 255
+        return np.any(self.color[:,3] != max)
+            
+    def isMapTrivial(self):
+        """
+        Return True if the gradient has exactly two stops in it: black at 0.0 and white at 1.0.
+        """
+        if len(self.pos) != 2:
+            return False
+        if self.pos[0] != 0.0 or self.pos[1] != 1.0:
+            return False
+        if self.color.dtype.kind == 'f':
+            return np.all(self.color == np.array([[0.,0.,0.,1.], [1.,1.,1.,1.]]))
+        else:
+            return np.all(self.color == np.array([[0,0,0,255], [255,255,255,255]]))
+
+    def __repr__(self):
+        pos = repr(self.pos).replace('\n', '')
+        color = repr(self.color).replace('\n', '')
+        return "ColorMap(%s, %s)" % (pos, color)
diff --git a/libs/pyqtgraph/configfile.py b/libs/pyqtgraph/configfile.py
new file mode 100644
index 0000000000000000000000000000000000000000..c095bba3059f2c7495bcb5ecabcd3edd38d4ac82
--- /dev/null
+++ b/libs/pyqtgraph/configfile.py
@@ -0,0 +1,217 @@
+# -*- coding: utf-8 -*-
+"""
+configfile.py - Human-readable text configuration file library 
+Copyright 2010  Luke Campagnola
+Distributed under MIT/X11 license. See license.txt for more infomation.
+
+Used for reading and writing dictionary objects to a python-like configuration
+file format. Data structures may be nested and contain any data type as long
+as it can be converted to/from a string using repr and eval.
+"""
+
+import re, os, sys
+from .pgcollections import OrderedDict
+GLOBAL_PATH = None # so not thread safe.
+from . import units
+from .python2_3 import asUnicode
+from .Qt import QtCore
+from .Point import Point
+from .colormap import ColorMap
+import numpy
+
+class ParseError(Exception):
+    def __init__(self, message, lineNum, line, fileName=None):
+        self.lineNum = lineNum
+        self.line = line
+        #self.message = message
+        self.fileName = fileName
+        Exception.__init__(self, message)
+        
+    def __str__(self):
+        if self.fileName is None:
+            msg = "Error parsing string at line %d:\n" % self.lineNum
+        else:
+            msg = "Error parsing config file '%s' at line %d:\n" % (self.fileName, self.lineNum)
+        msg += "%s\n%s" % (self.line, self.message)
+        return msg
+        #raise Exception()
+        
+
+def writeConfigFile(data, fname):
+    s = genString(data)
+    fd = open(fname, 'w')
+    fd.write(s)
+    fd.close()
+    
+def readConfigFile(fname):
+    #cwd = os.getcwd()
+    global GLOBAL_PATH
+    if GLOBAL_PATH is not None:
+        fname2 = os.path.join(GLOBAL_PATH, fname)
+        if os.path.exists(fname2):
+            fname = fname2
+
+    GLOBAL_PATH = os.path.dirname(os.path.abspath(fname))
+        
+    try:
+        #os.chdir(newDir)  ## bad.
+        fd = open(fname)
+        s = asUnicode(fd.read())
+        fd.close()
+        s = s.replace("\r\n", "\n")
+        s = s.replace("\r", "\n")
+        data = parseString(s)[1]
+    except ParseError:
+        sys.exc_info()[1].fileName = fname
+        raise
+    except:
+        print("Error while reading config file %s:"% fname)
+        raise
+    #finally:
+        #os.chdir(cwd)
+    return data
+
+def appendConfigFile(data, fname):
+    s = genString(data)
+    fd = open(fname, 'a')
+    fd.write(s)
+    fd.close()
+
+
+def genString(data, indent=''):
+    s = ''
+    for k in data:
+        sk = str(k)
+        if len(sk) == 0:
+            print(data)
+            raise Exception('blank dict keys not allowed (see data above)')
+        if sk[0] == ' ' or ':' in sk:
+            print(data)
+            raise Exception('dict keys must not contain ":" or start with spaces [offending key is "%s"]' % sk)
+        if isinstance(data[k], dict):
+            s += indent + sk + ':\n'
+            s += genString(data[k], indent + '    ')
+        else:
+            s += indent + sk + ': ' + repr(data[k]) + '\n'
+    return s
+    
+def parseString(lines, start=0):
+    
+    data = OrderedDict()
+    if isinstance(lines, basestring):
+        lines = lines.split('\n')
+        lines = [l for l in lines if re.search(r'\S', l) and not re.match(r'\s*#', l)]  ## remove empty lines
+        
+    indent = measureIndent(lines[start])
+    ln = start - 1
+    
+    try:
+        while True:
+            ln += 1
+            #print ln
+            if ln >= len(lines):
+                break
+            
+            l = lines[ln]
+            
+            ## Skip blank lines or lines starting with #
+            if re.match(r'\s*#', l) or not re.search(r'\S', l):
+                continue
+            
+            ## Measure line indentation, make sure it is correct for this level
+            lineInd = measureIndent(l)
+            if lineInd < indent:
+                ln -= 1
+                break
+            if lineInd > indent:
+                #print lineInd, indent
+                raise ParseError('Indentation is incorrect. Expected %d, got %d' % (indent, lineInd), ln+1, l)
+            
+            
+            if ':' not in l:
+                raise ParseError('Missing colon', ln+1, l)
+            
+            (k, p, v) = l.partition(':')
+            k = k.strip()
+            v = v.strip()
+            
+            ## set up local variables to use for eval
+            local = units.allUnits.copy()
+            local['OrderedDict'] = OrderedDict
+            local['readConfigFile'] = readConfigFile
+            local['Point'] = Point
+            local['QtCore'] = QtCore
+            local['ColorMap'] = ColorMap
+            # Needed for reconstructing numpy arrays
+            local['array'] = numpy.array
+            for dtype in ['int8', 'uint8', 
+                          'int16', 'uint16', 'float16',
+                          'int32', 'uint32', 'float32',
+                          'int64', 'uint64', 'float64']:
+                local[dtype] = getattr(numpy, dtype)
+                
+            if len(k) < 1:
+                raise ParseError('Missing name preceding colon', ln+1, l)
+            if k[0] == '(' and k[-1] == ')':  ## If the key looks like a tuple, try evaluating it.
+                try:
+                    k1 = eval(k, local)
+                    if type(k1) is tuple:
+                        k = k1
+                except:
+                    pass
+            if re.search(r'\S', v) and v[0] != '#':  ## eval the value
+                try:
+                    val = eval(v, local)
+                except:
+                    ex = sys.exc_info()[1]
+                    raise ParseError("Error evaluating expression '%s': [%s: %s]" % (v, ex.__class__.__name__, str(ex)), (ln+1), l)
+            else:
+                if ln+1 >= len(lines) or measureIndent(lines[ln+1]) <= indent:
+                    #print "blank dict"
+                    val = {}
+                else:
+                    #print "Going deeper..", ln+1
+                    (ln, val) = parseString(lines, start=ln+1)
+            data[k] = val
+        #print k, repr(val)
+    except ParseError:
+        raise
+    except:
+        ex = sys.exc_info()[1]
+        raise ParseError("%s: %s" % (ex.__class__.__name__, str(ex)), ln+1, l)
+    #print "Returning shallower..", ln+1
+    return (ln, data)
+    
+def measureIndent(s):
+    n = 0
+    while n < len(s) and s[n] == ' ':
+        n += 1
+    return n
+    
+    
+    
+if __name__ == '__main__':
+    import tempfile
+    fn = tempfile.mktemp()
+    tf = open(fn, 'w')
+    cf = """
+key: 'value'
+key2:              ##comment
+                   ##comment
+    key21: 'value' ## comment
+                   ##comment
+    key22: [1,2,3]
+    key23: 234  #comment
+    """
+    tf.write(cf)
+    tf.close()
+    print("=== Test:===")
+    num = 1
+    for line in cf.split('\n'):
+        print("%02d   %s" % (num, line))
+        num += 1
+    print(cf)
+    print("============")
+    data = readConfigFile(fn)
+    print(data)
+    os.remove(fn)
diff --git a/libs/pyqtgraph/console/CmdInput.py b/libs/pyqtgraph/console/CmdInput.py
new file mode 100644
index 0000000000000000000000000000000000000000..24a01e8949e65f522e6c7f5d350f1d3a28eb3316
--- /dev/null
+++ b/libs/pyqtgraph/console/CmdInput.py
@@ -0,0 +1,62 @@
+from ..Qt import QtCore, QtGui
+from ..python2_3 import asUnicode
+
+class CmdInput(QtGui.QLineEdit):
+    
+    sigExecuteCmd = QtCore.Signal(object)
+    
+    def __init__(self, parent):
+        QtGui.QLineEdit.__init__(self, parent)
+        self.history = [""]
+        self.ptr = 0
+        #self.lastCmd = None
+        #self.setMultiline(False)
+    
+    def keyPressEvent(self, ev):
+        #print "press:", ev.key(), QtCore.Qt.Key_Up, QtCore.Qt.Key_Down, QtCore.Qt.Key_Enter
+        if ev.key() == QtCore.Qt.Key_Up and self.ptr < len(self.history) - 1:
+            self.setHistory(self.ptr+1)
+            ev.accept()
+            return
+        elif ev.key() ==  QtCore.Qt.Key_Down and self.ptr > 0:
+            self.setHistory(self.ptr-1)
+            ev.accept()
+            return
+        elif ev.key() == QtCore.Qt.Key_Return:
+            self.execCmd()
+        else:
+            QtGui.QLineEdit.keyPressEvent(self, ev)
+            self.history[0] = asUnicode(self.text())
+        
+    def execCmd(self):
+        cmd = asUnicode(self.text())
+        if len(self.history) == 1 or cmd != self.history[1]:
+            self.history.insert(1, cmd)
+        #self.lastCmd = cmd
+        self.history[0] = ""
+        self.setHistory(0)
+        self.sigExecuteCmd.emit(cmd)
+        
+    def setHistory(self, num):
+        self.ptr = num
+        self.setText(self.history[self.ptr])
+        
+    #def setMultiline(self, m):
+        #height = QtGui.QFontMetrics(self.font()).lineSpacing()
+        #if m:
+            #self.setFixedHeight(height*5)
+        #else:
+            #self.setFixedHeight(height+15)
+            #self.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+            #self.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+            
+       
+    #def sizeHint(self):
+        #hint = QtGui.QPlainTextEdit.sizeHint(self)
+        #height = QtGui.QFontMetrics(self.font()).lineSpacing()
+        #hint.setHeight(height)
+        #return hint
+
+        
+        
+        
\ No newline at end of file
diff --git a/libs/pyqtgraph/console/Console.py b/libs/pyqtgraph/console/Console.py
new file mode 100644
index 0000000000000000000000000000000000000000..7b3f6d97d2ca8bda5cf7e1f4eb52261b2df4439c
--- /dev/null
+++ b/libs/pyqtgraph/console/Console.py
@@ -0,0 +1,388 @@
+
+from ..Qt import QtCore, QtGui, USE_PYSIDE, USE_PYQT5
+import sys, re, os, time, traceback, subprocess
+if USE_PYSIDE:
+    from . import template_pyside as template
+elif USE_PYQT5:
+    from . import template_pyqt5 as template
+else:
+    from . import template_pyqt as template
+    
+from .. import exceptionHandling as exceptionHandling
+import pickle
+from .. import getConfigOption
+
+class ConsoleWidget(QtGui.QWidget):
+    """
+    Widget displaying console output and accepting command input.
+    Implements:
+        
+    - eval python expressions / exec python statements
+    - storable history of commands
+    - exception handling allowing commands to be interpreted in the context of any level in the exception stack frame
+    
+    Why not just use python in an interactive shell (or ipython) ? There are a few reasons:
+       
+    - pyside does not yet allow Qt event processing and interactive shell at the same time
+    - on some systems, typing in the console _blocks_ the qt event loop until the user presses enter. This can 
+      be baffling and frustrating to users since it would appear the program has frozen.
+    - some terminals (eg windows cmd.exe) have notoriously unfriendly interfaces
+    - ability to add extra features like exception stack introspection
+    - ability to have multiple interactive prompts, including for spawned sub-processes
+    """
+    
+    def __init__(self, parent=None, namespace=None, historyFile=None, text=None, editor=None):
+        """
+        ==============  ============================================================================
+        **Arguments:**
+        namespace       dictionary containing the initial variables present in the default namespace
+        historyFile     optional file for storing command history
+        text            initial text to display in the console window
+        editor          optional string for invoking code editor (called when stack trace entries are 
+                        double-clicked). May contain {fileName} and {lineNum} format keys. Example:: 
+                      
+                            editorCommand --loadfile {fileName} --gotoline {lineNum}
+        ==============  =============================================================================
+        """
+        QtGui.QWidget.__init__(self, parent)
+        if namespace is None:
+            namespace = {}
+        self.localNamespace = namespace
+        self.editor = editor
+        self.multiline = None
+        self.inCmd = False
+        
+        self.ui = template.Ui_Form()
+        self.ui.setupUi(self)
+        self.output = self.ui.output
+        self.input = self.ui.input
+        self.input.setFocus()
+        
+        if text is not None:
+            self.output.setPlainText(text)
+
+        self.historyFile = historyFile
+        
+        history = self.loadHistory()
+        if history is not None:
+            self.input.history = [""] + history
+            self.ui.historyList.addItems(history[::-1])
+        self.ui.historyList.hide()
+        self.ui.exceptionGroup.hide()
+        
+        self.input.sigExecuteCmd.connect(self.runCmd)
+        self.ui.historyBtn.toggled.connect(self.ui.historyList.setVisible)
+        self.ui.historyList.itemClicked.connect(self.cmdSelected)
+        self.ui.historyList.itemDoubleClicked.connect(self.cmdDblClicked)
+        self.ui.exceptionBtn.toggled.connect(self.ui.exceptionGroup.setVisible)
+        
+        self.ui.catchAllExceptionsBtn.toggled.connect(self.catchAllExceptions)
+        self.ui.catchNextExceptionBtn.toggled.connect(self.catchNextException)
+        self.ui.clearExceptionBtn.clicked.connect(self.clearExceptionClicked)
+        self.ui.exceptionStackList.itemClicked.connect(self.stackItemClicked)
+        self.ui.exceptionStackList.itemDoubleClicked.connect(self.stackItemDblClicked)
+        self.ui.onlyUncaughtCheck.toggled.connect(self.updateSysTrace)
+        
+        self.currentTraceback = None
+        
+    def loadHistory(self):
+        """Return the list of previously-invoked command strings (or None)."""
+        if self.historyFile is not None:
+            return pickle.load(open(self.historyFile, 'rb'))
+        
+    def saveHistory(self, history):
+        """Store the list of previously-invoked command strings."""
+        if self.historyFile is not None:
+            pickle.dump(open(self.historyFile, 'wb'), history)
+        
+    def runCmd(self, cmd):
+        #cmd = str(self.input.lastCmd)
+        self.stdout = sys.stdout
+        self.stderr = sys.stderr
+        encCmd = re.sub(r'>', '&gt;', re.sub(r'<', '&lt;', cmd))
+        encCmd = re.sub(r' ', '&nbsp;', encCmd)
+        
+        self.ui.historyList.addItem(cmd)
+        self.saveHistory(self.input.history[1:100])
+        
+        try:
+            sys.stdout = self
+            sys.stderr = self
+            if self.multiline is not None:
+                self.write("<br><b>%s</b>\n"%encCmd, html=True)
+                self.execMulti(cmd)
+            else:
+                self.write("<br><div style='background-color: #CCF'><b>%s</b>\n"%encCmd, html=True)
+                self.inCmd = True
+                self.execSingle(cmd)
+            
+            if not self.inCmd:
+                self.write("</div>\n", html=True)
+                
+        finally:
+            sys.stdout = self.stdout
+            sys.stderr = self.stderr
+            
+            sb = self.output.verticalScrollBar()
+            sb.setValue(sb.maximum())
+            sb = self.ui.historyList.verticalScrollBar()
+            sb.setValue(sb.maximum())
+            
+    def globals(self):
+        frame = self.currentFrame()
+        if frame is not None and self.ui.runSelectedFrameCheck.isChecked():
+            return self.currentFrame().tb_frame.f_globals
+        else:
+            return globals()
+        
+    def locals(self):
+        frame = self.currentFrame()
+        if frame is not None and self.ui.runSelectedFrameCheck.isChecked():
+            return self.currentFrame().tb_frame.f_locals
+        else:
+            return self.localNamespace
+            
+    def currentFrame(self):
+        ## Return the currently selected exception stack frame (or None if there is no exception)
+        if self.currentTraceback is None:
+            return None
+        index = self.ui.exceptionStackList.currentRow()
+        tb = self.currentTraceback
+        for i in range(index):
+            tb = tb.tb_next
+        return tb
+        
+    def execSingle(self, cmd):
+        try:
+            output = eval(cmd, self.globals(), self.locals())
+            self.write(repr(output) + '\n')
+        except SyntaxError:
+            try:
+                exec(cmd, self.globals(), self.locals())
+            except SyntaxError as exc:
+                if 'unexpected EOF' in exc.msg:
+                    self.multiline = cmd
+                else:
+                    self.displayException()
+            except:
+                self.displayException()
+        except:
+            self.displayException()
+            
+            
+    def execMulti(self, nextLine):
+        #self.stdout.write(nextLine+"\n")
+        if nextLine.strip() != '':
+            self.multiline += "\n" + nextLine
+            return
+        else:
+            cmd = self.multiline
+            
+        try:
+            output = eval(cmd, self.globals(), self.locals())
+            self.write(str(output) + '\n')
+            self.multiline = None
+        except SyntaxError:
+            try:
+                exec(cmd, self.globals(), self.locals())
+                self.multiline = None
+            except SyntaxError as exc:
+                if 'unexpected EOF' in exc.msg:
+                    self.multiline = cmd
+                else:
+                    self.displayException()
+                    self.multiline = None
+            except:
+                self.displayException()
+                self.multiline = None
+        except:
+            self.displayException()
+            self.multiline = None
+
+    def write(self, strn, html=False):
+        self.output.moveCursor(QtGui.QTextCursor.End)
+        if html:
+            self.output.textCursor().insertHtml(strn)
+        else:
+            if self.inCmd:
+                self.inCmd = False
+                self.output.textCursor().insertHtml("</div><br><div style='font-weight: normal; background-color: #FFF;'>")
+                #self.stdout.write("</div><br><div style='font-weight: normal; background-color: #FFF;'>")
+            self.output.insertPlainText(strn)
+        #self.stdout.write(strn)
+    
+    def displayException(self):
+        """
+        Display the current exception and stack.
+        """
+        tb = traceback.format_exc()
+        lines = []
+        indent = 4
+        prefix = '' 
+        for l in tb.split('\n'):
+            lines.append(" "*indent + prefix + l)
+        self.write('\n'.join(lines))
+        self.exceptionHandler(*sys.exc_info())
+        
+    def cmdSelected(self, item):
+        index = -(self.ui.historyList.row(item)+1)
+        self.input.setHistory(index)
+        self.input.setFocus()
+        
+    def cmdDblClicked(self, item):
+        index = -(self.ui.historyList.row(item)+1)
+        self.input.setHistory(index)
+        self.input.execCmd()
+        
+    def flush(self):
+        pass
+
+    def catchAllExceptions(self, catch=True):
+        """
+        If True, the console will catch all unhandled exceptions and display the stack
+        trace. Each exception caught clears the last.
+        """
+        self.ui.catchAllExceptionsBtn.setChecked(catch)
+        if catch:
+            self.ui.catchNextExceptionBtn.setChecked(False)
+            self.enableExceptionHandling()
+            self.ui.exceptionBtn.setChecked(True)
+        else:
+            self.disableExceptionHandling()
+        
+    def catchNextException(self, catch=True):
+        """
+        If True, the console will catch the next unhandled exception and display the stack
+        trace.
+        """
+        self.ui.catchNextExceptionBtn.setChecked(catch)
+        if catch:
+            self.ui.catchAllExceptionsBtn.setChecked(False)
+            self.enableExceptionHandling()
+            self.ui.exceptionBtn.setChecked(True)
+        else:
+            self.disableExceptionHandling()
+        
+    def enableExceptionHandling(self):
+        exceptionHandling.register(self.exceptionHandler)
+        self.updateSysTrace()
+        
+    def disableExceptionHandling(self):
+        exceptionHandling.unregister(self.exceptionHandler)
+        self.updateSysTrace()
+        
+    def clearExceptionClicked(self):
+        self.currentTraceback = None
+        self.ui.exceptionInfoLabel.setText("[No current exception]")
+        self.ui.exceptionStackList.clear()
+        self.ui.clearExceptionBtn.setEnabled(False)
+        
+    def stackItemClicked(self, item):
+        pass
+    
+    def stackItemDblClicked(self, item):
+        editor = self.editor
+        if editor is None:
+            editor = getConfigOption('editorCommand')
+        if editor is None:
+            return
+        tb = self.currentFrame()
+        lineNum = tb.tb_lineno
+        fileName = tb.tb_frame.f_code.co_filename
+        subprocess.Popen(self.editor.format(fileName=fileName, lineNum=lineNum), shell=True)
+        
+    
+    #def allExceptionsHandler(self, *args):
+        #self.exceptionHandler(*args)
+    
+    #def nextExceptionHandler(self, *args):
+        #self.ui.catchNextExceptionBtn.setChecked(False)
+        #self.exceptionHandler(*args)
+
+    def updateSysTrace(self):
+        ## Install or uninstall  sys.settrace handler 
+        
+        if not self.ui.catchNextExceptionBtn.isChecked() and not self.ui.catchAllExceptionsBtn.isChecked():
+            if sys.gettrace() == self.systrace:
+                sys.settrace(None)
+            return
+        
+        if self.ui.onlyUncaughtCheck.isChecked():
+            if sys.gettrace() == self.systrace:
+                sys.settrace(None)
+        else:
+            if sys.gettrace() is not None and sys.gettrace() != self.systrace:
+                self.ui.onlyUncaughtCheck.setChecked(False)
+                raise Exception("sys.settrace is in use; cannot monitor for caught exceptions.")
+            else:
+                sys.settrace(self.systrace)
+        
+    def exceptionHandler(self, excType, exc, tb):
+        if self.ui.catchNextExceptionBtn.isChecked():
+            self.ui.catchNextExceptionBtn.setChecked(False)
+        elif not self.ui.catchAllExceptionsBtn.isChecked():
+            return
+        
+        self.ui.clearExceptionBtn.setEnabled(True)
+        self.currentTraceback = tb
+        
+        excMessage = ''.join(traceback.format_exception_only(excType, exc))
+        self.ui.exceptionInfoLabel.setText(excMessage)
+        self.ui.exceptionStackList.clear()
+        for index, line in enumerate(traceback.extract_tb(tb)):
+            self.ui.exceptionStackList.addItem('File "%s", line %s, in %s()\n  %s' % line)
+    
+    def systrace(self, frame, event, arg):
+        if event == 'exception' and self.checkException(*arg):
+            self.exceptionHandler(*arg)
+        return self.systrace
+        
+    def checkException(self, excType, exc, tb):
+        ## Return True if the exception is interesting; False if it should be ignored.
+        
+        filename = tb.tb_frame.f_code.co_filename
+        function = tb.tb_frame.f_code.co_name
+        
+        filterStr = str(self.ui.filterText.text())
+        if filterStr != '':
+            if isinstance(exc, Exception):
+                msg = exc.message
+            elif isinstance(exc, basestring):
+                msg = exc
+            else:
+                msg = repr(exc)
+            match = re.search(filterStr, "%s:%s:%s" % (filename, function, msg))
+            return match is not None
+
+        ## Go through a list of common exception points we like to ignore:
+        if excType is GeneratorExit or excType is StopIteration:
+            return False
+        if excType is KeyError:
+            if filename.endswith('python2.7/weakref.py') and function in ('__contains__', 'get'):
+                return False
+            if filename.endswith('python2.7/copy.py') and function == '_keep_alive':
+                return False
+        if excType is AttributeError:
+            if filename.endswith('python2.7/collections.py') and function == '__init__':
+                return False
+            if filename.endswith('numpy/core/fromnumeric.py') and function in ('all', '_wrapit', 'transpose', 'sum'):
+                return False
+            if filename.endswith('numpy/core/arrayprint.py') and function in ('_array2string'):
+                return False
+            if filename.endswith('MetaArray.py') and function == '__getattr__':
+                for name in ('__array_interface__', '__array_struct__', '__array__'):  ## numpy looks for these when converting objects to array
+                    if name in exc:
+                        return False
+            if filename.endswith('flowchart/eq.py'):
+                return False
+            if filename.endswith('pyqtgraph/functions.py') and function == 'makeQImage':
+                return False
+        if excType is TypeError:
+            if filename.endswith('numpy/lib/function_base.py') and function == 'iterable':
+                return False
+        if excType is ZeroDivisionError:
+            if filename.endswith('python2.7/traceback.py'):
+                return False
+            
+        return True
+    
diff --git a/libs/pyqtgraph/console/__init__.py b/libs/pyqtgraph/console/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..16436abd7637cd9452d2bf5246c09450d0c517e6
--- /dev/null
+++ b/libs/pyqtgraph/console/__init__.py
@@ -0,0 +1 @@
+from .Console import ConsoleWidget
\ No newline at end of file
diff --git a/libs/pyqtgraph/console/template.ui b/libs/pyqtgraph/console/template.ui
new file mode 100644
index 0000000000000000000000000000000000000000..1a672c5e4195204784c886d901285b6536e5d6da
--- /dev/null
+++ b/libs/pyqtgraph/console/template.ui
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>694</width>
+    <height>497</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Console</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <item row="0" column="0">
+    <widget class="QSplitter" name="splitter">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <widget class="QWidget" name="layoutWidget">
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QPlainTextEdit" name="output">
+         <property name="font">
+          <font>
+           <family>Monospace</family>
+          </font>
+         </property>
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <widget class="CmdInput" name="input"/>
+         </item>
+         <item>
+          <widget class="QPushButton" name="historyBtn">
+           <property name="text">
+            <string>History..</string>
+           </property>
+           <property name="checkable">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="exceptionBtn">
+           <property name="text">
+            <string>Exceptions..</string>
+           </property>
+           <property name="checkable">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QListWidget" name="historyList">
+      <property name="font">
+       <font>
+        <family>Monospace</family>
+       </font>
+      </property>
+     </widget>
+     <widget class="QGroupBox" name="exceptionGroup">
+      <property name="title">
+       <string>Exception Handling</string>
+      </property>
+      <layout class="QGridLayout" name="gridLayout_2">
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <item row="0" column="6">
+        <widget class="QPushButton" name="clearExceptionBtn">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <property name="text">
+          <string>Clear Exception</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QPushButton" name="catchAllExceptionsBtn">
+         <property name="text">
+          <string>Show All Exceptions</string>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="0">
+        <widget class="QPushButton" name="catchNextExceptionBtn">
+         <property name="text">
+          <string>Show Next Exception</string>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="4">
+        <widget class="QCheckBox" name="onlyUncaughtCheck">
+         <property name="text">
+          <string>Only Uncaught Exceptions</string>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" colspan="7">
+        <widget class="QListWidget" name="exceptionStackList">
+         <property name="alternatingRowColors">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0" colspan="7">
+        <widget class="QCheckBox" name="runSelectedFrameCheck">
+         <property name="text">
+          <string>Run commands in selected stack frame</string>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" colspan="7">
+        <widget class="QLabel" name="exceptionInfoLabel">
+         <property name="text">
+          <string>Exception Info</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="5">
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="0" column="2">
+        <widget class="QLabel" name="label">
+         <property name="text">
+          <string>Filter (regex):</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="3">
+        <widget class="QLineEdit" name="filterText"/>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>CmdInput</class>
+   <extends>QLineEdit</extends>
+   <header>.CmdInput</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/libs/pyqtgraph/console/template_pyqt.py b/libs/pyqtgraph/console/template_pyqt.py
new file mode 100644
index 0000000000000000000000000000000000000000..354fb1d65ba6676ed5e8bf4d1a5e4f480d6ac00f
--- /dev/null
+++ b/libs/pyqtgraph/console/template_pyqt.py
@@ -0,0 +1,127 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'template.ui'
+#
+# Created: Fri May 02 18:55:28 2014
+#      by: PyQt4 UI code generator 4.10.4
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt4 import QtCore, QtGui
+
+try:
+    _fromUtf8 = QtCore.QString.fromUtf8
+except AttributeError:
+    def _fromUtf8(s):
+        return s
+
+try:
+    _encoding = QtGui.QApplication.UnicodeUTF8
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig, _encoding)
+except AttributeError:
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig)
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName(_fromUtf8("Form"))
+        Form.resize(694, 497)
+        self.gridLayout = QtGui.QGridLayout(Form)
+        self.gridLayout.setMargin(0)
+        self.gridLayout.setSpacing(0)
+        self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
+        self.splitter = QtGui.QSplitter(Form)
+        self.splitter.setOrientation(QtCore.Qt.Vertical)
+        self.splitter.setObjectName(_fromUtf8("splitter"))
+        self.layoutWidget = QtGui.QWidget(self.splitter)
+        self.layoutWidget.setObjectName(_fromUtf8("layoutWidget"))
+        self.verticalLayout = QtGui.QVBoxLayout(self.layoutWidget)
+        self.verticalLayout.setMargin(0)
+        self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
+        self.output = QtGui.QPlainTextEdit(self.layoutWidget)
+        font = QtGui.QFont()
+        font.setFamily(_fromUtf8("Monospace"))
+        self.output.setFont(font)
+        self.output.setReadOnly(True)
+        self.output.setObjectName(_fromUtf8("output"))
+        self.verticalLayout.addWidget(self.output)
+        self.horizontalLayout = QtGui.QHBoxLayout()
+        self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
+        self.input = CmdInput(self.layoutWidget)
+        self.input.setObjectName(_fromUtf8("input"))
+        self.horizontalLayout.addWidget(self.input)
+        self.historyBtn = QtGui.QPushButton(self.layoutWidget)
+        self.historyBtn.setCheckable(True)
+        self.historyBtn.setObjectName(_fromUtf8("historyBtn"))
+        self.horizontalLayout.addWidget(self.historyBtn)
+        self.exceptionBtn = QtGui.QPushButton(self.layoutWidget)
+        self.exceptionBtn.setCheckable(True)
+        self.exceptionBtn.setObjectName(_fromUtf8("exceptionBtn"))
+        self.horizontalLayout.addWidget(self.exceptionBtn)
+        self.verticalLayout.addLayout(self.horizontalLayout)
+        self.historyList = QtGui.QListWidget(self.splitter)
+        font = QtGui.QFont()
+        font.setFamily(_fromUtf8("Monospace"))
+        self.historyList.setFont(font)
+        self.historyList.setObjectName(_fromUtf8("historyList"))
+        self.exceptionGroup = QtGui.QGroupBox(self.splitter)
+        self.exceptionGroup.setObjectName(_fromUtf8("exceptionGroup"))
+        self.gridLayout_2 = QtGui.QGridLayout(self.exceptionGroup)
+        self.gridLayout_2.setSpacing(0)
+        self.gridLayout_2.setContentsMargins(-1, 0, -1, 0)
+        self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2"))
+        self.clearExceptionBtn = QtGui.QPushButton(self.exceptionGroup)
+        self.clearExceptionBtn.setEnabled(False)
+        self.clearExceptionBtn.setObjectName(_fromUtf8("clearExceptionBtn"))
+        self.gridLayout_2.addWidget(self.clearExceptionBtn, 0, 6, 1, 1)
+        self.catchAllExceptionsBtn = QtGui.QPushButton(self.exceptionGroup)
+        self.catchAllExceptionsBtn.setCheckable(True)
+        self.catchAllExceptionsBtn.setObjectName(_fromUtf8("catchAllExceptionsBtn"))
+        self.gridLayout_2.addWidget(self.catchAllExceptionsBtn, 0, 1, 1, 1)
+        self.catchNextExceptionBtn = QtGui.QPushButton(self.exceptionGroup)
+        self.catchNextExceptionBtn.setCheckable(True)
+        self.catchNextExceptionBtn.setObjectName(_fromUtf8("catchNextExceptionBtn"))
+        self.gridLayout_2.addWidget(self.catchNextExceptionBtn, 0, 0, 1, 1)
+        self.onlyUncaughtCheck = QtGui.QCheckBox(self.exceptionGroup)
+        self.onlyUncaughtCheck.setChecked(True)
+        self.onlyUncaughtCheck.setObjectName(_fromUtf8("onlyUncaughtCheck"))
+        self.gridLayout_2.addWidget(self.onlyUncaughtCheck, 0, 4, 1, 1)
+        self.exceptionStackList = QtGui.QListWidget(self.exceptionGroup)
+        self.exceptionStackList.setAlternatingRowColors(True)
+        self.exceptionStackList.setObjectName(_fromUtf8("exceptionStackList"))
+        self.gridLayout_2.addWidget(self.exceptionStackList, 2, 0, 1, 7)
+        self.runSelectedFrameCheck = QtGui.QCheckBox(self.exceptionGroup)
+        self.runSelectedFrameCheck.setChecked(True)
+        self.runSelectedFrameCheck.setObjectName(_fromUtf8("runSelectedFrameCheck"))
+        self.gridLayout_2.addWidget(self.runSelectedFrameCheck, 3, 0, 1, 7)
+        self.exceptionInfoLabel = QtGui.QLabel(self.exceptionGroup)
+        self.exceptionInfoLabel.setObjectName(_fromUtf8("exceptionInfoLabel"))
+        self.gridLayout_2.addWidget(self.exceptionInfoLabel, 1, 0, 1, 7)
+        spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.gridLayout_2.addItem(spacerItem, 0, 5, 1, 1)
+        self.label = QtGui.QLabel(self.exceptionGroup)
+        self.label.setObjectName(_fromUtf8("label"))
+        self.gridLayout_2.addWidget(self.label, 0, 2, 1, 1)
+        self.filterText = QtGui.QLineEdit(self.exceptionGroup)
+        self.filterText.setObjectName(_fromUtf8("filterText"))
+        self.gridLayout_2.addWidget(self.filterText, 0, 3, 1, 1)
+        self.gridLayout.addWidget(self.splitter, 0, 0, 1, 1)
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        Form.setWindowTitle(_translate("Form", "Console", None))
+        self.historyBtn.setText(_translate("Form", "History..", None))
+        self.exceptionBtn.setText(_translate("Form", "Exceptions..", None))
+        self.exceptionGroup.setTitle(_translate("Form", "Exception Handling", None))
+        self.clearExceptionBtn.setText(_translate("Form", "Clear Exception", None))
+        self.catchAllExceptionsBtn.setText(_translate("Form", "Show All Exceptions", None))
+        self.catchNextExceptionBtn.setText(_translate("Form", "Show Next Exception", None))
+        self.onlyUncaughtCheck.setText(_translate("Form", "Only Uncaught Exceptions", None))
+        self.runSelectedFrameCheck.setText(_translate("Form", "Run commands in selected stack frame", None))
+        self.exceptionInfoLabel.setText(_translate("Form", "Exception Info", None))
+        self.label.setText(_translate("Form", "Filter (regex):", None))
+
+from .CmdInput import CmdInput
diff --git a/libs/pyqtgraph/console/template_pyqt5.py b/libs/pyqtgraph/console/template_pyqt5.py
new file mode 100644
index 0000000000000000000000000000000000000000..1fbc5bed2cad4e1cbfdfd35280da56724137635f
--- /dev/null
+++ b/libs/pyqtgraph/console/template_pyqt5.py
@@ -0,0 +1,107 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file './pyqtgraph/console/template.ui'
+#
+# Created: Wed Mar 26 15:09:29 2014
+#      by: PyQt5 UI code generator 5.0.1
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt5 import QtCore, QtGui, QtWidgets
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName("Form")
+        Form.resize(710, 497)
+        self.gridLayout = QtWidgets.QGridLayout(Form)
+        self.gridLayout.setContentsMargins(0, 0, 0, 0)
+        self.gridLayout.setSpacing(0)
+        self.gridLayout.setObjectName("gridLayout")
+        self.splitter = QtWidgets.QSplitter(Form)
+        self.splitter.setOrientation(QtCore.Qt.Vertical)
+        self.splitter.setObjectName("splitter")
+        self.layoutWidget = QtWidgets.QWidget(self.splitter)
+        self.layoutWidget.setObjectName("layoutWidget")
+        self.verticalLayout = QtWidgets.QVBoxLayout(self.layoutWidget)
+        self.verticalLayout.setContentsMargins(0, 0, 0, 0)
+        self.verticalLayout.setObjectName("verticalLayout")
+        self.output = QtWidgets.QPlainTextEdit(self.layoutWidget)
+        font = QtGui.QFont()
+        font.setFamily("Monospace")
+        self.output.setFont(font)
+        self.output.setReadOnly(True)
+        self.output.setObjectName("output")
+        self.verticalLayout.addWidget(self.output)
+        self.horizontalLayout = QtWidgets.QHBoxLayout()
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.input = CmdInput(self.layoutWidget)
+        self.input.setObjectName("input")
+        self.horizontalLayout.addWidget(self.input)
+        self.historyBtn = QtWidgets.QPushButton(self.layoutWidget)
+        self.historyBtn.setCheckable(True)
+        self.historyBtn.setObjectName("historyBtn")
+        self.horizontalLayout.addWidget(self.historyBtn)
+        self.exceptionBtn = QtWidgets.QPushButton(self.layoutWidget)
+        self.exceptionBtn.setCheckable(True)
+        self.exceptionBtn.setObjectName("exceptionBtn")
+        self.horizontalLayout.addWidget(self.exceptionBtn)
+        self.verticalLayout.addLayout(self.horizontalLayout)
+        self.historyList = QtWidgets.QListWidget(self.splitter)
+        font = QtGui.QFont()
+        font.setFamily("Monospace")
+        self.historyList.setFont(font)
+        self.historyList.setObjectName("historyList")
+        self.exceptionGroup = QtWidgets.QGroupBox(self.splitter)
+        self.exceptionGroup.setObjectName("exceptionGroup")
+        self.gridLayout_2 = QtWidgets.QGridLayout(self.exceptionGroup)
+        self.gridLayout_2.setSpacing(0)
+        self.gridLayout_2.setContentsMargins(-1, 0, -1, 0)
+        self.gridLayout_2.setObjectName("gridLayout_2")
+        self.catchAllExceptionsBtn = QtWidgets.QPushButton(self.exceptionGroup)
+        self.catchAllExceptionsBtn.setCheckable(True)
+        self.catchAllExceptionsBtn.setObjectName("catchAllExceptionsBtn")
+        self.gridLayout_2.addWidget(self.catchAllExceptionsBtn, 0, 1, 1, 1)
+        self.catchNextExceptionBtn = QtWidgets.QPushButton(self.exceptionGroup)
+        self.catchNextExceptionBtn.setCheckable(True)
+        self.catchNextExceptionBtn.setObjectName("catchNextExceptionBtn")
+        self.gridLayout_2.addWidget(self.catchNextExceptionBtn, 0, 0, 1, 1)
+        self.onlyUncaughtCheck = QtWidgets.QCheckBox(self.exceptionGroup)
+        self.onlyUncaughtCheck.setChecked(True)
+        self.onlyUncaughtCheck.setObjectName("onlyUncaughtCheck")
+        self.gridLayout_2.addWidget(self.onlyUncaughtCheck, 0, 2, 1, 1)
+        self.exceptionStackList = QtWidgets.QListWidget(self.exceptionGroup)
+        self.exceptionStackList.setAlternatingRowColors(True)
+        self.exceptionStackList.setObjectName("exceptionStackList")
+        self.gridLayout_2.addWidget(self.exceptionStackList, 2, 0, 1, 5)
+        self.runSelectedFrameCheck = QtWidgets.QCheckBox(self.exceptionGroup)
+        self.runSelectedFrameCheck.setChecked(True)
+        self.runSelectedFrameCheck.setObjectName("runSelectedFrameCheck")
+        self.gridLayout_2.addWidget(self.runSelectedFrameCheck, 3, 0, 1, 5)
+        self.exceptionInfoLabel = QtWidgets.QLabel(self.exceptionGroup)
+        self.exceptionInfoLabel.setObjectName("exceptionInfoLabel")
+        self.gridLayout_2.addWidget(self.exceptionInfoLabel, 1, 0, 1, 5)
+        self.clearExceptionBtn = QtWidgets.QPushButton(self.exceptionGroup)
+        self.clearExceptionBtn.setEnabled(False)
+        self.clearExceptionBtn.setObjectName("clearExceptionBtn")
+        self.gridLayout_2.addWidget(self.clearExceptionBtn, 0, 4, 1, 1)
+        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.gridLayout_2.addItem(spacerItem, 0, 3, 1, 1)
+        self.gridLayout.addWidget(self.splitter, 0, 0, 1, 1)
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        _translate = QtCore.QCoreApplication.translate
+        Form.setWindowTitle(_translate("Form", "Console"))
+        self.historyBtn.setText(_translate("Form", "History.."))
+        self.exceptionBtn.setText(_translate("Form", "Exceptions.."))
+        self.exceptionGroup.setTitle(_translate("Form", "Exception Handling"))
+        self.catchAllExceptionsBtn.setText(_translate("Form", "Show All Exceptions"))
+        self.catchNextExceptionBtn.setText(_translate("Form", "Show Next Exception"))
+        self.onlyUncaughtCheck.setText(_translate("Form", "Only Uncaught Exceptions"))
+        self.runSelectedFrameCheck.setText(_translate("Form", "Run commands in selected stack frame"))
+        self.exceptionInfoLabel.setText(_translate("Form", "Exception Info"))
+        self.clearExceptionBtn.setText(_translate("Form", "Clear Exception"))
+
+from .CmdInput import CmdInput
diff --git a/libs/pyqtgraph/console/template_pyside.py b/libs/pyqtgraph/console/template_pyside.py
new file mode 100644
index 0000000000000000000000000000000000000000..2db8ed95ac15776113f1a1ef7f229b9496e5eeac
--- /dev/null
+++ b/libs/pyqtgraph/console/template_pyside.py
@@ -0,0 +1,106 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file './pyqtgraph/console/template.ui'
+#
+# Created: Mon Dec 23 10:10:53 2013
+#      by: pyside-uic 0.2.14 running on PySide 1.1.2
+#
+# WARNING! All changes made in this file will be lost!
+
+from PySide import QtCore, QtGui
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName("Form")
+        Form.resize(710, 497)
+        self.gridLayout = QtGui.QGridLayout(Form)
+        self.gridLayout.setContentsMargins(0, 0, 0, 0)
+        self.gridLayout.setSpacing(0)
+        self.gridLayout.setObjectName("gridLayout")
+        self.splitter = QtGui.QSplitter(Form)
+        self.splitter.setOrientation(QtCore.Qt.Vertical)
+        self.splitter.setObjectName("splitter")
+        self.layoutWidget = QtGui.QWidget(self.splitter)
+        self.layoutWidget.setObjectName("layoutWidget")
+        self.verticalLayout = QtGui.QVBoxLayout(self.layoutWidget)
+        self.verticalLayout.setContentsMargins(0, 0, 0, 0)
+        self.verticalLayout.setObjectName("verticalLayout")
+        self.output = QtGui.QPlainTextEdit(self.layoutWidget)
+        font = QtGui.QFont()
+        font.setFamily("Monospace")
+        self.output.setFont(font)
+        self.output.setReadOnly(True)
+        self.output.setObjectName("output")
+        self.verticalLayout.addWidget(self.output)
+        self.horizontalLayout = QtGui.QHBoxLayout()
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.input = CmdInput(self.layoutWidget)
+        self.input.setObjectName("input")
+        self.horizontalLayout.addWidget(self.input)
+        self.historyBtn = QtGui.QPushButton(self.layoutWidget)
+        self.historyBtn.setCheckable(True)
+        self.historyBtn.setObjectName("historyBtn")
+        self.horizontalLayout.addWidget(self.historyBtn)
+        self.exceptionBtn = QtGui.QPushButton(self.layoutWidget)
+        self.exceptionBtn.setCheckable(True)
+        self.exceptionBtn.setObjectName("exceptionBtn")
+        self.horizontalLayout.addWidget(self.exceptionBtn)
+        self.verticalLayout.addLayout(self.horizontalLayout)
+        self.historyList = QtGui.QListWidget(self.splitter)
+        font = QtGui.QFont()
+        font.setFamily("Monospace")
+        self.historyList.setFont(font)
+        self.historyList.setObjectName("historyList")
+        self.exceptionGroup = QtGui.QGroupBox(self.splitter)
+        self.exceptionGroup.setObjectName("exceptionGroup")
+        self.gridLayout_2 = QtGui.QGridLayout(self.exceptionGroup)
+        self.gridLayout_2.setSpacing(0)
+        self.gridLayout_2.setContentsMargins(-1, 0, -1, 0)
+        self.gridLayout_2.setObjectName("gridLayout_2")
+        self.catchAllExceptionsBtn = QtGui.QPushButton(self.exceptionGroup)
+        self.catchAllExceptionsBtn.setCheckable(True)
+        self.catchAllExceptionsBtn.setObjectName("catchAllExceptionsBtn")
+        self.gridLayout_2.addWidget(self.catchAllExceptionsBtn, 0, 1, 1, 1)
+        self.catchNextExceptionBtn = QtGui.QPushButton(self.exceptionGroup)
+        self.catchNextExceptionBtn.setCheckable(True)
+        self.catchNextExceptionBtn.setObjectName("catchNextExceptionBtn")
+        self.gridLayout_2.addWidget(self.catchNextExceptionBtn, 0, 0, 1, 1)
+        self.onlyUncaughtCheck = QtGui.QCheckBox(self.exceptionGroup)
+        self.onlyUncaughtCheck.setChecked(True)
+        self.onlyUncaughtCheck.setObjectName("onlyUncaughtCheck")
+        self.gridLayout_2.addWidget(self.onlyUncaughtCheck, 0, 2, 1, 1)
+        self.exceptionStackList = QtGui.QListWidget(self.exceptionGroup)
+        self.exceptionStackList.setAlternatingRowColors(True)
+        self.exceptionStackList.setObjectName("exceptionStackList")
+        self.gridLayout_2.addWidget(self.exceptionStackList, 2, 0, 1, 5)
+        self.runSelectedFrameCheck = QtGui.QCheckBox(self.exceptionGroup)
+        self.runSelectedFrameCheck.setChecked(True)
+        self.runSelectedFrameCheck.setObjectName("runSelectedFrameCheck")
+        self.gridLayout_2.addWidget(self.runSelectedFrameCheck, 3, 0, 1, 5)
+        self.exceptionInfoLabel = QtGui.QLabel(self.exceptionGroup)
+        self.exceptionInfoLabel.setObjectName("exceptionInfoLabel")
+        self.gridLayout_2.addWidget(self.exceptionInfoLabel, 1, 0, 1, 5)
+        self.clearExceptionBtn = QtGui.QPushButton(self.exceptionGroup)
+        self.clearExceptionBtn.setEnabled(False)
+        self.clearExceptionBtn.setObjectName("clearExceptionBtn")
+        self.gridLayout_2.addWidget(self.clearExceptionBtn, 0, 4, 1, 1)
+        spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.gridLayout_2.addItem(spacerItem, 0, 3, 1, 1)
+        self.gridLayout.addWidget(self.splitter, 0, 0, 1, 1)
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        Form.setWindowTitle(QtGui.QApplication.translate("Form", "Console", None, QtGui.QApplication.UnicodeUTF8))
+        self.historyBtn.setText(QtGui.QApplication.translate("Form", "History..", None, QtGui.QApplication.UnicodeUTF8))
+        self.exceptionBtn.setText(QtGui.QApplication.translate("Form", "Exceptions..", None, QtGui.QApplication.UnicodeUTF8))
+        self.exceptionGroup.setTitle(QtGui.QApplication.translate("Form", "Exception Handling", None, QtGui.QApplication.UnicodeUTF8))
+        self.catchAllExceptionsBtn.setText(QtGui.QApplication.translate("Form", "Show All Exceptions", None, QtGui.QApplication.UnicodeUTF8))
+        self.catchNextExceptionBtn.setText(QtGui.QApplication.translate("Form", "Show Next Exception", None, QtGui.QApplication.UnicodeUTF8))
+        self.onlyUncaughtCheck.setText(QtGui.QApplication.translate("Form", "Only Uncaught Exceptions", None, QtGui.QApplication.UnicodeUTF8))
+        self.runSelectedFrameCheck.setText(QtGui.QApplication.translate("Form", "Run commands in selected stack frame", None, QtGui.QApplication.UnicodeUTF8))
+        self.exceptionInfoLabel.setText(QtGui.QApplication.translate("Form", "Exception Info", None, QtGui.QApplication.UnicodeUTF8))
+        self.clearExceptionBtn.setText(QtGui.QApplication.translate("Form", "Clear Exception", None, QtGui.QApplication.UnicodeUTF8))
+
+from .CmdInput import CmdInput
diff --git a/libs/pyqtgraph/debug.py b/libs/pyqtgraph/debug.py
new file mode 100644
index 0000000000000000000000000000000000000000..57c71bc8cbd3bafb9dfda14c1c11614abeadad81
--- /dev/null
+++ b/libs/pyqtgraph/debug.py
@@ -0,0 +1,1169 @@
+# -*- coding: utf-8 -*-
+"""
+debug.py - Functions to aid in debugging 
+Copyright 2010  Luke Campagnola
+Distributed under MIT/X11 license. See license.txt for more infomation.
+"""
+
+from __future__ import print_function
+
+import sys, traceback, time, gc, re, types, weakref, inspect, os, cProfile, threading
+from . import ptime
+from numpy import ndarray
+from .Qt import QtCore, QtGui
+from .util.mutex import Mutex
+from .util import cprint
+
+__ftraceDepth = 0
+def ftrace(func):
+    """Decorator used for marking the beginning and end of function calls.
+    Automatically indents nested calls.
+    """
+    def w(*args, **kargs):
+        global __ftraceDepth
+        pfx = "  " * __ftraceDepth
+        print(pfx + func.__name__ + " start")
+        __ftraceDepth += 1
+        try:
+            rv = func(*args, **kargs)
+        finally:
+            __ftraceDepth -= 1
+        print(pfx + func.__name__ + " done")
+        return rv
+    return w
+
+
+class Tracer(object):
+    """
+    Prints every function enter/exit. Useful for debugging crashes / lockups.
+    """
+    def __init__(self):
+        self.count = 0
+        self.stack = []
+
+    def trace(self, frame, event, arg):
+        self.count += 1
+        # If it has been a long time since we saw the top of the stack, 
+        # print a reminder
+        if self.count % 1000 == 0:
+            print("----- current stack: -----")
+            for line in self.stack:
+                print(line)
+        if event == 'call':
+            line = "  " * len(self.stack) + ">> " + self.frameInfo(frame) 
+            print(line)
+            self.stack.append(line)
+        elif event == 'return':
+            self.stack.pop()
+            line = "  " * len(self.stack) + "<< " + self.frameInfo(frame) 
+            print(line)
+            if len(self.stack) == 0:
+                self.count = 0
+
+        return self.trace
+
+    def stop(self):
+        sys.settrace(None)
+
+    def start(self):
+        sys.settrace(self.trace)
+
+    def frameInfo(self, fr):
+        filename = fr.f_code.co_filename
+        funcname = fr.f_code.co_name
+        lineno = fr.f_lineno
+        callfr = sys._getframe(3)
+        callline = "%s %d" % (callfr.f_code.co_name, callfr.f_lineno)
+        args, _, _, value_dict = inspect.getargvalues(fr)
+        if len(args) and args[0] == 'self':
+            instance = value_dict.get('self', None)
+            if instance is not None:
+                cls = getattr(instance, '__class__', None)
+                if cls is not None:
+                    funcname = cls.__name__ + "." + funcname
+        return "%s: %s %s: %s" % (callline, filename, lineno, funcname)
+
+def warnOnException(func):
+    """Decorator which catches/ignores exceptions and prints a stack trace."""
+    def w(*args, **kwds):
+        try:
+            func(*args, **kwds)
+        except:
+            printExc('Ignored exception:')
+    return w
+
+def getExc(indent=4, prefix='|  ', skip=1):
+    lines = (traceback.format_stack()[:-skip] 
+            + ["  ---- exception caught ---->\n"] 
+            + traceback.format_tb(sys.exc_info()[2])
+            + traceback.format_exception_only(*sys.exc_info()[:2]))
+    lines2 = []
+    for l in lines:
+        lines2.extend(l.strip('\n').split('\n'))
+    lines3 = [" "*indent + prefix + l for l in lines2]
+    return '\n'.join(lines3)
+
+
+def printExc(msg='', indent=4, prefix='|'):
+    """Print an error message followed by an indented exception backtrace
+    (This function is intended to be called within except: blocks)"""
+    exc = getExc(indent, prefix + '  ', skip=2)
+    print("[%s]  %s\n" % (time.strftime("%H:%M:%S"), msg))
+    print(" "*indent + prefix + '='*30 + '>>')
+    print(exc)
+    print(" "*indent + prefix + '='*30 + '<<')
+    
+def printTrace(msg='', indent=4, prefix='|'):
+    """Print an error message followed by an indented stack trace"""
+    trace = backtrace(1)
+    #exc = getExc(indent, prefix + '  ')
+    print("[%s]  %s\n" % (time.strftime("%H:%M:%S"), msg))
+    print(" "*indent + prefix + '='*30 + '>>')
+    for line in trace.split('\n'):
+        print(" "*indent + prefix + " " + line)
+    print(" "*indent + prefix + '='*30 + '<<')
+    
+
+def backtrace(skip=0):
+    return ''.join(traceback.format_stack()[:-(skip+1)])    
+    
+    
+def listObjs(regex='Q', typ=None):
+    """List all objects managed by python gc with class name matching regex.
+    Finds 'Q...' classes by default."""
+    if typ is not None:
+        return [x for x in gc.get_objects() if isinstance(x, typ)]
+    else:
+        return [x for x in gc.get_objects() if re.match(regex, type(x).__name__)]
+        
+
+    
+def findRefPath(startObj, endObj, maxLen=8, restart=True, seen={}, path=None, ignore=None):
+    """Determine all paths of object references from startObj to endObj"""
+    refs = []
+    if path is None:
+        path = [endObj]
+    if ignore is None:
+        ignore = {}
+    ignore[id(sys._getframe())] = None
+    ignore[id(path)] = None
+    ignore[id(seen)] = None
+    prefix = " "*(8-maxLen)
+    #print prefix + str(map(type, path))
+    prefix += " "
+    if restart:
+        #gc.collect()
+        seen.clear()
+    gc.collect()
+    newRefs = [r for r in gc.get_referrers(endObj) if id(r) not in ignore]
+    ignore[id(newRefs)] = None
+    #fo = allFrameObjs()
+    #newRefs = []
+    #for r in gc.get_referrers(endObj):
+        #try:
+            #if r not in fo:
+                #newRefs.append(r)
+        #except:
+            #newRefs.append(r)            
+        
+    for r in newRefs:
+        #print prefix+"->"+str(type(r))
+        if type(r).__name__ in ['frame', 'function', 'listiterator']:
+            #print prefix+"  FRAME"
+            continue
+        try:
+            if any([r is x for x in  path]):
+                #print prefix+"  LOOP", objChainString([r]+path)
+                continue
+        except:
+            print(r)
+            print(path)
+            raise
+        if r is startObj:
+            refs.append([r])
+            print(refPathString([startObj]+path))
+            continue
+        if maxLen == 0:
+            #print prefix+"  END:", objChainString([r]+path)
+            continue
+        ## See if we have already searched this node.
+        ## If not, recurse.
+        tree = None
+        try:
+            cache = seen[id(r)]
+            if cache[0] >= maxLen:
+                tree = cache[1]
+                for p in tree:
+                    print(refPathString(p+path))
+        except KeyError:
+            pass
+        
+        ignore[id(tree)] = None
+        if tree is None:
+            tree = findRefPath(startObj, r, maxLen-1, restart=False, path=[r]+path, ignore=ignore)
+            seen[id(r)] = [maxLen, tree]
+        ## integrate any returned results
+        if len(tree) == 0:
+            #print prefix+"  EMPTY TREE"
+            continue
+        else:
+            for p in tree:
+                refs.append(p+[r])
+        #seen[id(r)] = [maxLen, refs]
+    return refs
+
+
+def objString(obj):
+    """Return a short but descriptive string for any object"""
+    try:
+        if type(obj) in [int, float]:
+            return str(obj)
+        elif isinstance(obj, dict):
+            if len(obj) > 5:
+                return "<dict {%s,...}>" % (",".join(list(obj.keys())[:5]))
+            else:
+                return "<dict {%s}>" % (",".join(list(obj.keys())))
+        elif isinstance(obj, str):
+            if len(obj) > 50:
+                return '"%s..."' % obj[:50]
+            else:
+                return obj[:]
+        elif isinstance(obj, ndarray):
+            return "<ndarray %s %s>" % (str(obj.dtype), str(obj.shape))
+        elif hasattr(obj, '__len__'):
+            if len(obj) > 5:
+                return "<%s [%s,...]>" % (type(obj).__name__, ",".join([type(o).__name__ for o in obj[:5]]))
+            else:
+                return "<%s [%s]>" % (type(obj).__name__, ",".join([type(o).__name__ for o in obj]))
+        else:
+            return "<%s %s>" % (type(obj).__name__, obj.__class__.__name__)
+    except:
+        return str(type(obj))
+
+def refPathString(chain):
+    """Given a list of adjacent objects in a reference path, print the 'natural' path
+    names (ie, attribute names, keys, and indexes) that follow from one object to the next ."""
+    s = objString(chain[0])
+    i = 0
+    while i < len(chain)-1:
+        #print " -> ", i
+        i += 1
+        o1 = chain[i-1]
+        o2 = chain[i]
+        cont = False
+        if isinstance(o1, list) or isinstance(o1, tuple):
+            if any([o2 is x for x in o1]):
+                s += "[%d]" % o1.index(o2)
+                continue
+        #print "  not list"
+        if isinstance(o2, dict) and hasattr(o1, '__dict__') and o2 == o1.__dict__:
+            i += 1
+            if i >= len(chain):
+                s += ".__dict__"
+                continue
+            o3 = chain[i]
+            for k in o2:
+                if o2[k] is o3:
+                    s += '.%s' % k
+                    cont = True
+                    continue
+        #print "  not __dict__"
+        if isinstance(o1, dict):
+            try:
+                if o2 in o1:
+                    s += "[key:%s]" % objString(o2)
+                    continue
+            except TypeError:
+                pass
+            for k in o1:
+                if o1[k] is o2:
+                    s += "[%s]" % objString(k)
+                    cont = True
+                    continue
+        #print "  not dict"
+        #for k in dir(o1):  ## Not safe to request attributes like this.
+            #if getattr(o1, k) is o2:
+                #s += ".%s" % k
+                #cont = True
+                #continue
+        #print "  not attr"
+        if cont:
+            continue
+        s += " ? "
+        sys.stdout.flush()
+    return s
+
+    
+def objectSize(obj, ignore=None, verbose=False, depth=0, recursive=False):
+    """Guess how much memory an object is using"""
+    ignoreTypes = ['MethodType', 'UnboundMethodType', 'BuiltinMethodType', 'FunctionType', 'BuiltinFunctionType']
+    ignoreTypes = [getattr(types, key) for key in ignoreTypes if hasattr(types, key)]
+    ignoreRegex = re.compile('(method-wrapper|Flag|ItemChange|Option|Mode)')
+    
+    
+    if ignore is None:
+        ignore = {}
+        
+    indent = '  '*depth
+    
+    try:
+        hash(obj)
+        hsh = obj
+    except:
+        hsh = "%s:%d" % (str(type(obj)), id(obj))
+        
+    if hsh in ignore:
+        return 0
+    ignore[hsh] = 1
+    
+    try:
+        size = sys.getsizeof(obj)
+    except TypeError:
+        size = 0
+        
+    if isinstance(obj, ndarray):
+        try:
+            size += len(obj.data)
+        except:
+            pass
+            
+        
+    if recursive:
+        if type(obj) in [list, tuple]:
+            if verbose:
+                print(indent+"list:")
+            for o in obj:
+                s = objectSize(o, ignore=ignore, verbose=verbose, depth=depth+1)
+                if verbose:
+                    print(indent+'  +', s)
+                size += s
+        elif isinstance(obj, dict):
+            if verbose:
+                print(indent+"list:")
+            for k in obj:
+                s = objectSize(obj[k], ignore=ignore, verbose=verbose, depth=depth+1)
+                if verbose:
+                    print(indent+'  +', k, s)
+                size += s
+        #elif isinstance(obj, QtCore.QObject):
+            #try:
+                #childs = obj.children()
+                #if verbose:
+                    #print indent+"Qt children:"
+                #for ch in childs:
+                    #s = objectSize(obj, ignore=ignore, verbose=verbose, depth=depth+1)
+                    #size += s
+                    #if verbose:
+                        #print indent + '  +', ch.objectName(), s
+                    
+            #except:
+                #pass
+    #if isinstance(obj, types.InstanceType):
+        gc.collect()
+        if verbose:
+            print(indent+'attrs:')
+        for k in dir(obj):
+            if k in ['__dict__']:
+                continue
+            o = getattr(obj, k)
+            if type(o) in ignoreTypes:
+                continue
+            strtyp = str(type(o))
+            if ignoreRegex.search(strtyp):
+                continue
+            #if isinstance(o, types.ObjectType) and strtyp == "<type 'method-wrapper'>":
+                #continue
+            
+            #if verbose:
+                #print indent, k, '?'
+            refs = [r for r in gc.get_referrers(o) if type(r) != types.FrameType]
+            if len(refs) == 1:
+                s = objectSize(o, ignore=ignore, verbose=verbose, depth=depth+1)
+                size += s
+                if verbose:
+                    print(indent + "  +", k, s)
+            #else:
+                #if verbose:
+                    #print indent + '  -', k, len(refs)
+    return size
+
+class GarbageWatcher(object):
+    """
+    Convenient dictionary for holding weak references to objects.
+    Mainly used to check whether the objects have been collect yet or not.
+    
+    Example:
+        gw = GarbageWatcher()
+        gw['objName'] = obj
+        gw['objName2'] = obj2
+        gw.check()  
+        
+    
+    """
+    def __init__(self):
+        self.objs = weakref.WeakValueDictionary()
+        self.allNames = []
+        
+    def add(self, obj, name):
+        self.objs[name] = obj
+        self.allNames.append(name)
+        
+    def __setitem__(self, name, obj):
+        self.add(obj, name)
+        
+    def check(self):
+        """Print a list of all watched objects and whether they have been collected."""
+        gc.collect()
+        dead = self.allNames[:]
+        alive = []
+        for k in self.objs:
+            dead.remove(k)
+            alive.append(k)
+        print("Deleted objects:", dead)
+        print("Live objects:", alive)
+        
+    def __getitem__(self, item):
+        return self.objs[item]
+
+    
+
+
+class Profiler(object):
+    """Simple profiler allowing measurement of multiple time intervals.
+
+    By default, profilers are disabled.  To enable profiling, set the
+    environment variable `PYQTGRAPHPROFILE` to a comma-separated list of
+    fully-qualified names of profiled functions.
+
+    Calling a profiler registers a message (defaulting to an increasing
+    counter) that contains the time elapsed since the last call.  When the
+    profiler is about to be garbage-collected, the messages are passed to the
+    outer profiler if one is running, or printed to stdout otherwise.
+
+    If `delayed` is set to False, messages are immediately printed instead.
+
+    Example:
+        def function(...):
+            profiler = Profiler()
+            ... do stuff ...
+            profiler('did stuff')
+            ... do other stuff ...
+            profiler('did other stuff')
+            # profiler is garbage-collected and flushed at function end
+
+    If this function is a method of class C, setting `PYQTGRAPHPROFILE` to
+    "C.function" (without the module name) will enable this profiler.
+
+    For regular functions, use the qualified name of the function, stripping
+    only the initial "pyqtgraph." prefix from the module.
+    """
+
+    _profilers = os.environ.get("PYQTGRAPHPROFILE", None)
+    _profilers = _profilers.split(",") if _profilers is not None else []
+    
+    _depth = 0
+    _msgs = []
+    disable = False  # set this flag to disable all or individual profilers at runtime
+    
+    class DisabledProfiler(object):
+        def __init__(self, *args, **kwds):
+            pass
+        def __call__(self, *args):
+            pass
+        def finish(self):
+            pass
+        def mark(self, msg=None):
+            pass
+    _disabledProfiler = DisabledProfiler()
+        
+    def __new__(cls, msg=None, disabled='env', delayed=True):
+        """Optionally create a new profiler based on caller's qualname.
+        """
+        if disabled is True or (disabled == 'env' and len(cls._profilers) == 0):
+            return cls._disabledProfiler
+                        
+        # determine the qualified name of the caller function
+        caller_frame = sys._getframe(1)
+        try:
+            caller_object_type = type(caller_frame.f_locals["self"])
+        except KeyError: # we are in a regular function
+            qualifier = caller_frame.f_globals["__name__"].split(".", 1)[1]
+        else: # we are in a method
+            qualifier = caller_object_type.__name__
+        func_qualname = qualifier + "." + caller_frame.f_code.co_name
+        if disabled == 'env' and func_qualname not in cls._profilers: # don't do anything
+            return cls._disabledProfiler
+        # create an actual profiling object
+        cls._depth += 1
+        obj = super(Profiler, cls).__new__(cls)
+        obj._name = msg or func_qualname
+        obj._delayed = delayed
+        obj._markCount = 0
+        obj._finished = False
+        obj._firstTime = obj._lastTime = ptime.time()
+        obj._newMsg("> Entering " + obj._name)
+        return obj
+
+    def __call__(self, msg=None):
+        """Register or print a new message with timing information.
+        """
+        if self.disable:
+            return
+        if msg is None:
+            msg = str(self._markCount)
+        self._markCount += 1
+        newTime = ptime.time()
+        self._newMsg("  %s: %0.4f ms", 
+                     msg, (newTime - self._lastTime) * 1000)
+        self._lastTime = newTime
+        
+    def mark(self, msg=None):
+        self(msg)
+
+    def _newMsg(self, msg, *args):
+        msg = "  " * (self._depth - 1) + msg
+        if self._delayed:
+            self._msgs.append((msg, args))
+        else:
+            self.flush()
+            print(msg % args)
+
+    def __del__(self):
+        self.finish()
+    
+    def finish(self, msg=None):
+        """Add a final message; flush the message list if no parent profiler.
+        """
+        if self._finished or self.disable:
+            return        
+        self._finished = True
+        if msg is not None:
+            self(msg)
+        self._newMsg("< Exiting %s, total time: %0.4f ms", 
+                     self._name, (ptime.time() - self._firstTime) * 1000)
+        type(self)._depth -= 1
+        if self._depth < 1:
+            self.flush()
+        
+    def flush(self):
+        if self._msgs:
+            print("\n".join([m[0]%m[1] for m in self._msgs]))
+            type(self)._msgs = []
+
+
+def profile(code, name='profile_run', sort='cumulative', num=30):
+    """Common-use for cProfile"""
+    cProfile.run(code, name)
+    stats = pstats.Stats(name)
+    stats.sort_stats(sort)
+    stats.print_stats(num)
+    return stats
+        
+        
+  
+#### Code for listing (nearly) all objects in the known universe
+#### http://utcc.utoronto.ca/~cks/space/blog/python/GetAllObjects
+# Recursively expand slist's objects
+# into olist, using seen to track
+# already processed objects.
+def _getr(slist, olist, first=True):
+    i = 0 
+    for e in slist:
+        
+        oid = id(e)
+        typ = type(e)
+        if oid in olist or typ is int:    ## or e in olist:     ## since we're excluding all ints, there is no longer a need to check for olist keys
+            continue
+        olist[oid] = e
+        if first and (i%1000) == 0:
+            gc.collect()
+        tl = gc.get_referents(e)
+        if tl:
+            _getr(tl, olist, first=False)
+        i += 1        
+# The public function.
+def get_all_objects():
+    """Return a list of all live Python objects (excluding int and long), not including the list itself."""
+    gc.collect()
+    gcl = gc.get_objects()
+    olist = {}
+    _getr(gcl, olist)
+    
+    del olist[id(olist)]
+    del olist[id(gcl)]
+    del olist[id(sys._getframe())]
+    return olist
+
+
+def lookup(oid, objects=None):
+    """Return an object given its ID, if it exists."""
+    if objects is None:
+        objects = get_all_objects()
+    return objects[oid]
+        
+        
+                    
+        
+class ObjTracker(object):
+    """
+    Tracks all objects under the sun, reporting the changes between snapshots: what objects are created, deleted, and persistent.
+    This class is very useful for tracking memory leaks. The class goes to great (but not heroic) lengths to avoid tracking 
+    its own internal objects.
+    
+    Example:
+        ot = ObjTracker()   # takes snapshot of currently existing objects
+           ... do stuff ...
+        ot.diff()           # prints lists of objects created and deleted since ot was initialized
+           ... do stuff ...
+        ot.diff()           # prints lists of objects created and deleted since last call to ot.diff()
+                            # also prints list of items that were created since initialization AND have not been deleted yet
+                            #   (if done correctly, this list can tell you about objects that were leaked)
+           
+        arrays = ot.findPersistent('ndarray')  ## returns all objects matching 'ndarray' (string match, not instance checking)
+                                               ## that were considered persistent when the last diff() was run
+                                               
+        describeObj(arrays[0])    ## See if we can determine who has references to this array
+    """
+    
+    
+    allObjs = {} ## keep track of all objects created and stored within class instances
+    allObjs[id(allObjs)] = None
+    
+    def __init__(self):
+        self.startRefs = {}        ## list of objects that exist when the tracker is initialized {oid: weakref}
+                                   ##   (If it is not possible to weakref the object, then the value is None)
+        self.startCount = {}       
+        self.newRefs = {}          ## list of objects that have been created since initialization
+        self.persistentRefs = {}   ## list of objects considered 'persistent' when the last diff() was called
+        self.objTypes = {}
+            
+        ObjTracker.allObjs[id(self)] = None
+        self.objs = [self.__dict__, self.startRefs, self.startCount, self.newRefs, self.persistentRefs, self.objTypes]
+        self.objs.append(self.objs)
+        for v in self.objs:
+            ObjTracker.allObjs[id(v)] = None
+            
+        self.start()
+
+    def findNew(self, regex):
+        """Return all objects matching regex that were considered 'new' when the last diff() was run."""
+        return self.findTypes(self.newRefs, regex)
+    
+    def findPersistent(self, regex):
+        """Return all objects matching regex that were considered 'persistent' when the last diff() was run."""
+        return self.findTypes(self.persistentRefs, regex)
+        
+    
+    def start(self):
+        """
+        Remember the current set of objects as the comparison for all future calls to diff()
+        Called automatically on init, but can be called manually as well.
+        """
+        refs, count, objs = self.collect()
+        for r in self.startRefs:
+            self.forgetRef(self.startRefs[r])
+        self.startRefs.clear()
+        self.startRefs.update(refs)
+        for r in refs:
+            self.rememberRef(r)
+        self.startCount.clear()
+        self.startCount.update(count)
+        #self.newRefs.clear()
+        #self.newRefs.update(refs)
+
+    def diff(self, **kargs):
+        """
+        Compute all differences between the current object set and the reference set.
+        Print a set of reports for created, deleted, and persistent objects
+        """
+        refs, count, objs = self.collect()   ## refs contains the list of ALL objects
+        
+        ## Which refs have disappeared since call to start()  (these are only displayed once, then forgotten.)
+        delRefs = {}
+        for i in list(self.startRefs.keys()):
+            if i not in refs:
+                delRefs[i] = self.startRefs[i]
+                del self.startRefs[i]
+                self.forgetRef(delRefs[i])
+        for i in list(self.newRefs.keys()):
+            if i not in refs:
+                delRefs[i] = self.newRefs[i]
+                del self.newRefs[i]
+                self.forgetRef(delRefs[i])
+        #print "deleted:", len(delRefs)
+                
+        ## Which refs have appeared since call to start() or diff()
+        persistentRefs = {}      ## created since start(), but before last diff()
+        createRefs = {}          ## created since last diff()
+        for o in refs:
+            if o not in self.startRefs:       
+                if o not in self.newRefs:     
+                    createRefs[o] = refs[o]          ## object has been created since last diff()
+                else:
+                    persistentRefs[o] = refs[o]      ## object has been created since start(), but before last diff() (persistent)
+        #print "new:", len(newRefs)
+                
+        ## self.newRefs holds the entire set of objects created since start()
+        for r in self.newRefs:
+            self.forgetRef(self.newRefs[r])
+        self.newRefs.clear()
+        self.newRefs.update(persistentRefs)
+        self.newRefs.update(createRefs)
+        for r in self.newRefs:
+            self.rememberRef(self.newRefs[r])
+        #print "created:", len(createRefs)
+        
+        ## self.persistentRefs holds all objects considered persistent.
+        self.persistentRefs.clear()
+        self.persistentRefs.update(persistentRefs)
+        
+                
+        print("----------- Count changes since start: ----------")
+        c1 = count.copy()
+        for k in self.startCount:
+            c1[k] = c1.get(k, 0) - self.startCount[k]
+        typs = list(c1.keys())
+        #typs.sort(lambda a,b: cmp(c1[a], c1[b]))
+        typs.sort(key=lambda a: c1[a])
+        for t in typs:
+            if c1[t] == 0:
+                continue
+            num = "%d" % c1[t]
+            print("  " + num + " "*(10-len(num)) + str(t))
+            
+        print("-----------  %d Deleted since last diff: ------------" % len(delRefs))
+        self.report(delRefs, objs, **kargs)
+        print("-----------  %d Created since last diff: ------------" % len(createRefs))
+        self.report(createRefs, objs, **kargs)
+        print("-----------  %d Created since start (persistent): ------------" % len(persistentRefs))
+        self.report(persistentRefs, objs, **kargs)
+        
+        
+    def __del__(self):
+        self.startRefs.clear()
+        self.startCount.clear()
+        self.newRefs.clear()
+        self.persistentRefs.clear()
+        
+        del ObjTracker.allObjs[id(self)]
+        for v in self.objs:
+            del ObjTracker.allObjs[id(v)]
+            
+    @classmethod
+    def isObjVar(cls, o):
+        return type(o) is cls or id(o) in cls.allObjs
+            
+    def collect(self):
+        print("Collecting list of all objects...")
+        gc.collect()
+        objs = get_all_objects()
+        frame = sys._getframe()
+        del objs[id(frame)]  ## ignore the current frame 
+        del objs[id(frame.f_code)]
+        
+        ignoreTypes = [int]
+        refs = {}
+        count = {}
+        for k in objs:
+            o = objs[k]
+            typ = type(o)
+            oid = id(o)
+            if ObjTracker.isObjVar(o) or typ in ignoreTypes:
+                continue
+            
+            try:
+                ref = weakref.ref(obj)
+            except:
+                ref = None
+            refs[oid] = ref
+            typ = type(o)
+            typStr = typeStr(o)
+            self.objTypes[oid] = typStr
+            ObjTracker.allObjs[id(typStr)] = None
+            count[typ] = count.get(typ, 0) + 1
+            
+        print("All objects: %d   Tracked objects: %d" % (len(objs), len(refs)))
+        return refs, count, objs
+        
+    def forgetRef(self, ref):
+        if ref is not None:
+            del ObjTracker.allObjs[id(ref)]
+        
+    def rememberRef(self, ref):
+        ## Record the address of the weakref object so it is not included in future object counts.
+        if ref is not None:
+            ObjTracker.allObjs[id(ref)] = None
+            
+        
+    def lookup(self, oid, ref, objs=None):
+        if ref is None or ref() is None:
+            try:
+                obj = lookup(oid, objects=objs)
+            except:
+                obj = None
+        else:
+            obj = ref()
+        return obj
+                    
+                    
+    def report(self, refs, allobjs=None, showIDs=False):
+        if allobjs is None:
+            allobjs = get_all_objects()
+        
+        count = {}
+        rev = {}
+        for oid in refs:
+            obj = self.lookup(oid, refs[oid], allobjs)
+            if obj is None:
+                typ = "[del] " + self.objTypes[oid]
+            else:
+                typ = typeStr(obj)
+            if typ not in rev:
+                rev[typ] = []
+            rev[typ].append(oid)
+            c = count.get(typ, [0,0])
+            count[typ] =  [c[0]+1, c[1]+objectSize(obj)]
+        typs = list(count.keys())
+        #typs.sort(lambda a,b: cmp(count[a][1], count[b][1]))
+        typs.sort(key=lambda a: count[a][1])
+        
+        for t in typs:
+            line = "  %d\t%d\t%s" % (count[t][0], count[t][1], t)
+            if showIDs:
+                line += "\t"+",".join(map(str,rev[t]))
+            print(line)
+        
+    def findTypes(self, refs, regex):
+        allObjs = get_all_objects()
+        ids = {}
+        objs = []
+        r = re.compile(regex)
+        for k in refs:
+            if r.search(self.objTypes[k]):
+                objs.append(self.lookup(k, refs[k], allObjs))
+        return objs
+        
+
+    
+    
+def describeObj(obj, depth=4, path=None, ignore=None):
+    """
+    Trace all reference paths backward, printing a list of different ways this object can be accessed.
+    Attempts to answer the question "who has a reference to this object"
+    """
+    if path is None:
+        path = [obj]
+    if ignore is None:
+        ignore = {}   ## holds IDs of objects used within the function.
+    ignore[id(sys._getframe())] = None
+    ignore[id(path)] = None
+    gc.collect()
+    refs = gc.get_referrers(obj)
+    ignore[id(refs)] = None
+    printed=False
+    for ref in refs:
+        if id(ref) in ignore:
+            continue
+        if id(ref) in list(map(id, path)):
+            print("Cyclic reference: " + refPathString([ref]+path))
+            printed = True
+            continue
+        newPath = [ref]+path
+        if len(newPath) >= depth:
+            refStr = refPathString(newPath)
+            if '[_]' not in refStr:           ## ignore '_' references generated by the interactive shell
+                print(refStr)
+            printed = True
+        else:
+            describeObj(ref, depth, newPath, ignore)
+            printed = True
+    if not printed:
+        print("Dead end: " + refPathString(path))
+        
+    
+    
+def typeStr(obj):
+    """Create a more useful type string by making <instance> types report their class."""
+    typ = type(obj)
+    if typ == getattr(types, 'InstanceType', None):
+        return "<instance of %s>" % obj.__class__.__name__
+    else:
+        return str(typ)
+    
+def searchRefs(obj, *args):
+    """Pseudo-interactive function for tracing references backward.
+    **Arguments:**
+    
+        obj:   The initial object from which to start searching
+        args:  A set of string or int arguments.
+               each integer selects one of obj's referrers to be the new 'obj'
+               each string indicates an action to take on the current 'obj':
+                  t:  print the types of obj's referrers
+                  l:  print the lengths of obj's referrers (if they have __len__)
+                  i:  print the IDs of obj's referrers
+                  o:  print obj
+                  ro: return obj
+                  rr: return list of obj's referrers
+    
+    Examples::
+    
+       searchRefs(obj, 't')                    ## Print types of all objects referring to obj
+       searchRefs(obj, 't', 0, 't')            ##   ..then select the first referrer and print the types of its referrers
+       searchRefs(obj, 't', 0, 't', 'l')       ##   ..also print lengths of the last set of referrers
+       searchRefs(obj, 0, 1, 'ro')             ## Select index 0 from obj's referrer, then select index 1 from the next set of referrers, then return that object
+       
+    """
+    ignore = {id(sys._getframe()): None}
+    gc.collect()
+    refs = gc.get_referrers(obj)
+    ignore[id(refs)] = None
+    refs = [r for r in refs if id(r) not in ignore]
+    for a in args:
+        
+        #fo = allFrameObjs()
+        #refs = [r for r in refs if r not in fo]
+        
+        if type(a) is int:
+            obj = refs[a]
+            gc.collect()
+            refs = gc.get_referrers(obj)
+            ignore[id(refs)] = None
+            refs = [r for r in refs if id(r) not in ignore]
+        elif a == 't':
+            print(list(map(typeStr, refs)))
+        elif a == 'i':
+            print(list(map(id, refs)))
+        elif a == 'l':
+            def slen(o):
+                if hasattr(o, '__len__'):
+                    return len(o)
+                else:
+                    return None
+            print(list(map(slen, refs)))
+        elif a == 'o':
+            print(obj)
+        elif a == 'ro':
+            return obj
+        elif a == 'rr':
+            return refs
+    
+def allFrameObjs():
+    """Return list of frame objects in current stack. Useful if you want to ignore these objects in refernece searches"""
+    f = sys._getframe()
+    objs = []
+    while f is not None:
+        objs.append(f)
+        objs.append(f.f_code)
+        #objs.append(f.f_locals)
+        #objs.append(f.f_globals)
+        #objs.append(f.f_builtins)
+        f = f.f_back
+    return objs
+        
+    
+def findObj(regex):
+    """Return a list of objects whose typeStr matches regex"""
+    allObjs = get_all_objects()
+    objs = []
+    r = re.compile(regex)
+    for i in allObjs:
+        obj = allObjs[i]
+        if r.search(typeStr(obj)):
+            objs.append(obj)
+    return objs
+    
+
+
+def listRedundantModules():
+    """List modules that have been imported more than once via different paths."""
+    mods = {}
+    for name, mod in sys.modules.items():
+        if not hasattr(mod, '__file__'):
+            continue
+        mfile = os.path.abspath(mod.__file__)
+        if mfile[-1] == 'c':
+            mfile = mfile[:-1]
+        if mfile in mods:
+            print("module at %s has 2 names: %s, %s" % (mfile, name, mods[mfile]))
+        else:
+            mods[mfile] = name
+            
+
+def walkQObjectTree(obj, counts=None, verbose=False, depth=0):
+    """
+    Walk through a tree of QObjects, doing nothing to them.
+    The purpose of this function is to find dead objects and generate a crash
+    immediately rather than stumbling upon them later.
+    Prints a count of the objects encountered, for fun. (or is it?)
+    """
+    
+    if verbose:
+        print("  "*depth + typeStr(obj))
+    report = False
+    if counts is None:
+        counts = {}
+        report = True
+    typ = str(type(obj))
+    try:
+        counts[typ] += 1
+    except KeyError:
+        counts[typ] = 1
+    for child in obj.children():
+        walkQObjectTree(child, counts, verbose, depth+1)
+        
+    return counts
+
+QObjCache = {}
+def qObjectReport(verbose=False):
+    """Generate a report counting all QObjects and their types"""
+    global qObjCache
+    count = {}
+    for obj in findObj('PyQt'):
+        if isinstance(obj, QtCore.QObject):
+            oid = id(obj)
+            if oid not in QObjCache:
+                QObjCache[oid] = typeStr(obj) + "  " + obj.objectName()
+                try:
+                    QObjCache[oid] += "  " + obj.parent().objectName()
+                    QObjCache[oid] += "  " + obj.text()
+                except:
+                    pass
+            print("check obj", oid, str(QObjCache[oid]))
+            if obj.parent() is None:
+                walkQObjectTree(obj, count, verbose)
+            
+    typs = list(count.keys())
+    typs.sort()
+    for t in typs:
+        print(count[t], "\t", t)
+        
+
+class PrintDetector(object):
+    """Find code locations that print to stdout."""
+    def __init__(self):
+        self.stdout = sys.stdout
+        sys.stdout = self
+    
+    def remove(self):
+        sys.stdout = self.stdout
+        
+    def __del__(self):
+        self.remove()
+    
+    def write(self, x):
+        self.stdout.write(x)
+        traceback.print_stack()
+        
+    def flush(self):
+        self.stdout.flush()
+
+
+def listQThreads():
+    """Prints Thread IDs (Qt's, not OS's) for all QThreads."""
+    thr = findObj('[Tt]hread')
+    thr = [t for t in thr if isinstance(t, QtCore.QThread)]
+    import sip
+    for t in thr:
+        print("--> ", t)
+        print("     Qt ID: 0x%x" % sip.unwrapinstance(t))
+
+
+def pretty(data, indent=''):
+    """Format nested dict/list/tuple structures into a more human-readable string
+    This function is a bit better than pprint for displaying OrderedDicts.
+    """
+    ret = ""
+    ind2 = indent + "    "
+    if isinstance(data, dict):
+        ret = indent+"{\n"
+        for k, v in data.iteritems():
+            ret += ind2 + repr(k) + ":  " + pretty(v, ind2).strip() + "\n"
+        ret += indent+"}\n"
+    elif isinstance(data, list) or isinstance(data, tuple):
+        s = repr(data)
+        if len(s) < 40:
+            ret += indent + s
+        else:
+            if isinstance(data, list):
+                d = '[]'
+            else:
+                d = '()'
+            ret = indent+d[0]+"\n"
+            for i, v in enumerate(data):
+                ret += ind2 + str(i) + ":  " + pretty(v, ind2).strip() + "\n"
+            ret += indent+d[1]+"\n"
+    else:
+        ret += indent + repr(data)
+    return ret
+
+
+class PeriodicTrace(object):
+    """ 
+    Used to debug freezing by starting a new thread that reports on the 
+    location of the main thread periodically.
+    """
+    class ReportThread(QtCore.QThread):
+        def __init__(self):
+            self.frame = None
+            self.ind = 0
+            self.lastInd = None
+            self.lock = Mutex()
+            QtCore.QThread.__init__(self)
+
+        def notify(self, frame):
+            with self.lock:
+                self.frame = frame
+                self.ind += 1
+
+        def run(self):
+            while True:
+                time.sleep(1)
+                with self.lock:
+                    if self.lastInd != self.ind:
+                        print("== Trace %d: ==" % self.ind)
+                        traceback.print_stack(self.frame)
+                        self.lastInd = self.ind
+
+    def __init__(self):
+        self.mainThread = threading.current_thread()
+        self.thread = PeriodicTrace.ReportThread()
+        self.thread.start()
+        sys.settrace(self.trace)
+
+    def trace(self, frame, event, arg):
+        if threading.current_thread() is self.mainThread: # and 'threading' not in frame.f_code.co_filename:
+            self.thread.notify(frame)
+            # print("== Trace ==", event, arg)
+            # traceback.print_stack(frame)
+        return self.trace
+
+
+
+class ThreadColor(object):
+    """
+    Wrapper on stdout/stderr that colors text by the current thread ID.
+
+    *stream* must be 'stdout' or 'stderr'.
+    """
+    colors = {}
+    lock = Mutex()
+
+    def __init__(self, stream):
+        self.stream = getattr(sys, stream)
+        self.err = stream == 'stderr'
+        setattr(sys, stream, self)
+
+    def write(self, msg):
+        with self.lock:
+            cprint.cprint(self.stream, self.color(), msg, -1, stderr=self.err)
+
+    def flush(self):
+        with self.lock:
+            self.stream.flush()
+
+    def color(self):
+        tid = threading.current_thread()
+        if tid not in self.colors:
+            c = (len(self.colors) % 15) + 1
+            self.colors[tid] = c
+        return self.colors[tid]
diff --git a/libs/pyqtgraph/dockarea/Container.py b/libs/pyqtgraph/dockarea/Container.py
new file mode 100644
index 0000000000000000000000000000000000000000..c3225edf1a298ac48fff43de4339d5196deb7391
--- /dev/null
+++ b/libs/pyqtgraph/dockarea/Container.py
@@ -0,0 +1,277 @@
+# -*- coding: utf-8 -*-
+from ..Qt import QtCore, QtGui
+import weakref
+
+class Container(object):
+    #sigStretchChanged = QtCore.Signal()  ## can't do this here; not a QObject.
+    
+    def __init__(self, area):
+        object.__init__(self)
+        self.area = area
+        self._container = None
+        self._stretch = (10, 10)
+        self.stretches = weakref.WeakKeyDictionary()
+        
+    def container(self):
+        return self._container
+        
+    def containerChanged(self, c):
+        self._container = c
+
+    def type(self):
+        return None
+
+    def insert(self, new, pos=None, neighbor=None):
+        # remove from existing parent first
+        new.setParent(None)
+        
+        if not isinstance(new, list):
+            new = [new]
+        if neighbor is None:
+            if pos == 'before':
+                index = 0
+            else:
+                index = self.count()
+        else:
+            index = self.indexOf(neighbor)
+            if index == -1:
+                index = 0
+            if pos == 'after':
+                index += 1
+                
+        for n in new:
+            #print "change container", n, " -> ", self
+            n.containerChanged(self)
+            #print "insert", n, " -> ", self, index
+            self._insertItem(n, index)
+            index += 1
+            n.sigStretchChanged.connect(self.childStretchChanged)
+        #print "child added", self
+        self.updateStretch()
+            
+    def apoptose(self, propagate=True):
+        ##if there is only one (or zero) item in this container, disappear.
+        cont = self._container
+        c = self.count()
+        if c > 1:
+            return
+        if self.count() == 1:  ## if there is one item, give it to the parent container (unless this is the top)
+            if self is self.area.topContainer:
+                return
+            self.container().insert(self.widget(0), 'before', self)
+        #print "apoptose:", self
+        self.close()
+        if propagate and cont is not None:
+            cont.apoptose()
+        
+    def close(self):
+        self.area = None
+        self._container = None
+        self.setParent(None)
+        
+    def childEvent(self, ev):
+        ch = ev.child()
+        if ev.removed() and hasattr(ch, 'sigStretchChanged'):
+            #print "Child", ev.child(), "removed, updating", self
+            try:
+                ch.sigStretchChanged.disconnect(self.childStretchChanged)
+            except:
+                pass
+            self.updateStretch()
+        
+    def childStretchChanged(self):
+        #print "child", QtCore.QObject.sender(self), "changed shape, updating", self
+        self.updateStretch()
+        
+    def setStretch(self, x=None, y=None):
+        #print "setStretch", self, x, y
+        self._stretch = (x, y)
+        self.sigStretchChanged.emit()
+
+    def updateStretch(self):
+        ###Set the stretch values for this container to reflect its contents
+        pass
+        
+        
+    def stretch(self):
+        """Return the stretch factors for this container"""
+        return self._stretch
+            
+
+class SplitContainer(Container, QtGui.QSplitter):
+    """Horizontal or vertical splitter with some changes:
+     - save/restore works correctly
+    """
+    sigStretchChanged = QtCore.Signal()
+    
+    def __init__(self, area, orientation):
+        QtGui.QSplitter.__init__(self)
+        self.setOrientation(orientation)
+        Container.__init__(self, area)
+        #self.splitterMoved.connect(self.restretchChildren)
+        
+    def _insertItem(self, item, index):
+        self.insertWidget(index, item)
+        item.show()  ## need to show since it may have been previously hidden by tab
+        
+    def saveState(self):
+        sizes = self.sizes()
+        if all([x == 0 for x in sizes]):
+            sizes = [10] * len(sizes)
+        return {'sizes': sizes}
+        
+    def restoreState(self, state):
+        sizes = state['sizes']
+        self.setSizes(sizes)
+        for i in range(len(sizes)):
+            self.setStretchFactor(i, sizes[i])
+
+    def childEvent(self, ev):
+        QtGui.QSplitter.childEvent(self, ev)
+        Container.childEvent(self, ev)
+
+    #def restretchChildren(self):
+        #sizes = self.sizes()
+        #tot = sum(sizes)
+        
+        
+        
+
+class HContainer(SplitContainer):
+    def __init__(self, area):
+        SplitContainer.__init__(self, area, QtCore.Qt.Horizontal)
+        
+    def type(self):
+        return 'horizontal'
+        
+    def updateStretch(self):
+        ##Set the stretch values for this container to reflect its contents
+        #print "updateStretch", self
+        x = 0
+        y = 0
+        sizes = []
+        for i in range(self.count()):
+            wx, wy = self.widget(i).stretch()
+            x += wx
+            y = max(y, wy)
+            sizes.append(wx)
+            #print "  child", self.widget(i), wx, wy
+        self.setStretch(x, y)
+        #print sizes
+        
+        tot = float(sum(sizes))
+        if tot == 0:
+            scale = 1.0
+        else:
+            scale = self.width() / tot
+        self.setSizes([int(s*scale) for s in sizes])
+        
+
+
+class VContainer(SplitContainer):
+    def __init__(self, area):
+        SplitContainer.__init__(self, area, QtCore.Qt.Vertical)
+        
+    def type(self):
+        return 'vertical'
+
+    def updateStretch(self):
+        ##Set the stretch values for this container to reflect its contents
+        #print "updateStretch", self
+        x = 0
+        y = 0
+        sizes = []
+        for i in range(self.count()):
+            wx, wy = self.widget(i).stretch()
+            y += wy
+            x = max(x, wx)
+            sizes.append(wy)
+            #print "  child", self.widget(i), wx, wy
+        self.setStretch(x, y)
+
+        #print sizes
+        tot = float(sum(sizes))
+        if tot == 0:
+            scale = 1.0
+        else:
+            scale = self.height() / tot
+        self.setSizes([int(s*scale) for s in sizes])
+
+
+class TContainer(Container, QtGui.QWidget):
+    sigStretchChanged = QtCore.Signal()
+    def __init__(self, area):
+        QtGui.QWidget.__init__(self)
+        Container.__init__(self, area)
+        self.layout = QtGui.QGridLayout()
+        self.layout.setSpacing(0)
+        self.layout.setContentsMargins(0,0,0,0)
+        self.setLayout(self.layout)
+        
+        self.hTabLayout = QtGui.QHBoxLayout()
+        self.hTabBox = QtGui.QWidget()
+        self.hTabBox.setLayout(self.hTabLayout)
+        self.hTabLayout.setSpacing(2)
+        self.hTabLayout.setContentsMargins(0,0,0,0)
+        self.layout.addWidget(self.hTabBox, 0, 1)
+
+        self.stack = QtGui.QStackedWidget()
+        self.layout.addWidget(self.stack, 1, 1)
+        self.stack.childEvent = self.stackChildEvent
+
+
+        self.setLayout(self.layout)
+        for n in ['count', 'widget', 'indexOf']:
+            setattr(self, n, getattr(self.stack, n))
+
+
+    def _insertItem(self, item, index):
+        if not isinstance(item, Dock.Dock):
+            raise Exception("Tab containers may hold only docks, not other containers.")
+        self.stack.insertWidget(index, item)
+        self.hTabLayout.insertWidget(index, item.label)
+        #QtCore.QObject.connect(item.label, QtCore.SIGNAL('clicked'), self.tabClicked)
+        item.label.sigClicked.connect(self.tabClicked)
+        self.tabClicked(item.label)
+        
+    def tabClicked(self, tab, ev=None):
+        if ev is None or ev.button() == QtCore.Qt.LeftButton:
+            for i in range(self.count()):
+                w = self.widget(i)
+                if w is tab.dock:
+                    w.label.setDim(False)
+                    self.stack.setCurrentIndex(i)
+                else:
+                    w.label.setDim(True)
+        
+    def raiseDock(self, dock):
+        """Move *dock* to the top of the stack"""
+        self.stack.currentWidget().label.setDim(True)
+        self.stack.setCurrentWidget(dock)
+        dock.label.setDim(False)
+        
+        
+    def type(self):
+        return 'tab'
+
+    def saveState(self):
+        return {'index': self.stack.currentIndex()}
+        
+    def restoreState(self, state):
+        self.stack.setCurrentIndex(state['index'])
+        
+    def updateStretch(self):
+        ##Set the stretch values for this container to reflect its contents
+        x = 0
+        y = 0
+        for i in range(self.count()):
+            wx, wy = self.widget(i).stretch()
+            x = max(x, wx)
+            y = max(y, wy)
+        self.setStretch(x, y)
+        
+    def stackChildEvent(self, ev):
+        QtGui.QStackedWidget.childEvent(self.stack, ev)
+        Container.childEvent(self, ev)
+        
+from . import Dock
diff --git a/libs/pyqtgraph/dockarea/Dock.py b/libs/pyqtgraph/dockarea/Dock.py
new file mode 100644
index 0000000000000000000000000000000000000000..4493d075e1eccc9759b4e914cbd1738f3ab12953
--- /dev/null
+++ b/libs/pyqtgraph/dockarea/Dock.py
@@ -0,0 +1,361 @@
+from ..Qt import QtCore, QtGui
+
+from .DockDrop import *
+from ..widgets.VerticalLabel import VerticalLabel
+from ..python2_3 import asUnicode
+
+class Dock(QtGui.QWidget, DockDrop):
+    
+    sigStretchChanged = QtCore.Signal()
+    sigClosed = QtCore.Signal(object)
+    
+    def __init__(self, name, area=None, size=(10, 10), widget=None, hideTitle=False, autoOrientation=True, closable=False):
+        QtGui.QWidget.__init__(self)
+        DockDrop.__init__(self)
+        self._container = None
+        self._name = name
+        self.area = area
+        self.label = DockLabel(name, self, closable)
+        if closable:
+            self.label.sigCloseClicked.connect(self.close)
+        self.labelHidden = False
+        self.moveLabel = True  ## If false, the dock is no longer allowed to move the label.
+        self.autoOrient = autoOrientation
+        self.orientation = 'horizontal'
+        #self.label.setAlignment(QtCore.Qt.AlignHCenter)
+        self.topLayout = QtGui.QGridLayout()
+        self.topLayout.setContentsMargins(0, 0, 0, 0)
+        self.topLayout.setSpacing(0)
+        self.setLayout(self.topLayout)
+        self.topLayout.addWidget(self.label, 0, 1)
+        self.widgetArea = QtGui.QWidget()
+        self.topLayout.addWidget(self.widgetArea, 1, 1)
+        self.layout = QtGui.QGridLayout()
+        self.layout.setContentsMargins(0, 0, 0, 0)
+        self.layout.setSpacing(0)
+        self.widgetArea.setLayout(self.layout)
+        self.widgetArea.setSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
+        self.widgets = []
+        self.currentRow = 0
+        #self.titlePos = 'top'
+        self.raiseOverlay()
+        self.hStyle = """
+        Dock > QWidget {
+            border: 1px solid #000;
+            border-radius: 5px;
+            border-top-left-radius: 0px;
+            border-top-right-radius: 0px;
+            border-top-width: 0px;
+        }"""
+        self.vStyle = """
+        Dock > QWidget {
+            border: 1px solid #000;
+            border-radius: 5px;
+            border-top-left-radius: 0px;
+            border-bottom-left-radius: 0px;
+            border-left-width: 0px;
+        }"""
+        self.nStyle = """
+        Dock > QWidget {
+            border: 1px solid #000;
+            border-radius: 5px;
+        }"""
+        self.dragStyle = """
+        Dock > QWidget {
+            border: 4px solid #00F;
+            border-radius: 5px;
+        }"""
+        self.setAutoFillBackground(False)
+        self.widgetArea.setStyleSheet(self.hStyle)
+        
+        self.setStretch(*size)
+        
+        if widget is not None:
+            self.addWidget(widget)
+
+        if hideTitle:
+            self.hideTitleBar()
+
+    def implements(self, name=None):
+        if name is None:
+            return ['dock']
+        else:
+            return name == 'dock'
+        
+    def setStretch(self, x=None, y=None):
+        """
+        Set the 'target' size for this Dock.
+        The actual size will be determined by comparing this Dock's
+        stretch value to the rest of the docks it shares space with.
+        """
+        #print "setStretch", self, x, y
+        #self._stretch = (x, y)
+        if x is None:
+            x = 0
+        if y is None:
+            y = 0
+        #policy = self.sizePolicy()
+        #policy.setHorizontalStretch(x)
+        #policy.setVerticalStretch(y)
+        #self.setSizePolicy(policy)
+        self._stretch = (x, y)
+        self.sigStretchChanged.emit()
+        #print "setStretch", self, x, y, self.stretch()
+        
+    def stretch(self):
+        #policy = self.sizePolicy()
+        #return policy.horizontalStretch(), policy.verticalStretch()
+        return self._stretch
+        
+    #def stretch(self):
+        #return self._stretch
+
+    def hideTitleBar(self):
+        """
+        Hide the title bar for this Dock.
+        This will prevent the Dock being moved by the user.
+        """
+        self.label.hide()
+        self.labelHidden = True
+        if 'center' in self.allowedAreas:
+            self.allowedAreas.remove('center')
+        self.updateStyle()
+        
+    def showTitleBar(self):
+        """
+        Show the title bar for this Dock.
+        """
+        self.label.show()
+        self.labelHidden = False
+        self.allowedAreas.add('center')
+        self.updateStyle()
+
+    def title(self):
+        """
+        Gets the text displayed in the title bar for this dock.
+        """
+        return asUnicode(self.label.text())
+
+    def setTitle(self, text):
+        """
+        Sets the text displayed in title bar for this Dock.
+        """
+        self.label.setText(text)
+        
+    def setOrientation(self, o='auto', force=False):
+        """
+        Sets the orientation of the title bar for this Dock.
+        Must be one of 'auto', 'horizontal', or 'vertical'.
+        By default ('auto'), the orientation is determined
+        based on the aspect ratio of the Dock.
+        """
+        #print self.name(), "setOrientation", o, force
+        if o == 'auto' and self.autoOrient:
+            if self.container().type() == 'tab':
+                o = 'horizontal'
+            elif self.width() > self.height()*1.5:
+                o = 'vertical'
+            else:
+                o = 'horizontal'
+        if force or self.orientation != o:
+            self.orientation = o
+            self.label.setOrientation(o)
+            self.updateStyle()
+        
+    def updateStyle(self):
+        ## updates orientation and appearance of title bar
+        #print self.name(), "update style:", self.orientation, self.moveLabel, self.label.isVisible()
+        if self.labelHidden:
+            self.widgetArea.setStyleSheet(self.nStyle)
+        elif self.orientation == 'vertical':
+            self.label.setOrientation('vertical')
+            if self.moveLabel:
+                #print self.name(), "reclaim label"
+                self.topLayout.addWidget(self.label, 1, 0)
+            self.widgetArea.setStyleSheet(self.vStyle)
+        else:
+            self.label.setOrientation('horizontal')
+            if self.moveLabel:
+                #print self.name(), "reclaim label"
+                self.topLayout.addWidget(self.label, 0, 1)
+            self.widgetArea.setStyleSheet(self.hStyle)
+
+    def resizeEvent(self, ev):
+        self.setOrientation()
+        self.resizeOverlay(self.size())
+
+    def name(self):
+        return self._name
+
+    def container(self):
+        return self._container
+
+    def addWidget(self, widget, row=None, col=0, rowspan=1, colspan=1):
+        """
+        Add a new widget to the interior of this Dock.
+        Each Dock uses a QGridLayout to arrange widgets within.
+        """
+        if row is None:
+            row = self.currentRow
+        self.currentRow = max(row+1, self.currentRow)
+        self.widgets.append(widget)
+        self.layout.addWidget(widget, row, col, rowspan, colspan)
+        self.raiseOverlay()
+        
+        
+    def startDrag(self):
+        self.drag = QtGui.QDrag(self)
+        mime = QtCore.QMimeData()
+        #mime.setPlainText("asd")
+        self.drag.setMimeData(mime)
+        self.widgetArea.setStyleSheet(self.dragStyle)
+        self.update()
+        action = self.drag.exec_()
+        self.updateStyle()
+        
+    def float(self):
+        self.area.floatDock(self)
+            
+    def containerChanged(self, c):
+        #print self.name(), "container changed"
+        self._container = c
+        if c.type() != 'tab':
+            self.moveLabel = True
+            self.label.setDim(False)
+        else:
+            self.moveLabel = False
+            
+        self.setOrientation(force=True)
+        
+    def raiseDock(self):
+        """If this Dock is stacked underneath others, raise it to the top."""
+        self.container().raiseDock(self)
+        
+
+    def close(self):
+        """Remove this dock from the DockArea it lives inside."""
+        self.setParent(None)
+        self.label.setParent(None)
+        self._container.apoptose()
+        self._container = None
+        self.sigClosed.emit(self)
+
+    def __repr__(self):
+        return "<Dock %s %s>" % (self.name(), self.stretch())
+
+    ## PySide bug: We need to explicitly redefine these methods
+    ## or else drag/drop events will not be delivered.
+    def dragEnterEvent(self, *args):
+        DockDrop.dragEnterEvent(self, *args)
+
+    def dragMoveEvent(self, *args):
+        DockDrop.dragMoveEvent(self, *args)
+
+    def dragLeaveEvent(self, *args):
+        DockDrop.dragLeaveEvent(self, *args)
+
+    def dropEvent(self, *args):
+        DockDrop.dropEvent(self, *args)
+
+
+class DockLabel(VerticalLabel):
+    
+    sigClicked = QtCore.Signal(object, object)
+    sigCloseClicked = QtCore.Signal()
+    
+    def __init__(self, text, dock, showCloseButton):
+        self.dim = False
+        self.fixedWidth = False
+        VerticalLabel.__init__(self, text, orientation='horizontal', forceWidth=False)
+        self.setAlignment(QtCore.Qt.AlignTop|QtCore.Qt.AlignHCenter)
+        self.dock = dock
+        self.updateStyle()
+        self.setAutoFillBackground(False)
+        self.startedDrag = False
+
+        self.closeButton = None
+        if showCloseButton:
+            self.closeButton = QtGui.QToolButton(self)
+            self.closeButton.clicked.connect(self.sigCloseClicked)
+            self.closeButton.setIcon(QtGui.QApplication.style().standardIcon(QtGui.QStyle.SP_TitleBarCloseButton))
+
+    def updateStyle(self):
+        r = '3px'
+        if self.dim:
+            fg = '#aaa'
+            bg = '#44a'
+            border = '#339'
+        else:
+            fg = '#fff'
+            bg = '#66c'
+            border = '#55B'
+        
+        if self.orientation == 'vertical':
+            self.vStyle = """DockLabel {
+                background-color : %s;
+                color : %s;
+                border-top-right-radius: 0px;
+                border-top-left-radius: %s;
+                border-bottom-right-radius: 0px;
+                border-bottom-left-radius: %s;
+                border-width: 0px;
+                border-right: 2px solid %s;
+                padding-top: 3px;
+                padding-bottom: 3px;
+            }""" % (bg, fg, r, r, border)
+            self.setStyleSheet(self.vStyle)
+        else:
+            self.hStyle = """DockLabel {
+                background-color : %s;
+                color : %s;
+                border-top-right-radius: %s;
+                border-top-left-radius: %s;
+                border-bottom-right-radius: 0px;
+                border-bottom-left-radius: 0px;
+                border-width: 0px;
+                border-bottom: 2px solid %s;
+                padding-left: 3px;
+                padding-right: 3px;
+            }""" % (bg, fg, r, r, border)
+            self.setStyleSheet(self.hStyle)
+
+    def setDim(self, d):
+        if self.dim != d:
+            self.dim = d
+            self.updateStyle()
+    
+    def setOrientation(self, o):
+        VerticalLabel.setOrientation(self, o)
+        self.updateStyle()
+
+    def mousePressEvent(self, ev):
+        if ev.button() == QtCore.Qt.LeftButton:
+            self.pressPos = ev.pos()
+            self.startedDrag = False
+            ev.accept()
+        
+    def mouseMoveEvent(self, ev):
+        if not self.startedDrag and (ev.pos() - self.pressPos).manhattanLength() > QtGui.QApplication.startDragDistance():
+            self.dock.startDrag()
+        ev.accept()
+            
+    def mouseReleaseEvent(self, ev):
+        if not self.startedDrag:
+            self.sigClicked.emit(self, ev)
+        ev.accept()
+        
+    def mouseDoubleClickEvent(self, ev):
+        if ev.button() == QtCore.Qt.LeftButton:
+            self.dock.float()
+            
+    def resizeEvent (self, ev):
+        if self.closeButton:
+            if self.orientation == 'vertical':
+                size = ev.size().width()
+                pos = QtCore.QPoint(0, 0)
+            else:
+                size = ev.size().height()
+                pos = QtCore.QPoint(ev.size().width() - size, 0)
+            self.closeButton.setFixedSize(QtCore.QSize(size, size))
+            self.closeButton.move(pos)
+        super(DockLabel,self).resizeEvent(ev)
diff --git a/libs/pyqtgraph/dockarea/DockArea.py b/libs/pyqtgraph/dockarea/DockArea.py
new file mode 100644
index 0000000000000000000000000000000000000000..aedee74966b8d643ba20eb1d4fea6b27c6b81e5d
--- /dev/null
+++ b/libs/pyqtgraph/dockarea/DockArea.py
@@ -0,0 +1,339 @@
+# -*- coding: utf-8 -*-
+from ..Qt import QtCore, QtGui
+from .Container import *
+from .DockDrop import *
+from .Dock import Dock
+from .. import debug as debug
+import weakref
+
+## TODO:
+# - containers should be drop areas, not docks. (but every slot within a container must have its own drop areas?)
+# - drop between tabs
+# - nest splitters inside tab boxes, etc.
+
+
+
+
+class DockArea(Container, QtGui.QWidget, DockDrop):
+    def __init__(self, temporary=False, home=None):
+        Container.__init__(self, self)
+        QtGui.QWidget.__init__(self)
+        DockDrop.__init__(self, allowedAreas=['left', 'right', 'top', 'bottom'])
+        self.layout = QtGui.QVBoxLayout()
+        self.layout.setContentsMargins(0,0,0,0)
+        self.layout.setSpacing(0)
+        self.setLayout(self.layout)
+        self.docks = weakref.WeakValueDictionary()
+        self.topContainer = None
+        self.raiseOverlay()
+        self.temporary = temporary
+        self.tempAreas = []
+        self.home = home
+        
+    def type(self):
+        return "top"
+        
+    def addDock(self, dock=None, position='bottom', relativeTo=None, **kwds):
+        """Adds a dock to this area.
+        
+        ============== =================================================================
+        **Arguments:**
+        dock           The new Dock object to add. If None, then a new Dock will be 
+                       created.
+        position       'bottom', 'top', 'left', 'right', 'above', or 'below'
+        relativeTo     If relativeTo is None, then the new Dock is added to fill an 
+                       entire edge of the window. If relativeTo is another Dock, then 
+                       the new Dock is placed adjacent to it (or in a tabbed 
+                       configuration for 'above' and 'below'). 
+        ============== =================================================================
+        
+        All extra keyword arguments are passed to Dock.__init__() if *dock* is
+        None.        
+        """
+        if dock is None:
+            dock = Dock(**kwds)
+        
+        
+        ## Determine the container to insert this dock into.
+        ## If there is no neighbor, then the container is the top.
+        if relativeTo is None or relativeTo is self:
+            if self.topContainer is None:
+                container = self
+                neighbor = None
+            else:
+                container = self.topContainer
+                neighbor = None
+        else:
+            if isinstance(relativeTo, basestring):
+                relativeTo = self.docks[relativeTo]
+            container = self.getContainer(relativeTo)
+            neighbor = relativeTo
+        
+        ## what container type do we need?
+        neededContainer = {
+            'bottom': 'vertical',
+            'top': 'vertical',
+            'left': 'horizontal',
+            'right': 'horizontal',
+            'above': 'tab',
+            'below': 'tab'
+        }[position]
+        
+        ## Can't insert new containers into a tab container; insert outside instead.
+        if neededContainer != container.type() and container.type() == 'tab':
+            neighbor = container
+            container = container.container()
+            
+        ## Decide if the container we have is suitable.
+        ## If not, insert a new container inside.
+        if neededContainer != container.type():
+            if neighbor is None:
+                container = self.addContainer(neededContainer, self.topContainer)
+            else:
+                container = self.addContainer(neededContainer, neighbor)
+            
+        ## Insert the new dock before/after its neighbor
+        insertPos = {
+            'bottom': 'after',
+            'top': 'before',
+            'left': 'before',
+            'right': 'after',
+            'above': 'before',
+            'below': 'after'
+        }[position]
+        #print "request insert", dock, insertPos, neighbor
+        old = dock.container()
+        container.insert(dock, insertPos, neighbor)
+        dock.area = self
+        self.docks[dock.name()] = dock
+        if old is not None:
+            old.apoptose()
+        
+        return dock
+        
+    def moveDock(self, dock, position, neighbor):
+        """
+        Move an existing Dock to a new location. 
+        """
+        ## Moving to the edge of a tabbed dock causes a drop outside the tab box
+        if position in ['left', 'right', 'top', 'bottom'] and neighbor is not None and neighbor.container() is not None and neighbor.container().type() == 'tab':
+            neighbor = neighbor.container()
+        self.addDock(dock, position, neighbor)
+        
+    def getContainer(self, obj):
+        if obj is None:
+            return self
+        return obj.container()
+        
+    def makeContainer(self, typ):
+        if typ == 'vertical':
+            new = VContainer(self)
+        elif typ == 'horizontal':
+            new = HContainer(self)
+        elif typ == 'tab':
+            new = TContainer(self)
+        return new
+        
+    def addContainer(self, typ, obj):
+        """Add a new container around obj"""
+        new = self.makeContainer(typ)
+        
+        container = self.getContainer(obj)
+        container.insert(new, 'before', obj)
+        #print "Add container:", new, " -> ", container
+        if obj is not None:
+            new.insert(obj)
+        self.raiseOverlay()
+        return new
+    
+    def insert(self, new, pos=None, neighbor=None):
+        if self.topContainer is not None:
+            self.topContainer.containerChanged(None)
+        self.layout.addWidget(new)
+        self.topContainer = new
+        #print self, "set top:", new
+        new._container = self
+        self.raiseOverlay()
+        #print "Insert top:", new
+        
+    def count(self):
+        if self.topContainer is None:
+            return 0
+        return 1
+        
+        
+    #def paintEvent(self, ev):
+        #self.drawDockOverlay()
+        
+    def resizeEvent(self, ev):
+        self.resizeOverlay(self.size())
+        
+    def addTempArea(self):
+        if self.home is None:
+            area = DockArea(temporary=True, home=self)
+            self.tempAreas.append(area)
+            win = TempAreaWindow(area)
+            area.win = win
+            win.show()
+        else:
+            area = self.home.addTempArea()
+        #print "added temp area", area, area.window()
+        return area
+        
+    def floatDock(self, dock):
+        """Removes *dock* from this DockArea and places it in a new window."""
+        area = self.addTempArea()
+        area.win.resize(dock.size())
+        area.moveDock(dock, 'top', None)
+        
+        
+    def removeTempArea(self, area):
+        self.tempAreas.remove(area)
+        #print "close window", area.window()
+        area.window().close()
+        
+    def saveState(self):
+        """
+        Return a serialized (storable) representation of the state of
+        all Docks in this DockArea."""
+
+        if self.topContainer is None:
+            main = None
+        else:
+            main = self.childState(self.topContainer)
+
+        state = {'main': main, 'float': []}
+        for a in self.tempAreas:
+            geo = a.win.geometry()
+            geo = (geo.x(), geo.y(), geo.width(), geo.height())
+            state['float'].append((a.saveState(), geo))
+        return state
+        
+    def childState(self, obj):
+        if isinstance(obj, Dock):
+            return ('dock', obj.name(), {})
+        else:
+            childs = []
+            for i in range(obj.count()):
+                childs.append(self.childState(obj.widget(i)))
+            return (obj.type(), childs, obj.saveState())
+        
+        
+    def restoreState(self, state):
+        """
+        Restore Dock configuration as generated by saveState.
+        
+        Note that this function does not create any Docks--it will only 
+        restore the arrangement of an existing set of Docks.
+        
+        """
+        
+        ## 1) make dict of all docks and list of existing containers
+        containers, docks = self.findAll()
+        oldTemps = self.tempAreas[:]
+        #print "found docks:", docks
+        
+        ## 2) create container structure, move docks into new containers
+        if state['main'] is not None:
+            self.buildFromState(state['main'], docks, self)
+        
+        ## 3) create floating areas, populate
+        for s in state['float']:
+            a = self.addTempArea()
+            a.buildFromState(s[0]['main'], docks, a)
+            a.win.setGeometry(*s[1])
+        
+        ## 4) Add any remaining docks to the bottom
+        for d in docks.values():
+            self.moveDock(d, 'below', None)
+        
+        #print "\nKill old containers:"
+        ## 5) kill old containers
+        for c in containers:
+            c.close()
+        for a in oldTemps:
+            a.apoptose()
+
+
+    def buildFromState(self, state, docks, root, depth=0):
+        typ, contents, state = state
+        pfx = "  " * depth
+        if typ == 'dock':
+            try:
+                obj = docks[contents]
+                del docks[contents]
+            except KeyError:
+                raise Exception('Cannot restore dock state; no dock with name "%s"' % contents)
+        else:
+            obj = self.makeContainer(typ)
+            
+        root.insert(obj, 'after')
+        #print pfx+"Add:", obj, " -> ", root
+        
+        if typ != 'dock':
+            for o in contents:
+                self.buildFromState(o, docks, obj, depth+1)
+            obj.apoptose(propagate=False)
+            obj.restoreState(state)  ## this has to be done later?
+        
+
+    def findAll(self, obj=None, c=None, d=None):
+        if obj is None:
+            obj = self.topContainer
+        
+        ## check all temp areas first
+        if c is None:
+            c = []
+            d = {}
+            for a in self.tempAreas:
+                c1, d1 = a.findAll()
+                c.extend(c1)
+                d.update(d1)
+        
+        if isinstance(obj, Dock):
+            d[obj.name()] = obj
+        elif obj is not None:
+            c.append(obj)
+            for i in range(obj.count()):
+                o2 = obj.widget(i)
+                c2, d2 = self.findAll(o2)
+                c.extend(c2)
+                d.update(d2)
+        return (c, d)
+
+    def apoptose(self):
+        #print "apoptose area:", self.temporary, self.topContainer, self.topContainer.count()
+        if self.topContainer.count() == 0:
+            self.topContainer = None
+            if self.temporary:
+                self.home.removeTempArea(self)
+                #self.close()
+
+    def clear(self):
+        docks = self.findAll()[1]
+        for dock in docks.values():
+            dock.close()
+            
+    ## PySide bug: We need to explicitly redefine these methods
+    ## or else drag/drop events will not be delivered.
+    def dragEnterEvent(self, *args):
+        DockDrop.dragEnterEvent(self, *args)
+
+    def dragMoveEvent(self, *args):
+        DockDrop.dragMoveEvent(self, *args)
+
+    def dragLeaveEvent(self, *args):
+        DockDrop.dragLeaveEvent(self, *args)
+
+    def dropEvent(self, *args):
+        DockDrop.dropEvent(self, *args)
+
+
+class TempAreaWindow(QtGui.QMainWindow):
+    def __init__(self, area, **kwargs):
+        QtGui.QMainWindow.__init__(self, **kwargs)
+        self.setCentralWidget(area)
+
+    def closeEvent(self, *args, **kwargs):
+        self.centralWidget().clear()
+        QtGui.QMainWindow.closeEvent(self, *args, **kwargs)
diff --git a/libs/pyqtgraph/dockarea/DockDrop.py b/libs/pyqtgraph/dockarea/DockDrop.py
new file mode 100644
index 0000000000000000000000000000000000000000..bd364f5066baac8f83046c11311772fecf4859b7
--- /dev/null
+++ b/libs/pyqtgraph/dockarea/DockDrop.py
@@ -0,0 +1,128 @@
+# -*- coding: utf-8 -*-
+from ..Qt import QtCore, QtGui
+
+class DockDrop(object):
+    """Provides dock-dropping methods"""
+    def __init__(self, allowedAreas=None):
+        object.__init__(self)
+        if allowedAreas is None:
+            allowedAreas = ['center', 'right', 'left', 'top', 'bottom']
+        self.allowedAreas = set(allowedAreas)
+        self.setAcceptDrops(True)
+        self.dropArea = None
+        self.overlay = DropAreaOverlay(self)
+        self.overlay.raise_()
+    
+    def resizeOverlay(self, size):
+        self.overlay.resize(size)
+        
+    def raiseOverlay(self):
+        self.overlay.raise_()
+    
+    def dragEnterEvent(self, ev):
+        src = ev.source()
+        if hasattr(src, 'implements') and src.implements('dock'):
+            #print "drag enter accept"
+            ev.accept()
+        else:
+            #print "drag enter ignore"
+            ev.ignore()
+        
+    def dragMoveEvent(self, ev):
+        #print "drag move"
+        ld = ev.pos().x()
+        rd = self.width() - ld
+        td = ev.pos().y()
+        bd = self.height() - td
+        
+        mn = min(ld, rd, td, bd)
+        if mn > 30:
+            self.dropArea = "center"
+        elif (ld == mn or td == mn) and mn > self.height()/3.:
+            self.dropArea = "center"
+        elif (rd == mn or ld == mn) and mn > self.width()/3.:
+            self.dropArea = "center"
+            
+        elif rd == mn:
+            self.dropArea = "right"
+        elif ld == mn:
+            self.dropArea = "left"
+        elif td == mn:
+            self.dropArea = "top"
+        elif bd == mn:
+            self.dropArea = "bottom"
+            
+        if ev.source() is self and self.dropArea == 'center':
+            #print "  no self-center"
+            self.dropArea = None
+            ev.ignore()
+        elif self.dropArea not in self.allowedAreas:
+            #print "  not allowed"
+            self.dropArea = None
+            ev.ignore()
+        else:
+            #print "  ok"
+            ev.accept()
+        self.overlay.setDropArea(self.dropArea)
+            
+    def dragLeaveEvent(self, ev):
+        self.dropArea = None
+        self.overlay.setDropArea(self.dropArea)
+    
+    def dropEvent(self, ev):
+        area = self.dropArea
+        if area is None:
+            return
+        if area == 'center':
+            area = 'above'
+        self.area.moveDock(ev.source(), area, self)
+        self.dropArea = None
+        self.overlay.setDropArea(self.dropArea)
+
+        
+
+class DropAreaOverlay(QtGui.QWidget):
+    """Overlay widget that draws drop areas during a drag-drop operation"""
+    
+    def __init__(self, parent):
+        QtGui.QWidget.__init__(self, parent)
+        self.dropArea = None
+        self.hide()
+        self.setAttribute(QtCore.Qt.WA_TransparentForMouseEvents)
+        
+    def setDropArea(self, area):
+        self.dropArea = area
+        if area is None:
+            self.hide()
+        else:
+            ## Resize overlay to just the region where drop area should be displayed.
+            ## This works around a Qt bug--can't display transparent widgets over QGLWidget
+            prgn = self.parent().rect()
+            rgn = QtCore.QRect(prgn)
+            w = min(30, prgn.width()/3.)
+            h = min(30, prgn.height()/3.)
+            
+            if self.dropArea == 'left':
+                rgn.setWidth(w)
+            elif self.dropArea == 'right':
+                rgn.setLeft(rgn.left() + prgn.width() - w)
+            elif self.dropArea == 'top':
+                rgn.setHeight(h)
+            elif self.dropArea == 'bottom':
+                rgn.setTop(rgn.top() + prgn.height() - h)
+            elif self.dropArea == 'center':
+                rgn.adjust(w, h, -w, -h)
+            self.setGeometry(rgn)
+            self.show()
+
+        self.update()
+    
+    def paintEvent(self, ev):
+        if self.dropArea is None:
+            return
+        p = QtGui.QPainter(self)
+        rgn = self.rect()
+
+        p.setBrush(QtGui.QBrush(QtGui.QColor(100, 100, 255, 50)))
+        p.setPen(QtGui.QPen(QtGui.QColor(50, 50, 150), 3))
+        p.drawRect(rgn)
diff --git a/libs/pyqtgraph/dockarea/__init__.py b/libs/pyqtgraph/dockarea/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..f67c50c3b9e9f69109067dc60a2f748a1ba0f485
--- /dev/null
+++ b/libs/pyqtgraph/dockarea/__init__.py
@@ -0,0 +1,2 @@
+from .DockArea import DockArea
+from .Dock import Dock
\ No newline at end of file
diff --git a/libs/pyqtgraph/dockarea/tests/test_dock.py b/libs/pyqtgraph/dockarea/tests/test_dock.py
new file mode 100644
index 0000000000000000000000000000000000000000..949f3f0ecaaba6eacc393badb821cfe360d3fc39
--- /dev/null
+++ b/libs/pyqtgraph/dockarea/tests/test_dock.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+#import sip
+#sip.setapi('QString', 1)
+
+import pyqtgraph as pg
+pg.mkQApp()
+
+import pyqtgraph.dockarea as da
+
+def test_dock():
+    name = pg.asUnicode("évènts_zàhéér")
+    dock = da.Dock(name=name)
+    # make sure unicode names work correctly
+    assert dock.name() == name
+    # no surprises in return type.
+    assert type(dock.name()) == type(name)
diff --git a/libs/pyqtgraph/exceptionHandling.py b/libs/pyqtgraph/exceptionHandling.py
new file mode 100644
index 0000000000000000000000000000000000000000..3182b7ebd3e18ca42eefbb061b15bb0d5fb344da
--- /dev/null
+++ b/libs/pyqtgraph/exceptionHandling.py
@@ -0,0 +1,106 @@
+# -*- coding: utf-8 -*-
+"""This module installs a wrapper around sys.excepthook which allows multiple
+new exception handlers to be registered. 
+
+Optionally, the wrapper also stops exceptions from causing long-term storage 
+of local stack frames. This has two major effects:
+  - Unhandled exceptions will no longer cause memory leaks
+    (If an exception occurs while a lot of data is present on the stack, 
+    such as when loading large files, the data would ordinarily be kept
+    until the next exception occurs. We would rather release this memory 
+    as soon as possible.)
+  - Some debuggers may have a hard time handling uncaught exceptions
+ 
+The module also provides a callback mechanism allowing others to respond 
+to exceptions.
+"""
+
+import sys, time
+#from lib.Manager import logMsg
+import traceback
+#from log import *
+
+#logging = False
+
+callbacks = []
+clear_tracebacks = False
+
+def register(fn):
+    """
+    Register a callable to be invoked when there is an unhandled exception.
+    The callback will be passed the output of sys.exc_info(): (exception type, exception, traceback)
+    Multiple callbacks will be invoked in the order they were registered.
+    """
+    callbacks.append(fn)
+    
+def unregister(fn):
+    """Unregister a previously registered callback."""
+    callbacks.remove(fn)
+
+def setTracebackClearing(clear=True):
+    """
+    Enable or disable traceback clearing.
+    By default, clearing is disabled and Python will indefinitely store unhandled exception stack traces.
+    This function is provided since Python's default behavior can cause unexpected retention of 
+    large memory-consuming objects.
+    """
+    global clear_tracebacks
+    clear_tracebacks = clear
+    
+class ExceptionHandler(object):
+    def __call__(self, *args):
+        ## Start by extending recursion depth just a bit. 
+        ## If the error we are catching is due to recursion, we don't want to generate another one here.
+        recursionLimit = sys.getrecursionlimit()
+        try:
+            sys.setrecursionlimit(recursionLimit+100)
+        
+        
+            ## call original exception handler first (prints exception)
+            global original_excepthook, callbacks, clear_tracebacks
+            try:
+                print("===== %s =====" % str(time.strftime("%Y.%m.%d %H:%m:%S", time.localtime(time.time()))))
+            except Exception:
+                sys.stderr.write("Warning: stdout is broken! Falling back to stderr.\n")
+                sys.stdout = sys.stderr
+
+            ret = original_excepthook(*args)
+                
+            for cb in callbacks:
+                try:
+                    cb(*args)
+                except Exception:
+                    print("   --------------------------------------------------------------")
+                    print("      Error occurred during exception callback %s" % str(cb))
+                    print("   --------------------------------------------------------------")
+                    traceback.print_exception(*sys.exc_info())
+                
+            
+            ## Clear long-term storage of last traceback to prevent memory-hogging.
+            ## (If an exception occurs while a lot of data is present on the stack, 
+            ## such as when loading large files, the data would ordinarily be kept
+            ## until the next exception occurs. We would rather release this memory 
+            ## as soon as possible.)
+            if clear_tracebacks is True:
+                sys.last_traceback = None
+        
+        finally:
+            sys.setrecursionlimit(recursionLimit)            
+            
+            
+    def implements(self, interface=None):
+        ## this just makes it easy for us to detect whether an ExceptionHook is already installed.
+        if interface is None:
+            return ['ExceptionHandler']
+        else:
+            return interface == 'ExceptionHandler'
+    
+
+
+## replace built-in excepthook only if this has not already been done
+if not (hasattr(sys.excepthook, 'implements') and sys.excepthook.implements('ExceptionHandler')):
+    original_excepthook = sys.excepthook
+    sys.excepthook = ExceptionHandler()
+
+
+
diff --git a/libs/pyqtgraph/exporters/CSVExporter.py b/libs/pyqtgraph/exporters/CSVExporter.py
new file mode 100644
index 0000000000000000000000000000000000000000..b87f0182e8e2dfeae067cbc70945b95bace3bfb4
--- /dev/null
+++ b/libs/pyqtgraph/exporters/CSVExporter.py
@@ -0,0 +1,83 @@
+from ..Qt import QtGui, QtCore
+from .Exporter import Exporter
+from ..parametertree import Parameter
+from .. import PlotItem
+
+__all__ = ['CSVExporter']
+    
+    
+class CSVExporter(Exporter):
+    Name = "CSV from plot data"
+    windows = []
+    def __init__(self, item):
+        Exporter.__init__(self, item)
+        self.params = Parameter(name='params', type='group', children=[
+            {'name': 'separator', 'type': 'list', 'value': 'comma', 'values': ['comma', 'tab']},
+            {'name': 'precision', 'type': 'int', 'value': 10, 'limits': [0, None]},
+            {'name': 'columnMode', 'type': 'list', 'values': ['(x,y) per plot', '(x,y,y,y) for all plots']}
+        ])
+        
+    def parameters(self):
+        return self.params
+    
+    def export(self, fileName=None):
+        
+        if not isinstance(self.item, PlotItem):
+            raise Exception("Must have a PlotItem selected for CSV export.")
+        
+        if fileName is None:
+            self.fileSaveDialog(filter=["*.csv", "*.tsv"])
+            return
+
+        fd = open(fileName, 'w')
+        data = []
+        header = []
+
+        appendAllX = self.params['columnMode'] == '(x,y) per plot'
+
+        for i, c in enumerate(self.item.curves):
+            cd = c.getData()
+            if cd[0] is None:
+                continue
+            data.append(cd)
+            if hasattr(c, 'implements') and c.implements('plotData') and c.name() is not None:
+                name = c.name().replace('"', '""') + '_'
+                xName, yName = '"'+name+'x"', '"'+name+'y"'
+            else:
+                xName = 'x%04d' % i
+                yName = 'y%04d' % i
+            if appendAllX or i == 0:
+                header.extend([xName, yName])
+            else:
+                header.extend([yName])
+
+        if self.params['separator'] == 'comma':
+            sep = ','
+        else:
+            sep = '\t'
+            
+        fd.write(sep.join(header) + '\n')
+        i = 0
+        numFormat = '%%0.%dg' % self.params['precision']
+        numRows = max([len(d[0]) for d in data])
+        for i in range(numRows):
+            for j, d in enumerate(data):
+                # write x value if this is the first column, or if we want x 
+                # for all rows
+                if appendAllX or j == 0:
+                    if d is not None and i < len(d[0]):
+                        fd.write(numFormat % d[0][i] + sep)
+                    else:
+                        fd.write(' %s' % sep)
+                
+                # write y value 
+                if d is not None and i < len(d[1]):
+                    fd.write(numFormat % d[1][i] + sep)
+                else:
+                    fd.write(' %s' % sep)
+            fd.write('\n')
+        fd.close()
+
+CSVExporter.register()        
+                
+        
diff --git a/libs/pyqtgraph/exporters/Exporter.py b/libs/pyqtgraph/exporters/Exporter.py
new file mode 100644
index 0000000000000000000000000000000000000000..64a2529449a489dd129b14111166a517d9b673e9
--- /dev/null
+++ b/libs/pyqtgraph/exporters/Exporter.py
@@ -0,0 +1,139 @@
+from ..widgets.FileDialog import FileDialog
+from ..Qt import QtGui, QtCore, QtSvg
+from ..python2_3 import asUnicode
+from ..GraphicsScene import GraphicsScene
+import os, re
+LastExportDirectory = None
+
+
+class Exporter(object):
+    """
+    Abstract class used for exporting graphics to file / printer / whatever.
+    """    
+    allowCopy = False  # subclasses set this to True if they can use the copy buffer
+    Exporters = []
+    
+    @classmethod
+    def register(cls):
+        """
+        Used to register Exporter classes to appear in the export dialog.
+        """
+        Exporter.Exporters.append(cls)
+    
+    def __init__(self, item):
+        """
+        Initialize with the item to be exported.
+        Can be an individual graphics item or a scene.
+        """
+        object.__init__(self)
+        self.item = item
+        
+    def parameters(self):
+        """Return the parameters used to configure this exporter."""
+        raise Exception("Abstract method must be overridden in subclass.")
+        
+    def export(self, fileName=None, toBytes=False, copy=False):
+        """
+        If *fileName* is None, pop-up a file dialog.
+        If *toBytes* is True, return a bytes object rather than writing to file.
+        If *copy* is True, export to the copy buffer rather than writing to file.
+        """
+        raise Exception("Abstract method must be overridden in subclass.")
+
+    def fileSaveDialog(self, filter=None, opts=None):
+        ## Show a file dialog, call self.export(fileName) when finished.
+        if opts is None:
+            opts = {}
+        self.fileDialog = FileDialog()
+        self.fileDialog.setFileMode(QtGui.QFileDialog.AnyFile)
+        self.fileDialog.setAcceptMode(QtGui.QFileDialog.AcceptSave)
+        if filter is not None:
+            if isinstance(filter, basestring):
+                self.fileDialog.setNameFilter(filter)
+            elif isinstance(filter, list):
+                self.fileDialog.setNameFilters(filter)
+        global LastExportDirectory
+        exportDir = LastExportDirectory
+        if exportDir is not None:
+            self.fileDialog.setDirectory(exportDir)
+        self.fileDialog.show()
+        self.fileDialog.opts = opts
+        self.fileDialog.fileSelected.connect(self.fileSaveFinished)
+        return
+        
+    def fileSaveFinished(self, fileName):
+        fileName = asUnicode(fileName)
+        global LastExportDirectory
+        LastExportDirectory = os.path.split(fileName)[0]
+        
+        ## If file name does not match selected extension, append it now
+        ext = os.path.splitext(fileName)[1].lower().lstrip('.')
+        selectedExt = re.search(r'\*\.(\w+)\b', asUnicode(self.fileDialog.selectedNameFilter()))
+        if selectedExt is not None:
+            selectedExt = selectedExt.groups()[0].lower()
+            if ext != selectedExt:
+                fileName = fileName + '.' + selectedExt.lstrip('.')
+        
+        self.export(fileName=fileName, **self.fileDialog.opts)
+        
+    def getScene(self):
+        if isinstance(self.item, GraphicsScene):
+            return self.item
+        else:
+            return self.item.scene()
+        
+    def getSourceRect(self):
+        if isinstance(self.item, GraphicsScene):
+            w = self.item.getViewWidget()
+            return w.viewportTransform().inverted()[0].mapRect(w.rect())
+        else:
+            return self.item.sceneBoundingRect()
+        
+    def getTargetRect(self):        
+        if isinstance(self.item, GraphicsScene):
+            return self.item.getViewWidget().rect()
+        else:
+            return self.item.mapRectToDevice(self.item.boundingRect())
+        
+    def setExportMode(self, export, opts=None):
+        """
+        Call setExportMode(export, opts) on all items that will 
+        be painted during the export. This informs the item
+        that it is about to be painted for export, allowing it to 
+        alter its appearance temporarily
+        
+        
+        *export*  - bool; must be True before exporting and False afterward
+        *opts*    - dict; common parameters are 'antialias' and 'background'
+        """
+        if opts is None:
+            opts = {}
+        for item in self.getPaintItems():
+            if hasattr(item, 'setExportMode'):
+                item.setExportMode(export, opts)
+    
+    def getPaintItems(self, root=None):
+        """Return a list of all items that should be painted in the correct order."""
+        if root is None:
+            root = self.item
+        preItems = []
+        postItems = []
+        if isinstance(root, QtGui.QGraphicsScene):
+            childs = [i for i in root.items() if i.parentItem() is None]
+            rootItem = []
+        else:
+            childs = root.childItems()
+            rootItem = [root]
+        childs.sort(key=lambda a: a.zValue())
+        while len(childs) > 0:
+            ch = childs.pop(0)
+            tree = self.getPaintItems(ch)
+            if int(ch.flags() & ch.ItemStacksBehindParent) > 0 or (ch.zValue() < 0 and int(ch.flags() & ch.ItemNegativeZStacksBehindParent) > 0):
+                preItems.extend(tree)
+            else:
+                postItems.extend(tree)
+                
+        return preItems + rootItem + postItems
+
+    def render(self, painter, targetRect, sourceRect, item=None):
+        self.getScene().render(painter, QtCore.QRectF(targetRect), QtCore.QRectF(sourceRect))
diff --git a/libs/pyqtgraph/exporters/HDF5Exporter.py b/libs/pyqtgraph/exporters/HDF5Exporter.py
new file mode 100644
index 0000000000000000000000000000000000000000..cc8b5733e7c2490bd66cd2444e296424fd581101
--- /dev/null
+++ b/libs/pyqtgraph/exporters/HDF5Exporter.py
@@ -0,0 +1,58 @@
+from ..Qt import QtGui, QtCore
+from .Exporter import Exporter
+from ..parametertree import Parameter
+from .. import PlotItem
+
+import numpy 
+try:
+    import h5py
+    HAVE_HDF5 = True
+except ImportError:
+    HAVE_HDF5 = False
+    
+__all__ = ['HDF5Exporter']
+
+    
+class HDF5Exporter(Exporter):
+    Name = "HDF5 Export: plot (x,y)"
+    windows = []
+    allowCopy = False
+
+    def __init__(self, item):
+        Exporter.__init__(self, item)
+        self.params = Parameter(name='params', type='group', children=[
+            {'name': 'Name', 'type': 'str', 'value': 'Export',},
+            {'name': 'columnMode', 'type': 'list', 'values': ['(x,y) per plot', '(x,y,y,y) for all plots']},
+        ])
+        
+    def parameters(self):
+        return self.params
+    
+    def export(self, fileName=None):
+        if not HAVE_HDF5:
+            raise RuntimeError("This exporter requires the h5py package, "
+                               "but it was not importable.")
+        
+        if not isinstance(self.item, PlotItem):
+            raise Exception("Must have a PlotItem selected for HDF5 export.")
+        
+        if fileName is None:
+            self.fileSaveDialog(filter=["*.h5", "*.hdf", "*.hd5"])
+            return
+        dsname = self.params['Name']
+        fd = h5py.File(fileName, 'a') # forces append to file... 'w' doesn't seem to "delete/overwrite"
+        data = []
+        
+        appendAllX = self.params['columnMode'] == '(x,y) per plot'
+        for i,c in enumerate(self.item.curves):
+            d = c.getData()
+            if appendAllX or i == 0:
+                data.append(d[0])
+            data.append(d[1])
+                
+        fdata = numpy.array(data).astype('double')
+        dset = fd.create_dataset(dsname, data=fdata)
+        fd.close()
+
+if HAVE_HDF5:
+    HDF5Exporter.register()
diff --git a/libs/pyqtgraph/exporters/ImageExporter.py b/libs/pyqtgraph/exporters/ImageExporter.py
new file mode 100644
index 0000000000000000000000000000000000000000..78d93106549e615859ee3a376df26e9fdd3f0e1f
--- /dev/null
+++ b/libs/pyqtgraph/exporters/ImageExporter.py
@@ -0,0 +1,102 @@
+from .Exporter import Exporter
+from ..parametertree import Parameter
+from ..Qt import QtGui, QtCore, QtSvg, USE_PYSIDE
+from .. import functions as fn
+import numpy as np
+
+__all__ = ['ImageExporter']
+
+class ImageExporter(Exporter):
+    Name = "Image File (PNG, TIF, JPG, ...)"
+    allowCopy = True
+    
+    def __init__(self, item):
+        Exporter.__init__(self, item)
+        tr = self.getTargetRect()
+        if isinstance(item, QtGui.QGraphicsItem):
+            scene = item.scene()
+        else:
+            scene = item
+        bgbrush = scene.views()[0].backgroundBrush()
+        bg = bgbrush.color()
+        if bgbrush.style() == QtCore.Qt.NoBrush:
+            bg.setAlpha(0)
+            
+        self.params = Parameter(name='params', type='group', children=[
+            {'name': 'width', 'type': 'int', 'value': tr.width(), 'limits': (0, None)},
+            {'name': 'height', 'type': 'int', 'value': tr.height(), 'limits': (0, None)},
+            {'name': 'antialias', 'type': 'bool', 'value': True},
+            {'name': 'background', 'type': 'color', 'value': bg},
+        ])
+        self.params.param('width').sigValueChanged.connect(self.widthChanged)
+        self.params.param('height').sigValueChanged.connect(self.heightChanged)
+        
+    def widthChanged(self):
+        sr = self.getSourceRect()
+        ar = float(sr.height()) / sr.width()
+        self.params.param('height').setValue(self.params['width'] * ar, blockSignal=self.heightChanged)
+        
+    def heightChanged(self):
+        sr = self.getSourceRect()
+        ar = float(sr.width()) / sr.height()
+        self.params.param('width').setValue(self.params['height'] * ar, blockSignal=self.widthChanged)
+        
+    def parameters(self):
+        return self.params
+    
+    def export(self, fileName=None, toBytes=False, copy=False):
+        if fileName is None and not toBytes and not copy:
+            if USE_PYSIDE:
+                filter = ["*."+str(f) for f in QtGui.QImageWriter.supportedImageFormats()]
+            else:
+                filter = ["*."+bytes(f).decode('utf-8') for f in QtGui.QImageWriter.supportedImageFormats()]
+            preferred = ['*.png', '*.tif', '*.jpg']
+            for p in preferred[::-1]:
+                if p in filter:
+                    filter.remove(p)
+                    filter.insert(0, p)
+            self.fileSaveDialog(filter=filter)
+            return
+            
+        targetRect = QtCore.QRect(0, 0, self.params['width'], self.params['height'])
+        sourceRect = self.getSourceRect()
+        
+        
+        #self.png = QtGui.QImage(targetRect.size(), QtGui.QImage.Format_ARGB32)
+        #self.png.fill(pyqtgraph.mkColor(self.params['background']))
+        w, h = self.params['width'], self.params['height']
+        if w == 0 or h == 0:
+            raise Exception("Cannot export image with size=0 (requested export size is %dx%d)" % (w,h))
+        bg = np.empty((self.params['width'], self.params['height'], 4), dtype=np.ubyte)
+        color = self.params['background']
+        bg[:,:,0] = color.blue()
+        bg[:,:,1] = color.green()
+        bg[:,:,2] = color.red()
+        bg[:,:,3] = color.alpha()
+        self.png = fn.makeQImage(bg, alpha=True)
+        
+        ## set resolution of image:
+        origTargetRect = self.getTargetRect()
+        resolutionScale = targetRect.width() / origTargetRect.width()
+        #self.png.setDotsPerMeterX(self.png.dotsPerMeterX() * resolutionScale)
+        #self.png.setDotsPerMeterY(self.png.dotsPerMeterY() * resolutionScale)
+        
+        painter = QtGui.QPainter(self.png)
+        #dtr = painter.deviceTransform()
+        try:
+            self.setExportMode(True, {'antialias': self.params['antialias'], 'background': self.params['background'], 'painter': painter, 'resolutionScale': resolutionScale})
+            painter.setRenderHint(QtGui.QPainter.Antialiasing, self.params['antialias'])
+            self.getScene().render(painter, QtCore.QRectF(targetRect), QtCore.QRectF(sourceRect))
+        finally:
+            self.setExportMode(False)
+        painter.end()
+        
+        if copy:
+            QtGui.QApplication.clipboard().setImage(self.png)
+        elif toBytes:
+            return self.png
+        else:
+            self.png.save(fileName)
+        
+ImageExporter.register()        
+        
diff --git a/libs/pyqtgraph/exporters/Matplotlib.py b/libs/pyqtgraph/exporters/Matplotlib.py
new file mode 100644
index 0000000000000000000000000000000000000000..8cec1cef5c9fd9a8abc4c1736c8e297580b458d8
--- /dev/null
+++ b/libs/pyqtgraph/exporters/Matplotlib.py
@@ -0,0 +1,128 @@
+from ..Qt import QtGui, QtCore
+from .Exporter import Exporter
+from .. import PlotItem
+from .. import functions as fn
+
+__all__ = ['MatplotlibExporter']
+
+"""
+It is helpful when using the matplotlib Exporter if your
+.matplotlib/matplotlibrc file is configured appropriately.
+The following are suggested for getting usable PDF output that
+can be edited in Illustrator, etc.
+
+backend      : Qt4Agg
+text.usetex : True  # Assumes you have a findable LaTeX installation
+interactive : False
+font.family : sans-serif
+font.sans-serif : 'Arial'  # (make first in list)
+mathtext.default : sf
+figure.facecolor : white  # personal preference
+# next setting allows pdf font to be readable in Adobe Illustrator
+pdf.fonttype : 42   # set fonts to TrueType (otherwise it will be 3
+                    # and the text will be vectorized.
+text.dvipnghack : True  # primarily to clean up font appearance on Mac
+
+The advantage is that there is less to do to get an exported file cleaned and ready for
+publication. Fonts are not vectorized (outlined), and window colors are white.
+
+"""
+    
+class MatplotlibExporter(Exporter):
+    Name = "Matplotlib Window"
+    windows = []
+    def __init__(self, item):
+        Exporter.__init__(self, item)
+        
+    def parameters(self):
+        return None
+
+    def cleanAxes(self, axl):
+        if type(axl) is not list:
+            axl = [axl]
+        for ax in axl:
+            if ax is None:
+                continue
+            for loc, spine in ax.spines.iteritems():
+                if loc in ['left', 'bottom']:
+                    pass
+                elif loc in ['right', 'top']:
+                    spine.set_color('none')
+                    # do not draw the spine
+                else:
+                    raise ValueError('Unknown spine location: %s' % loc)
+                # turn off ticks when there is no spine
+                ax.xaxis.set_ticks_position('bottom')
+    
+    def export(self, fileName=None):
+        
+        if isinstance(self.item, PlotItem):
+            mpw = MatplotlibWindow()
+            MatplotlibExporter.windows.append(mpw)
+
+            stdFont = 'Arial'
+            
+            fig = mpw.getFigure()
+            
+            # get labels from the graphic item
+            xlabel = self.item.axes['bottom']['item'].label.toPlainText()
+            ylabel = self.item.axes['left']['item'].label.toPlainText()
+            title = self.item.titleLabel.text
+
+            ax = fig.add_subplot(111, title=title)
+            ax.clear()
+            self.cleanAxes(ax)
+            #ax.grid(True)
+            for item in self.item.curves:
+                x, y = item.getData()
+                opts = item.opts
+                pen = fn.mkPen(opts['pen'])
+                if pen.style() == QtCore.Qt.NoPen:
+                    linestyle = ''
+                else:
+                    linestyle = '-'
+                color = tuple([c/255. for c in fn.colorTuple(pen.color())])
+                symbol = opts['symbol']
+                if symbol == 't':
+                    symbol = '^'
+                symbolPen = fn.mkPen(opts['symbolPen'])
+                symbolBrush = fn.mkBrush(opts['symbolBrush'])
+                markeredgecolor = tuple([c/255. for c in fn.colorTuple(symbolPen.color())])
+                markerfacecolor = tuple([c/255. for c in fn.colorTuple(symbolBrush.color())])
+                markersize = opts['symbolSize']
+                
+                if opts['fillLevel'] is not None and opts['fillBrush'] is not None:
+                    fillBrush = fn.mkBrush(opts['fillBrush'])
+                    fillcolor = tuple([c/255. for c in fn.colorTuple(fillBrush.color())])
+                    ax.fill_between(x=x, y1=y, y2=opts['fillLevel'], facecolor=fillcolor)
+                
+                pl = ax.plot(x, y, marker=symbol, color=color, linewidth=pen.width(), 
+                        linestyle=linestyle, markeredgecolor=markeredgecolor, markerfacecolor=markerfacecolor,
+                        markersize=markersize)
+                xr, yr = self.item.viewRange()
+                ax.set_xbound(*xr)
+                ax.set_ybound(*yr)
+            ax.set_xlabel(xlabel)  # place the labels.
+            ax.set_ylabel(ylabel)
+            mpw.draw()
+        else:
+            raise Exception("Matplotlib export currently only works with plot items")
+                
+MatplotlibExporter.register()        
+        
+
+class MatplotlibWindow(QtGui.QMainWindow):
+    def __init__(self):
+        from ..widgets import MatplotlibWidget
+        QtGui.QMainWindow.__init__(self)
+        self.mpl = MatplotlibWidget.MatplotlibWidget()
+        self.setCentralWidget(self.mpl)
+        self.show()
+        
+    def __getattr__(self, attr):
+        return getattr(self.mpl, attr)
+        
+    def closeEvent(self, ev):
+        MatplotlibExporter.windows.remove(self)
+
+
diff --git a/libs/pyqtgraph/exporters/PrintExporter.py b/libs/pyqtgraph/exporters/PrintExporter.py
new file mode 100644
index 0000000000000000000000000000000000000000..530a18003982862c1a4f5a6f2ceeb5268d2dda85
--- /dev/null
+++ b/libs/pyqtgraph/exporters/PrintExporter.py
@@ -0,0 +1,68 @@
+from .Exporter import Exporter
+from ..parametertree import Parameter
+from ..Qt import QtGui, QtCore, QtSvg
+import re
+
+__all__ = ['PrintExporter']  
+#__all__ = []   ## Printer is disabled for now--does not work very well.
+
+class PrintExporter(Exporter):
+    Name = "Printer"
+    def __init__(self, item):
+        Exporter.__init__(self, item)
+        tr = self.getTargetRect()
+        self.params = Parameter(name='params', type='group', children=[
+            {'name': 'width', 'type': 'float', 'value': 0.1, 'limits': (0, None), 'suffix': 'm', 'siPrefix': True},
+            {'name': 'height', 'type': 'float', 'value': (0.1 * tr.height()) / tr.width(), 'limits': (0, None), 'suffix': 'm', 'siPrefix': True},
+        ])
+        self.params.param('width').sigValueChanged.connect(self.widthChanged)
+        self.params.param('height').sigValueChanged.connect(self.heightChanged)
+
+    def widthChanged(self):
+        sr = self.getSourceRect()
+        ar = sr.height() / sr.width()
+        self.params.param('height').setValue(self.params['width'] * ar, blockSignal=self.heightChanged)
+        
+    def heightChanged(self):
+        sr = self.getSourceRect()
+        ar = sr.width() / sr.height()
+        self.params.param('width').setValue(self.params['height'] * ar, blockSignal=self.widthChanged)
+        
+    def parameters(self):
+        return self.params
+    
+    def export(self, fileName=None):
+        printer = QtGui.QPrinter(QtGui.QPrinter.HighResolution)
+        dialog = QtGui.QPrintDialog(printer)
+        dialog.setWindowTitle("Print Document")
+        if dialog.exec_() != QtGui.QDialog.Accepted:
+            return
+            
+        #dpi = QtGui.QDesktopWidget().physicalDpiX()
+        
+        #self.svg.setSize(QtCore.QSize(100,100))
+        #self.svg.setResolution(600)
+        #res = printer.resolution()
+        sr = self.getSourceRect()
+        #res = sr.width() * .4 / (self.params['width'] * 100 / 2.54)
+        res = QtGui.QDesktopWidget().physicalDpiX()
+        printer.setResolution(res)
+        rect = printer.pageRect()
+        center = rect.center()
+        h = self.params['height'] * res * 100. / 2.54
+        w = self.params['width'] * res * 100. / 2.54
+        x = center.x() - w/2.
+        y = center.y() - h/2.
+        
+        targetRect = QtCore.QRect(x, y, w, h)
+        sourceRect = self.getSourceRect()
+        painter = QtGui.QPainter(printer)
+        try:
+            self.setExportMode(True, {'painter': painter})
+            self.getScene().render(painter, QtCore.QRectF(targetRect), QtCore.QRectF(sourceRect))
+        finally:
+            self.setExportMode(False)
+        painter.end()
+
+
+#PrintExporter.register()        
diff --git a/libs/pyqtgraph/exporters/SVGExporter.py b/libs/pyqtgraph/exporters/SVGExporter.py
new file mode 100644
index 0000000000000000000000000000000000000000..ccf921654e999f66a36543f10c65103742bdda70
--- /dev/null
+++ b/libs/pyqtgraph/exporters/SVGExporter.py
@@ -0,0 +1,442 @@
+from .Exporter import Exporter
+from ..python2_3 import asUnicode
+from ..parametertree import Parameter
+from ..Qt import QtGui, QtCore, QtSvg, USE_PYSIDE
+from .. import debug
+from .. import functions as fn
+import re
+import xml.dom.minidom as xml
+import numpy as np
+
+
+__all__ = ['SVGExporter']
+
+class SVGExporter(Exporter):
+    Name = "Scalable Vector Graphics (SVG)"
+    allowCopy=True
+    
+    def __init__(self, item):
+        Exporter.__init__(self, item)
+        #tr = self.getTargetRect()
+        self.params = Parameter(name='params', type='group', children=[
+            #{'name': 'width', 'type': 'float', 'value': tr.width(), 'limits': (0, None)},
+            #{'name': 'height', 'type': 'float', 'value': tr.height(), 'limits': (0, None)},
+            #{'name': 'viewbox clipping', 'type': 'bool', 'value': True},
+            #{'name': 'normalize coordinates', 'type': 'bool', 'value': True},
+            #{'name': 'normalize line width', 'type': 'bool', 'value': True},
+        ])
+        #self.params.param('width').sigValueChanged.connect(self.widthChanged)
+        #self.params.param('height').sigValueChanged.connect(self.heightChanged)
+
+    def widthChanged(self):
+        sr = self.getSourceRect()
+        ar = sr.height() / sr.width()
+        self.params.param('height').setValue(self.params['width'] * ar, blockSignal=self.heightChanged)
+        
+    def heightChanged(self):
+        sr = self.getSourceRect()
+        ar = sr.width() / sr.height()
+        self.params.param('width').setValue(self.params['height'] * ar, blockSignal=self.widthChanged)
+        
+    def parameters(self):
+        return self.params
+    
+    def export(self, fileName=None, toBytes=False, copy=False):
+        if toBytes is False and copy is False and fileName is None:
+            self.fileSaveDialog(filter="Scalable Vector Graphics (*.svg)")
+            return
+        
+        ## Qt's SVG generator is not complete. (notably, it lacks clipping)
+        ## Instead, we will use Qt to generate SVG for each item independently,
+        ## then manually reconstruct the entire document.
+        xml = generateSvg(self.item)
+        
+        if toBytes:
+            return xml.encode('UTF-8')
+        elif copy:
+            md = QtCore.QMimeData()
+            md.setData('image/svg+xml', QtCore.QByteArray(xml.encode('UTF-8')))
+            QtGui.QApplication.clipboard().setMimeData(md)
+        else:
+            with open(fileName, 'wb') as fh:
+                fh.write(asUnicode(xml).encode('utf-8'))
+
+
+xmlHeader = """\
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  version="1.2" baseProfile="tiny">
+<title>pyqtgraph SVG export</title>
+<desc>Generated with Qt and pyqtgraph</desc>
+"""
+
+def generateSvg(item):
+    global xmlHeader
+    try:
+        node, defs = _generateItemSvg(item)
+    finally:
+        ## reset export mode for all items in the tree
+        if isinstance(item, QtGui.QGraphicsScene):
+            items = item.items()
+        else:
+            items = [item]
+            for i in items:
+                items.extend(i.childItems())
+        for i in items:
+            if hasattr(i, 'setExportMode'):
+                i.setExportMode(False)
+    
+    cleanXml(node)
+    
+    defsXml = "<defs>\n"
+    for d in defs:
+        defsXml += d.toprettyxml(indent='    ')
+    defsXml += "</defs>\n"
+    return xmlHeader + defsXml + node.toprettyxml(indent='    ') + "\n</svg>\n"
+
+
+def _generateItemSvg(item, nodes=None, root=None):
+    ## This function is intended to work around some issues with Qt's SVG generator
+    ## and SVG in general.
+    ## 1) Qt SVG does not implement clipping paths. This is absurd.
+    ##    The solution is to let Qt generate SVG for each item independently,
+    ##    then glue them together manually with clipping.
+    ##    
+    ##    The format Qt generates for all items looks like this:
+    ##    
+    ##    <g>
+    ##        <g transform="matrix(...)">
+    ##            one or more of: <path/> or <polyline/> or <text/>
+    ##        </g>
+    ##        <g transform="matrix(...)">
+    ##            one or more of: <path/> or <polyline/> or <text/>
+    ##        </g>
+    ##        . . .
+    ##    </g>
+    ##    
+    ## 2) There seems to be wide disagreement over whether path strokes
+    ##    should be scaled anisotropically. 
+    ##      see: http://web.mit.edu/jonas/www/anisotropy/
+    ##    Given that both inkscape and illustrator seem to prefer isotropic
+    ##    scaling, we will optimize for those cases.  
+    ##    
+    ## 3) Qt generates paths using non-scaling-stroke from SVG 1.2, but 
+    ##    inkscape only supports 1.1. 
+    ##    
+    ##    Both 2 and 3 can be addressed by drawing all items in world coordinates.
+    
+    profiler = debug.Profiler()
+    
+    if nodes is None:  ## nodes maps all node IDs to their XML element. 
+                       ## this allows us to ensure all elements receive unique names.
+        nodes = {}
+        
+    if root is None:
+        root = item
+                
+    ## Skip hidden items
+    if hasattr(item, 'isVisible') and not item.isVisible():
+        return None
+        
+    ## If this item defines its own SVG generator, use that.
+    if hasattr(item, 'generateSvg'):
+        return item.generateSvg(nodes)
+    
+
+    ## Generate SVG text for just this item (exclude its children; we'll handle them later)
+    tr = QtGui.QTransform()
+    if isinstance(item, QtGui.QGraphicsScene):
+        xmlStr = "<g>\n</g>\n"
+        doc = xml.parseString(xmlStr)
+        childs = [i for i in item.items() if i.parentItem() is None]
+    elif item.__class__.paint == QtGui.QGraphicsItem.paint:
+        xmlStr = "<g>\n</g>\n"
+        doc = xml.parseString(xmlStr)
+        childs = item.childItems()
+    else:
+        childs = item.childItems()
+        tr = itemTransform(item, item.scene())
+        
+        ## offset to corner of root item
+        if isinstance(root, QtGui.QGraphicsScene):
+            rootPos = QtCore.QPoint(0,0)
+        else:
+            rootPos = root.scenePos()
+        tr2 = QtGui.QTransform()
+        tr2.translate(-rootPos.x(), -rootPos.y())
+        tr = tr * tr2
+
+        arr = QtCore.QByteArray()
+        buf = QtCore.QBuffer(arr)
+        svg = QtSvg.QSvgGenerator()
+        svg.setOutputDevice(buf)
+        dpi = QtGui.QDesktopWidget().physicalDpiX()
+        svg.setResolution(dpi)
+
+        p = QtGui.QPainter()
+        p.begin(svg)
+        if hasattr(item, 'setExportMode'):
+            item.setExportMode(True, {'painter': p})
+        try:
+            p.setTransform(tr)
+            item.paint(p, QtGui.QStyleOptionGraphicsItem(), None)
+        finally:
+            p.end()
+            ## Can't do this here--we need to wait until all children have painted as well.
+            ## this is taken care of in generateSvg instead.
+            #if hasattr(item, 'setExportMode'):
+                #item.setExportMode(False)
+
+        if USE_PYSIDE:
+            xmlStr = str(arr)
+        else:
+            xmlStr = bytes(arr).decode('utf-8')
+        doc = xml.parseString(xmlStr)
+        
+    try:
+        ## Get top-level group for this item
+        g1 = doc.getElementsByTagName('g')[0]
+        ## get list of sub-groups
+        g2 = [n for n in g1.childNodes if isinstance(n, xml.Element) and n.tagName == 'g']
+        
+        defs = doc.getElementsByTagName('defs')
+        if len(defs) > 0:
+            defs = [n for n in defs[0].childNodes if isinstance(n, xml.Element)]
+    except:
+        print(doc.toxml())
+        raise
+
+    profiler('render')
+
+    ## Get rid of group transformation matrices by applying
+    ## transformation to inner coordinates
+    correctCoordinates(g1, defs, item)
+    profiler('correct')
+    ## make sure g1 has the transformation matrix
+    #m = (tr.m11(), tr.m12(), tr.m21(), tr.m22(), tr.m31(), tr.m32())
+    #g1.setAttribute('transform', "matrix(%f,%f,%f,%f,%f,%f)" % m)
+    
+    #print "=================",item,"====================="
+    #print g1.toprettyxml(indent="  ", newl='')
+    
+    ## Inkscape does not support non-scaling-stroke (this is SVG 1.2, inkscape supports 1.1)
+    ## So we need to correct anything attempting to use this.
+    #correctStroke(g1, item, root)
+    
+    ## decide on a name for this item
+    baseName = item.__class__.__name__
+    i = 1
+    while True:
+        name = baseName + "_%d" % i
+        if name not in nodes:
+            break
+        i += 1
+    nodes[name] = g1
+    g1.setAttribute('id', name)
+    
+    ## If this item clips its children, we need to take care of that.
+    childGroup = g1  ## add children directly to this node unless we are clipping
+    if not isinstance(item, QtGui.QGraphicsScene):
+        ## See if this item clips its children
+        if int(item.flags() & item.ItemClipsChildrenToShape) > 0:
+            ## Generate svg for just the path
+            #if isinstance(root, QtGui.QGraphicsScene):
+                #path = QtGui.QGraphicsPathItem(item.mapToScene(item.shape()))
+            #else:
+                #path = QtGui.QGraphicsPathItem(root.mapToParent(item.mapToItem(root, item.shape())))
+            path = QtGui.QGraphicsPathItem(item.mapToScene(item.shape()))
+            item.scene().addItem(path)
+            try:
+                #pathNode = _generateItemSvg(path, root=root).getElementsByTagName('path')[0]
+                pathNode = _generateItemSvg(path, root=root)[0].getElementsByTagName('path')[0]
+                # assume <defs> for this path is empty.. possibly problematic.
+            finally:
+                item.scene().removeItem(path)
+            
+            ## and for the clipPath element
+            clip = name + '_clip'
+            clipNode = g1.ownerDocument.createElement('clipPath')
+            clipNode.setAttribute('id', clip)
+            clipNode.appendChild(pathNode)
+            g1.appendChild(clipNode)
+            
+            childGroup = g1.ownerDocument.createElement('g')
+            childGroup.setAttribute('clip-path', 'url(#%s)' % clip)
+            g1.appendChild(childGroup)
+    profiler('clipping')
+            
+    ## Add all child items as sub-elements.
+    childs.sort(key=lambda c: c.zValue())
+    for ch in childs:
+        csvg = _generateItemSvg(ch, nodes, root)
+        if csvg is None:
+            continue
+        cg, cdefs = csvg
+        childGroup.appendChild(cg)  ### this isn't quite right--some items draw below their parent (good enough for now)
+        defs.extend(cdefs)
+        
+    profiler('children')
+    return g1, defs
+
+def correctCoordinates(node, defs, item):
+    # TODO: correct gradient coordinates inside defs
+    
+    ## Remove transformation matrices from <g> tags by applying matrix to coordinates inside.
+    ## Each item is represented by a single top-level group with one or more groups inside.
+    ## Each inner group contains one or more drawing primitives, possibly of different types.
+    groups = node.getElementsByTagName('g')
+    
+    ## Since we leave text unchanged, groups which combine text and non-text primitives must be split apart.
+    ## (if at some point we start correcting text transforms as well, then it should be safe to remove this)
+    groups2 = []
+    for grp in groups:
+        subGroups = [grp.cloneNode(deep=False)]
+        textGroup = None
+        for ch in grp.childNodes[:]:
+            if isinstance(ch, xml.Element):
+                if textGroup is None:
+                    textGroup = ch.tagName == 'text'
+                if ch.tagName == 'text':
+                    if textGroup is False:
+                        subGroups.append(grp.cloneNode(deep=False))
+                        textGroup = True
+                else:
+                    if textGroup is True:
+                        subGroups.append(grp.cloneNode(deep=False))
+                        textGroup = False
+            subGroups[-1].appendChild(ch)
+        groups2.extend(subGroups)
+        for sg in subGroups:
+            node.insertBefore(sg, grp)
+        node.removeChild(grp)
+    groups = groups2
+        
+    
+    for grp in groups:
+        matrix = grp.getAttribute('transform')
+        match = re.match(r'matrix\((.*)\)', matrix)
+        if match is None:
+            vals = [1,0,0,1,0,0]
+        else:
+            vals = [float(a) for a in match.groups()[0].split(',')]
+        tr = np.array([[vals[0], vals[2], vals[4]], [vals[1], vals[3], vals[5]]])
+        
+        removeTransform = False
+        for ch in grp.childNodes:
+            if not isinstance(ch, xml.Element):
+                continue
+            if ch.tagName == 'polyline':
+                removeTransform = True
+                coords = np.array([[float(a) for a in c.split(',')] for c in ch.getAttribute('points').strip().split(' ')])
+                coords = fn.transformCoordinates(tr, coords, transpose=True)
+                ch.setAttribute('points', ' '.join([','.join([str(a) for a in c]) for c in coords]))
+            elif ch.tagName == 'path':
+                removeTransform = True
+                newCoords = ''
+                oldCoords = ch.getAttribute('d').strip()
+                if oldCoords == '':
+                    continue
+                for c in oldCoords.split(' '):
+                    x,y = c.split(',')
+                    if x[0].isalpha():
+                        t = x[0]
+                        x = x[1:]
+                    else:
+                        t = ''
+                    nc = fn.transformCoordinates(tr, np.array([[float(x),float(y)]]), transpose=True)
+                    newCoords += t+str(nc[0,0])+','+str(nc[0,1])+' '
+                ch.setAttribute('d', newCoords)
+            elif ch.tagName == 'text':
+                removeTransform = False
+                ## leave text alone for now. Might need this later to correctly render text with outline.
+                #c = np.array([
+                    #[float(ch.getAttribute('x')), float(ch.getAttribute('y'))], 
+                    #[float(ch.getAttribute('font-size')), 0], 
+                    #[0,0]])
+                #c = fn.transformCoordinates(tr, c, transpose=True)
+                #ch.setAttribute('x', str(c[0,0]))
+                #ch.setAttribute('y', str(c[0,1]))
+                #fs = c[1]-c[2]
+                #fs = (fs**2).sum()**0.5
+                #ch.setAttribute('font-size', str(fs))
+                
+                ## Correct some font information
+                families = ch.getAttribute('font-family').split(',')
+                if len(families) == 1:
+                    font = QtGui.QFont(families[0].strip('" '))
+                    if font.style() == font.SansSerif:
+                        families.append('sans-serif')
+                    elif font.style() == font.Serif:
+                        families.append('serif')
+                    elif font.style() == font.Courier:
+                        families.append('monospace')
+                    ch.setAttribute('font-family', ', '.join([f if ' ' not in f else '"%s"'%f for f in families]))
+                
+            ## correct line widths if needed
+            if removeTransform and ch.getAttribute('vector-effect') != 'non-scaling-stroke':
+                w = float(grp.getAttribute('stroke-width'))
+                s = fn.transformCoordinates(tr, np.array([[w,0], [0,0]]), transpose=True)
+                w = ((s[0]-s[1])**2).sum()**0.5
+                ch.setAttribute('stroke-width', str(w))
+            
+        if removeTransform:
+            grp.removeAttribute('transform')
+
+
+SVGExporter.register()        
+
+
+def itemTransform(item, root):
+    ## Return the transformation mapping item to root
+    ## (actually to parent coordinate system of root)
+    
+    if item is root:
+        tr = QtGui.QTransform()
+        tr.translate(*item.pos())
+        tr = tr * item.transform()
+        return tr
+        
+    
+    if int(item.flags() & item.ItemIgnoresTransformations) > 0:
+        pos = item.pos()
+        parent = item.parentItem()
+        if parent is not None:
+            pos = itemTransform(parent, root).map(pos)
+        tr = QtGui.QTransform()
+        tr.translate(pos.x(), pos.y())
+        tr = item.transform() * tr
+    else:
+        ## find next parent that is either the root item or 
+        ## an item that ignores its transformation
+        nextRoot = item
+        while True:
+            nextRoot = nextRoot.parentItem()
+            if nextRoot is None:
+                nextRoot = root
+                break
+            if nextRoot is root or int(nextRoot.flags() & nextRoot.ItemIgnoresTransformations) > 0:
+                break
+        
+        if isinstance(nextRoot, QtGui.QGraphicsScene):
+            tr = item.sceneTransform()
+        else:
+            tr = itemTransform(nextRoot, root) * item.itemTransform(nextRoot)[0]
+    
+    return tr
+
+            
+def cleanXml(node):
+    ## remove extraneous text; let the xml library do the formatting.
+    hasElement = False
+    nonElement = []
+    for ch in node.childNodes:
+        if isinstance(ch, xml.Element):
+            hasElement = True
+            cleanXml(ch)
+        else:
+            nonElement.append(ch)
+    
+    if hasElement:
+        for ch in nonElement:
+            node.removeChild(ch)
+    elif node.tagName == 'g':  ## remove childless groups
+        node.parentNode.removeChild(node)
diff --git a/libs/pyqtgraph/exporters/__init__.py b/libs/pyqtgraph/exporters/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..62ab1331c07c044c2f4ef9e7cdec5979927fc0ad
--- /dev/null
+++ b/libs/pyqtgraph/exporters/__init__.py
@@ -0,0 +1,11 @@
+from .Exporter import Exporter
+from .ImageExporter import *
+from .SVGExporter import *
+from .Matplotlib import *
+from .CSVExporter import *
+from .PrintExporter import *
+from .HDF5Exporter import *
+
+def listExporters():
+    return Exporter.Exporters[:]
+
diff --git a/libs/pyqtgraph/exporters/tests/test_csv.py b/libs/pyqtgraph/exporters/tests/test_csv.py
new file mode 100644
index 0000000000000000000000000000000000000000..a98372ec4f66dedf45296026bab02ac3e5f7e077
--- /dev/null
+++ b/libs/pyqtgraph/exporters/tests/test_csv.py
@@ -0,0 +1,49 @@
+"""
+SVG export test
+"""
+import pyqtgraph as pg
+import pyqtgraph.exporters
+import csv
+
+app = pg.mkQApp()
+
+def approxeq(a, b):
+    return (a-b) <= ((a + b) * 1e-6)
+
+def test_CSVExporter():
+    plt = pg.plot()
+    y1 = [1,3,2,3,1,6,9,8,4,2]
+    plt.plot(y=y1, name='myPlot')
+    
+    y2 = [3,4,6,1,2,4,2,3,5,3,5,1,3]
+    x2 = pg.np.linspace(0, 1.0, len(y2))
+    plt.plot(x=x2, y=y2)
+    
+    y3 = [1,5,2,3,4,6,1,2,4,2,3,5,3]
+    x3 = pg.np.linspace(0, 1.0, len(y3)+1)
+    plt.plot(x=x3, y=y3, stepMode=True)
+    
+    ex = pg.exporters.CSVExporter(plt.plotItem)
+    ex.export(fileName='test.csv')
+
+    r = csv.reader(open('test.csv', 'r'))
+    lines = [line for line in r]
+    header = lines.pop(0)
+    assert header == ['myPlot_x', 'myPlot_y', 'x0001', 'y0001', 'x0002', 'y0002']
+    
+    i = 0
+    for vals in lines:
+        vals = list(map(str.strip, vals))
+        assert (i >= len(y1) and vals[0] == '') or approxeq(float(vals[0]), i) 
+        assert (i >= len(y1) and vals[1] == '') or approxeq(float(vals[1]), y1[i]) 
+        
+        assert (i >= len(x2) and vals[2] == '') or approxeq(float(vals[2]), x2[i])
+        assert (i >= len(y2) and vals[3] == '') or approxeq(float(vals[3]), y2[i])
+        
+        assert (i >= len(x3) and vals[4] == '') or approxeq(float(vals[4]), x3[i])
+        assert (i >= len(y3) and vals[5] == '') or approxeq(float(vals[5]), y3[i])
+        i += 1
+    
+if __name__ == '__main__':
+    test_CSVExporter()
+    
\ No newline at end of file
diff --git a/libs/pyqtgraph/exporters/tests/test_svg.py b/libs/pyqtgraph/exporters/tests/test_svg.py
new file mode 100644
index 0000000000000000000000000000000000000000..871f43c2b05f4388c0ea85dfd3523086cad86528
--- /dev/null
+++ b/libs/pyqtgraph/exporters/tests/test_svg.py
@@ -0,0 +1,67 @@
+"""
+SVG export test
+"""
+import pyqtgraph as pg
+import pyqtgraph.exporters
+app = pg.mkQApp()
+
+def test_plotscene():
+    pg.setConfigOption('foreground', (0,0,0))
+    w = pg.GraphicsWindow()
+    w.show()        
+    p1 = w.addPlot()
+    p2 = w.addPlot()
+    p1.plot([1,3,2,3,1,6,9,8,4,2,3,5,3], pen={'color':'k'})
+    p1.setXRange(0,5)
+    p2.plot([1,5,2,3,4,6,1,2,4,2,3,5,3], pen={'color':'k', 'cosmetic':False, 'width': 0.3})
+    app.processEvents()
+    app.processEvents()
+    
+    ex = pg.exporters.SVGExporter(w.scene())
+    ex.export(fileName='test.svg')
+
+
+def test_simple():
+    scene = pg.QtGui.QGraphicsScene()
+    #rect = pg.QtGui.QGraphicsRectItem(0, 0, 100, 100)
+    #scene.addItem(rect)
+    #rect.setPos(20,20)
+    #rect.translate(50, 50)
+    #rect.rotate(30)
+    #rect.scale(0.5, 0.5)
+    
+    #rect1 = pg.QtGui.QGraphicsRectItem(0, 0, 100, 100)
+    #rect1.setParentItem(rect)
+    #rect1.setFlag(rect1.ItemIgnoresTransformations)
+    #rect1.setPos(20, 20)
+    #rect1.scale(2,2)
+    
+    #el1 = pg.QtGui.QGraphicsEllipseItem(0, 0, 100, 100)
+    #el1.setParentItem(rect1)
+    ##grp = pg.ItemGroup()
+    #grp.setParentItem(rect)
+    #grp.translate(200,0)
+    ##grp.rotate(30)
+    
+    #rect2 = pg.QtGui.QGraphicsRectItem(0, 0, 100, 25)
+    #rect2.setFlag(rect2.ItemClipsChildrenToShape)
+    #rect2.setParentItem(grp)
+    #rect2.setPos(0,25)
+    #rect2.rotate(30)
+    #el = pg.QtGui.QGraphicsEllipseItem(0, 0, 100, 50)
+    #el.translate(10,-5)
+    #el.scale(0.5,2)
+    #el.setParentItem(rect2)
+    
+    grp2 = pg.ItemGroup()
+    scene.addItem(grp2)
+    grp2.scale(100,100)
+    
+    rect3 = pg.QtGui.QGraphicsRectItem(0,0,2,2)
+    rect3.setPen(pg.mkPen(width=1, cosmetic=False))
+    grp2.addItem(rect3)
+    
+    ex = pg.exporters.SVGExporter(scene)
+    ex.export(fileName='test.svg')
+        
+
diff --git a/libs/pyqtgraph/flowchart/Flowchart.py b/libs/pyqtgraph/flowchart/Flowchart.py
new file mode 100644
index 0000000000000000000000000000000000000000..94c2e175e678de83f14241591aae7fe8fc463370
--- /dev/null
+++ b/libs/pyqtgraph/flowchart/Flowchart.py
@@ -0,0 +1,938 @@
+# -*- coding: utf-8 -*-
+from ..Qt import QtCore, QtGui, USE_PYSIDE, USE_PYQT5
+from .Node import *
+from ..pgcollections import OrderedDict
+from ..widgets.TreeWidget import *
+from .. import FileDialog, DataTreeWidget
+
+## pyside and pyqt use incompatible ui files.
+if USE_PYSIDE:
+    from . import FlowchartTemplate_pyside as FlowchartTemplate
+    from . import FlowchartCtrlTemplate_pyside as FlowchartCtrlTemplate
+elif USE_PYQT5:
+    from . import FlowchartTemplate_pyqt5 as FlowchartTemplate
+    from . import FlowchartCtrlTemplate_pyqt5 as FlowchartCtrlTemplate
+else:
+    from . import FlowchartTemplate_pyqt as FlowchartTemplate
+    from . import FlowchartCtrlTemplate_pyqt as FlowchartCtrlTemplate
+    
+from .Terminal import Terminal
+from numpy import ndarray
+from .library import LIBRARY
+from ..debug import printExc
+from .. import configfile as configfile
+from .. import dockarea as dockarea
+from . import FlowchartGraphicsView
+from .. import functions as fn
+
+def strDict(d):
+    return dict([(str(k), v) for k, v in d.items()])
+
+
+        
+
+class Flowchart(Node):
+    sigFileLoaded = QtCore.Signal(object)
+    sigFileSaved = QtCore.Signal(object)
+    
+    
+    #sigOutputChanged = QtCore.Signal() ## inherited from Node
+    sigChartLoaded = QtCore.Signal()
+    sigStateChanged = QtCore.Signal()  # called when output is expected to have changed
+    sigChartChanged = QtCore.Signal(object, object, object) # called when nodes are added, removed, or renamed.
+                                                            # (self, action, node)
+    
+    def __init__(self, terminals=None, name=None, filePath=None, library=None):
+        self.library = library or LIBRARY
+        if name is None:
+            name = "Flowchart"
+        if terminals is None:
+            terminals = {}
+        self.filePath = filePath
+        Node.__init__(self, name, allowAddInput=True, allowAddOutput=True)  ## create node without terminals; we'll add these later
+        
+        
+        self.inputWasSet = False  ## flag allows detection of changes in the absence of input change.
+        self._nodes = {}
+        self.nextZVal = 10
+        #self.connects = []
+        #self._chartGraphicsItem = FlowchartGraphicsItem(self)
+        self._widget = None
+        self._scene = None
+        self.processing = False ## flag that prevents recursive node updates
+        
+        self.widget()
+        
+        self.inputNode = Node('Input', allowRemove=False, allowAddOutput=True)
+        self.outputNode = Node('Output', allowRemove=False, allowAddInput=True)
+        self.addNode(self.inputNode, 'Input', [-150, 0])
+        self.addNode(self.outputNode, 'Output', [300, 0])
+        
+        self.outputNode.sigOutputChanged.connect(self.outputChanged)
+        self.outputNode.sigTerminalRenamed.connect(self.internalTerminalRenamed)
+        self.inputNode.sigTerminalRenamed.connect(self.internalTerminalRenamed)
+        self.outputNode.sigTerminalRemoved.connect(self.internalTerminalRemoved)
+        self.inputNode.sigTerminalRemoved.connect(self.internalTerminalRemoved)
+        self.outputNode.sigTerminalAdded.connect(self.internalTerminalAdded)
+        self.inputNode.sigTerminalAdded.connect(self.internalTerminalAdded)
+        
+        self.viewBox.autoRange(padding = 0.04)
+            
+        for name, opts in terminals.items():
+            self.addTerminal(name, **opts)
+      
+    def setLibrary(self, lib):
+        self.library = lib
+        self.widget().chartWidget.buildMenu()
+      
+    def setInput(self, **args):
+        """Set the input values of the flowchart. This will automatically propagate
+        the new values throughout the flowchart, (possibly) causing the output to change.
+        """
+        #print "setInput", args
+        #Node.setInput(self, **args)
+        #print "  ....."
+        self.inputWasSet = True
+        self.inputNode.setOutput(**args)
+        
+    def outputChanged(self):
+        ## called when output of internal node has changed
+        vals = self.outputNode.inputValues()
+        self.widget().outputChanged(vals)
+        self.setOutput(**vals)
+        #self.sigOutputChanged.emit(self)
+        
+    def output(self):
+        """Return a dict of the values on the Flowchart's output terminals.
+        """
+        return self.outputNode.inputValues()
+        
+    def nodes(self):
+        return self._nodes
+        
+    def addTerminal(self, name, **opts):
+        term = Node.addTerminal(self, name, **opts)
+        name = term.name()
+        if opts['io'] == 'in':  ## inputs to the flowchart become outputs on the input node
+            opts['io'] = 'out'
+            opts['multi'] = False
+            self.inputNode.sigTerminalAdded.disconnect(self.internalTerminalAdded)
+            try:
+                term2 = self.inputNode.addTerminal(name, **opts)
+            finally:
+                self.inputNode.sigTerminalAdded.connect(self.internalTerminalAdded)
+                
+        else:
+            opts['io'] = 'in'
+            #opts['multi'] = False
+            self.outputNode.sigTerminalAdded.disconnect(self.internalTerminalAdded)
+            try:
+                term2 = self.outputNode.addTerminal(name, **opts)
+            finally:
+                self.outputNode.sigTerminalAdded.connect(self.internalTerminalAdded)
+        return term
+
+    def removeTerminal(self, name):
+        #print "remove:", name
+        term = self[name]
+        inTerm = self.internalTerminal(term)
+        Node.removeTerminal(self, name)
+        inTerm.node().removeTerminal(inTerm.name())
+        
+    def internalTerminalRenamed(self, term, oldName):
+        self[oldName].rename(term.name())
+        
+    def internalTerminalAdded(self, node, term):
+        if term._io == 'in':
+            io = 'out'
+        else:
+            io = 'in'
+        Node.addTerminal(self, term.name(), io=io, renamable=term.isRenamable(), removable=term.isRemovable(), multiable=term.isMultiable())
+        
+    def internalTerminalRemoved(self, node, term):
+        try:
+            Node.removeTerminal(self, term.name())
+        except KeyError:
+            pass
+        
+    def terminalRenamed(self, term, oldName):
+        newName = term.name()
+        #print "flowchart rename", newName, oldName
+        #print self.terminals
+        Node.terminalRenamed(self, self[oldName], oldName)
+        #print self.terminals
+        for n in [self.inputNode, self.outputNode]:
+            if oldName in n.terminals:
+                n[oldName].rename(newName)
+
+    def createNode(self, nodeType, name=None, pos=None):
+        if name is None:
+            n = 0
+            while True:
+                name = "%s.%d" % (nodeType, n)
+                if name not in self._nodes:
+                    break
+                n += 1
+                
+        node = self.library.getNodeType(nodeType)(name)
+        self.addNode(node, name, pos)
+        return node
+        
+    def addNode(self, node, name, pos=None):
+        if pos is None:
+            pos = [0, 0]
+        if type(pos) in [QtCore.QPoint, QtCore.QPointF]:
+            pos = [pos.x(), pos.y()]
+        item = node.graphicsItem()
+        item.setZValue(self.nextZVal*2)
+        self.nextZVal += 1
+        self.viewBox.addItem(item)
+        item.moveBy(*pos)
+        self._nodes[name] = node
+        self.widget().addNode(node) 
+        node.sigClosed.connect(self.nodeClosed)
+        node.sigRenamed.connect(self.nodeRenamed)
+        node.sigOutputChanged.connect(self.nodeOutputChanged)
+        self.sigChartChanged.emit(self, 'add', node)
+        
+    def removeNode(self, node):
+        node.close()
+        
+    def nodeClosed(self, node):
+        del self._nodes[node.name()]
+        self.widget().removeNode(node)
+        for signal in ['sigClosed', 'sigRenamed', 'sigOutputChanged']:
+            try:
+                getattr(node, signal).disconnect(self.nodeClosed)
+            except (TypeError, RuntimeError):
+                pass
+        self.sigChartChanged.emit(self, 'remove', node)
+        
+    def nodeRenamed(self, node, oldName):
+        del self._nodes[oldName]
+        self._nodes[node.name()] = node
+        self.widget().nodeRenamed(node, oldName)
+        self.sigChartChanged.emit(self, 'rename', node)
+        
+    def arrangeNodes(self):
+        pass
+        
+    def internalTerminal(self, term):
+        """If the terminal belongs to the external Node, return the corresponding internal terminal"""
+        if term.node() is self:
+            if term.isInput():
+                return self.inputNode[term.name()]
+            else:
+                return self.outputNode[term.name()]
+        else:
+            return term
+        
+    def connectTerminals(self, term1, term2):
+        """Connect two terminals together within this flowchart."""
+        term1 = self.internalTerminal(term1)
+        term2 = self.internalTerminal(term2)
+        term1.connectTo(term2)
+        
+        
+    def process(self, **args):
+        """
+        Process data through the flowchart, returning the output.
+        
+        Keyword arguments must be the names of input terminals. 
+        The return value is a dict with one key per output terminal.
+        
+        """
+        data = {}  ## Stores terminal:value pairs
+        
+        ## determine order of operations
+        ## order should look like [('p', node1), ('p', node2), ('d', terminal1), ...] 
+        ## Each tuple specifies either (p)rocess this node or (d)elete the result from this terminal
+        order = self.processOrder()
+        #print "ORDER:", order
+        
+        ## Record inputs given to process()
+        for n, t in self.inputNode.outputs().items():
+            # if n not in args:
+            #     raise Exception("Parameter %s required to process this chart." % n)
+            if n in args:
+                data[t] = args[n]
+        
+        ret = {}
+            
+        ## process all in order
+        for c, arg in order:
+            
+            if c == 'p':     ## Process a single node
+                #print "===> process:", arg
+                node = arg
+                if node is self.inputNode:
+                    continue  ## input node has already been processed.
+                
+                            
+                ## get input and output terminals for this node
+                outs = list(node.outputs().values())
+                ins = list(node.inputs().values())
+                
+                ## construct input value dictionary
+                args = {}
+                for inp in ins:
+                    inputs = inp.inputTerminals()
+                    if len(inputs) == 0:
+                        continue
+                    if inp.isMultiValue():  ## multi-input terminals require a dict of all inputs
+                        args[inp.name()] = dict([(i, data[i]) for i in inputs if i in data])
+                    else:                   ## single-inputs terminals only need the single input value available
+                        args[inp.name()] = data[inputs[0]]  
+                        
+                if node is self.outputNode:
+                    ret = args  ## we now have the return value, but must keep processing in case there are other endpoint nodes in the chart
+                else:
+                    try:
+                        if node.isBypassed():
+                            result = node.processBypassed(args)
+                        else:
+                            result = node.process(display=False, **args)
+                    except:
+                        print("Error processing node %s. Args are: %s" % (str(node), str(args)))
+                        raise
+                    for out in outs:
+                        #print "    Output:", out, out.name()
+                        #print out.name()
+                        try:
+                            data[out] = result[out.name()]
+                        except KeyError:
+                            pass
+            elif c == 'd':   ## delete a terminal result (no longer needed; may be holding a lot of memory)
+                #print "===> delete", arg
+                if arg in data:
+                    del data[arg]
+
+        return ret
+        
+    def processOrder(self):
+        """Return the order of operations required to process this chart.
+        The order returned should look like [('p', node1), ('p', node2), ('d', terminal1), ...] 
+        where each tuple specifies either (p)rocess this node or (d)elete the result from this terminal
+        """
+        
+        ## first collect list of nodes/terminals and their dependencies
+        deps = {}
+        tdeps = {}   ## {terminal: [nodes that depend on terminal]}
+        for name, node in self._nodes.items():
+            deps[node] = node.dependentNodes()
+            for t in node.outputs().values():
+                tdeps[t] = t.dependentNodes()
+            
+        #print "DEPS:", deps
+        ## determine correct node-processing order
+        #deps[self] = []
+        order = fn.toposort(deps)
+        #print "ORDER1:", order
+        
+        ## construct list of operations
+        ops = [('p', n) for n in order]
+        
+        ## determine when it is safe to delete terminal values
+        dels = []
+        for t, nodes in tdeps.items():
+            lastInd = 0
+            lastNode = None
+            for n in nodes:  ## determine which node is the last to be processed according to order
+                if n is self:
+                    lastInd = None
+                    break
+                else:
+                    try:
+                        ind = order.index(n)
+                    except ValueError:
+                        continue
+                if lastNode is None or ind > lastInd:
+                    lastNode = n
+                    lastInd = ind
+            #tdeps[t] = lastNode
+            if lastInd is not None:
+                dels.append((lastInd+1, t))
+        #dels.sort(lambda a,b: cmp(b[0], a[0]))
+        dels.sort(key=lambda a: a[0], reverse=True)
+        for i, t in dels:
+            ops.insert(i, ('d', t))
+        return ops
+        
+        
+    def nodeOutputChanged(self, startNode):
+        """Triggered when a node's output values have changed. (NOT called during process())
+        Propagates new data forward through network."""
+        ## first collect list of nodes/terminals and their dependencies
+        
+        if self.processing:
+            return
+        self.processing = True
+        try:
+            deps = {}
+            for name, node in self._nodes.items():
+                deps[node] = []
+                for t in node.outputs().values():
+                    deps[node].extend(t.dependentNodes())
+            
+            ## determine order of updates 
+            order = fn.toposort(deps, nodes=[startNode])
+            order.reverse()
+            
+            ## keep track of terminals that have been updated
+            terms = set(startNode.outputs().values())
+            
+            #print "======= Updating", startNode
+            #print "Order:", order
+            for node in order[1:]:
+                #print "Processing node", node
+                for term in list(node.inputs().values()):
+                    #print "  checking terminal", term
+                    deps = list(term.connections().keys())
+                    update = False
+                    for d in deps:
+                        if d in terms:
+                            #print "    ..input", d, "changed"
+                            update = True
+                            term.inputChanged(d, process=False)
+                    if update:
+                        #print "  processing.."
+                        node.update()
+                        terms |= set(node.outputs().values())
+                    
+        finally:
+            self.processing = False
+            if self.inputWasSet:
+                self.inputWasSet = False
+            else:
+                self.sigStateChanged.emit()
+        
+        
+
+    def chartGraphicsItem(self):
+        """Return the graphicsItem which displays the internals of this flowchart.
+        (graphicsItem() still returns the external-view item)"""
+        #return self._chartGraphicsItem
+        return self.viewBox
+        
+    def widget(self):
+        if self._widget is None:
+            self._widget = FlowchartCtrlWidget(self)
+            self.scene = self._widget.scene()
+            self.viewBox = self._widget.viewBox()
+            #self._scene = QtGui.QGraphicsScene()
+            #self._widget.setScene(self._scene)
+            #self.scene.addItem(self.chartGraphicsItem())
+            
+            #ci = self.chartGraphicsItem()
+            #self.viewBox.addItem(ci)
+            #self.viewBox.autoRange()
+        return self._widget
+
+    def listConnections(self):
+        conn = set()
+        for n in self._nodes.values():
+            terms = n.outputs()
+            for n, t in terms.items():
+                for c in t.connections():
+                    conn.add((t, c))
+        return conn
+
+    def saveState(self):
+        state = Node.saveState(self)
+        state['nodes'] = []
+        state['connects'] = []
+        #state['terminals'] = self.saveTerminals()
+        
+        for name, node in self._nodes.items():
+            cls = type(node)
+            if hasattr(cls, 'nodeName'):
+                clsName = cls.nodeName
+                pos = node.graphicsItem().pos()
+                ns = {'class': clsName, 'name': name, 'pos': (pos.x(), pos.y()), 'state': node.saveState()}
+                state['nodes'].append(ns)
+            
+        conn = self.listConnections()
+        for a, b in conn:
+            state['connects'].append((a.node().name(), a.name(), b.node().name(), b.name()))
+        
+        state['inputNode'] = self.inputNode.saveState()
+        state['outputNode'] = self.outputNode.saveState()
+        
+        return state
+        
+    def restoreState(self, state, clear=False):
+        self.blockSignals(True)
+        try:
+            if clear:
+                self.clear()
+            Node.restoreState(self, state)
+            nodes = state['nodes']
+            #nodes.sort(lambda a, b: cmp(a['pos'][0], b['pos'][0]))
+            nodes.sort(key=lambda a: a['pos'][0])
+            for n in nodes:
+                if n['name'] in self._nodes:
+                    #self._nodes[n['name']].graphicsItem().moveBy(*n['pos'])
+                    self._nodes[n['name']].restoreState(n['state'])
+                    continue
+                try:
+                    node = self.createNode(n['class'], name=n['name'])
+                    node.restoreState(n['state'])
+                except:
+                    printExc("Error creating node %s: (continuing anyway)" % n['name'])
+                #node.graphicsItem().moveBy(*n['pos'])
+                
+            self.inputNode.restoreState(state.get('inputNode', {}))
+            self.outputNode.restoreState(state.get('outputNode', {}))
+                
+            #self.restoreTerminals(state['terminals'])
+            for n1, t1, n2, t2 in state['connects']:
+                try:
+                    self.connectTerminals(self._nodes[n1][t1], self._nodes[n2][t2])
+                except:
+                    print(self._nodes[n1].terminals)
+                    print(self._nodes[n2].terminals)
+                    printExc("Error connecting terminals %s.%s - %s.%s:" % (n1, t1, n2, t2))
+                    
+                
+        finally:
+            self.blockSignals(False)
+            
+        self.sigChartLoaded.emit()
+        self.outputChanged()
+        self.sigStateChanged.emit()
+        #self.sigOutputChanged.emit()
+            
+    def loadFile(self, fileName=None, startDir=None):
+        if fileName is None:
+            if startDir is None:
+                startDir = self.filePath
+            if startDir is None:
+                startDir = '.'
+            self.fileDialog = FileDialog(None, "Load Flowchart..", startDir, "Flowchart (*.fc)")
+            #self.fileDialog.setFileMode(QtGui.QFileDialog.AnyFile)
+            #self.fileDialog.setAcceptMode(QtGui.QFileDialog.AcceptSave) 
+            self.fileDialog.show()
+            self.fileDialog.fileSelected.connect(self.loadFile)
+            return
+            ## NOTE: was previously using a real widget for the file dialog's parent, but this caused weird mouse event bugs..
+            #fileName = QtGui.QFileDialog.getOpenFileName(None, "Load Flowchart..", startDir, "Flowchart (*.fc)")
+        fileName = unicode(fileName)
+        state = configfile.readConfigFile(fileName)
+        self.restoreState(state, clear=True)
+        self.viewBox.autoRange()
+        #self.emit(QtCore.SIGNAL('fileLoaded'), fileName)
+        self.sigFileLoaded.emit(fileName)
+        
+    def saveFile(self, fileName=None, startDir=None, suggestedFileName='flowchart.fc'):
+        if fileName is None:
+            if startDir is None:
+                startDir = self.filePath
+            if startDir is None:
+                startDir = '.'
+            self.fileDialog = FileDialog(None, "Save Flowchart..", startDir, "Flowchart (*.fc)")
+            #self.fileDialog.setFileMode(QtGui.QFileDialog.AnyFile)
+            self.fileDialog.setAcceptMode(QtGui.QFileDialog.AcceptSave) 
+            #self.fileDialog.setDirectory(startDir)
+            self.fileDialog.show()
+            self.fileDialog.fileSelected.connect(self.saveFile)
+            return
+            #fileName = QtGui.QFileDialog.getSaveFileName(None, "Save Flowchart..", startDir, "Flowchart (*.fc)")
+        fileName = unicode(fileName)
+        configfile.writeConfigFile(self.saveState(), fileName)
+        self.sigFileSaved.emit(fileName)
+
+    def clear(self):
+        for n in list(self._nodes.values()):
+            if n is self.inputNode or n is self.outputNode:
+                continue
+            n.close()  ## calls self.nodeClosed(n) by signal
+        #self.clearTerminals()
+        self.widget().clear()
+        
+    def clearTerminals(self):
+        Node.clearTerminals(self)
+        self.inputNode.clearTerminals()
+        self.outputNode.clearTerminals()
+
+#class FlowchartGraphicsItem(QtGui.QGraphicsItem):
+class FlowchartGraphicsItem(GraphicsObject):
+    
+    def __init__(self, chart):
+        #print "FlowchartGraphicsItem.__init__"
+        #QtGui.QGraphicsItem.__init__(self)
+        GraphicsObject.__init__(self)
+        self.chart = chart ## chart is an instance of Flowchart()
+        self.updateTerminals()
+        
+    def updateTerminals(self):
+        #print "FlowchartGraphicsItem.updateTerminals"
+        self.terminals = {}
+        bounds = self.boundingRect()
+        inp = self.chart.inputs()
+        dy = bounds.height() / (len(inp)+1)
+        y = dy
+        for n, t in inp.items():
+            item = t.graphicsItem()
+            self.terminals[n] = item
+            item.setParentItem(self)
+            item.setAnchor(bounds.width(), y)
+            y += dy
+        out = self.chart.outputs()
+        dy = bounds.height() / (len(out)+1)
+        y = dy
+        for n, t in out.items():
+            item = t.graphicsItem()
+            self.terminals[n] = item
+            item.setParentItem(self)
+            item.setAnchor(0, y)
+            y += dy
+        
+    def boundingRect(self):
+        #print "FlowchartGraphicsItem.boundingRect"
+        return QtCore.QRectF()
+        
+    def paint(self, p, *args):
+        #print "FlowchartGraphicsItem.paint"
+        pass
+        #p.drawRect(self.boundingRect())
+    
+
+class FlowchartCtrlWidget(QtGui.QWidget):
+    """The widget that contains the list of all the nodes in a flowchart and their controls, as well as buttons for loading/saving flowcharts."""
+    
+    def __init__(self, chart):
+        self.items = {}
+        #self.loadDir = loadDir  ## where to look initially for chart files
+        self.currentFileName = None
+        QtGui.QWidget.__init__(self)
+        self.chart = chart
+        self.ui = FlowchartCtrlTemplate.Ui_Form()
+        self.ui.setupUi(self)
+        self.ui.ctrlList.setColumnCount(2)
+        #self.ui.ctrlList.setColumnWidth(0, 200)
+        self.ui.ctrlList.setColumnWidth(1, 20)
+        self.ui.ctrlList.setVerticalScrollMode(self.ui.ctrlList.ScrollPerPixel)
+        self.ui.ctrlList.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+        
+        self.chartWidget = FlowchartWidget(chart, self)
+        #self.chartWidget.viewBox().autoRange()
+        self.cwWin = QtGui.QMainWindow()
+        self.cwWin.setWindowTitle('Flowchart')
+        self.cwWin.setCentralWidget(self.chartWidget)
+        self.cwWin.resize(1000,800)
+        
+        h = self.ui.ctrlList.header()
+        if not USE_PYQT5:
+            h.setResizeMode(0, h.Stretch)
+        else:
+            h.setSectionResizeMode(0, h.Stretch)
+        
+        self.ui.ctrlList.itemChanged.connect(self.itemChanged)
+        self.ui.loadBtn.clicked.connect(self.loadClicked)
+        self.ui.saveBtn.clicked.connect(self.saveClicked)
+        self.ui.saveAsBtn.clicked.connect(self.saveAsClicked)
+        self.ui.showChartBtn.toggled.connect(self.chartToggled)
+        self.chart.sigFileLoaded.connect(self.setCurrentFile)
+        self.ui.reloadBtn.clicked.connect(self.reloadClicked)
+        self.chart.sigFileSaved.connect(self.fileSaved)
+        
+    
+        
+    #def resizeEvent(self, ev):
+        #QtGui.QWidget.resizeEvent(self, ev)
+        #self.ui.ctrlList.setColumnWidth(0, self.ui.ctrlList.viewport().width()-20)
+        
+    def chartToggled(self, b):
+        if b:
+            self.cwWin.show()
+        else:
+            self.cwWin.hide()
+
+    def reloadClicked(self):
+        try:
+            self.chartWidget.reloadLibrary()
+            self.ui.reloadBtn.success("Reloaded.")
+        except:
+            self.ui.reloadBtn.success("Error.")
+            raise
+            
+            
+    def loadClicked(self):
+        newFile = self.chart.loadFile()
+        #self.setCurrentFile(newFile)
+        
+    def fileSaved(self, fileName):
+        self.setCurrentFile(unicode(fileName))
+        self.ui.saveBtn.success("Saved.")
+        
+    def saveClicked(self):
+        if self.currentFileName is None:
+            self.saveAsClicked()
+        else:
+            try:
+                self.chart.saveFile(self.currentFileName)
+                #self.ui.saveBtn.success("Saved.")
+            except:
+                self.ui.saveBtn.failure("Error")
+                raise
+        
+    def saveAsClicked(self):
+        try:
+            if self.currentFileName is None:
+                newFile = self.chart.saveFile()
+            else:
+                newFile = self.chart.saveFile(suggestedFileName=self.currentFileName)
+            #self.ui.saveAsBtn.success("Saved.")
+            #print "Back to saveAsClicked."
+        except:
+            self.ui.saveBtn.failure("Error")
+            raise
+            
+        #self.setCurrentFile(newFile)
+            
+    def setCurrentFile(self, fileName):
+        self.currentFileName = unicode(fileName)
+        if fileName is None:
+            self.ui.fileNameLabel.setText("<b>[ new ]</b>")
+        else:
+            self.ui.fileNameLabel.setText("<b>%s</b>" % os.path.split(self.currentFileName)[1])
+        self.resizeEvent(None)
+
+    def itemChanged(self, *args):
+        pass
+    
+    def scene(self):
+        return self.chartWidget.scene() ## returns the GraphicsScene object
+    
+    def viewBox(self):
+        return self.chartWidget.viewBox()
+
+    def nodeRenamed(self, node, oldName):
+        self.items[node].setText(0, node.name())
+
+    def addNode(self, node):
+        ctrl = node.ctrlWidget()
+        #if ctrl is None:
+            #return
+        item = QtGui.QTreeWidgetItem([node.name(), '', ''])
+        self.ui.ctrlList.addTopLevelItem(item)
+        byp = QtGui.QPushButton('X')
+        byp.setCheckable(True)
+        byp.setFixedWidth(20)
+        item.bypassBtn = byp
+        self.ui.ctrlList.setItemWidget(item, 1, byp)
+        byp.node = node
+        node.bypassButton = byp
+        byp.setChecked(node.isBypassed())
+        byp.clicked.connect(self.bypassClicked)
+        
+        if ctrl is not None:
+            item2 = QtGui.QTreeWidgetItem()
+            item.addChild(item2)
+            self.ui.ctrlList.setItemWidget(item2, 0, ctrl)
+            
+        self.items[node] = item
+        
+    def removeNode(self, node):
+        if node in self.items:
+            item = self.items[node]
+            #self.disconnect(item.bypassBtn, QtCore.SIGNAL('clicked()'), self.bypassClicked)
+            try:
+                item.bypassBtn.clicked.disconnect(self.bypassClicked)
+            except (TypeError, RuntimeError):
+                pass
+            self.ui.ctrlList.removeTopLevelItem(item)
+            
+    def bypassClicked(self):
+        btn = QtCore.QObject.sender(self)
+        btn.node.bypass(btn.isChecked())
+            
+    def chartWidget(self):
+        return self.chartWidget
+
+    def outputChanged(self, data):
+        pass
+        #self.ui.outputTree.setData(data, hideRoot=True)
+
+    def clear(self):
+        self.chartWidget.clear()
+        
+    def select(self, node):
+        item = self.items[node]
+        self.ui.ctrlList.setCurrentItem(item)
+
+class FlowchartWidget(dockarea.DockArea):
+    """Includes the actual graphical flowchart and debugging interface"""
+    def __init__(self, chart, ctrl):
+        #QtGui.QWidget.__init__(self)
+        dockarea.DockArea.__init__(self)
+        self.chart = chart
+        self.ctrl = ctrl
+        self.hoverItem = None
+        #self.setMinimumWidth(250)
+        #self.setSizePolicy(QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding))
+        
+        #self.ui = FlowchartTemplate.Ui_Form()
+        #self.ui.setupUi(self)
+        
+        ## build user interface (it was easier to do it here than via developer)
+        self.view = FlowchartGraphicsView.FlowchartGraphicsView(self)
+        self.viewDock = dockarea.Dock('view', size=(1000,600))
+        self.viewDock.addWidget(self.view)
+        self.viewDock.hideTitleBar()
+        self.addDock(self.viewDock)
+    
+
+        self.hoverText = QtGui.QTextEdit()
+        self.hoverText.setReadOnly(True)
+        self.hoverDock = dockarea.Dock('Hover Info', size=(1000,20))
+        self.hoverDock.addWidget(self.hoverText)
+        self.addDock(self.hoverDock, 'bottom')
+
+        self.selInfo = QtGui.QWidget()
+        self.selInfoLayout = QtGui.QGridLayout()
+        self.selInfo.setLayout(self.selInfoLayout)
+        self.selDescLabel = QtGui.QLabel()
+        self.selNameLabel = QtGui.QLabel()
+        self.selDescLabel.setWordWrap(True)
+        self.selectedTree = DataTreeWidget()
+        #self.selectedTree.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
+        #self.selInfoLayout.addWidget(self.selNameLabel)
+        self.selInfoLayout.addWidget(self.selDescLabel)
+        self.selInfoLayout.addWidget(self.selectedTree)
+        self.selDock = dockarea.Dock('Selected Node', size=(1000,200))
+        self.selDock.addWidget(self.selInfo)
+        self.addDock(self.selDock, 'bottom')
+        
+        self._scene = self.view.scene()
+        self._viewBox = self.view.viewBox()
+        #self._scene = QtGui.QGraphicsScene()
+        #self._scene = FlowchartGraphicsView.FlowchartGraphicsScene()
+        #self.view.setScene(self._scene)
+        
+        self.buildMenu()
+        #self.ui.addNodeBtn.mouseReleaseEvent = self.addNodeBtnReleased
+            
+        self._scene.selectionChanged.connect(self.selectionChanged)
+        self._scene.sigMouseHover.connect(self.hoverOver)
+        #self.view.sigClicked.connect(self.showViewMenu)
+        #self._scene.sigSceneContextMenu.connect(self.showViewMenu)
+        #self._viewBox.sigActionPositionChanged.connect(self.menuPosChanged)
+        
+        
+    def reloadLibrary(self):
+        #QtCore.QObject.disconnect(self.nodeMenu, QtCore.SIGNAL('triggered(QAction*)'), self.nodeMenuTriggered)
+        self.nodeMenu.triggered.disconnect(self.nodeMenuTriggered)
+        self.nodeMenu = None
+        self.subMenus = []
+        self.chart.library.reload()
+        self.buildMenu()
+        
+    def buildMenu(self, pos=None):
+        def buildSubMenu(node, rootMenu, subMenus, pos=None):
+            for section, node in node.items():
+                menu = QtGui.QMenu(section)
+                rootMenu.addMenu(menu)
+                if isinstance(node, OrderedDict): 
+                    buildSubMenu(node, menu, subMenus, pos=pos)
+                    subMenus.append(menu)
+                else:
+                    act = rootMenu.addAction(section)
+                    act.nodeType = section
+                    act.pos = pos
+        self.nodeMenu = QtGui.QMenu()
+        self.subMenus = []       
+        buildSubMenu(self.chart.library.getNodeTree(), self.nodeMenu, self.subMenus, pos=pos)
+        self.nodeMenu.triggered.connect(self.nodeMenuTriggered)
+        return self.nodeMenu
+    
+    def menuPosChanged(self, pos):
+        self.menuPos = pos
+    
+    def showViewMenu(self, ev):
+        #QtGui.QPushButton.mouseReleaseEvent(self.ui.addNodeBtn, ev)
+        #if ev.button() == QtCore.Qt.RightButton:
+            #self.menuPos = self.view.mapToScene(ev.pos())
+            #self.nodeMenu.popup(ev.globalPos())
+        #print "Flowchart.showViewMenu called"
+
+        #self.menuPos = ev.scenePos()
+        self.buildMenu(ev.scenePos())
+        self.nodeMenu.popup(ev.screenPos())
+        
+    def scene(self):
+        return self._scene ## the GraphicsScene item
+
+    def viewBox(self):
+        return self._viewBox ## the viewBox that items should be added to
+
+    def nodeMenuTriggered(self, action):
+        nodeType = action.nodeType
+        if action.pos is not None:
+            pos = action.pos
+        else:
+            pos = self.menuPos
+        pos = self.viewBox().mapSceneToView(pos)
+
+        self.chart.createNode(nodeType, pos=pos)
+
+
+    def selectionChanged(self):
+        #print "FlowchartWidget.selectionChanged called."
+        items = self._scene.selectedItems()
+        #print "     scene.selectedItems: ", items
+        if len(items) == 0:
+            data = None
+        else:
+            item = items[0]
+            if hasattr(item, 'node') and isinstance(item.node, Node):
+                n = item.node
+                self.ctrl.select(n)
+                data = {'outputs': n.outputValues(), 'inputs': n.inputValues()}
+                self.selNameLabel.setText(n.name())
+                if hasattr(n, 'nodeName'):
+                    self.selDescLabel.setText("<b>%s</b>: %s" % (n.nodeName, n.__class__.__doc__))
+                else:
+                    self.selDescLabel.setText("")
+                if n.exception is not None:
+                    data['exception'] = n.exception
+            else:
+                data = None
+        self.selectedTree.setData(data, hideRoot=True)
+
+    def hoverOver(self, items):
+        #print "FlowchartWidget.hoverOver called."
+        term = None
+        for item in items:
+            if item is self.hoverItem:
+                return
+            self.hoverItem = item
+            if hasattr(item, 'term') and isinstance(item.term, Terminal):
+                term = item.term
+                break
+        if term is None:
+            self.hoverText.setPlainText("")
+        else:
+            val = term.value()
+            if isinstance(val, ndarray):
+                val = "%s %s %s" % (type(val).__name__, str(val.shape), str(val.dtype))
+            else:
+                val = str(val)
+                if len(val) > 400:
+                    val = val[:400] + "..."
+            self.hoverText.setPlainText("%s.%s = %s" % (term.node().name(), term.name(), val))
+            #self.hoverLabel.setCursorPosition(0)
+
+    
+
+    def clear(self):
+        #self.outputTree.setData(None)
+        self.selectedTree.setData(None)
+        self.hoverText.setPlainText('')
+        self.selNameLabel.setText('')
+        self.selDescLabel.setText('')
+        
+        
+class FlowchartNode(Node):
+    pass
+
diff --git a/libs/pyqtgraph/flowchart/FlowchartCtrlTemplate.ui b/libs/pyqtgraph/flowchart/FlowchartCtrlTemplate.ui
new file mode 100644
index 0000000000000000000000000000000000000000..0361ad3e65867541e73f441ba5850f54b63c44ae
--- /dev/null
+++ b/libs/pyqtgraph/flowchart/FlowchartCtrlTemplate.ui
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>217</width>
+    <height>499</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="verticalSpacing">
+    <number>0</number>
+   </property>
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item row="1" column="0">
+    <widget class="QPushButton" name="loadBtn">
+     <property name="text">
+      <string>Load..</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" colspan="2">
+    <widget class="FeedbackButton" name="saveBtn">
+     <property name="text">
+      <string>Save</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="3">
+    <widget class="FeedbackButton" name="saveAsBtn">
+     <property name="text">
+      <string>As..</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="2">
+    <widget class="FeedbackButton" name="reloadBtn">
+     <property name="text">
+      <string>Reload Libs</string>
+     </property>
+     <property name="checkable">
+      <bool>false</bool>
+     </property>
+     <property name="flat">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="2" colspan="2">
+    <widget class="QPushButton" name="showChartBtn">
+     <property name="text">
+      <string>Flowchart</string>
+     </property>
+     <property name="checkable">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="4">
+    <widget class="TreeWidget" name="ctrlList">
+     <attribute name="headerVisible">
+      <bool>false</bool>
+     </attribute>
+     <attribute name="headerStretchLastSection">
+      <bool>false</bool>
+     </attribute>
+     <attribute name="headerVisible">
+      <bool>false</bool>
+     </attribute>
+     <attribute name="headerStretchLastSection">
+      <bool>false</bool>
+     </attribute>
+     <column>
+      <property name="text">
+       <string notr="true">1</string>
+      </property>
+     </column>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QLabel" name="fileNameLabel">
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>TreeWidget</class>
+   <extends>QTreeWidget</extends>
+   <header>..widgets.TreeWidget</header>
+  </customwidget>
+  <customwidget>
+   <class>FeedbackButton</class>
+   <extends>QPushButton</extends>
+   <header>..widgets.FeedbackButton</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/libs/pyqtgraph/flowchart/FlowchartCtrlTemplate_pyqt.py b/libs/pyqtgraph/flowchart/FlowchartCtrlTemplate_pyqt.py
new file mode 100644
index 0000000000000000000000000000000000000000..8afd43f8ff25ac77cfc2345ec995f8f295444e38
--- /dev/null
+++ b/libs/pyqtgraph/flowchart/FlowchartCtrlTemplate_pyqt.py
@@ -0,0 +1,80 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file './pyqtgraph/flowchart/FlowchartCtrlTemplate.ui'
+#
+# Created: Mon Dec 23 10:10:50 2013
+#      by: PyQt4 UI code generator 4.10
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt4 import QtCore, QtGui
+
+try:
+    _fromUtf8 = QtCore.QString.fromUtf8
+except AttributeError:
+    def _fromUtf8(s):
+        return s
+
+try:
+    _encoding = QtGui.QApplication.UnicodeUTF8
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig, _encoding)
+except AttributeError:
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig)
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName(_fromUtf8("Form"))
+        Form.resize(217, 499)
+        self.gridLayout = QtGui.QGridLayout(Form)
+        self.gridLayout.setMargin(0)
+        self.gridLayout.setVerticalSpacing(0)
+        self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
+        self.loadBtn = QtGui.QPushButton(Form)
+        self.loadBtn.setObjectName(_fromUtf8("loadBtn"))
+        self.gridLayout.addWidget(self.loadBtn, 1, 0, 1, 1)
+        self.saveBtn = FeedbackButton(Form)
+        self.saveBtn.setObjectName(_fromUtf8("saveBtn"))
+        self.gridLayout.addWidget(self.saveBtn, 1, 1, 1, 2)
+        self.saveAsBtn = FeedbackButton(Form)
+        self.saveAsBtn.setObjectName(_fromUtf8("saveAsBtn"))
+        self.gridLayout.addWidget(self.saveAsBtn, 1, 3, 1, 1)
+        self.reloadBtn = FeedbackButton(Form)
+        self.reloadBtn.setCheckable(False)
+        self.reloadBtn.setFlat(False)
+        self.reloadBtn.setObjectName(_fromUtf8("reloadBtn"))
+        self.gridLayout.addWidget(self.reloadBtn, 4, 0, 1, 2)
+        self.showChartBtn = QtGui.QPushButton(Form)
+        self.showChartBtn.setCheckable(True)
+        self.showChartBtn.setObjectName(_fromUtf8("showChartBtn"))
+        self.gridLayout.addWidget(self.showChartBtn, 4, 2, 1, 2)
+        self.ctrlList = TreeWidget(Form)
+        self.ctrlList.setObjectName(_fromUtf8("ctrlList"))
+        self.ctrlList.headerItem().setText(0, _fromUtf8("1"))
+        self.ctrlList.header().setVisible(False)
+        self.ctrlList.header().setStretchLastSection(False)
+        self.gridLayout.addWidget(self.ctrlList, 3, 0, 1, 4)
+        self.fileNameLabel = QtGui.QLabel(Form)
+        font = QtGui.QFont()
+        font.setBold(True)
+        font.setWeight(75)
+        self.fileNameLabel.setFont(font)
+        self.fileNameLabel.setText(_fromUtf8(""))
+        self.fileNameLabel.setAlignment(QtCore.Qt.AlignCenter)
+        self.fileNameLabel.setObjectName(_fromUtf8("fileNameLabel"))
+        self.gridLayout.addWidget(self.fileNameLabel, 0, 1, 1, 1)
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        Form.setWindowTitle(_translate("Form", "Form", None))
+        self.loadBtn.setText(_translate("Form", "Load..", None))
+        self.saveBtn.setText(_translate("Form", "Save", None))
+        self.saveAsBtn.setText(_translate("Form", "As..", None))
+        self.reloadBtn.setText(_translate("Form", "Reload Libs", None))
+        self.showChartBtn.setText(_translate("Form", "Flowchart", None))
+
+from ..widgets.TreeWidget import TreeWidget
+from ..widgets.FeedbackButton import FeedbackButton
diff --git a/libs/pyqtgraph/flowchart/FlowchartCtrlTemplate_pyqt5.py b/libs/pyqtgraph/flowchart/FlowchartCtrlTemplate_pyqt5.py
new file mode 100644
index 0000000000000000000000000000000000000000..b661918d2d15c9662dc503ffbdcca041581ef018
--- /dev/null
+++ b/libs/pyqtgraph/flowchart/FlowchartCtrlTemplate_pyqt5.py
@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file './pyqtgraph/flowchart/FlowchartCtrlTemplate.ui'
+#
+# Created: Wed Mar 26 15:09:28 2014
+#      by: PyQt5 UI code generator 5.0.1
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt5 import QtCore, QtGui, QtWidgets
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName("Form")
+        Form.resize(217, 499)
+        self.gridLayout = QtWidgets.QGridLayout(Form)
+        self.gridLayout.setContentsMargins(0, 0, 0, 0)
+        self.gridLayout.setVerticalSpacing(0)
+        self.gridLayout.setObjectName("gridLayout")
+        self.loadBtn = QtWidgets.QPushButton(Form)
+        self.loadBtn.setObjectName("loadBtn")
+        self.gridLayout.addWidget(self.loadBtn, 1, 0, 1, 1)
+        self.saveBtn = FeedbackButton(Form)
+        self.saveBtn.setObjectName("saveBtn")
+        self.gridLayout.addWidget(self.saveBtn, 1, 1, 1, 2)
+        self.saveAsBtn = FeedbackButton(Form)
+        self.saveAsBtn.setObjectName("saveAsBtn")
+        self.gridLayout.addWidget(self.saveAsBtn, 1, 3, 1, 1)
+        self.reloadBtn = FeedbackButton(Form)
+        self.reloadBtn.setCheckable(False)
+        self.reloadBtn.setFlat(False)
+        self.reloadBtn.setObjectName("reloadBtn")
+        self.gridLayout.addWidget(self.reloadBtn, 4, 0, 1, 2)
+        self.showChartBtn = QtWidgets.QPushButton(Form)
+        self.showChartBtn.setCheckable(True)
+        self.showChartBtn.setObjectName("showChartBtn")
+        self.gridLayout.addWidget(self.showChartBtn, 4, 2, 1, 2)
+        self.ctrlList = TreeWidget(Form)
+        self.ctrlList.setObjectName("ctrlList")
+        self.ctrlList.headerItem().setText(0, "1")
+        self.ctrlList.header().setVisible(False)
+        self.ctrlList.header().setStretchLastSection(False)
+        self.gridLayout.addWidget(self.ctrlList, 3, 0, 1, 4)
+        self.fileNameLabel = QtWidgets.QLabel(Form)
+        font = QtGui.QFont()
+        font.setBold(True)
+        font.setWeight(75)
+        self.fileNameLabel.setFont(font)
+        self.fileNameLabel.setText("")
+        self.fileNameLabel.setAlignment(QtCore.Qt.AlignCenter)
+        self.fileNameLabel.setObjectName("fileNameLabel")
+        self.gridLayout.addWidget(self.fileNameLabel, 0, 1, 1, 1)
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        _translate = QtCore.QCoreApplication.translate
+        Form.setWindowTitle(_translate("Form", "Form"))
+        self.loadBtn.setText(_translate("Form", "Load.."))
+        self.saveBtn.setText(_translate("Form", "Save"))
+        self.saveAsBtn.setText(_translate("Form", "As.."))
+        self.reloadBtn.setText(_translate("Form", "Reload Libs"))
+        self.showChartBtn.setText(_translate("Form", "Flowchart"))
+
+from ..widgets.FeedbackButton import FeedbackButton
+from ..widgets.TreeWidget import TreeWidget
diff --git a/libs/pyqtgraph/flowchart/FlowchartCtrlTemplate_pyside.py b/libs/pyqtgraph/flowchart/FlowchartCtrlTemplate_pyside.py
new file mode 100644
index 0000000000000000000000000000000000000000..b722000e9a04dd4ba2de3b1c4d35c9e6c8ee3613
--- /dev/null
+++ b/libs/pyqtgraph/flowchart/FlowchartCtrlTemplate_pyside.py
@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file './pyqtgraph/flowchart/FlowchartCtrlTemplate.ui'
+#
+# Created: Mon Dec 23 10:10:51 2013
+#      by: pyside-uic 0.2.14 running on PySide 1.1.2
+#
+# WARNING! All changes made in this file will be lost!
+
+from PySide import QtCore, QtGui
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName("Form")
+        Form.resize(217, 499)
+        self.gridLayout = QtGui.QGridLayout(Form)
+        self.gridLayout.setContentsMargins(0, 0, 0, 0)
+        self.gridLayout.setVerticalSpacing(0)
+        self.gridLayout.setObjectName("gridLayout")
+        self.loadBtn = QtGui.QPushButton(Form)
+        self.loadBtn.setObjectName("loadBtn")
+        self.gridLayout.addWidget(self.loadBtn, 1, 0, 1, 1)
+        self.saveBtn = FeedbackButton(Form)
+        self.saveBtn.setObjectName("saveBtn")
+        self.gridLayout.addWidget(self.saveBtn, 1, 1, 1, 2)
+        self.saveAsBtn = FeedbackButton(Form)
+        self.saveAsBtn.setObjectName("saveAsBtn")
+        self.gridLayout.addWidget(self.saveAsBtn, 1, 3, 1, 1)
+        self.reloadBtn = FeedbackButton(Form)
+        self.reloadBtn.setCheckable(False)
+        self.reloadBtn.setFlat(False)
+        self.reloadBtn.setObjectName("reloadBtn")
+        self.gridLayout.addWidget(self.reloadBtn, 4, 0, 1, 2)
+        self.showChartBtn = QtGui.QPushButton(Form)
+        self.showChartBtn.setCheckable(True)
+        self.showChartBtn.setObjectName("showChartBtn")
+        self.gridLayout.addWidget(self.showChartBtn, 4, 2, 1, 2)
+        self.ctrlList = TreeWidget(Form)
+        self.ctrlList.setObjectName("ctrlList")
+        self.ctrlList.headerItem().setText(0, "1")
+        self.ctrlList.header().setVisible(False)
+        self.ctrlList.header().setStretchLastSection(False)
+        self.gridLayout.addWidget(self.ctrlList, 3, 0, 1, 4)
+        self.fileNameLabel = QtGui.QLabel(Form)
+        font = QtGui.QFont()
+        font.setWeight(75)
+        font.setBold(True)
+        self.fileNameLabel.setFont(font)
+        self.fileNameLabel.setText("")
+        self.fileNameLabel.setAlignment(QtCore.Qt.AlignCenter)
+        self.fileNameLabel.setObjectName("fileNameLabel")
+        self.gridLayout.addWidget(self.fileNameLabel, 0, 1, 1, 1)
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        Form.setWindowTitle(QtGui.QApplication.translate("Form", "Form", None, QtGui.QApplication.UnicodeUTF8))
+        self.loadBtn.setText(QtGui.QApplication.translate("Form", "Load..", None, QtGui.QApplication.UnicodeUTF8))
+        self.saveBtn.setText(QtGui.QApplication.translate("Form", "Save", None, QtGui.QApplication.UnicodeUTF8))
+        self.saveAsBtn.setText(QtGui.QApplication.translate("Form", "As..", None, QtGui.QApplication.UnicodeUTF8))
+        self.reloadBtn.setText(QtGui.QApplication.translate("Form", "Reload Libs", None, QtGui.QApplication.UnicodeUTF8))
+        self.showChartBtn.setText(QtGui.QApplication.translate("Form", "Flowchart", None, QtGui.QApplication.UnicodeUTF8))
+
+from ..widgets.TreeWidget import TreeWidget
+from ..widgets.FeedbackButton import FeedbackButton
diff --git a/libs/pyqtgraph/flowchart/FlowchartGraphicsView.py b/libs/pyqtgraph/flowchart/FlowchartGraphicsView.py
new file mode 100644
index 0000000000000000000000000000000000000000..ab4b2914d155f34d41d8b77f69fca76f15897e0f
--- /dev/null
+++ b/libs/pyqtgraph/flowchart/FlowchartGraphicsView.py
@@ -0,0 +1,109 @@
+# -*- coding: utf-8 -*-
+from ..Qt import QtGui, QtCore
+from ..widgets.GraphicsView import GraphicsView
+from ..GraphicsScene import GraphicsScene
+from ..graphicsItems.ViewBox import ViewBox
+
+#class FlowchartGraphicsView(QtGui.QGraphicsView):
+class FlowchartGraphicsView(GraphicsView):
+    
+    sigHoverOver = QtCore.Signal(object)
+    sigClicked = QtCore.Signal(object)
+    
+    def __init__(self, widget, *args):
+        #QtGui.QGraphicsView.__init__(self, *args)
+        GraphicsView.__init__(self, *args, useOpenGL=False)
+        #self.setBackgroundBrush(QtGui.QBrush(QtGui.QColor(255,255,255)))
+        self._vb = FlowchartViewBox(widget, lockAspect=True, invertY=True)
+        self.setCentralItem(self._vb)
+        #self.scene().addItem(self.vb)
+        #self.setMouseTracking(True)
+        #self.lastPos = None
+        #self.setTransformationAnchor(self.AnchorViewCenter)
+        #self.setRenderHints(QtGui.QPainter.Antialiasing)
+        self.setRenderHint(QtGui.QPainter.Antialiasing, True)
+        #self.setDragMode(QtGui.QGraphicsView.RubberBandDrag)
+        #self.setRubberBandSelectionMode(QtCore.Qt.ContainsItemBoundingRect)
+    
+    def viewBox(self):
+        return self._vb
+    
+    
+    #def mousePressEvent(self, ev):
+        #self.moved = False
+        #self.lastPos = ev.pos()
+        #return QtGui.QGraphicsView.mousePressEvent(self, ev)
+
+    #def mouseMoveEvent(self, ev):
+        #self.moved = True
+        #callSuper = False
+        #if ev.buttons() &  QtCore.Qt.RightButton:
+            #if self.lastPos is not None:
+                #dif = ev.pos() - self.lastPos
+                #self.scale(1.01**-dif.y(), 1.01**-dif.y())
+        #elif ev.buttons() & QtCore.Qt.MidButton:
+            #if self.lastPos is not None:
+                #dif = ev.pos() - self.lastPos
+                #self.translate(dif.x(), -dif.y())
+        #else:
+            ##self.emit(QtCore.SIGNAL('hoverOver'), self.items(ev.pos()))
+            #self.sigHoverOver.emit(self.items(ev.pos()))
+            #callSuper = True
+        #self.lastPos = ev.pos()
+        
+        #if callSuper:
+            #QtGui.QGraphicsView.mouseMoveEvent(self, ev)
+            
+    #def mouseReleaseEvent(self, ev):
+        #if not self.moved:
+            ##self.emit(QtCore.SIGNAL('clicked'), ev)
+            #self.sigClicked.emit(ev)
+        #return QtGui.QGraphicsView.mouseReleaseEvent(self, ev)
+        
+class FlowchartViewBox(ViewBox):
+    
+    def __init__(self, widget, *args, **kwargs):
+        ViewBox.__init__(self, *args, **kwargs)
+        self.widget = widget
+        #self.menu = None
+        #self._subMenus = None ## need a place to store the menus otherwise they dissappear (even though they've been added to other menus) ((yes, it doesn't make sense))
+        
+        
+        
+        
+    def getMenu(self, ev):
+        ## called by ViewBox to create a new context menu
+        self._fc_menu = QtGui.QMenu()
+        self._subMenus = self.getContextMenus(ev)
+        for menu in self._subMenus:
+            self._fc_menu.addMenu(menu)
+        return self._fc_menu
+    
+    def getContextMenus(self, ev):
+        ## called by scene to add menus on to someone else's context menu
+        menu = self.widget.buildMenu(ev.scenePos())
+        menu.setTitle("Add node")
+        return [menu, ViewBox.getMenu(self, ev)]
+
+    
+    
+        
+        
+        
+        
+        
+
+
+##class FlowchartGraphicsScene(QtGui.QGraphicsScene):
+#class FlowchartGraphicsScene(GraphicsScene):
+    
+    #sigContextMenuEvent = QtCore.Signal(object)
+    
+    #def __init__(self, *args):
+        ##QtGui.QGraphicsScene.__init__(self, *args)
+        #GraphicsScene.__init__(self, *args)
+        
+    #def mouseClickEvent(self, ev):
+        ##QtGui.QGraphicsScene.contextMenuEvent(self, ev)
+        #if not ev.button() in [QtCore.Qt.RightButton]:
+            #self.sigContextMenuEvent.emit(ev)
\ No newline at end of file
diff --git a/libs/pyqtgraph/flowchart/FlowchartTemplate.ui b/libs/pyqtgraph/flowchart/FlowchartTemplate.ui
new file mode 100644
index 0000000000000000000000000000000000000000..8b0c19dad0be3662a12ead75b4bda236b4b5e004
--- /dev/null
+++ b/libs/pyqtgraph/flowchart/FlowchartTemplate.ui
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>529</width>
+    <height>329</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <widget class="QWidget" name="selInfoWidget" native="true">
+   <property name="geometry">
+    <rect>
+     <x>260</x>
+     <y>10</y>
+     <width>264</width>
+     <height>222</height>
+    </rect>
+   </property>
+   <layout class="QGridLayout" name="gridLayout">
+    <item row="0" column="0">
+     <widget class="QLabel" name="selDescLabel">
+      <property name="text">
+       <string/>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+      </property>
+      <property name="wordWrap">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="1">
+     <widget class="QLabel" name="selNameLabel">
+      <property name="font">
+       <font>
+        <weight>75</weight>
+        <bold>true</bold>
+       </font>
+      </property>
+      <property name="text">
+       <string/>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="0" colspan="2">
+     <widget class="DataTreeWidget" name="selectedTree">
+      <column>
+       <property name="text">
+        <string notr="true">1</string>
+       </property>
+      </column>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QTextEdit" name="hoverText">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>240</y>
+     <width>521</width>
+     <height>81</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="FlowchartGraphicsView" name="view">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>256</width>
+     <height>192</height>
+    </rect>
+   </property>
+  </widget>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>DataTreeWidget</class>
+   <extends>QTreeWidget</extends>
+   <header>..widgets.DataTreeWidget</header>
+  </customwidget>
+  <customwidget>
+   <class>FlowchartGraphicsView</class>
+   <extends>QGraphicsView</extends>
+   <header>..flowchart.FlowchartGraphicsView</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/libs/pyqtgraph/flowchart/FlowchartTemplate_pyqt.py b/libs/pyqtgraph/flowchart/FlowchartTemplate_pyqt.py
new file mode 100644
index 0000000000000000000000000000000000000000..06b10bfe714c42bc9c994d6f258739edec60f967
--- /dev/null
+++ b/libs/pyqtgraph/flowchart/FlowchartTemplate_pyqt.py
@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file './pyqtgraph/flowchart/FlowchartTemplate.ui'
+#
+# Created: Mon Dec 23 10:10:51 2013
+#      by: PyQt4 UI code generator 4.10
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt4 import QtCore, QtGui
+
+try:
+    _fromUtf8 = QtCore.QString.fromUtf8
+except AttributeError:
+    def _fromUtf8(s):
+        return s
+
+try:
+    _encoding = QtGui.QApplication.UnicodeUTF8
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig, _encoding)
+except AttributeError:
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig)
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName(_fromUtf8("Form"))
+        Form.resize(529, 329)
+        self.selInfoWidget = QtGui.QWidget(Form)
+        self.selInfoWidget.setGeometry(QtCore.QRect(260, 10, 264, 222))
+        self.selInfoWidget.setObjectName(_fromUtf8("selInfoWidget"))
+        self.gridLayout = QtGui.QGridLayout(self.selInfoWidget)
+        self.gridLayout.setMargin(0)
+        self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
+        self.selDescLabel = QtGui.QLabel(self.selInfoWidget)
+        self.selDescLabel.setText(_fromUtf8(""))
+        self.selDescLabel.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
+        self.selDescLabel.setWordWrap(True)
+        self.selDescLabel.setObjectName(_fromUtf8("selDescLabel"))
+        self.gridLayout.addWidget(self.selDescLabel, 0, 0, 1, 1)
+        self.selNameLabel = QtGui.QLabel(self.selInfoWidget)
+        font = QtGui.QFont()
+        font.setBold(True)
+        font.setWeight(75)
+        self.selNameLabel.setFont(font)
+        self.selNameLabel.setText(_fromUtf8(""))
+        self.selNameLabel.setObjectName(_fromUtf8("selNameLabel"))
+        self.gridLayout.addWidget(self.selNameLabel, 0, 1, 1, 1)
+        self.selectedTree = DataTreeWidget(self.selInfoWidget)
+        self.selectedTree.setObjectName(_fromUtf8("selectedTree"))
+        self.selectedTree.headerItem().setText(0, _fromUtf8("1"))
+        self.gridLayout.addWidget(self.selectedTree, 1, 0, 1, 2)
+        self.hoverText = QtGui.QTextEdit(Form)
+        self.hoverText.setGeometry(QtCore.QRect(0, 240, 521, 81))
+        self.hoverText.setObjectName(_fromUtf8("hoverText"))
+        self.view = FlowchartGraphicsView(Form)
+        self.view.setGeometry(QtCore.QRect(0, 0, 256, 192))
+        self.view.setObjectName(_fromUtf8("view"))
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        Form.setWindowTitle(_translate("Form", "Form", None))
+
+from ..flowchart.FlowchartGraphicsView import FlowchartGraphicsView
+from ..widgets.DataTreeWidget import DataTreeWidget
diff --git a/libs/pyqtgraph/flowchart/FlowchartTemplate_pyqt5.py b/libs/pyqtgraph/flowchart/FlowchartTemplate_pyqt5.py
new file mode 100644
index 0000000000000000000000000000000000000000..ba754305dfb0d3137e6a4779dd8ee17b884bcf9d
--- /dev/null
+++ b/libs/pyqtgraph/flowchart/FlowchartTemplate_pyqt5.py
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file './pyqtgraph/flowchart/FlowchartTemplate.ui'
+#
+# Created: Wed Mar 26 15:09:28 2014
+#      by: PyQt5 UI code generator 5.0.1
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt5 import QtCore, QtGui, QtWidgets
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName("Form")
+        Form.resize(529, 329)
+        self.selInfoWidget = QtWidgets.QWidget(Form)
+        self.selInfoWidget.setGeometry(QtCore.QRect(260, 10, 264, 222))
+        self.selInfoWidget.setObjectName("selInfoWidget")
+        self.gridLayout = QtWidgets.QGridLayout(self.selInfoWidget)
+        self.gridLayout.setContentsMargins(0, 0, 0, 0)
+        self.gridLayout.setObjectName("gridLayout")
+        self.selDescLabel = QtWidgets.QLabel(self.selInfoWidget)
+        self.selDescLabel.setText("")
+        self.selDescLabel.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
+        self.selDescLabel.setWordWrap(True)
+        self.selDescLabel.setObjectName("selDescLabel")
+        self.gridLayout.addWidget(self.selDescLabel, 0, 0, 1, 1)
+        self.selNameLabel = QtWidgets.QLabel(self.selInfoWidget)
+        font = QtGui.QFont()
+        font.setBold(True)
+        font.setWeight(75)
+        self.selNameLabel.setFont(font)
+        self.selNameLabel.setText("")
+        self.selNameLabel.setObjectName("selNameLabel")
+        self.gridLayout.addWidget(self.selNameLabel, 0, 1, 1, 1)
+        self.selectedTree = DataTreeWidget(self.selInfoWidget)
+        self.selectedTree.setObjectName("selectedTree")
+        self.selectedTree.headerItem().setText(0, "1")
+        self.gridLayout.addWidget(self.selectedTree, 1, 0, 1, 2)
+        self.hoverText = QtWidgets.QTextEdit(Form)
+        self.hoverText.setGeometry(QtCore.QRect(0, 240, 521, 81))
+        self.hoverText.setObjectName("hoverText")
+        self.view = FlowchartGraphicsView(Form)
+        self.view.setGeometry(QtCore.QRect(0, 0, 256, 192))
+        self.view.setObjectName("view")
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        _translate = QtCore.QCoreApplication.translate
+        Form.setWindowTitle(_translate("Form", "Form"))
+
+from ..widgets.DataTreeWidget import DataTreeWidget
+from ..flowchart.FlowchartGraphicsView import FlowchartGraphicsView
diff --git a/libs/pyqtgraph/flowchart/FlowchartTemplate_pyside.py b/libs/pyqtgraph/flowchart/FlowchartTemplate_pyside.py
new file mode 100644
index 0000000000000000000000000000000000000000..2c693c60307af433a6cfc2179c85595a2ecf1541
--- /dev/null
+++ b/libs/pyqtgraph/flowchart/FlowchartTemplate_pyside.py
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file './pyqtgraph/flowchart/FlowchartTemplate.ui'
+#
+# Created: Mon Dec 23 10:10:51 2013
+#      by: pyside-uic 0.2.14 running on PySide 1.1.2
+#
+# WARNING! All changes made in this file will be lost!
+
+from PySide import QtCore, QtGui
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName("Form")
+        Form.resize(529, 329)
+        self.selInfoWidget = QtGui.QWidget(Form)
+        self.selInfoWidget.setGeometry(QtCore.QRect(260, 10, 264, 222))
+        self.selInfoWidget.setObjectName("selInfoWidget")
+        self.gridLayout = QtGui.QGridLayout(self.selInfoWidget)
+        self.gridLayout.setContentsMargins(0, 0, 0, 0)
+        self.gridLayout.setObjectName("gridLayout")
+        self.selDescLabel = QtGui.QLabel(self.selInfoWidget)
+        self.selDescLabel.setText("")
+        self.selDescLabel.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
+        self.selDescLabel.setWordWrap(True)
+        self.selDescLabel.setObjectName("selDescLabel")
+        self.gridLayout.addWidget(self.selDescLabel, 0, 0, 1, 1)
+        self.selNameLabel = QtGui.QLabel(self.selInfoWidget)
+        font = QtGui.QFont()
+        font.setWeight(75)
+        font.setBold(True)
+        self.selNameLabel.setFont(font)
+        self.selNameLabel.setText("")
+        self.selNameLabel.setObjectName("selNameLabel")
+        self.gridLayout.addWidget(self.selNameLabel, 0, 1, 1, 1)
+        self.selectedTree = DataTreeWidget(self.selInfoWidget)
+        self.selectedTree.setObjectName("selectedTree")
+        self.selectedTree.headerItem().setText(0, "1")
+        self.gridLayout.addWidget(self.selectedTree, 1, 0, 1, 2)
+        self.hoverText = QtGui.QTextEdit(Form)
+        self.hoverText.setGeometry(QtCore.QRect(0, 240, 521, 81))
+        self.hoverText.setObjectName("hoverText")
+        self.view = FlowchartGraphicsView(Form)
+        self.view.setGeometry(QtCore.QRect(0, 0, 256, 192))
+        self.view.setObjectName("view")
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        Form.setWindowTitle(QtGui.QApplication.translate("Form", "Form", None, QtGui.QApplication.UnicodeUTF8))
+
+from ..flowchart.FlowchartGraphicsView import FlowchartGraphicsView
+from ..widgets.DataTreeWidget import DataTreeWidget
diff --git a/libs/pyqtgraph/flowchart/Node.py b/libs/pyqtgraph/flowchart/Node.py
new file mode 100644
index 0000000000000000000000000000000000000000..fc7b04d3553087eb02d07a39865053e1a3f2ec87
--- /dev/null
+++ b/libs/pyqtgraph/flowchart/Node.py
@@ -0,0 +1,644 @@
+# -*- coding: utf-8 -*-
+from ..Qt import QtCore, QtGui
+from ..graphicsItems.GraphicsObject import GraphicsObject
+from .. import functions as fn
+from .Terminal import *
+from ..pgcollections import OrderedDict
+from ..debug import *
+import numpy as np
+from .eq import *
+
+
+def strDict(d):
+    return dict([(str(k), v) for k, v in d.items()])
+
+class Node(QtCore.QObject):
+    """
+    Node represents the basic processing unit of a flowchart. 
+    A Node subclass implements at least:
+    
+    1) A list of input / ouptut terminals and their properties
+    2) a process() function which takes the names of input terminals as keyword arguments and returns a dict with the names of output terminals as keys.
+
+    A flowchart thus consists of multiple instances of Node subclasses, each of which is connected
+    to other by wires between their terminals. A flowchart is, itself, also a special subclass of Node.
+    This allows Nodes within the flowchart to connect to the input/output nodes of the flowchart itself.
+
+    Optionally, a node class can implement the ctrlWidget() method, which must return a QWidget (usually containing other widgets) that will be displayed in the flowchart control panel. Some nodes implement fairly complex control widgets, but most nodes follow a simple form-like pattern: a list of parameter names and a single value (represented as spin box, check box, etc..) for each parameter. To make this easier, the CtrlNode subclass allows you to instead define a simple data structure that CtrlNode will use to automatically generate the control widget.     """
+    
+    sigOutputChanged = QtCore.Signal(object)   # self
+    sigClosed = QtCore.Signal(object)
+    sigRenamed = QtCore.Signal(object, object)
+    sigTerminalRenamed = QtCore.Signal(object, object)  # term, oldName
+    sigTerminalAdded = QtCore.Signal(object, object)  # self, term
+    sigTerminalRemoved = QtCore.Signal(object, object)  # self, term
+
+    
+    def __init__(self, name, terminals=None, allowAddInput=False, allowAddOutput=False, allowRemove=True):
+        """
+        ==============  ============================================================
+        **Arguments:**
+        name            The name of this specific node instance. It can be any 
+                        string, but must be unique within a flowchart. Usually,
+                        we simply let the flowchart decide on a name when calling
+                        Flowchart.addNode(...)
+        terminals       Dict-of-dicts specifying the terminals present on this Node.
+                        Terminal specifications look like::
+                        
+                            'inputTerminalName': {'io': 'in'}
+                            'outputTerminalName': {'io': 'out'} 
+                            
+                        There are a number of optional parameters for terminals:
+                        multi, pos, renamable, removable, multiable, bypass. See
+                        the Terminal class for more information.
+        allowAddInput   bool; whether the user is allowed to add inputs by the
+                        context menu.
+        allowAddOutput  bool; whether the user is allowed to add outputs by the
+                        context menu.
+        allowRemove     bool; whether the user is allowed to remove this node by the
+                        context menu.
+        ==============  ============================================================  
+        
+        """
+        QtCore.QObject.__init__(self)
+        self._name = name
+        self._bypass = False
+        self.bypassButton = None  ## this will be set by the flowchart ctrl widget..
+        self._graphicsItem = None
+        self.terminals = OrderedDict()
+        self._inputs = OrderedDict()
+        self._outputs = OrderedDict()
+        self._allowAddInput = allowAddInput   ## flags to allow the user to add/remove terminals
+        self._allowAddOutput = allowAddOutput
+        self._allowRemove = allowRemove
+        
+        self.exception = None
+        if terminals is None:
+            return
+        for name, opts in terminals.items():
+            self.addTerminal(name, **opts)
+
+        
+    def nextTerminalName(self, name):
+        """Return an unused terminal name"""
+        name2 = name
+        i = 1
+        while name2 in self.terminals:
+            name2 = "%s.%d" % (name, i)
+            i += 1
+        return name2
+        
+    def addInput(self, name="Input", **args):
+        """Add a new input terminal to this Node with the given name. Extra
+        keyword arguments are passed to Terminal.__init__.
+        
+        This is a convenience function that just calls addTerminal(io='in', ...)"""
+        #print "Node.addInput called."
+        return self.addTerminal(name, io='in', **args)
+        
+    def addOutput(self, name="Output", **args):
+        """Add a new output terminal to this Node with the given name. Extra
+        keyword arguments are passed to Terminal.__init__.
+        
+        This is a convenience function that just calls addTerminal(io='out', ...)"""
+        return self.addTerminal(name, io='out', **args)
+        
+    def removeTerminal(self, term):
+        """Remove the specified terminal from this Node. May specify either the 
+        terminal's name or the terminal itself.
+        
+        Causes sigTerminalRemoved to be emitted."""
+        if isinstance(term, Terminal):
+            name = term.name()
+        else:
+            name = term
+            term = self.terminals[name]
+        
+        #print "remove", name
+        #term.disconnectAll()
+        term.close()
+        del self.terminals[name]
+        if name in self._inputs:
+            del self._inputs[name]
+        if name in self._outputs:
+            del self._outputs[name]
+        self.graphicsItem().updateTerminals()
+        self.sigTerminalRemoved.emit(self, term)
+        
+        
+    def terminalRenamed(self, term, oldName):
+        """Called after a terminal has been renamed        
+        
+        Causes sigTerminalRenamed to be emitted."""
+        newName = term.name()
+        for d in [self.terminals, self._inputs, self._outputs]:
+            if oldName not in d:
+                continue
+            d[newName] = d[oldName]
+            del d[oldName]
+            
+        self.graphicsItem().updateTerminals()
+        self.sigTerminalRenamed.emit(term, oldName)
+        
+    def addTerminal(self, name, **opts):
+        """Add a new terminal to this Node with the given name. Extra
+        keyword arguments are passed to Terminal.__init__.
+                
+        Causes sigTerminalAdded to be emitted."""
+        name = self.nextTerminalName(name)
+        term = Terminal(self, name, **opts)
+        self.terminals[name] = term
+        if term.isInput():
+            self._inputs[name] = term
+        elif term.isOutput():
+            self._outputs[name] = term
+        self.graphicsItem().updateTerminals()
+        self.sigTerminalAdded.emit(self, term)
+        return term
+
+        
+    def inputs(self):
+        """Return dict of all input terminals.
+        Warning: do not modify."""
+        return self._inputs
+        
+    def outputs(self):
+        """Return dict of all output terminals.
+        Warning: do not modify."""
+        return self._outputs
+        
+    def process(self, **kargs):
+        """Process data through this node. This method is called any time the flowchart 
+        wants the node to process data. It will be called with one keyword argument
+        corresponding to each input terminal, and must return a dict mapping the name
+        of each output terminal to its new value.
+        
+        This method is also called with a 'display' keyword argument, which indicates
+        whether the node should update its display (if it implements any) while processing
+        this data. This is primarily used to disable expensive display operations
+        during batch processing.
+        """
+        return {}
+    
+    def graphicsItem(self):
+        """Return the GraphicsItem for this node. Subclasses may re-implement
+        this method to customize their appearance in the flowchart."""
+        if self._graphicsItem is None:
+            self._graphicsItem = NodeGraphicsItem(self)
+        return self._graphicsItem
+    
+    ## this is just bad planning. Causes too many bugs.
+    def __getattr__(self, attr):
+        """Return the terminal with the given name"""
+        if attr not in self.terminals:
+            raise AttributeError(attr)
+        else:
+            import traceback
+            traceback.print_stack()
+            print("Warning: use of node.terminalName is deprecated; use node['terminalName'] instead.")
+            return self.terminals[attr]
+            
+    def __getitem__(self, item):
+        #return getattr(self, item)
+        """Return the terminal with the given name"""
+        if item not in self.terminals:
+            raise KeyError(item)
+        else:
+            return self.terminals[item]
+            
+    def name(self):
+        """Return the name of this node."""
+        return self._name
+
+    def rename(self, name):
+        """Rename this node. This will cause sigRenamed to be emitted."""
+        oldName = self._name
+        self._name = name
+        #self.emit(QtCore.SIGNAL('renamed'), self, oldName)
+        self.sigRenamed.emit(self, oldName)
+
+    def dependentNodes(self):
+        """Return the list of nodes which provide direct input to this node"""
+        nodes = set()
+        for t in self.inputs().values():
+            nodes |= set([i.node() for i in t.inputTerminals()])
+        return nodes
+        #return set([t.inputTerminals().node() for t in self.listInputs().itervalues()])
+        
+    def __repr__(self):
+        return "<Node %s @%x>" % (self.name(), id(self))
+        
+    def ctrlWidget(self):
+        """Return this Node's control widget. 
+        
+        By default, Nodes have no control widget. Subclasses may reimplement this 
+        method to provide a custom widget. This method is called by Flowcharts
+        when they are constructing their Node list."""
+        return None
+
+    def bypass(self, byp):
+        """Set whether this node should be bypassed.
+        
+        When bypassed, a Node's process() method is never called. In some cases,
+        data is automatically copied directly from specific input nodes to 
+        output nodes instead (see the bypass argument to Terminal.__init__). 
+        This is usually called when the user disables a node from the flowchart 
+        control panel.
+        """
+        self._bypass = byp
+        if self.bypassButton is not None:
+            self.bypassButton.setChecked(byp)
+        self.update()
+        
+    def isBypassed(self):
+        """Return True if this Node is currently bypassed."""
+        return self._bypass
+
+    def setInput(self, **args):
+        """Set the values on input terminals. For most nodes, this will happen automatically through Terminal.inputChanged.
+        This is normally only used for nodes with no connected inputs."""
+        changed = False
+        for k, v in args.items():
+            term = self._inputs[k]
+            oldVal = term.value()
+            if not eq(oldVal, v):
+                changed = True
+            term.setValue(v, process=False)
+        if changed and '_updatesHandled_' not in args:
+            self.update()
+        
+    def inputValues(self):
+        """Return a dict of all input values currently assigned to this node."""
+        vals = {}
+        for n, t in self.inputs().items():
+            vals[n] = t.value()
+        return vals
+            
+    def outputValues(self):
+        """Return a dict of all output values currently generated by this node."""
+        vals = {}
+        for n, t in self.outputs().items():
+            vals[n] = t.value()
+        return vals
+            
+    def connected(self, localTerm, remoteTerm):
+        """Called whenever one of this node's terminals is connected elsewhere."""
+        pass
+    
+    def disconnected(self, localTerm, remoteTerm):
+        """Called whenever one of this node's terminals is disconnected from another."""
+        pass 
+    
+    def update(self, signal=True):
+        """Collect all input values, attempt to process new output values, and propagate downstream.
+        Subclasses should call update() whenever thir internal state has changed
+        (such as when the user interacts with the Node's control widget). Update
+        is automatically called when the inputs to the node are changed.
+        """
+        vals = self.inputValues()
+        #print "  inputs:", vals
+        try:
+            if self.isBypassed():
+                out = self.processBypassed(vals)
+            else:
+                out = self.process(**strDict(vals))
+            #print "  output:", out
+            if out is not None:
+                if signal:
+                    self.setOutput(**out)
+                else:
+                    self.setOutputNoSignal(**out)
+            for n,t in self.inputs().items():
+                t.setValueAcceptable(True)
+            self.clearException()
+        except:
+            #printExc( "Exception while processing %s:" % self.name())
+            for n,t in self.outputs().items():
+                t.setValue(None)
+            self.setException(sys.exc_info())
+            
+            if signal:
+                #self.emit(QtCore.SIGNAL('outputChanged'), self)  ## triggers flowchart to propagate new data
+                self.sigOutputChanged.emit(self)  ## triggers flowchart to propagate new data
+
+    def processBypassed(self, args):
+        """Called when the flowchart would normally call Node.process, but this node is currently bypassed.
+        The default implementation looks for output terminals with a bypass connection and returns the
+        corresponding values. Most Node subclasses will _not_ need to reimplement this method."""
+        result = {}
+        for term in list(self.outputs().values()):
+            byp = term.bypassValue()
+            if byp is None:
+                result[term.name()] = None
+            else:
+                result[term.name()] = args.get(byp, None)
+        return result
+
+    def setOutput(self, **vals):
+        self.setOutputNoSignal(**vals)
+        #self.emit(QtCore.SIGNAL('outputChanged'), self)  ## triggers flowchart to propagate new data
+        self.sigOutputChanged.emit(self)  ## triggers flowchart to propagate new data
+
+    def setOutputNoSignal(self, **vals):
+        for k, v in vals.items():
+            term = self.outputs()[k]
+            term.setValue(v)
+            #targets = term.connections()
+            #for t in targets:  ## propagate downstream
+                #if t is term:
+                    #continue
+                #t.inputChanged(term)
+            term.setValueAcceptable(True)
+
+    def setException(self, exc):
+        self.exception = exc
+        self.recolor()
+        
+    def clearException(self):
+        self.setException(None)
+        
+    def recolor(self):
+        if self.exception is None:
+            self.graphicsItem().setPen(QtGui.QPen(QtGui.QColor(0, 0, 0)))
+        else:
+            self.graphicsItem().setPen(QtGui.QPen(QtGui.QColor(150, 0, 0), 3))
+
+    def saveState(self):
+        """Return a dictionary representing the current state of this node
+        (excluding input / output values). This is used for saving/reloading
+        flowcharts. The default implementation returns this Node's position,
+        bypass state, and information about each of its terminals. 
+        
+        Subclasses may want to extend this method, adding extra keys to the returned
+        dict."""
+        pos = self.graphicsItem().pos()
+        state = {'pos': (pos.x(), pos.y()), 'bypass': self.isBypassed()}
+        termsEditable = self._allowAddInput | self._allowAddOutput
+        for term in self._inputs.values() + self._outputs.values():
+            termsEditable |= term._renamable | term._removable | term._multiable
+        if termsEditable:
+            state['terminals'] = self.saveTerminals()
+        return state
+        
+    def restoreState(self, state):
+        """Restore the state of this node from a structure previously generated
+        by saveState(). """
+        pos = state.get('pos', (0,0))
+        self.graphicsItem().setPos(*pos)
+        self.bypass(state.get('bypass', False))
+        if 'terminals' in state:
+            self.restoreTerminals(state['terminals'])
+
+    def saveTerminals(self):
+        terms = OrderedDict()
+        for n, t in self.terminals.items():
+            terms[n] = (t.saveState())
+        return terms
+        
+    def restoreTerminals(self, state):
+        for name in list(self.terminals.keys()):
+            if name not in state:
+                self.removeTerminal(name)
+        for name, opts in state.items():
+            if name in self.terminals:
+                term = self[name]
+                term.setOpts(**opts)
+                continue
+            try:
+                opts = strDict(opts)
+                self.addTerminal(name, **opts)
+            except:
+                printExc("Error restoring terminal %s (%s):" % (str(name), str(opts)))
+                
+        
+    def clearTerminals(self):
+        for t in self.terminals.values():
+            t.close()
+        self.terminals = OrderedDict()
+        self._inputs = OrderedDict()
+        self._outputs = OrderedDict()
+        
+    def close(self):
+        """Cleans up after the node--removes terminals, graphicsItem, widget"""
+        self.disconnectAll()
+        self.clearTerminals()
+        item = self.graphicsItem()
+        if item.scene() is not None:
+            item.scene().removeItem(item)
+        self._graphicsItem = None
+        w = self.ctrlWidget()
+        if w is not None:
+            w.setParent(None)
+        #self.emit(QtCore.SIGNAL('closed'), self)
+        self.sigClosed.emit(self)
+            
+    def disconnectAll(self):
+        for t in self.terminals.values():
+            t.disconnectAll()
+    
+
+#class NodeGraphicsItem(QtGui.QGraphicsItem):
+class NodeGraphicsItem(GraphicsObject):
+    def __init__(self, node):
+        #QtGui.QGraphicsItem.__init__(self)
+        GraphicsObject.__init__(self)
+        #QObjectWorkaround.__init__(self)
+        
+        #self.shadow = QtGui.QGraphicsDropShadowEffect()
+        #self.shadow.setOffset(5,5)
+        #self.shadow.setBlurRadius(10)
+        #self.setGraphicsEffect(self.shadow)
+        
+        self.pen = fn.mkPen(0,0,0)
+        self.selectPen = fn.mkPen(200,200,200,width=2)
+        self.brush = fn.mkBrush(200, 200, 200, 150)
+        self.hoverBrush = fn.mkBrush(200, 200, 200, 200)
+        self.selectBrush = fn.mkBrush(200, 200, 255, 200)
+        self.hovered = False
+        
+        self.node = node
+        flags = self.ItemIsMovable | self.ItemIsSelectable | self.ItemIsFocusable |self.ItemSendsGeometryChanges
+        #flags =  self.ItemIsFocusable |self.ItemSendsGeometryChanges
+
+        self.setFlags(flags)
+        self.bounds = QtCore.QRectF(0, 0, 100, 100)
+        self.nameItem = QtGui.QGraphicsTextItem(self.node.name(), self)
+        self.nameItem.setDefaultTextColor(QtGui.QColor(50, 50, 50))
+        self.nameItem.moveBy(self.bounds.width()/2. - self.nameItem.boundingRect().width()/2., 0)
+        self.nameItem.setTextInteractionFlags(QtCore.Qt.TextEditorInteraction)
+        self.updateTerminals()
+        #self.setZValue(10)
+
+        self.nameItem.focusOutEvent = self.labelFocusOut
+        self.nameItem.keyPressEvent = self.labelKeyPress
+        
+        self.menu = None
+        self.buildMenu()
+        
+        #self.node.sigTerminalRenamed.connect(self.updateActionMenu)
+        
+    #def setZValue(self, z):
+        #for t, item in self.terminals.itervalues():
+            #item.setZValue(z+1)
+        #GraphicsObject.setZValue(self, z)
+        
+    def labelFocusOut(self, ev):
+        QtGui.QGraphicsTextItem.focusOutEvent(self.nameItem, ev)
+        self.labelChanged()
+        
+    def labelKeyPress(self, ev):
+        if ev.key() == QtCore.Qt.Key_Enter or ev.key() == QtCore.Qt.Key_Return:
+            self.labelChanged()
+        else:
+            QtGui.QGraphicsTextItem.keyPressEvent(self.nameItem, ev)
+        
+    def labelChanged(self):
+        newName = str(self.nameItem.toPlainText())
+        if newName != self.node.name():
+            self.node.rename(newName)
+            
+        ### re-center the label
+        bounds = self.boundingRect()
+        self.nameItem.setPos(bounds.width()/2. - self.nameItem.boundingRect().width()/2., 0)
+
+    def setPen(self, *args, **kwargs):
+        self.pen = fn.mkPen(*args, **kwargs)
+        self.update()
+        
+    def setBrush(self, brush):
+        self.brush = brush
+        self.update()
+        
+        
+    def updateTerminals(self):
+        bounds = self.bounds
+        self.terminals = {}
+        inp = self.node.inputs()
+        dy = bounds.height() / (len(inp)+1)
+        y = dy
+        for i, t in inp.items():
+            item = t.graphicsItem()
+            item.setParentItem(self)
+            #item.setZValue(self.zValue()+1)
+            br = self.bounds
+            item.setAnchor(0, y)
+            self.terminals[i] = (t, item)
+            y += dy
+        
+        out = self.node.outputs()
+        dy = bounds.height() / (len(out)+1)
+        y = dy
+        for i, t in out.items():
+            item = t.graphicsItem()
+            item.setParentItem(self)
+            item.setZValue(self.zValue())
+            br = self.bounds
+            item.setAnchor(bounds.width(), y)
+            self.terminals[i] = (t, item)
+            y += dy
+        
+        #self.buildMenu()
+        
+        
+    def boundingRect(self):
+        return self.bounds.adjusted(-5, -5, 5, 5)
+        
+    def paint(self, p, *args):
+        
+        p.setPen(self.pen)
+        if self.isSelected():
+            p.setPen(self.selectPen)
+            p.setBrush(self.selectBrush)
+        else:
+            p.setPen(self.pen)
+            if self.hovered:
+                p.setBrush(self.hoverBrush)
+            else:
+                p.setBrush(self.brush)
+                
+        p.drawRect(self.bounds)
+
+        
+    def mousePressEvent(self, ev):
+        ev.ignore()
+
+
+    def mouseClickEvent(self, ev):
+        #print "Node.mouseClickEvent called."
+        if int(ev.button()) == int(QtCore.Qt.LeftButton):
+            ev.accept()
+            #print "    ev.button: left"
+            sel = self.isSelected()
+            #ret = QtGui.QGraphicsItem.mousePressEvent(self, ev)
+            self.setSelected(True)
+            if not sel and self.isSelected():
+                #self.setBrush(QtGui.QBrush(QtGui.QColor(200, 200, 255)))
+                #self.emit(QtCore.SIGNAL('selected'))
+                #self.scene().selectionChanged.emit() ## for some reason this doesn't seem to be happening automatically
+                self.update()
+            #return ret
+        
+        elif int(ev.button()) == int(QtCore.Qt.RightButton):
+            #print "    ev.button: right"
+            ev.accept()
+            #pos = ev.screenPos()
+            self.raiseContextMenu(ev)
+            #self.menu.popup(QtCore.QPoint(pos.x(), pos.y()))
+            
+    def mouseDragEvent(self, ev):
+        #print "Node.mouseDrag"
+        if ev.button() == QtCore.Qt.LeftButton:
+            ev.accept()
+            self.setPos(self.pos()+self.mapToParent(ev.pos())-self.mapToParent(ev.lastPos()))
+        
+    def hoverEvent(self, ev):
+        if not ev.isExit() and ev.acceptClicks(QtCore.Qt.LeftButton):
+            ev.acceptDrags(QtCore.Qt.LeftButton)
+            self.hovered = True
+        else:
+            self.hovered = False
+        self.update()
+            
+    def keyPressEvent(self, ev):
+        if ev.key() == QtCore.Qt.Key_Delete or ev.key() == QtCore.Qt.Key_Backspace:
+            ev.accept()
+            if not self.node._allowRemove:
+                return
+            self.node.close()
+        else:
+            ev.ignore()
+
+    def itemChange(self, change, val):
+        if change == self.ItemPositionHasChanged:
+            for k, t in self.terminals.items():
+                t[1].nodeMoved()
+        return GraphicsObject.itemChange(self, change, val)
+            
+
+    def getMenu(self):
+        return self.menu
+    
+    def raiseContextMenu(self, ev):
+        menu = self.scene().addParentContextMenus(self, self.getMenu(), ev)
+        pos = ev.screenPos()
+        menu.popup(QtCore.QPoint(pos.x(), pos.y()))
+        
+    def buildMenu(self):
+        self.menu = QtGui.QMenu()
+        self.menu.setTitle("Node")
+        a = self.menu.addAction("Add input", self.addInputFromMenu)
+        if not self.node._allowAddInput:
+            a.setEnabled(False)
+        a = self.menu.addAction("Add output", self.addOutputFromMenu)
+        if not self.node._allowAddOutput:
+            a.setEnabled(False)
+        a = self.menu.addAction("Remove node", self.node.close)
+        if not self.node._allowRemove:
+            a.setEnabled(False)
+        
+    def addInputFromMenu(self):  ## called when add input is clicked in context menu
+        self.node.addInput(renamable=True, removable=True, multiable=True)
+        
+    def addOutputFromMenu(self):  ## called when add output is clicked in context menu
+        self.node.addOutput(renamable=True, removable=True, multiable=False)
+        
diff --git a/libs/pyqtgraph/flowchart/NodeLibrary.py b/libs/pyqtgraph/flowchart/NodeLibrary.py
new file mode 100644
index 0000000000000000000000000000000000000000..8e04e97ddee4ee916a27a6ffe2f85084d2dc1dce
--- /dev/null
+++ b/libs/pyqtgraph/flowchart/NodeLibrary.py
@@ -0,0 +1,86 @@
+from ..pgcollections import OrderedDict
+from .Node import Node
+
+def isNodeClass(cls):
+    try:
+        if not issubclass(cls, Node):
+            return False
+    except:
+        return False
+    return hasattr(cls, 'nodeName')
+
+
+
+class NodeLibrary:
+    """
+    A library of flowchart Node types. Custom libraries may be built to provide 
+    each flowchart with a specific set of allowed Node types.
+    """
+
+    def __init__(self):
+        self.nodeList = OrderedDict()
+        self.nodeTree = OrderedDict()
+        
+    def addNodeType(self, nodeClass, paths, override=False):
+        """
+        Register a new node type. If the type's name is already in use,
+        an exception will be raised (unless override=True).
+        
+        ============== =========================================================
+        **Arguments:**
+        
+        nodeClass      a subclass of Node (must have typ.nodeName)
+        paths          list of tuples specifying the location(s) this 
+                       type will appear in the library tree.
+        override       if True, overwrite any class having the same name
+        ============== =========================================================
+        """
+        if not isNodeClass(nodeClass):
+            raise Exception("Object %s is not a Node subclass" % str(nodeClass))
+        
+        name = nodeClass.nodeName
+        if not override and name in self.nodeList:
+            raise Exception("Node type name '%s' is already registered." % name)
+        
+        self.nodeList[name] = nodeClass
+        for path in paths:
+            root = self.nodeTree
+            for n in path:
+                if n not in root:
+                    root[n] = OrderedDict()
+                root = root[n]
+            root[name] = nodeClass
+
+    def getNodeType(self, name):
+        try:
+            return self.nodeList[name]
+        except KeyError:
+            raise Exception("No node type called '%s'" % name)
+
+    def getNodeTree(self):
+        return self.nodeTree
+
+    def copy(self):
+        """
+        Return a copy of this library.
+        """
+        lib = NodeLibrary()
+        lib.nodeList = self.nodeList.copy()
+        lib.nodeTree = self.treeCopy(self.nodeTree)
+        return lib
+
+    @staticmethod
+    def treeCopy(tree):
+        copy = OrderedDict()
+        for k,v in tree.items():
+            if isNodeClass(v):
+                copy[k] = v
+            else:
+                copy[k] = NodeLibrary.treeCopy(v)
+        return copy
+
+    def reload(self):
+        """
+        Reload Node classes in this library.
+        """
+        raise NotImplementedError()
diff --git a/libs/pyqtgraph/flowchart/Terminal.py b/libs/pyqtgraph/flowchart/Terminal.py
new file mode 100644
index 0000000000000000000000000000000000000000..6a6db62e05b42be580ab8b7b97fc53f6907a5086
--- /dev/null
+++ b/libs/pyqtgraph/flowchart/Terminal.py
@@ -0,0 +1,634 @@
+# -*- coding: utf-8 -*-
+from ..Qt import QtCore, QtGui
+import weakref
+from ..graphicsItems.GraphicsObject import GraphicsObject
+from .. import functions as fn
+from ..Point import Point
+#from PySide import QtCore, QtGui
+from .eq import *
+
+class Terminal(object):
+    def __init__(self, node, name, io, optional=False, multi=False, pos=None, renamable=False, removable=False, multiable=False, bypass=None):
+        """
+        Construct a new terminal. 
+        
+        ==============  =================================================================================
+        **Arguments:**
+        node            the node to which this terminal belongs
+        name            string, the name of the terminal
+        io              'in' or 'out'
+        optional        bool, whether the node may process without connection to this terminal
+        multi           bool, for inputs: whether this terminal may make multiple connections
+                        for outputs: whether this terminal creates a different value for each connection
+        pos             [x, y], the position of the terminal within its node's boundaries
+        renamable       (bool) Whether the terminal can be renamed by the user
+        removable       (bool) Whether the terminal can be removed by the user
+        multiable       (bool) Whether the user may toggle the *multi* option for this terminal
+        bypass          (str) Name of the terminal from which this terminal's value is derived
+                        when the Node is in bypass mode.
+        ==============  =================================================================================
+        """
+        self._io = io
+        #self._isOutput = opts[0] in ['out', 'io']
+        #self._isInput = opts[0]] in ['in', 'io']
+        #self._isIO = opts[0]=='io'
+        self._optional = optional
+        self._multi = multi
+        self._node = weakref.ref(node)
+        self._name = name
+        self._renamable = renamable
+        self._removable = removable
+        self._multiable = multiable
+        self._connections = {}
+        self._graphicsItem = TerminalGraphicsItem(self, parent=self._node().graphicsItem())
+        self._bypass = bypass
+        
+        if multi:
+            self._value = {}  ## dictionary of terminal:value pairs.
+        else:
+            self._value = None  
+        
+        self.valueOk = None
+        self.recolor()
+        
+    def value(self, term=None):
+        """Return the value this terminal provides for the connected terminal"""
+        if term is None:
+            return self._value
+            
+        if self.isMultiValue():
+            return self._value.get(term, None)
+        else:
+            return self._value
+
+    def bypassValue(self):
+        return self._bypass
+
+    def setValue(self, val, process=True):
+        """If this is a single-value terminal, val should be a single value.
+        If this is a multi-value terminal, val should be a dict of terminal:value pairs"""
+        if not self.isMultiValue():
+            if eq(val, self._value):
+                return
+            self._value = val
+        else:
+            if not isinstance(self._value, dict):
+                self._value = {}
+            if val is not None:
+                self._value.update(val)
+            
+        self.setValueAcceptable(None)  ## by default, input values are 'unchecked' until Node.update(). 
+        if self.isInput() and process:
+            self.node().update()
+            
+        ## Let the flowchart handle this.
+        #if self.isOutput():
+            #for c in self.connections():
+                #if c.isInput():
+                    #c.inputChanged(self)
+        self.recolor()
+        
+    def setOpts(self, **opts):
+        self._renamable = opts.get('renamable', self._renamable)
+        self._removable = opts.get('removable', self._removable)
+        self._multiable = opts.get('multiable', self._multiable)
+        if 'multi' in opts:
+            self.setMultiValue(opts['multi'])
+        
+
+    def connected(self, term):
+        """Called whenever this terminal has been connected to another. (note--this function is called on both terminals)"""
+        if self.isInput() and term.isOutput():
+            self.inputChanged(term)
+        if self.isOutput() and self.isMultiValue():
+            self.node().update()
+        self.node().connected(self, term)
+        
+    def disconnected(self, term):
+        """Called whenever this terminal has been disconnected from another. (note--this function is called on both terminals)"""
+        if self.isMultiValue() and term in self._value:
+            del self._value[term]
+            self.node().update()
+            #self.recolor()
+        else:
+            if self.isInput():
+                self.setValue(None)
+        self.node().disconnected(self, term)
+        #self.node().update()
+
+    def inputChanged(self, term, process=True):
+        """Called whenever there is a change to the input value to this terminal.
+        It may often be useful to override this function."""
+        if self.isMultiValue():
+            self.setValue({term: term.value(self)}, process=process)
+        else:
+            self.setValue(term.value(self), process=process)
+            
+    def valueIsAcceptable(self):
+        """Returns True->acceptable  None->unknown  False->Unacceptable"""
+        return self.valueOk
+        
+    def setValueAcceptable(self, v=True):
+        self.valueOk = v
+        self.recolor()
+        
+    def connections(self):
+        return self._connections
+        
+    def node(self):
+        return self._node()
+        
+    def isInput(self):
+        return self._io == 'in'
+    
+    def isMultiValue(self):
+        return self._multi
+    
+    def setMultiValue(self, multi):
+        """Set whether this is a multi-value terminal."""
+        self._multi = multi
+        if not multi and len(self.inputTerminals()) > 1:
+            self.disconnectAll()
+            
+        for term in self.inputTerminals():
+            self.inputChanged(term)
+
+    def isOutput(self):
+        return self._io == 'out'
+        
+    def isRenamable(self):
+        return self._renamable
+
+    def isRemovable(self):
+        return self._removable
+
+    def isMultiable(self):
+        return self._multiable
+
+    def name(self):
+        return self._name
+        
+    def graphicsItem(self):
+        return self._graphicsItem
+        
+    def isConnected(self):
+        return len(self.connections()) > 0
+        
+    def connectedTo(self, term):
+        return term in self.connections()
+        
+    def hasInput(self):
+        #conn = self.extendedConnections()
+        for t in self.connections():
+            if t.isOutput():
+                return True
+        return False        
+        
+    def inputTerminals(self):
+        """Return the terminal(s) that give input to this one."""
+        #terms = self.extendedConnections()
+        #for t in terms:
+            #if t.isOutput():
+                #return t
+        return [t for t in self.connections() if t.isOutput()]
+                
+        
+    def dependentNodes(self):
+        """Return the list of nodes which receive input from this terminal."""
+        #conn = self.extendedConnections()
+        #del conn[self]
+        return set([t.node() for t in self.connections() if t.isInput()])
+        
+    def connectTo(self, term, connectionItem=None):
+        try:
+            if self.connectedTo(term):
+                raise Exception('Already connected')
+            if term is self:
+                raise Exception('Not connecting terminal to self')
+            if term.node() is self.node():
+                raise Exception("Can't connect to terminal on same node.")
+            for t in [self, term]:
+                if t.isInput() and not t._multi and len(t.connections()) > 0:
+                    raise Exception("Cannot connect %s <-> %s: Terminal %s is already connected to %s (and does not allow multiple connections)" % (self, term, t, list(t.connections().keys())))
+            #if self.hasInput() and term.hasInput():
+                #raise Exception('Target terminal already has input')
+            
+            #if term in self.node().terminals.values():
+                #if self.isOutput() or term.isOutput():
+                    #raise Exception('Can not connect an output back to the same node.')
+        except:
+            if connectionItem is not None:
+                connectionItem.close()
+            raise
+            
+        if connectionItem is None:
+            connectionItem = ConnectionItem(self.graphicsItem(), term.graphicsItem())
+            #self.graphicsItem().scene().addItem(connectionItem)
+            self.graphicsItem().getViewBox().addItem(connectionItem)
+            #connectionItem.setParentItem(self.graphicsItem().parent().parent())
+        self._connections[term] = connectionItem
+        term._connections[self] = connectionItem
+        
+        self.recolor()
+        
+        #if self.isOutput() and term.isInput():
+            #term.inputChanged(self)
+        #if term.isInput() and term.isOutput():
+            #self.inputChanged(term)
+        self.connected(term)
+        term.connected(self)
+        
+        return connectionItem
+        
+    def disconnectFrom(self, term):
+        if not self.connectedTo(term):
+            return
+        item = self._connections[term]
+        #print "removing connection", item
+        #item.scene().removeItem(item)
+        item.close()
+        del self._connections[term]
+        del term._connections[self]
+        self.recolor()
+        term.recolor()
+        
+        self.disconnected(term)
+        term.disconnected(self)
+        #if self.isOutput() and term.isInput():
+            #term.inputChanged(self)
+        #if term.isInput() and term.isOutput():
+            #self.inputChanged(term)
+            
+        
+    def disconnectAll(self):
+        for t in list(self._connections.keys()):
+            self.disconnectFrom(t)
+        
+    def recolor(self, color=None, recurse=True):
+        if color is None:
+            if not self.isConnected():       ## disconnected terminals are black
+                color = QtGui.QColor(0,0,0)
+            elif self.isInput() and not self.hasInput():   ## input terminal with no connected output terminals 
+                color = QtGui.QColor(200,200,0)
+            elif self._value is None or eq(self._value, {}):         ## terminal is connected but has no data (possibly due to processing error) 
+                color = QtGui.QColor(255,255,255)
+            elif self.valueIsAcceptable() is None:   ## terminal has data, but it is unknown if the data is ok
+                color = QtGui.QColor(200, 200, 0)
+            elif self.valueIsAcceptable() is True:   ## terminal has good input, all ok
+                color = QtGui.QColor(0, 200, 0)
+            else:                                    ## terminal has bad input
+                color = QtGui.QColor(200, 0, 0)
+        self.graphicsItem().setBrush(QtGui.QBrush(color))
+        
+        if recurse:
+            for t in self.connections():
+                t.recolor(color, recurse=False)
+
+        
+    def rename(self, name):
+        oldName = self._name
+        self._name = name
+        self.node().terminalRenamed(self, oldName)
+        self.graphicsItem().termRenamed(name)
+        
+    def __repr__(self):
+        return "<Terminal %s.%s>" % (str(self.node().name()), str(self.name()))
+        
+    #def extendedConnections(self, terms=None):
+        #"""Return list of terminals (including this one) that are directly or indirectly wired to this."""        
+        #if terms is None:
+            #terms = {}
+        #terms[self] = None
+        #for t in self._connections:
+            #if t in terms:
+                #continue
+            #terms.update(t.extendedConnections(terms))
+        #return terms
+        
+    def __hash__(self):
+        return id(self)
+
+    def close(self):
+        self.disconnectAll()
+        item = self.graphicsItem()
+        if item.scene() is not None:
+            item.scene().removeItem(item)
+        
+    def saveState(self):
+        return {'io': self._io, 'multi': self._multi, 'optional': self._optional, 'renamable': self._renamable, 'removable': self._removable, 'multiable': self._multiable}
+
+
+#class TerminalGraphicsItem(QtGui.QGraphicsItem):
+class TerminalGraphicsItem(GraphicsObject):
+    
+    def __init__(self, term, parent=None):
+        self.term = term
+        #QtGui.QGraphicsItem.__init__(self, parent)
+        GraphicsObject.__init__(self, parent)
+        self.brush = fn.mkBrush(0,0,0)
+        self.box = QtGui.QGraphicsRectItem(0, 0, 10, 10, self)
+        self.label = QtGui.QGraphicsTextItem(self.term.name(), self)
+        self.label.scale(0.7, 0.7)
+        #self.setAcceptHoverEvents(True)
+        self.newConnection = None
+        self.setFiltersChildEvents(True)  ## to pick up mouse events on the rectitem
+        if self.term.isRenamable():
+            self.label.setTextInteractionFlags(QtCore.Qt.TextEditorInteraction)
+            self.label.focusOutEvent = self.labelFocusOut
+            self.label.keyPressEvent = self.labelKeyPress
+        self.setZValue(1)
+        self.menu = None
+            
+
+    def labelFocusOut(self, ev):
+        QtGui.QGraphicsTextItem.focusOutEvent(self.label, ev)
+        self.labelChanged()
+        
+    def labelKeyPress(self, ev):
+        if ev.key() == QtCore.Qt.Key_Enter or ev.key() == QtCore.Qt.Key_Return:
+            self.labelChanged()
+        else:
+            QtGui.QGraphicsTextItem.keyPressEvent(self.label, ev)
+        
+    def labelChanged(self):
+        newName = str(self.label.toPlainText())
+        if newName != self.term.name():
+            self.term.rename(newName)
+
+    def termRenamed(self, name):
+        self.label.setPlainText(name)
+
+    def setBrush(self, brush):
+        self.brush = brush
+        self.box.setBrush(brush)
+
+    def disconnect(self, target):
+        self.term.disconnectFrom(target.term)
+
+    def boundingRect(self):
+        br = self.box.mapRectToParent(self.box.boundingRect())
+        lr = self.label.mapRectToParent(self.label.boundingRect())
+        return br | lr
+        
+    def paint(self, p, *args):
+        pass
+        
+    def setAnchor(self, x, y):
+        pos = QtCore.QPointF(x, y)
+        self.anchorPos = pos
+        br = self.box.mapRectToParent(self.box.boundingRect())
+        lr = self.label.mapRectToParent(self.label.boundingRect())
+        
+        
+        if self.term.isInput():
+            self.box.setPos(pos.x(), pos.y()-br.height()/2.)
+            self.label.setPos(pos.x() + br.width(), pos.y() - lr.height()/2.)
+        else:
+            self.box.setPos(pos.x()-br.width(), pos.y()-br.height()/2.)
+            self.label.setPos(pos.x()-br.width()-lr.width(), pos.y()-lr.height()/2.)
+        self.updateConnections()
+        
+    def updateConnections(self):
+        for t, c in self.term.connections().items():
+            c.updateLine()
+            
+    def mousePressEvent(self, ev):
+        #ev.accept()
+        ev.ignore() ## necessary to allow click/drag events to process correctly
+
+    def mouseClickEvent(self, ev):
+        if ev.button() == QtCore.Qt.LeftButton:
+            ev.accept()
+            self.label.setFocus(QtCore.Qt.MouseFocusReason)
+        elif ev.button() == QtCore.Qt.RightButton:
+            ev.accept()
+            self.raiseContextMenu(ev)
+            
+    def raiseContextMenu(self, ev):
+        ## only raise menu if this terminal is removable
+        menu = self.getMenu()
+        menu = self.scene().addParentContextMenus(self, menu, ev)
+        pos = ev.screenPos()
+        menu.popup(QtCore.QPoint(pos.x(), pos.y()))
+        
+    def getMenu(self):
+        if self.menu is None:
+            self.menu = QtGui.QMenu()
+            self.menu.setTitle("Terminal")
+            remAct = QtGui.QAction("Remove terminal", self.menu)
+            remAct.triggered.connect(self.removeSelf)
+            self.menu.addAction(remAct)
+            self.menu.remAct = remAct
+            if not self.term.isRemovable():
+                remAct.setEnabled(False)
+            multiAct = QtGui.QAction("Multi-value", self.menu)
+            multiAct.setCheckable(True)
+            multiAct.setChecked(self.term.isMultiValue())
+            multiAct.setEnabled(self.term.isMultiable())
+            
+            multiAct.triggered.connect(self.toggleMulti)
+            self.menu.addAction(multiAct)
+            self.menu.multiAct = multiAct
+            if self.term.isMultiable():
+                multiAct.setEnabled = False
+        return self.menu
+
+    def toggleMulti(self):
+        multi = self.menu.multiAct.isChecked()
+        self.term.setMultiValue(multi)
+    
+    def removeSelf(self):
+        self.term.node().removeTerminal(self.term)
+        
+    def mouseDragEvent(self, ev):
+        if ev.button() != QtCore.Qt.LeftButton:
+            ev.ignore()
+            return
+        
+        ev.accept()
+        if ev.isStart():
+            if self.newConnection is None:
+                self.newConnection = ConnectionItem(self)
+                #self.scene().addItem(self.newConnection)
+                self.getViewBox().addItem(self.newConnection)
+                #self.newConnection.setParentItem(self.parent().parent())
+
+            self.newConnection.setTarget(self.mapToView(ev.pos()))
+        elif ev.isFinish():
+            if self.newConnection is not None:
+                items = self.scene().items(ev.scenePos())
+                gotTarget = False
+                for i in items:
+                    if isinstance(i, TerminalGraphicsItem):
+                        self.newConnection.setTarget(i)
+                        try:
+                            self.term.connectTo(i.term, self.newConnection)
+                            gotTarget = True
+                        except:
+                            self.scene().removeItem(self.newConnection)
+                            self.newConnection = None
+                            raise
+                        break
+                
+                if not gotTarget:
+                    #print "remove unused connection"
+                    #self.scene().removeItem(self.newConnection)
+                    self.newConnection.close()
+                self.newConnection = None
+        else:
+            if self.newConnection is not None:
+                self.newConnection.setTarget(self.mapToView(ev.pos()))
+        
+    def hoverEvent(self, ev):
+        if not ev.isExit() and ev.acceptDrags(QtCore.Qt.LeftButton):
+            ev.acceptClicks(QtCore.Qt.LeftButton) ## we don't use the click, but we also don't want anyone else to use it.
+            ev.acceptClicks(QtCore.Qt.RightButton)
+            self.box.setBrush(fn.mkBrush('w'))
+        else:
+            self.box.setBrush(self.brush)
+        self.update()
+        
+    #def hoverEnterEvent(self, ev):
+        #self.hover = True
+        
+    #def hoverLeaveEvent(self, ev):
+        #self.hover = False
+        
+    def connectPoint(self):
+        ## return the connect position of this terminal in view coords
+        return self.mapToView(self.mapFromItem(self.box, self.box.boundingRect().center()))
+
+    def nodeMoved(self):
+        for t, item in self.term.connections().items():
+            item.updateLine()
+
+
+#class ConnectionItem(QtGui.QGraphicsItem):
+class ConnectionItem(GraphicsObject):
+    
+    def __init__(self, source, target=None):
+        #QtGui.QGraphicsItem.__init__(self)
+        GraphicsObject.__init__(self)
+        self.setFlags(
+            self.ItemIsSelectable | 
+            self.ItemIsFocusable
+        )
+        self.source = source
+        self.target = target
+        self.length = 0
+        self.hovered = False
+        self.path = None
+        self.shapePath = None
+        self.style = {
+            'shape': 'line',
+            'color': (100, 100, 250),
+            'width': 1.0,
+            'hoverColor': (150, 150, 250),
+            'hoverWidth': 1.0,
+            'selectedColor': (200, 200, 0),
+            'selectedWidth': 3.0,
+            }
+        #self.line = QtGui.QGraphicsLineItem(self)
+        self.source.getViewBox().addItem(self)
+        self.updateLine()
+        self.setZValue(0)
+        
+    def close(self):
+        if self.scene() is not None:
+            #self.scene().removeItem(self.line)
+            self.scene().removeItem(self)
+        
+    def setTarget(self, target):
+        self.target = target
+        self.updateLine()
+    
+    def setStyle(self, **kwds):
+        self.style.update(kwds)
+        if 'shape' in kwds:
+            self.updateLine()
+        else:
+            self.update()
+    
+    def updateLine(self):
+        start = Point(self.source.connectPoint())
+        if isinstance(self.target, TerminalGraphicsItem):
+            stop = Point(self.target.connectPoint())
+        elif isinstance(self.target, QtCore.QPointF):
+            stop = Point(self.target)
+        else:
+            return
+        self.prepareGeometryChange()
+        
+        self.path = self.generatePath(start, stop)
+        self.shapePath = None
+        self.update()
+        
+    def generatePath(self, start, stop):
+        path = QtGui.QPainterPath()
+        path.moveTo(start)
+        if self.style['shape'] == 'line':
+            path.lineTo(stop)
+        elif self.style['shape'] == 'cubic':
+            path.cubicTo(Point(stop.x(), start.y()), Point(start.x(), stop.y()), Point(stop.x(), stop.y()))
+        else:
+            raise Exception('Invalid shape "%s"; options are "line" or "cubic"' % self.style['shape'])
+        return path
+
+    def keyPressEvent(self, ev):
+        if ev.key() == QtCore.Qt.Key_Delete or ev.key() == QtCore.Qt.Key_Backspace:
+            #if isinstance(self.target, TerminalGraphicsItem):
+            self.source.disconnect(self.target)
+            ev.accept()
+        else:
+            ev.ignore()
+    
+    def mousePressEvent(self, ev):
+        ev.ignore()
+        
+    def mouseClickEvent(self, ev):
+        if ev.button() == QtCore.Qt.LeftButton:
+            ev.accept()
+            sel = self.isSelected()
+            self.setSelected(True)
+            if not sel and self.isSelected():
+                self.update()
+                
+    def hoverEvent(self, ev):
+        if (not ev.isExit()) and ev.acceptClicks(QtCore.Qt.LeftButton):
+            self.hovered = True
+        else:
+            self.hovered = False
+        self.update()
+            
+            
+    def boundingRect(self):
+        return self.shape().boundingRect()
+        ##return self.line.boundingRect()
+        #px = self.pixelWidth()
+        #return QtCore.QRectF(-5*px, 0, 10*px, self.length)
+    def viewRangeChanged(self):
+        self.shapePath = None
+        self.prepareGeometryChange()
+        
+    def shape(self):
+        if self.shapePath is None:
+            if self.path is None:
+                return QtGui.QPainterPath()
+            stroker = QtGui.QPainterPathStroker()
+            px = self.pixelWidth()
+            stroker.setWidth(px*8)
+            self.shapePath = stroker.createStroke(self.path)
+        return self.shapePath
+        
+    def paint(self, p, *args):
+        if self.isSelected():
+            p.setPen(fn.mkPen(self.style['selectedColor'], width=self.style['selectedWidth']))
+        else:
+            if self.hovered:
+                p.setPen(fn.mkPen(self.style['hoverColor'], width=self.style['hoverWidth']))
+            else:
+                p.setPen(fn.mkPen(self.style['color'], width=self.style['width']))
+                
+        #p.drawLine(0, 0, 0, self.length)
+        
+        p.drawPath(self.path)
diff --git a/libs/pyqtgraph/flowchart/__init__.py b/libs/pyqtgraph/flowchart/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..46e04db0e9818862db8841c849b05bf93a7b2b49
--- /dev/null
+++ b/libs/pyqtgraph/flowchart/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+from .Flowchart import *
+
+from .library import getNodeType, registerNodeType, getNodeTree
\ No newline at end of file
diff --git a/libs/pyqtgraph/flowchart/eq.py b/libs/pyqtgraph/flowchart/eq.py
new file mode 100644
index 0000000000000000000000000000000000000000..554989b2e33525909e187374b14a45f7975b43ff
--- /dev/null
+++ b/libs/pyqtgraph/flowchart/eq.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+from numpy import ndarray, bool_
+from ..metaarray import MetaArray
+
+def eq(a, b):
+    """The great missing equivalence function: Guaranteed evaluation to a single bool value."""
+    if a is b:
+        return True
+        
+    try:
+        e = a==b
+    except ValueError:
+        return False
+    except AttributeError: 
+        return False
+    except:
+        print("a:", str(type(a)), str(a))
+        print("b:", str(type(b)), str(b))
+        raise
+    t = type(e)
+    if t is bool:
+        return e
+    elif t is bool_:
+        return bool(e)
+    elif isinstance(e, ndarray) or (hasattr(e, 'implements') and e.implements('MetaArray')):
+        try:   ## disaster: if a is an empty array and b is not, then e.all() is True
+            if a.shape != b.shape:
+                return False
+        except:
+            return False
+        if (hasattr(e, 'implements') and e.implements('MetaArray')):
+            return e.asarray().all()
+        else:
+            return e.all()
+    else:
+        raise Exception("== operator returned type %s" % str(type(e)))
diff --git a/libs/pyqtgraph/flowchart/library/Data.py b/libs/pyqtgraph/flowchart/library/Data.py
new file mode 100644
index 0000000000000000000000000000000000000000..5236de8d03f571ed2d66d997e867b00800c84123
--- /dev/null
+++ b/libs/pyqtgraph/flowchart/library/Data.py
@@ -0,0 +1,356 @@
+# -*- coding: utf-8 -*-
+from ..Node import Node
+from ...Qt import QtGui, QtCore
+import numpy as np
+from .common import *
+from ...SRTTransform import SRTTransform
+from ...Point import Point
+from ...widgets.TreeWidget import TreeWidget
+from ...graphicsItems.LinearRegionItem import LinearRegionItem
+
+from . import functions
+
+class ColumnSelectNode(Node):
+    """Select named columns from a record array or MetaArray."""
+    nodeName = "ColumnSelect"
+    def __init__(self, name):
+        Node.__init__(self, name, terminals={'In': {'io': 'in'}})
+        self.columns = set()
+        self.columnList = QtGui.QListWidget()
+        self.axis = 0
+        self.columnList.itemChanged.connect(self.itemChanged)
+        
+    def process(self, In, display=True):
+        if display:
+            self.updateList(In)
+                
+        out = {}
+        if hasattr(In, 'implements') and In.implements('MetaArray'):
+            for c in self.columns:
+                out[c] = In[self.axis:c]
+        elif isinstance(In, np.ndarray) and In.dtype.fields is not None:
+            for c in self.columns:
+                out[c] = In[c]
+        else:
+            self.In.setValueAcceptable(False)
+            raise Exception("Input must be MetaArray or ndarray with named fields")
+            
+        return out
+        
+    def ctrlWidget(self):
+        return self.columnList
+
+    def updateList(self, data):
+        if hasattr(data, 'implements') and data.implements('MetaArray'):
+            cols = data.listColumns()
+            for ax in cols:  ## find first axis with columns
+                if len(cols[ax]) > 0:
+                    self.axis = ax
+                    cols = set(cols[ax])
+                    break
+        else:
+            cols = list(data.dtype.fields.keys())
+                
+        rem = set()
+        for c in self.columns:
+            if c not in cols:
+                self.removeTerminal(c)
+                rem.add(c)
+        self.columns -= rem
+                
+        self.columnList.blockSignals(True)
+        self.columnList.clear()
+        for c in cols:
+            item = QtGui.QListWidgetItem(c)
+            item.setFlags(QtCore.Qt.ItemIsEnabled|QtCore.Qt.ItemIsUserCheckable)
+            if c in self.columns:
+                item.setCheckState(QtCore.Qt.Checked)
+            else:
+                item.setCheckState(QtCore.Qt.Unchecked)
+            self.columnList.addItem(item)
+        self.columnList.blockSignals(False)
+        
+
+    def itemChanged(self, item):
+        col = str(item.text())
+        if item.checkState() == QtCore.Qt.Checked:
+            if col not in self.columns:
+                self.columns.add(col)
+                self.addOutput(col)
+        else:
+            if col in self.columns:
+                self.columns.remove(col)
+                self.removeTerminal(col)
+        self.update()
+        
+    def saveState(self):
+        state = Node.saveState(self)
+        state['columns'] = list(self.columns)
+        return state
+    
+    def restoreState(self, state):
+        Node.restoreState(self, state)
+        self.columns = set(state.get('columns', []))
+        for c in self.columns:
+            self.addOutput(c)
+
+
+
+class RegionSelectNode(CtrlNode):
+    """Returns a slice from a 1-D array. Connect the 'widget' output to a plot to display a region-selection widget."""
+    nodeName = "RegionSelect"
+    uiTemplate = [
+        ('start', 'spin', {'value': 0, 'step': 0.1}),
+        ('stop', 'spin', {'value': 0.1, 'step': 0.1}),
+        ('display', 'check', {'value': True}),
+        ('movable', 'check', {'value': True}),
+    ]
+    
+    def __init__(self, name):
+        self.items = {}
+        CtrlNode.__init__(self, name, terminals={
+            'data': {'io': 'in'},
+            'selected': {'io': 'out'},
+            'region': {'io': 'out'},
+            'widget': {'io': 'out', 'multi': True}
+        })
+        self.ctrls['display'].toggled.connect(self.displayToggled)
+        self.ctrls['movable'].toggled.connect(self.movableToggled)
+        
+    def displayToggled(self, b):
+        for item in self.items.values():
+            item.setVisible(b)
+            
+    def movableToggled(self, b):
+        for item in self.items.values():
+            item.setMovable(b)
+            
+        
+    def process(self, data=None, display=True):
+        #print "process.."
+        s = self.stateGroup.state()
+        region = [s['start'], s['stop']]
+        
+        if display:
+            conn = self['widget'].connections()
+            for c in conn:
+                plot = c.node().getPlot()
+                if plot is None:
+                    continue
+                if c in self.items:
+                    item = self.items[c]
+                    item.setRegion(region)
+                    #print "  set rgn:", c, region
+                    #item.setXVals(events)
+                else:
+                    item = LinearRegionItem(values=region)
+                    self.items[c] = item
+                    #item.connect(item, QtCore.SIGNAL('regionChanged'), self.rgnChanged)
+                    item.sigRegionChanged.connect(self.rgnChanged)
+                    item.setVisible(s['display'])
+                    item.setMovable(s['movable'])
+                    #print "  new rgn:", c, region
+                    #self.items[c].setYRange([0., 0.2], relative=True)
+        
+        if self['selected'].isConnected():
+            if data is None:
+                sliced = None
+            elif (hasattr(data, 'implements') and data.implements('MetaArray')):
+                sliced = data[0:s['start']:s['stop']]
+            else:
+                mask = (data['time'] >= s['start']) * (data['time'] < s['stop'])
+            sliced = data[mask]
+        else:
+            sliced = None
+            
+        return {'selected': sliced, 'widget': self.items, 'region': region}
+        
+        
+    def rgnChanged(self, item):
+        region = item.getRegion()
+        self.stateGroup.setState({'start': region[0], 'stop': region[1]})
+        self.update()
+        
+        
+class EvalNode(Node):
+    """Return the output of a string evaluated/executed by the python interpreter.
+    The string may be either an expression or a python script, and inputs are accessed as the name of the terminal. 
+    For expressions, a single value may be evaluated for a single output, or a dict for multiple outputs.
+    For a script, the text will be executed as the body of a function."""
+    nodeName = 'PythonEval'
+    
+    def __init__(self, name):
+        Node.__init__(self, name, 
+            terminals = {
+                'input': {'io': 'in', 'renamable': True, 'multiable': True},
+                'output': {'io': 'out', 'renamable': True, 'multiable': True},
+            },
+            allowAddInput=True, allowAddOutput=True)
+        
+        self.ui = QtGui.QWidget()
+        self.layout = QtGui.QGridLayout()
+        #self.addInBtn = QtGui.QPushButton('+Input')
+        #self.addOutBtn = QtGui.QPushButton('+Output')
+        self.text = QtGui.QTextEdit()
+        self.text.setTabStopWidth(30)
+        self.text.setPlainText("# Access inputs as args['input_name']\nreturn {'output': None} ## one key per output terminal")
+        #self.layout.addWidget(self.addInBtn, 0, 0)
+        #self.layout.addWidget(self.addOutBtn, 0, 1)
+        self.layout.addWidget(self.text, 1, 0, 1, 2)
+        self.ui.setLayout(self.layout)
+        
+        #QtCore.QObject.connect(self.addInBtn, QtCore.SIGNAL('clicked()'), self.addInput)
+        #self.addInBtn.clicked.connect(self.addInput)
+        #QtCore.QObject.connect(self.addOutBtn, QtCore.SIGNAL('clicked()'), self.addOutput)
+        #self.addOutBtn.clicked.connect(self.addOutput)
+        self.text.focusOutEvent = self.focusOutEvent
+        self.lastText = None
+        
+    def ctrlWidget(self):
+        return self.ui
+        
+    #def addInput(self):
+        #Node.addInput(self, 'input', renamable=True)
+        
+    #def addOutput(self):
+        #Node.addOutput(self, 'output', renamable=True)
+        
+    def focusOutEvent(self, ev):
+        text = str(self.text.toPlainText())
+        if text != self.lastText:
+            self.lastText = text
+            self.update()
+        return QtGui.QTextEdit.focusOutEvent(self.text, ev)
+        
+    def process(self, display=True, **args):
+        l = locals()
+        l.update(args)
+        ## try eval first, then exec
+        try:  
+            text = str(self.text.toPlainText()).replace('\n', ' ')
+            output = eval(text, globals(), l)
+        except SyntaxError:
+            fn = "def fn(**args):\n"
+            run = "\noutput=fn(**args)\n"
+            text = fn + "\n".join(["    "+l for l in str(self.text.toPlainText()).split('\n')]) + run
+            exec(text)
+        except:
+            print("Error processing node: %s" % self.name())
+            raise
+        return output
+        
+    def saveState(self):
+        state = Node.saveState(self)
+        state['text'] = str(self.text.toPlainText())
+        #state['terminals'] = self.saveTerminals()
+        return state
+        
+    def restoreState(self, state):
+        Node.restoreState(self, state)
+        self.text.clear()
+        self.text.insertPlainText(state['text'])
+        self.restoreTerminals(state['terminals'])
+        self.update()
+        
+class ColumnJoinNode(Node):
+    """Concatenates record arrays and/or adds new columns"""
+    nodeName = 'ColumnJoin'
+    
+    def __init__(self, name):
+        Node.__init__(self, name, terminals = {
+            'output': {'io': 'out'},
+        })
+        
+        #self.items = []
+        
+        self.ui = QtGui.QWidget()
+        self.layout = QtGui.QGridLayout()
+        self.ui.setLayout(self.layout)
+        
+        self.tree = TreeWidget()
+        self.addInBtn = QtGui.QPushButton('+ Input')
+        self.remInBtn = QtGui.QPushButton('- Input')
+        
+        self.layout.addWidget(self.tree, 0, 0, 1, 2)
+        self.layout.addWidget(self.addInBtn, 1, 0)
+        self.layout.addWidget(self.remInBtn, 1, 1)
+
+        self.addInBtn.clicked.connect(self.addInput)
+        self.remInBtn.clicked.connect(self.remInput)
+        self.tree.sigItemMoved.connect(self.update)
+        
+    def ctrlWidget(self):
+        return self.ui
+        
+    def addInput(self):
+        #print "ColumnJoinNode.addInput called."
+        term = Node.addInput(self, 'input', renamable=True, removable=True, multiable=True)
+        #print "Node.addInput returned. term:", term
+        item = QtGui.QTreeWidgetItem([term.name()])
+        item.term = term
+        term.joinItem = item
+        #self.items.append((term, item))
+        self.tree.addTopLevelItem(item)
+
+    def remInput(self):
+        sel = self.tree.currentItem()
+        term = sel.term
+        term.joinItem = None
+        sel.term = None
+        self.tree.removeTopLevelItem(sel)
+        self.removeTerminal(term)
+        self.update()
+
+    def process(self, display=True, **args):
+        order = self.order()
+        vals = []
+        for name in order:
+            if name not in args:
+                continue
+            val = args[name]
+            if isinstance(val, np.ndarray) and len(val.dtype) > 0:
+                vals.append(val)
+            else:
+                vals.append((name, None, val))
+        return {'output': functions.concatenateColumns(vals)}
+
+    def order(self):
+        return [str(self.tree.topLevelItem(i).text(0)) for i in range(self.tree.topLevelItemCount())]
+
+    def saveState(self):
+        state = Node.saveState(self)
+        state['order'] = self.order()
+        return state
+        
+    def restoreState(self, state):
+        Node.restoreState(self, state)
+        inputs = self.inputs()
+
+        ## Node.restoreState should have created all of the terminals we need
+        ## However: to maintain support for some older flowchart files, we need
+        ## to manually add any terminals that were not taken care of.
+        for name in [n for n in state['order'] if n not in inputs]:
+            Node.addInput(self, name, renamable=True, removable=True, multiable=True)
+        inputs = self.inputs()
+
+        order = [name for name in state['order'] if name in inputs]
+        for name in inputs:
+            if name not in order:
+                order.append(name)
+        
+        self.tree.clear()
+        for name in order:
+            term = self[name]
+            item = QtGui.QTreeWidgetItem([name])
+            item.term = term
+            term.joinItem = item
+            #self.items.append((term, item))
+            self.tree.addTopLevelItem(item)
+
+    def terminalRenamed(self, term, oldName):
+        Node.terminalRenamed(self, term, oldName)
+        item = term.joinItem
+        item.setText(0, term.name())
+        self.update()
+        
+        
diff --git a/libs/pyqtgraph/flowchart/library/Display.py b/libs/pyqtgraph/flowchart/library/Display.py
new file mode 100644
index 0000000000000000000000000000000000000000..642e64913f5ea54f75f8fa29e6e22d2cdc42a41f
--- /dev/null
+++ b/libs/pyqtgraph/flowchart/library/Display.py
@@ -0,0 +1,312 @@
+# -*- coding: utf-8 -*-
+from ..Node import Node
+import weakref
+from ...Qt import QtCore, QtGui
+from ...graphicsItems.ScatterPlotItem import ScatterPlotItem
+from ...graphicsItems.PlotCurveItem import PlotCurveItem
+from ... import PlotDataItem, ComboBox
+
+from .common import *
+import numpy as np
+
+class PlotWidgetNode(Node):
+    """Connection to PlotWidget. Will plot arrays, metaarrays, and display event lists."""
+    nodeName = 'PlotWidget'
+    sigPlotChanged = QtCore.Signal(object)
+    
+    def __init__(self, name):
+        Node.__init__(self, name, terminals={'In': {'io': 'in', 'multi': True}})
+        self.plot = None  # currently selected plot 
+        self.plots = {}   # list of available plots user may select from
+        self.ui = None 
+        self.items = {}
+        
+    def disconnected(self, localTerm, remoteTerm):
+        if localTerm is self['In'] and remoteTerm in self.items:
+            self.plot.removeItem(self.items[remoteTerm])
+            del self.items[remoteTerm]
+        
+    def setPlot(self, plot):
+        #print "======set plot"
+        if plot == self.plot:
+            return
+        
+        # clear data from previous plot
+        if self.plot is not None:
+            for vid in list(self.items.keys()):
+                self.plot.removeItem(self.items[vid])
+                del self.items[vid]
+
+        self.plot = plot
+        self.updateUi()
+        self.update()
+        self.sigPlotChanged.emit(self)
+        
+    def getPlot(self):
+        return self.plot
+        
+    def process(self, In, display=True):
+        if display and self.plot is not None:
+            items = set()
+            # Add all new input items to selected plot
+            for name, vals in In.items():
+                if vals is None:
+                    continue
+                if type(vals) is not list:
+                    vals = [vals]
+                    
+                for val in vals:
+                    vid = id(val)
+                    if vid in self.items and self.items[vid].scene() is self.plot.scene():
+                        # Item is already added to the correct scene
+                        #   possible bug: what if two plots occupy the same scene? (should
+                        #   rarely be a problem because items are removed from a plot before
+                        #   switching).
+                        items.add(vid)
+                    else:
+                        # Add the item to the plot, or generate a new item if needed.
+                        if isinstance(val, QtGui.QGraphicsItem):
+                            self.plot.addItem(val)
+                            item = val
+                        else:
+                            item = self.plot.plot(val)
+                        self.items[vid] = item
+                        items.add(vid)
+                        
+            # Any left-over items that did not appear in the input must be removed
+            for vid in list(self.items.keys()):
+                if vid not in items:
+                    self.plot.removeItem(self.items[vid])
+                    del self.items[vid]
+            
+    def processBypassed(self, args):
+        if self.plot is None:
+            return
+        for item in list(self.items.values()):
+            self.plot.removeItem(item)
+        self.items = {}
+        
+    def ctrlWidget(self):
+        if self.ui is None:
+            self.ui = ComboBox()
+            self.ui.currentIndexChanged.connect(self.plotSelected)
+            self.updateUi()
+        return self.ui
+    
+    def plotSelected(self, index):
+        self.setPlot(self.ui.value())
+    
+    def setPlotList(self, plots):
+        """
+        Specify the set of plots (PlotWidget or PlotItem) that the user may
+        select from.
+        
+        *plots* must be a dictionary of {name: plot} pairs.
+        """
+        self.plots = plots
+        self.updateUi()
+    
+    def updateUi(self):
+        # sets list and automatically preserves previous selection
+        self.ui.setItems(self.plots)
+        try:
+            self.ui.setValue(self.plot)
+        except ValueError:
+            pass
+        
+
+class CanvasNode(Node):
+    """Connection to a Canvas widget."""
+    nodeName = 'CanvasWidget'
+    
+    def __init__(self, name):
+        Node.__init__(self, name, terminals={'In': {'io': 'in', 'multi': True}})
+        self.canvas = None
+        self.items = {}
+        
+    def disconnected(self, localTerm, remoteTerm):
+        if localTerm is self.In and remoteTerm in self.items:
+            self.canvas.removeItem(self.items[remoteTerm])
+            del self.items[remoteTerm]
+        
+    def setCanvas(self, canvas):
+        self.canvas = canvas
+        
+    def getCanvas(self):
+        return self.canvas
+        
+    def process(self, In, display=True):
+        if display:
+            items = set()
+            for name, vals in In.items():
+                if vals is None:
+                    continue
+                if type(vals) is not list:
+                    vals = [vals]
+                
+                for val in vals:
+                    vid = id(val)
+                    if vid in self.items:
+                        items.add(vid)
+                    else:
+                        self.canvas.addItem(val)
+                        item = val
+                        self.items[vid] = item
+                        items.add(vid)
+            for vid in list(self.items.keys()):
+                if vid not in items:
+                    #print "remove", self.items[vid]
+                    self.canvas.removeItem(self.items[vid])
+                    del self.items[vid]
+
+
+class PlotCurve(CtrlNode):
+    """Generates a plot curve from x/y data"""
+    nodeName = 'PlotCurve'
+    uiTemplate = [
+        ('color', 'color'),
+    ]
+    
+    def __init__(self, name):
+        CtrlNode.__init__(self, name, terminals={
+            'x': {'io': 'in'},
+            'y': {'io': 'in'},
+            'plot': {'io': 'out'}
+        })
+        self.item = PlotDataItem()
+    
+    def process(self, x, y, display=True):
+        #print "scatterplot process"
+        if not display:
+            return {'plot': None}
+        
+        self.item.setData(x, y, pen=self.ctrls['color'].color())
+        return {'plot': self.item}
+        
+        
+
+
+class ScatterPlot(CtrlNode):
+    """Generates a scatter plot from a record array or nested dicts"""
+    nodeName = 'ScatterPlot'
+    uiTemplate = [
+        ('x', 'combo', {'values': [], 'index': 0}),
+        ('y', 'combo', {'values': [], 'index': 0}),
+        ('sizeEnabled', 'check', {'value': False}),
+        ('size', 'combo', {'values': [], 'index': 0}),
+        ('absoluteSize', 'check', {'value': False}),
+        ('colorEnabled', 'check', {'value': False}),
+        ('color', 'colormap', {}),
+        ('borderEnabled', 'check', {'value': False}),
+        ('border', 'colormap', {}),
+    ]
+    
+    def __init__(self, name):
+        CtrlNode.__init__(self, name, terminals={
+            'input': {'io': 'in'},
+            'plot': {'io': 'out'}
+        })
+        self.item = ScatterPlotItem()
+        self.keys = []
+        
+        #self.ui = QtGui.QWidget()
+        #self.layout = QtGui.QGridLayout()
+        #self.ui.setLayout(self.layout)
+        
+        #self.xCombo = QtGui.QComboBox()
+        #self.yCombo = QtGui.QComboBox()
+        
+        
+    
+    def process(self, input, display=True):
+        #print "scatterplot process"
+        if not display:
+            return {'plot': None}
+            
+        self.updateKeys(input[0])
+        
+        x = str(self.ctrls['x'].currentText())
+        y = str(self.ctrls['y'].currentText())
+        size = str(self.ctrls['size'].currentText())
+        pen = QtGui.QPen(QtGui.QColor(0,0,0,0))
+        points = []
+        for i in input:
+            pt = {'pos': (i[x], i[y])}
+            if self.ctrls['sizeEnabled'].isChecked():
+                pt['size'] = i[size]
+            if self.ctrls['borderEnabled'].isChecked():
+                pt['pen'] = QtGui.QPen(self.ctrls['border'].getColor(i))
+            else:
+                pt['pen'] = pen
+            if self.ctrls['colorEnabled'].isChecked():
+                pt['brush'] = QtGui.QBrush(self.ctrls['color'].getColor(i))
+            points.append(pt)
+        self.item.setPxMode(not self.ctrls['absoluteSize'].isChecked())
+            
+        self.item.setPoints(points)
+        
+        return {'plot': self.item}
+        
+        
+
+    def updateKeys(self, data):
+        if isinstance(data, dict):
+            keys = list(data.keys())
+        elif isinstance(data, list) or isinstance(data, tuple):
+            keys = data
+        elif isinstance(data, np.ndarray) or isinstance(data, np.void):
+            keys = data.dtype.names
+        else:
+            print("Unknown data type:", type(data), data)
+            return
+            
+        for c in self.ctrls.values():
+            c.blockSignals(True)
+        for c in [self.ctrls['x'], self.ctrls['y'], self.ctrls['size']]:
+            cur = str(c.currentText())
+            c.clear()
+            for k in keys:
+                c.addItem(k)
+                if k == cur:
+                    c.setCurrentIndex(c.count()-1)
+        for c in [self.ctrls['color'], self.ctrls['border']]:
+            c.setArgList(keys)
+        for c in self.ctrls.values():
+            c.blockSignals(False)
+                
+        self.keys = keys
+        
+
+    def saveState(self):
+        state = CtrlNode.saveState(self)
+        return {'keys': self.keys, 'ctrls': state}
+        
+    def restoreState(self, state):
+        self.updateKeys(state['keys'])
+        CtrlNode.restoreState(self, state['ctrls'])
+        
+#class ImageItem(Node):
+    #"""Creates an ImageItem for display in a canvas from a file handle."""
+    #nodeName = 'Image'
+    
+    #def __init__(self, name):
+        #Node.__init__(self, name, terminals={
+            #'file': {'io': 'in'},
+            #'image': {'io': 'out'}
+        #})
+        #self.imageItem = graphicsItems.ImageItem()
+        #self.handle = None
+        
+    #def process(self, file, display=True):
+        #if not display:
+            #return {'image': None}
+            
+        #if file != self.handle:
+            #self.handle = file
+            #data = file.read()
+            #self.imageItem.updateImage(data)
+            
+        #pos = file.
+        
+        
+        
diff --git a/libs/pyqtgraph/flowchart/library/Filters.py b/libs/pyqtgraph/flowchart/library/Filters.py
new file mode 100644
index 0000000000000000000000000000000000000000..88a2f6c553c36e2e30254e8cf33bd23e73631bee
--- /dev/null
+++ b/libs/pyqtgraph/flowchart/library/Filters.py
@@ -0,0 +1,346 @@
+# -*- coding: utf-8 -*-
+from ...Qt import QtCore, QtGui
+from ..Node import Node
+from . import functions
+from ... import functions as pgfn
+from .common import *
+import numpy as np
+
+from ... import PolyLineROI
+from ... import Point
+from ... import metaarray as metaarray
+
+
+class Downsample(CtrlNode):
+    """Downsample by averaging samples together."""
+    nodeName = 'Downsample'
+    uiTemplate = [
+        ('n', 'intSpin', {'min': 1, 'max': 1000000})
+    ]
+    
+    def processData(self, data):
+        return functions.downsample(data, self.ctrls['n'].value(), axis=0)
+
+
+class Subsample(CtrlNode):
+    """Downsample by selecting every Nth sample."""
+    nodeName = 'Subsample'
+    uiTemplate = [
+        ('n', 'intSpin', {'min': 1, 'max': 1000000})
+    ]
+    
+    def processData(self, data):
+        return data[::self.ctrls['n'].value()]
+
+
+class Bessel(CtrlNode):
+    """Bessel filter. Input data must have time values."""
+    nodeName = 'BesselFilter'
+    uiTemplate = [
+        ('band', 'combo', {'values': ['lowpass', 'highpass'], 'index': 0}),
+        ('cutoff', 'spin', {'value': 1000., 'step': 1, 'dec': True, 'range': [0.0, None], 'suffix': 'Hz', 'siPrefix': True}),
+        ('order', 'intSpin', {'value': 4, 'min': 1, 'max': 16}),
+        ('bidir', 'check', {'checked': True})
+    ]
+    
+    def processData(self, data):
+        s = self.stateGroup.state()
+        if s['band'] == 'lowpass':
+            mode = 'low'
+        else:
+            mode = 'high'
+        return functions.besselFilter(data, bidir=s['bidir'], btype=mode, cutoff=s['cutoff'], order=s['order'])
+
+
+class Butterworth(CtrlNode):
+    """Butterworth filter"""
+    nodeName = 'ButterworthFilter'
+    uiTemplate = [
+        ('band', 'combo', {'values': ['lowpass', 'highpass'], 'index': 0}),
+        ('wPass', 'spin', {'value': 1000., 'step': 1, 'dec': True, 'range': [0.0, None], 'suffix': 'Hz', 'siPrefix': True}),
+        ('wStop', 'spin', {'value': 2000., 'step': 1, 'dec': True, 'range': [0.0, None], 'suffix': 'Hz', 'siPrefix': True}),
+        ('gPass', 'spin', {'value': 2.0, 'step': 1, 'dec': True, 'range': [0.0, None], 'suffix': 'dB', 'siPrefix': True}),
+        ('gStop', 'spin', {'value': 20.0, 'step': 1, 'dec': True, 'range': [0.0, None], 'suffix': 'dB', 'siPrefix': True}),
+        ('bidir', 'check', {'checked': True})
+    ]
+    
+    def processData(self, data):
+        s = self.stateGroup.state()
+        if s['band'] == 'lowpass':
+            mode = 'low'
+        else:
+            mode = 'high'
+        ret = functions.butterworthFilter(data, bidir=s['bidir'], btype=mode, wPass=s['wPass'], wStop=s['wStop'], gPass=s['gPass'], gStop=s['gStop'])
+        return ret
+
+        
+class ButterworthNotch(CtrlNode):
+    """Butterworth notch filter"""
+    nodeName = 'ButterworthNotchFilter'
+    uiTemplate = [
+        ('low_wPass', 'spin', {'value': 1000., 'step': 1, 'dec': True, 'range': [0.0, None], 'suffix': 'Hz', 'siPrefix': True}),
+        ('low_wStop', 'spin', {'value': 2000., 'step': 1, 'dec': True, 'range': [0.0, None], 'suffix': 'Hz', 'siPrefix': True}),
+        ('low_gPass', 'spin', {'value': 2.0, 'step': 1, 'dec': True, 'range': [0.0, None], 'suffix': 'dB', 'siPrefix': True}),
+        ('low_gStop', 'spin', {'value': 20.0, 'step': 1, 'dec': True, 'range': [0.0, None], 'suffix': 'dB', 'siPrefix': True}),
+        ('high_wPass', 'spin', {'value': 3000., 'step': 1, 'dec': True, 'range': [0.0, None], 'suffix': 'Hz', 'siPrefix': True}),
+        ('high_wStop', 'spin', {'value': 4000., 'step': 1, 'dec': True, 'range': [0.0, None], 'suffix': 'Hz', 'siPrefix': True}),
+        ('high_gPass', 'spin', {'value': 2.0, 'step': 1, 'dec': True, 'range': [0.0, None], 'suffix': 'dB', 'siPrefix': True}),
+        ('high_gStop', 'spin', {'value': 20.0, 'step': 1, 'dec': True, 'range': [0.0, None], 'suffix': 'dB', 'siPrefix': True}),
+        ('bidir', 'check', {'checked': True})
+    ]
+    
+    def processData(self, data):
+        s = self.stateGroup.state()
+        
+        low = functions.butterworthFilter(data, bidir=s['bidir'], btype='low', wPass=s['low_wPass'], wStop=s['low_wStop'], gPass=s['low_gPass'], gStop=s['low_gStop'])
+        high = functions.butterworthFilter(data, bidir=s['bidir'], btype='high', wPass=s['high_wPass'], wStop=s['high_wStop'], gPass=s['high_gPass'], gStop=s['high_gStop'])
+        return low + high
+    
+
+class Mean(CtrlNode):
+    """Filters data by taking the mean of a sliding window"""
+    nodeName = 'MeanFilter'
+    uiTemplate = [
+        ('n', 'intSpin', {'min': 1, 'max': 1000000})
+    ]
+    
+    @metaArrayWrapper
+    def processData(self, data):
+        n = self.ctrls['n'].value()
+        return functions.rollingSum(data, n) / n
+
+
+class Median(CtrlNode):
+    """Filters data by taking the median of a sliding window"""
+    nodeName = 'MedianFilter'
+    uiTemplate = [
+        ('n', 'intSpin', {'min': 1, 'max': 1000000})
+    ]
+    
+    @metaArrayWrapper
+    def processData(self, data):
+        try:
+            import scipy.ndimage
+        except ImportError:
+            raise Exception("MedianFilter node requires the package scipy.ndimage.")
+        return scipy.ndimage.median_filter(data, self.ctrls['n'].value())
+
+class Mode(CtrlNode):
+    """Filters data by taking the mode (histogram-based) of a sliding window"""
+    nodeName = 'ModeFilter'
+    uiTemplate = [
+        ('window', 'intSpin', {'value': 500, 'min': 1, 'max': 1000000}),
+    ]
+    
+    @metaArrayWrapper
+    def processData(self, data):
+        return functions.modeFilter(data, self.ctrls['window'].value())
+
+
+class Denoise(CtrlNode):
+    """Removes anomalous spikes from data, replacing with nearby values"""
+    nodeName = 'DenoiseFilter'
+    uiTemplate = [
+        ('radius', 'intSpin', {'value': 2, 'min': 0, 'max': 1000000}),
+        ('threshold', 'doubleSpin', {'value': 4.0, 'min': 0, 'max': 1000})
+    ]
+    
+    def processData(self, data):
+        #print "DENOISE"
+        s = self.stateGroup.state()
+        return functions.denoise(data, **s)
+
+
+class Gaussian(CtrlNode):
+    """Gaussian smoothing filter."""
+    nodeName = 'GaussianFilter'
+    uiTemplate = [
+        ('sigma', 'doubleSpin', {'min': 0, 'max': 1000000})
+    ]
+    
+    @metaArrayWrapper
+    def processData(self, data):
+        try:
+            import scipy.ndimage
+        except ImportError:
+            raise Exception("GaussianFilter node requires the package scipy.ndimage.")
+        return pgfn.gaussianFilter(data, self.ctrls['sigma'].value())
+
+
+class Derivative(CtrlNode):
+    """Returns the pointwise derivative of the input"""
+    nodeName = 'DerivativeFilter'
+    
+    def processData(self, data):
+        if hasattr(data, 'implements') and data.implements('MetaArray'):
+            info = data.infoCopy()
+            if 'values' in info[0]:
+                info[0]['values'] = info[0]['values'][:-1]
+            return metaarray.MetaArray(data[1:] - data[:-1], info=info)
+        else:
+            return data[1:] - data[:-1]
+
+
+class Integral(CtrlNode):
+    """Returns the pointwise integral of the input"""
+    nodeName = 'IntegralFilter'
+    
+    @metaArrayWrapper
+    def processData(self, data):
+        data[1:] += data[:-1]
+        return data
+
+
+class Detrend(CtrlNode):
+    """Removes linear trend from the data"""
+    nodeName = 'DetrendFilter'
+    
+    @metaArrayWrapper
+    def processData(self, data):
+        try:
+            from scipy.signal import detrend
+        except ImportError:
+            raise Exception("DetrendFilter node requires the package scipy.signal.")
+        return detrend(data)
+
+class RemoveBaseline(PlottingCtrlNode):
+    """Remove an arbitrary, graphically defined baseline from the data."""
+    nodeName = 'RemoveBaseline'
+    
+    def __init__(self, name):
+        ## define inputs and outputs (one output needs to be a plot)
+        PlottingCtrlNode.__init__(self, name)
+        self.line = PolyLineROI([[0,0],[1,0]])
+        self.line.sigRegionChanged.connect(self.changed)
+        
+        ## create a PolyLineROI, add it to a plot -- actually, I think we want to do this after the node is connected to a plot (look at EventDetection.ThresholdEvents node for ideas), and possible after there is data. We will need to update the end positions of the line each time the input data changes
+        #self.line = None ## will become a PolyLineROI
+        
+    def connectToPlot(self, node):
+        """Define what happens when the node is connected to a plot"""
+
+        if node.plot is None:
+            return
+        node.getPlot().addItem(self.line)
+       
+    def disconnectFromPlot(self, plot):
+        """Define what happens when the node is disconnected from a plot"""
+        plot.removeItem(self.line)    
+    
+    def processData(self, data):
+        ## get array of baseline (from PolyLineROI)
+        h0 = self.line.getHandles()[0]
+        h1 = self.line.getHandles()[-1]
+        
+        timeVals = data.xvals(0)
+        h0.setPos(timeVals[0], h0.pos()[1])
+        h1.setPos(timeVals[-1], h1.pos()[1])      
+        
+        pts = self.line.listPoints() ## lists line handles in same coordinates as data
+        pts, indices = self.adjustXPositions(pts, timeVals) ## maxe sure x positions match x positions of data points
+        
+        ## construct an array that represents the baseline
+        arr = np.zeros(len(data), dtype=float)
+        n = 1
+        arr[0] = pts[0].y()
+        for i in range(len(pts)-1):
+            x1 = pts[i].x()
+            x2 = pts[i+1].x()
+            y1 = pts[i].y()
+            y2 = pts[i+1].y()
+            m = (y2-y1)/(x2-x1)
+            b = y1
+            
+            times = timeVals[(timeVals > x1)*(timeVals <= x2)]
+            arr[n:n+len(times)] = (m*(times-times[0]))+b
+            n += len(times)
+                
+        return data - arr ## subract baseline from data
+        
+    def adjustXPositions(self, pts, data):
+        """Return a list of Point() where the x position is set to the nearest x value in *data* for each point in *pts*."""
+        points = []
+        timeIndices = []
+        for p in pts:
+            x = np.argwhere(abs(data - p.x()) == abs(data - p.x()).min())
+            points.append(Point(data[x], p.y()))
+            timeIndices.append(x)
+            
+        return points, timeIndices
+
+
+
+class AdaptiveDetrend(CtrlNode):
+    """Removes baseline from data, ignoring anomalous events"""
+    nodeName = 'AdaptiveDetrend'
+    uiTemplate = [
+        ('threshold', 'doubleSpin', {'value': 3.0, 'min': 0, 'max': 1000000})
+    ]
+    
+    def processData(self, data):
+        return functions.adaptiveDetrend(data, threshold=self.ctrls['threshold'].value())
+
+class HistogramDetrend(CtrlNode):
+    """Removes baseline from data by computing mode (from histogram) of beginning and end of data."""
+    nodeName = 'HistogramDetrend'
+    uiTemplate = [
+        ('windowSize', 'intSpin', {'value': 500, 'min': 10, 'max': 1000000, 'suffix': 'pts'}),
+        ('numBins', 'intSpin', {'value': 50, 'min': 3, 'max': 1000000}),
+        ('offsetOnly', 'check', {'checked': False}),
+    ]
+    
+    def processData(self, data):
+        s = self.stateGroup.state()
+        #ws = self.ctrls['windowSize'].value()
+        #bn = self.ctrls['numBins'].value()
+        #offset = self.ctrls['offsetOnly'].checked()
+        return functions.histogramDetrend(data, window=s['windowSize'], bins=s['numBins'], offsetOnly=s['offsetOnly'])
+
+
+    
+class RemovePeriodic(CtrlNode):
+    nodeName = 'RemovePeriodic'
+    uiTemplate = [
+        #('windowSize', 'intSpin', {'value': 500, 'min': 10, 'max': 1000000, 'suffix': 'pts'}),
+        #('numBins', 'intSpin', {'value': 50, 'min': 3, 'max': 1000000})
+        ('f0', 'spin', {'value': 60, 'suffix': 'Hz', 'siPrefix': True, 'min': 0, 'max': None}),
+        ('harmonics', 'intSpin', {'value': 30, 'min': 0}),
+        ('samples', 'intSpin', {'value': 1, 'min': 1}),
+    ]
+
+    def processData(self, data):
+        times = data.xvals('Time')
+        dt = times[1]-times[0]
+        
+        data1 = data.asarray()
+        ft = np.fft.fft(data1)
+        
+        ## determine frequencies in fft data
+        df = 1.0 / (len(data1) * dt)
+        freqs = np.linspace(0.0, (len(ft)-1) * df, len(ft))
+        
+        ## flatten spikes at f0 and harmonics
+        f0 = self.ctrls['f0'].value()
+        for i in xrange(1, self.ctrls['harmonics'].value()+2):
+            f = f0 * i # target frequency
+            
+            ## determine index range to check for this frequency
+            ind1 = int(np.floor(f / df))
+            ind2 = int(np.ceil(f / df)) + (self.ctrls['samples'].value()-1)
+            if ind1 > len(ft)/2.:
+                break
+            mag = (abs(ft[ind1-1]) + abs(ft[ind2+1])) * 0.5
+            for j in range(ind1, ind2+1):
+                phase = np.angle(ft[j])   ## Must preserve the phase of each point, otherwise any transients in the trace might lead to large artifacts.
+                re = mag * np.cos(phase)
+                im = mag * np.sin(phase)
+                ft[j] = re + im*1j
+                ft[len(ft)-j] = re - im*1j
+                
+        data2 = np.fft.ifft(ft).real
+        
+        ma = metaarray.MetaArray(data2, info=data.infoCopy())
+        return ma
+        
+        
+        
diff --git a/libs/pyqtgraph/flowchart/library/Operators.py b/libs/pyqtgraph/flowchart/library/Operators.py
new file mode 100644
index 0000000000000000000000000000000000000000..579d2cd2b7c7849f0b8c5eaf258cab1048a94385
--- /dev/null
+++ b/libs/pyqtgraph/flowchart/library/Operators.py
@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+from ..Node import Node
+
+class UniOpNode(Node):
+    """Generic node for performing any operation like Out = In.fn()"""
+    def __init__(self, name, fn):
+        self.fn = fn
+        Node.__init__(self, name, terminals={
+            'In': {'io': 'in'},
+            'Out': {'io': 'out', 'bypass': 'In'}
+        })
+        
+    def process(self, **args):
+        return {'Out': getattr(args['In'], self.fn)()}
+
+class BinOpNode(Node):
+    """Generic node for performing any operation like A.fn(B)"""
+    def __init__(self, name, fn):
+        self.fn = fn
+        Node.__init__(self, name, terminals={
+            'A': {'io': 'in'},
+            'B': {'io': 'in'},
+            'Out': {'io': 'out', 'bypass': 'A'}
+        })
+        
+    def process(self, **args):
+        if isinstance(self.fn, tuple):
+            for name in self.fn:
+                try:
+                    fn = getattr(args['A'], name)
+                    break
+                except AttributeError:
+                    pass
+        else:
+            fn = getattr(args['A'], self.fn)
+        out = fn(args['B'])
+        if out is NotImplemented:
+            raise Exception("Operation %s not implemented between %s and %s" % (fn, str(type(args['A'])), str(type(args['B']))))
+        #print "     ", fn, out
+        return {'Out': out}
+
+
+class AbsNode(UniOpNode):
+    """Returns abs(Inp). Does not check input types."""
+    nodeName = 'Abs'
+    def __init__(self, name):
+        UniOpNode.__init__(self, name, '__abs__')
+
+class AddNode(BinOpNode):
+    """Returns A + B. Does not check input types."""
+    nodeName = 'Add'
+    def __init__(self, name):
+        BinOpNode.__init__(self, name, '__add__')
+
+class SubtractNode(BinOpNode):
+    """Returns A - B. Does not check input types."""
+    nodeName = 'Subtract'
+    def __init__(self, name):
+        BinOpNode.__init__(self, name, '__sub__')
+
+class MultiplyNode(BinOpNode):
+    """Returns A * B. Does not check input types."""
+    nodeName = 'Multiply'
+    def __init__(self, name):
+        BinOpNode.__init__(self, name, '__mul__')
+
+class DivideNode(BinOpNode):
+    """Returns A / B. Does not check input types."""
+    nodeName = 'Divide'
+    def __init__(self, name):
+        # try truediv first, followed by div
+        BinOpNode.__init__(self, name, ('__truediv__', '__div__'))
+        
+
diff --git a/libs/pyqtgraph/flowchart/library/__init__.py b/libs/pyqtgraph/flowchart/library/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..d8038aa4bace6ba5ebee3e046049b4aca6ecc12a
--- /dev/null
+++ b/libs/pyqtgraph/flowchart/library/__init__.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+from ...pgcollections import OrderedDict
+import os, types
+from ...debug import printExc
+from ..NodeLibrary import NodeLibrary, isNodeClass
+from ... import reload as reload
+
+
+# Build default library
+LIBRARY = NodeLibrary()
+
+# For backward compatibility, expose the default library's properties here:
+NODE_LIST = LIBRARY.nodeList
+NODE_TREE = LIBRARY.nodeTree
+registerNodeType = LIBRARY.addNodeType
+getNodeTree = LIBRARY.getNodeTree
+getNodeType = LIBRARY.getNodeType
+
+# Add all nodes to the default library
+from . import Data, Display, Filters, Operators
+for mod in [Data, Display, Filters, Operators]:
+    nodes = [getattr(mod, name) for name in dir(mod) if isNodeClass(getattr(mod, name))]
+    for node in nodes:
+        LIBRARY.addNodeType(node, [(mod.__name__.split('.')[-1],)])
+    
+
+
+
diff --git a/libs/pyqtgraph/flowchart/library/common.py b/libs/pyqtgraph/flowchart/library/common.py
new file mode 100644
index 0000000000000000000000000000000000000000..425fe86c9fceb8534f449aa3ded1fc117cfd0d63
--- /dev/null
+++ b/libs/pyqtgraph/flowchart/library/common.py
@@ -0,0 +1,184 @@
+# -*- coding: utf-8 -*-
+from ...Qt import QtCore, QtGui
+from ...widgets.SpinBox import SpinBox
+#from ...SignalProxy import SignalProxy
+from ...WidgetGroup import WidgetGroup
+#from ColorMapper import ColorMapper
+from ..Node import Node
+import numpy as np
+from ...widgets.ColorButton import ColorButton
+try:
+    import metaarray
+    HAVE_METAARRAY = True
+except:
+    HAVE_METAARRAY = False
+
+
+def generateUi(opts):
+    """Convenience function for generating common UI types"""
+    widget = QtGui.QWidget()
+    l = QtGui.QFormLayout()
+    l.setSpacing(0)
+    widget.setLayout(l)
+    ctrls = {}
+    row = 0
+    for opt in opts:
+        if len(opt) == 2:
+            k, t = opt
+            o = {}
+        elif len(opt) == 3:
+            k, t, o = opt
+        else:
+            raise Exception("Widget specification must be (name, type) or (name, type, {opts})")
+        if t == 'intSpin':
+            w = QtGui.QSpinBox()
+            if 'max' in o:
+                w.setMaximum(o['max'])
+            if 'min' in o:
+                w.setMinimum(o['min'])
+            if 'value' in o:
+                w.setValue(o['value'])
+        elif t == 'doubleSpin':
+            w = QtGui.QDoubleSpinBox()
+            if 'max' in o:
+                w.setMaximum(o['max'])
+            if 'min' in o:
+                w.setMinimum(o['min'])                
+            if 'value' in o:
+                w.setValue(o['value'])
+        elif t == 'spin':
+            w = SpinBox()
+            w.setOpts(**o)
+        elif t == 'check':
+            w = QtGui.QCheckBox()
+            if 'checked' in o:
+                w.setChecked(o['checked'])
+        elif t == 'combo':
+            w = QtGui.QComboBox()
+            for i in o['values']:
+                w.addItem(i)
+        #elif t == 'colormap':
+            #w = ColorMapper()
+        elif t == 'color':
+            w = ColorButton()
+        else:
+            raise Exception("Unknown widget type '%s'" % str(t))
+        if 'tip' in o:
+            w.setToolTip(o['tip'])
+        w.setObjectName(k)
+        l.addRow(k, w)
+        if o.get('hidden', False):
+            w.hide()
+            label = l.labelForField(w)
+            label.hide()
+            
+        ctrls[k] = w
+        w.rowNum = row
+        row += 1
+    group = WidgetGroup(widget)
+    return widget, group, ctrls
+
+
+class CtrlNode(Node):
+    """Abstract class for nodes with auto-generated control UI"""
+    
+    sigStateChanged = QtCore.Signal(object)
+    
+    def __init__(self, name, ui=None, terminals=None):
+        if ui is None:
+            if hasattr(self, 'uiTemplate'):
+                ui = self.uiTemplate
+            else:
+                ui = []
+        if terminals is None:
+            terminals = {'In': {'io': 'in'}, 'Out': {'io': 'out', 'bypass': 'In'}}
+        Node.__init__(self, name=name, terminals=terminals)
+        
+        self.ui, self.stateGroup, self.ctrls = generateUi(ui)
+        self.stateGroup.sigChanged.connect(self.changed)
+       
+    def ctrlWidget(self):
+        return self.ui
+       
+    def changed(self):
+        self.update()
+        self.sigStateChanged.emit(self)
+
+    def process(self, In, display=True):
+        out = self.processData(In)
+        return {'Out': out}
+    
+    def saveState(self):
+        state = Node.saveState(self)
+        state['ctrl'] = self.stateGroup.state()
+        return state
+    
+    def restoreState(self, state):
+        Node.restoreState(self, state)
+        if self.stateGroup is not None:
+            self.stateGroup.setState(state.get('ctrl', {}))
+            
+    def hideRow(self, name):
+        w = self.ctrls[name]
+        l = self.ui.layout().labelForField(w)
+        w.hide()
+        l.hide()
+        
+    def showRow(self, name):
+        w = self.ctrls[name]
+        l = self.ui.layout().labelForField(w)
+        w.show()
+        l.show()
+
+
+class PlottingCtrlNode(CtrlNode):
+    """Abstract class for CtrlNodes that can connect to plots."""
+    
+    def __init__(self, name, ui=None, terminals=None):
+        #print "PlottingCtrlNode.__init__ called."
+        CtrlNode.__init__(self, name, ui=ui, terminals=terminals)
+        self.plotTerminal = self.addOutput('plot', optional=True)
+        
+    def connected(self, term, remote):
+        CtrlNode.connected(self, term, remote)
+        if term is not self.plotTerminal:
+            return
+        node = remote.node()
+        node.sigPlotChanged.connect(self.connectToPlot)
+        self.connectToPlot(node)    
+        
+    def disconnected(self, term, remote):
+        CtrlNode.disconnected(self, term, remote)
+        if term is not self.plotTerminal:
+            return
+        remote.node().sigPlotChanged.disconnect(self.connectToPlot)
+        self.disconnectFromPlot(remote.node().getPlot())   
+       
+    def connectToPlot(self, node):
+        """Define what happens when the node is connected to a plot"""
+        raise Exception("Must be re-implemented in subclass")
+    
+    def disconnectFromPlot(self, plot):
+        """Define what happens when the node is disconnected from a plot"""
+        raise Exception("Must be re-implemented in subclass")
+
+    def process(self, In, display=True):
+        out = CtrlNode.process(self, In, display)
+        out['plot'] = None
+        return out
+
+
+def metaArrayWrapper(fn):
+    def newFn(self, data, *args, **kargs):
+        if HAVE_METAARRAY and (hasattr(data, 'implements') and data.implements('MetaArray')):
+            d1 = fn(self, data.view(np.ndarray), *args, **kargs)
+            info = data.infoCopy()
+            if d1.shape != data.shape:
+                for i in range(data.ndim):
+                    if 'values' in info[i]:
+                        info[i]['values'] = info[i]['values'][:d1.shape[i]]
+            return metaarray.MetaArray(d1, info=info)
+        else:
+            return fn(self, data, *args, **kargs)
+    return newFn
+
diff --git a/libs/pyqtgraph/flowchart/library/functions.py b/libs/pyqtgraph/flowchart/library/functions.py
new file mode 100644
index 0000000000000000000000000000000000000000..338d25c41693caf6b51e83d7c24815e2fe29c7c1
--- /dev/null
+++ b/libs/pyqtgraph/flowchart/library/functions.py
@@ -0,0 +1,355 @@
+import numpy as np
+from ...metaarray import MetaArray
+
+def downsample(data, n, axis=0, xvals='subsample'):
+    """Downsample by averaging points together across axis.
+    If multiple axes are specified, runs once per axis.
+    If a metaArray is given, then the axis values can be either subsampled
+    or downsampled to match.
+    """
+    ma = None
+    if (hasattr(data, 'implements') and data.implements('MetaArray')):
+        ma = data
+        data = data.view(np.ndarray)
+        
+    
+    if hasattr(axis, '__len__'):
+        if not hasattr(n, '__len__'):
+            n = [n]*len(axis)
+        for i in range(len(axis)):
+            data = downsample(data, n[i], axis[i])
+        return data
+    
+    nPts = int(data.shape[axis] / n)
+    s = list(data.shape)
+    s[axis] = nPts
+    s.insert(axis+1, n)
+    sl = [slice(None)] * data.ndim
+    sl[axis] = slice(0, nPts*n)
+    d1 = data[tuple(sl)]
+    #print d1.shape, s
+    d1.shape = tuple(s)
+    d2 = d1.mean(axis+1)
+    
+    if ma is None:
+        return d2
+    else:
+        info = ma.infoCopy()
+        if 'values' in info[axis]:
+            if xvals == 'subsample':
+                info[axis]['values'] = info[axis]['values'][::n][:nPts]
+            elif xvals == 'downsample':
+                info[axis]['values'] = downsample(info[axis]['values'], n)
+        return MetaArray(d2, info=info)
+
+
+def applyFilter(data, b, a, padding=100, bidir=True):
+    """Apply a linear filter with coefficients a, b. Optionally pad the data before filtering
+    and/or run the filter in both directions."""
+    try:
+        import scipy.signal
+    except ImportError:
+        raise Exception("applyFilter() requires the package scipy.signal.")
+    
+    d1 = data.view(np.ndarray)
+    
+    if padding > 0:
+        d1 = np.hstack([d1[:padding], d1, d1[-padding:]])
+    
+    if bidir:
+        d1 = scipy.signal.lfilter(b, a, scipy.signal.lfilter(b, a, d1)[::-1])[::-1]
+    else:
+        d1 = scipy.signal.lfilter(b, a, d1)
+    
+    if padding > 0:
+        d1 = d1[padding:-padding]
+        
+    if (hasattr(data, 'implements') and data.implements('MetaArray')):
+        return MetaArray(d1, info=data.infoCopy())
+    else:
+        return d1
+    
+def besselFilter(data, cutoff, order=1, dt=None, btype='low', bidir=True):
+    """return data passed through bessel filter"""
+    try:
+        import scipy.signal
+    except ImportError:
+        raise Exception("besselFilter() requires the package scipy.signal.")
+    
+    if dt is None:
+        try:
+            tvals = data.xvals('Time')
+            dt = (tvals[-1]-tvals[0]) / (len(tvals)-1)
+        except:
+            dt = 1.0
+    
+    b,a = scipy.signal.bessel(order, cutoff * dt, btype=btype) 
+    
+    return applyFilter(data, b, a, bidir=bidir)
+    #base = data.mean()
+    #d1 = scipy.signal.lfilter(b, a, data.view(ndarray)-base) + base
+    #if (hasattr(data, 'implements') and data.implements('MetaArray')):
+        #return MetaArray(d1, info=data.infoCopy())
+    #return d1
+
+def butterworthFilter(data, wPass, wStop=None, gPass=2.0, gStop=20.0, order=1, dt=None, btype='low', bidir=True):
+    """return data passed through bessel filter"""
+    try:
+        import scipy.signal
+    except ImportError:
+        raise Exception("butterworthFilter() requires the package scipy.signal.")
+    
+    if dt is None:
+        try:
+            tvals = data.xvals('Time')
+            dt = (tvals[-1]-tvals[0]) / (len(tvals)-1)
+        except:
+            dt = 1.0
+    
+    if wStop is None:
+        wStop = wPass * 2.0
+    ord, Wn = scipy.signal.buttord(wPass*dt*2., wStop*dt*2., gPass, gStop)
+    #print "butterworth ord %f   Wn %f   c %f   sc %f" % (ord, Wn, cutoff, stopCutoff)
+    b,a = scipy.signal.butter(ord, Wn, btype=btype) 
+    
+    return applyFilter(data, b, a, bidir=bidir)
+
+
+def rollingSum(data, n):
+    d1 = data.copy()
+    d1[1:] += d1[:-1]  # integrate
+    d2 = np.empty(len(d1) - n + 1, dtype=data.dtype)
+    d2[0] = d1[n-1]  # copy first point
+    d2[1:] = d1[n:] - d1[:-n]  # subtract
+    return d2
+
+
+def mode(data, bins=None):
+    """Returns location max value from histogram."""
+    if bins is None:
+        bins = int(len(data)/10.)
+        if bins < 2:
+            bins = 2
+    y, x = np.histogram(data, bins=bins)
+    ind = np.argmax(y)
+    mode = 0.5 * (x[ind] + x[ind+1])
+    return mode
+    
+def modeFilter(data, window=500, step=None, bins=None):
+    """Filter based on histogram-based mode function"""
+    d1 = data.view(np.ndarray)
+    vals = []
+    l2 = int(window/2.)
+    if step is None:
+        step = l2
+    i = 0
+    while True:
+        if i > len(data)-step:
+            break
+        vals.append(mode(d1[i:i+window], bins))
+        i += step
+            
+    chunks = [np.linspace(vals[0], vals[0], l2)]
+    for i in range(len(vals)-1):
+        chunks.append(np.linspace(vals[i], vals[i+1], step))
+    remain = len(data) - step*(len(vals)-1) - l2
+    chunks.append(np.linspace(vals[-1], vals[-1], remain))
+    d2 = np.hstack(chunks)
+    
+    if (hasattr(data, 'implements') and data.implements('MetaArray')):
+        return MetaArray(d2, info=data.infoCopy())
+    return d2
+
+def denoise(data, radius=2, threshold=4):
+    """Very simple noise removal function. Compares a point to surrounding points,
+    replaces with nearby values if the difference is too large."""
+    
+    
+    r2 = radius * 2
+    d1 = data.view(np.ndarray)
+    d2 = d1[radius:] - d1[:-radius] #a derivative
+    #d3 = data[r2:] - data[:-r2]
+    #d4 = d2 - d3
+    stdev = d2.std()
+    #print "denoise: stdev of derivative:", stdev
+    mask1 = d2 > stdev*threshold #where derivative is large and positive
+    mask2 = d2 < -stdev*threshold #where derivative is large and negative
+    maskpos = mask1[:-radius] * mask2[radius:] #both need to be true
+    maskneg = mask1[radius:] * mask2[:-radius]
+    mask = maskpos + maskneg
+    d5 = np.where(mask, d1[:-r2], d1[radius:-radius]) #where both are true replace the value with the value from 2 points before
+    d6 = np.empty(d1.shape, dtype=d1.dtype) #add points back to the ends
+    d6[radius:-radius] = d5
+    d6[:radius] = d1[:radius]
+    d6[-radius:] = d1[-radius:]
+    
+    if (hasattr(data, 'implements') and data.implements('MetaArray')):
+        return MetaArray(d6, info=data.infoCopy())
+    return d6
+
+def adaptiveDetrend(data, x=None, threshold=3.0):
+    """Return the signal with baseline removed. Discards outliers from baseline measurement."""
+    try:
+        import scipy.signal
+    except ImportError:
+        raise Exception("adaptiveDetrend() requires the package scipy.signal.")
+    
+    if x is None:
+        x = data.xvals(0)
+    
+    d = data.view(np.ndarray)
+    
+    d2 = scipy.signal.detrend(d)
+    
+    stdev = d2.std()
+    mask = abs(d2) < stdev*threshold
+    #d3 = where(mask, 0, d2)
+    #d4 = d2 - lowPass(d3, cutoffs[1], dt=dt)
+    
+    lr = scipy.stats.linregress(x[mask], d[mask])
+    base = lr[1] + lr[0]*x
+    d4 = d - base
+    
+    if (hasattr(data, 'implements') and data.implements('MetaArray')):
+        return MetaArray(d4, info=data.infoCopy())
+    return d4
+    
+
+def histogramDetrend(data, window=500, bins=50, threshold=3.0, offsetOnly=False):
+    """Linear detrend. Works by finding the most common value at the beginning and end of a trace, excluding outliers.
+    If offsetOnly is True, then only the offset from the beginning of the trace is subtracted.
+    """
+    
+    d1 = data.view(np.ndarray)
+    d2 = [d1[:window], d1[-window:]]
+    v = [0, 0]
+    for i in [0, 1]:
+        d3 = d2[i]
+        stdev = d3.std()
+        mask = abs(d3-np.median(d3)) < stdev*threshold
+        d4 = d3[mask]
+        y, x = np.histogram(d4, bins=bins)
+        ind = np.argmax(y)
+        v[i] = 0.5 * (x[ind] + x[ind+1])
+        
+    if offsetOnly:
+        d3 = data.view(np.ndarray) - v[0]
+    else:
+        base = np.linspace(v[0], v[1], len(data))
+        d3 = data.view(np.ndarray) - base
+    
+    if (hasattr(data, 'implements') and data.implements('MetaArray')):
+        return MetaArray(d3, info=data.infoCopy())
+    return d3
+    
+def concatenateColumns(data):
+    """Returns a single record array with columns taken from the elements in data. 
+    data should be a list of elements, which can be either record arrays or tuples (name, type, data)
+    """
+    
+    ## first determine dtype
+    dtype = []
+    names = set()
+    maxLen = 0
+    for element in data:
+        if isinstance(element, np.ndarray):
+            ## use existing columns
+            for i in range(len(element.dtype)):
+                name = element.dtype.names[i]
+                dtype.append((name, element.dtype[i]))
+            maxLen = max(maxLen, len(element))
+        else:
+            name, type, d = element
+            if type is None:
+                type = suggestDType(d)
+            dtype.append((name, type))
+            if isinstance(d, list) or isinstance(d, np.ndarray):
+                maxLen = max(maxLen, len(d))
+        if name in names:
+            raise Exception('Name "%s" repeated' % name)
+        names.add(name)
+            
+            
+    
+    ## create empty array
+    out = np.empty(maxLen, dtype)
+    
+    ## fill columns
+    for element in data:
+        if isinstance(element, np.ndarray):
+            for i in range(len(element.dtype)):
+                name = element.dtype.names[i]
+                try:
+                    out[name] = element[name]
+                except:
+                    print("Column:", name)
+                    print("Input shape:", element.shape, element.dtype)
+                    print("Output shape:", out.shape, out.dtype)
+                    raise
+        else:
+            name, type, d = element
+            out[name] = d
+            
+    return out
+    
+def suggestDType(x):
+    """Return a suitable dtype for x"""
+    if isinstance(x, list) or isinstance(x, tuple):
+        if len(x) == 0:
+            raise Exception('can not determine dtype for empty list')
+        x = x[0]
+        
+    if hasattr(x, 'dtype'):
+        return x.dtype
+    elif isinstance(x, float):
+        return float
+    elif isinstance(x, int):
+        return int
+    #elif isinstance(x, basestring):  ## don't try to guess correct string length; use object instead.
+        #return '<U%d' % len(x)
+    else:
+        return object
+
+def removePeriodic(data, f0=60.0, dt=None, harmonics=10, samples=4):
+    if (hasattr(data, 'implements') and data.implements('MetaArray')):
+        data1 = data.asarray()
+        if dt is None:
+            times = data.xvals('Time')
+            dt = times[1]-times[0]
+    else:
+        data1 = data
+        if dt is None:
+            raise Exception('Must specify dt for this data')
+    
+    ft = np.fft.fft(data1)
+    
+    ## determine frequencies in fft data
+    df = 1.0 / (len(data1) * dt)
+    freqs = np.linspace(0.0, (len(ft)-1) * df, len(ft))
+    
+    ## flatten spikes at f0 and harmonics
+    for i in xrange(1, harmonics + 2):
+        f = f0 * i # target frequency
+        
+        ## determine index range to check for this frequency
+        ind1 = int(np.floor(f / df))
+        ind2 = int(np.ceil(f / df)) + (samples-1)
+        if ind1 > len(ft)/2.:
+            break
+        mag = (abs(ft[ind1-1]) + abs(ft[ind2+1])) * 0.5
+        for j in range(ind1, ind2+1):
+            phase = np.angle(ft[j])   ## Must preserve the phase of each point, otherwise any transients in the trace might lead to large artifacts.
+            re = mag * np.cos(phase)
+            im = mag * np.sin(phase)
+            ft[j] = re + im*1j
+            ft[len(ft)-j] = re - im*1j
+            
+    data2 = np.fft.ifft(ft).real
+    
+    if (hasattr(data, 'implements') and data.implements('MetaArray')):
+        return metaarray.MetaArray(data2, info=data.infoCopy())
+    else:
+        return data2
+    
+    
+    
\ No newline at end of file
diff --git a/libs/pyqtgraph/frozenSupport.py b/libs/pyqtgraph/frozenSupport.py
new file mode 100644
index 0000000000000000000000000000000000000000..c42a12e14a368adefc9935adc9b9676984064d82
--- /dev/null
+++ b/libs/pyqtgraph/frozenSupport.py
@@ -0,0 +1,52 @@
+## Definitions helpful in frozen environments (eg py2exe)
+import os, sys, zipfile
+
+def listdir(path):
+    """Replacement for os.listdir that works in frozen environments."""
+    if not hasattr(sys, 'frozen'):
+        return os.listdir(path)
+    
+    (zipPath, archivePath) = splitZip(path)
+    if archivePath is None:
+        return os.listdir(path)
+    
+    with zipfile.ZipFile(zipPath, "r") as zipobj:
+        contents = zipobj.namelist()
+    results = set()
+    for name in contents:
+        # components in zip archive paths are always separated by forward slash
+        if name.startswith(archivePath) and len(name) > len(archivePath):
+            name = name[len(archivePath):].split('/')[0]
+            results.add(name)
+    return list(results)
+
+def isdir(path):
+    """Replacement for os.path.isdir that works in frozen environments."""
+    if not hasattr(sys, 'frozen'):
+        return os.path.isdir(path)
+    
+    (zipPath, archivePath) = splitZip(path)
+    if archivePath is None:
+        return os.path.isdir(path)
+    with zipfile.ZipFile(zipPath, "r") as zipobj:
+        contents = zipobj.namelist()
+    archivePath = archivePath.rstrip('/') + '/'   ## make sure there's exactly one '/' at the end
+    for c in contents:
+        if c.startswith(archivePath):
+            return True
+    return False
+    
+    
+def splitZip(path):
+    """Splits a path containing a zip file into (zipfile, subpath).
+    If there is no zip file, returns (path, None)"""
+    components = os.path.normpath(path).split(os.sep)
+    for index, component in enumerate(components):
+        if component.endswith('.zip'):
+            zipPath = os.sep.join(components[0:index+1])
+            archivePath = ''.join([x+'/' for x in components[index+1:]])
+            return (zipPath, archivePath)
+    else:
+        return (path, None)
+    
+    
\ No newline at end of file
diff --git a/libs/pyqtgraph/functions.py b/libs/pyqtgraph/functions.py
new file mode 100644
index 0000000000000000000000000000000000000000..c22227d3fad1d318e5226d58e641c3f3dc925ed9
--- /dev/null
+++ b/libs/pyqtgraph/functions.py
@@ -0,0 +1,2253 @@
+# -*- coding: utf-8 -*-
+"""
+functions.py -  Miscellaneous functions with no other home
+Copyright 2010  Luke Campagnola
+Distributed under MIT/X11 license. See license.txt for more infomation.
+"""
+
+from __future__ import division
+from .python2_3 import asUnicode
+from .Qt import QtGui, QtCore, USE_PYSIDE
+Colors = {
+    'b': QtGui.QColor(0,0,255,255),
+    'g': QtGui.QColor(0,255,0,255),
+    'r': QtGui.QColor(255,0,0,255),
+    'c': QtGui.QColor(0,255,255,255),
+    'm': QtGui.QColor(255,0,255,255),
+    'y': QtGui.QColor(255,255,0,255),
+    'k': QtGui.QColor(0,0,0,255),
+    'w': QtGui.QColor(255,255,255,255),
+    'd': QtGui.QColor(150,150,150,255),
+    'l': QtGui.QColor(200,200,200,255),
+    's': QtGui.QColor(100,100,150,255),
+}  
+
+SI_PREFIXES = asUnicode('yzafpnµm kMGTPEZY')
+SI_PREFIXES_ASCII = 'yzafpnum kMGTPEZY'
+
+
+
+from .Qt import QtGui, QtCore, USE_PYSIDE
+from . import getConfigOption, setConfigOptions
+import numpy as np
+import decimal, re
+import ctypes
+import sys, struct
+
+from . import debug
+
+def siScale(x, minVal=1e-25, allowUnicode=True):
+    """
+    Return the recommended scale factor and SI prefix string for x.
+    
+    Example::
+    
+        siScale(0.0001)   # returns (1e6, 'μ')
+        # This indicates that the number 0.0001 is best represented as 0.0001 * 1e6 = 100 μUnits
+    """
+    
+    if isinstance(x, decimal.Decimal):
+        x = float(x)
+        
+    try:
+        if np.isnan(x) or np.isinf(x):
+            return(1, '')
+    except:
+        print(x, type(x))
+        raise
+    if abs(x) < minVal:
+        m = 0
+        x = 0
+    else:
+        m = int(np.clip(np.floor(np.log(abs(x))/np.log(1000)), -9.0, 9.0))
+    
+    if m == 0:
+        pref = ''
+    elif m < -8 or m > 8:
+        pref = 'e%d' % (m*3)
+    else:
+        if allowUnicode:
+            pref = SI_PREFIXES[m+8]
+        else:
+            pref = SI_PREFIXES_ASCII[m+8]
+    p = .001**m
+    
+    return (p, pref)    
+
+def siFormat(x, precision=3, suffix='', space=True, error=None, minVal=1e-25, allowUnicode=True):
+    """
+    Return the number x formatted in engineering notation with SI prefix.
+    
+    Example::
+        siFormat(0.0001, suffix='V')  # returns "100 μV"
+    """
+    
+    if space is True:
+        space = ' '
+    if space is False:
+        space = ''
+        
+    
+    (p, pref) = siScale(x, minVal, allowUnicode)
+    if not (len(pref) > 0 and pref[0] == 'e'):
+        pref = space + pref
+    
+    if error is None:
+        fmt = "%." + str(precision) + "g%s%s"
+        return fmt % (x*p, pref, suffix)
+    else:
+        if allowUnicode:
+            plusminus = space + asUnicode("±") + space
+        else:
+            plusminus = " +/- "
+        fmt = "%." + str(precision) + "g%s%s%s%s"
+        return fmt % (x*p, pref, suffix, plusminus, siFormat(error, precision=precision, suffix=suffix, space=space, minVal=minVal))
+    
+def siEval(s):
+    """
+    Convert a value written in SI notation to its equivalent prefixless value
+    
+    Example::
+    
+        siEval("100 μV")  # returns 0.0001
+    """
+    
+    s = asUnicode(s)
+    m = re.match(r'(-?((\d+(\.\d*)?)|(\.\d+))([eE]-?\d+)?)\s*([u' + SI_PREFIXES + r']?).*$', s)
+    if m is None:
+        raise Exception("Can't convert string '%s' to number." % s)
+    v = float(m.groups()[0])
+    p = m.groups()[6]
+    #if p not in SI_PREFIXES:
+        #raise Exception("Can't convert string '%s' to number--unknown prefix." % s)
+    if p ==  '':
+        n = 0
+    elif p == 'u':
+        n = -2
+    else:
+        n = SI_PREFIXES.index(p) - 8
+    return v * 1000**n
+    
+
+class Color(QtGui.QColor):
+    def __init__(self, *args):
+        QtGui.QColor.__init__(self, mkColor(*args))
+        
+    def glColor(self):
+        """Return (r,g,b,a) normalized for use in opengl"""
+        return (self.red()/255., self.green()/255., self.blue()/255., self.alpha()/255.)
+        
+    def __getitem__(self, ind):
+        return (self.red, self.green, self.blue, self.alpha)[ind]()
+        
+    
+def mkColor(*args):
+    """
+    Convenience function for constructing QColor from a variety of argument types. Accepted arguments are:
+    
+    ================ ================================================
+     'c'             one of: r, g, b, c, m, y, k, w                      
+     R, G, B, [A]    integers 0-255
+     (R, G, B, [A])  tuple of integers 0-255
+     float           greyscale, 0.0-1.0
+     int             see :func:`intColor() <pyqtgraph.intColor>`
+     (int, hues)     see :func:`intColor() <pyqtgraph.intColor>`
+     "RGB"           hexadecimal strings; may begin with '#'
+     "RGBA"          
+     "RRGGBB"       
+     "RRGGBBAA"     
+     QColor          QColor instance; makes a copy.
+    ================ ================================================
+    """
+    err = 'Not sure how to make a color from "%s"' % str(args)
+    if len(args) == 1:
+        if isinstance(args[0], basestring):
+            c = args[0]
+            if c[0] == '#':
+                c = c[1:]
+            if len(c) == 1:
+                try:
+                    return Colors[c]
+                except KeyError:
+                    raise Exception('No color named "%s"' % c)
+            if len(c) == 3:
+                r = int(c[0]*2, 16)
+                g = int(c[1]*2, 16)
+                b = int(c[2]*2, 16)
+                a = 255
+            elif len(c) == 4:
+                r = int(c[0]*2, 16)
+                g = int(c[1]*2, 16)
+                b = int(c[2]*2, 16)
+                a = int(c[3]*2, 16)
+            elif len(c) == 6:
+                r = int(c[0:2], 16)
+                g = int(c[2:4], 16)
+                b = int(c[4:6], 16)
+                a = 255
+            elif len(c) == 8:
+                r = int(c[0:2], 16)
+                g = int(c[2:4], 16)
+                b = int(c[4:6], 16)
+                a = int(c[6:8], 16)
+        elif isinstance(args[0], QtGui.QColor):
+            return QtGui.QColor(args[0])
+        elif isinstance(args[0], float):
+            r = g = b = int(args[0] * 255)
+            a = 255
+        elif hasattr(args[0], '__len__'):
+            if len(args[0]) == 3:
+                (r, g, b) = args[0]
+                a = 255
+            elif len(args[0]) == 4:
+                (r, g, b, a) = args[0]
+            elif len(args[0]) == 2:
+                return intColor(*args[0])
+            else:
+                raise Exception(err)
+        elif type(args[0]) == int:
+            return intColor(args[0])
+        else:
+            raise Exception(err)
+    elif len(args) == 3:
+        (r, g, b) = args
+        a = 255
+    elif len(args) == 4:
+        (r, g, b, a) = args
+    else:
+        raise Exception(err)
+    
+    args = [r,g,b,a]
+    args = [0 if np.isnan(a) or np.isinf(a) else a for a in args]
+    args = list(map(int, args))
+    return QtGui.QColor(*args)
+
+
+def mkBrush(*args, **kwds):
+    """
+    | Convenience function for constructing Brush.
+    | This function always constructs a solid brush and accepts the same arguments as :func:`mkColor() <pyqtgraph.mkColor>`
+    | Calling mkBrush(None) returns an invisible brush.
+    """
+    if 'color' in kwds:
+        color = kwds['color']
+    elif len(args) == 1:
+        arg = args[0]
+        if arg is None:
+            return QtGui.QBrush(QtCore.Qt.NoBrush)
+        elif isinstance(arg, QtGui.QBrush):
+            return QtGui.QBrush(arg)
+        else:
+            color = arg
+    elif len(args) > 1:
+        color = args
+    return QtGui.QBrush(mkColor(color))
+
+def mkPen(*args, **kargs):
+    """
+    Convenience function for constructing QPen. 
+    
+    Examples::
+    
+        mkPen(color)
+        mkPen(color, width=2)
+        mkPen(cosmetic=False, width=4.5, color='r')
+        mkPen({'color': "FF0", width: 2})
+        mkPen(None)   # (no pen)
+    
+    In these examples, *color* may be replaced with any arguments accepted by :func:`mkColor() <pyqtgraph.mkColor>`    """
+    
+    color = kargs.get('color', None)
+    width = kargs.get('width', 1)
+    style = kargs.get('style', None)
+    dash = kargs.get('dash', None)
+    cosmetic = kargs.get('cosmetic', True)
+    hsv = kargs.get('hsv', None)
+    
+    if len(args) == 1:
+        arg = args[0]
+        if isinstance(arg, dict):
+            return mkPen(**arg)
+        if isinstance(arg, QtGui.QPen):
+            return QtGui.QPen(arg)  ## return a copy of this pen
+        elif arg is None:
+            style = QtCore.Qt.NoPen
+        else:
+            color = arg
+    if len(args) > 1:
+        color = args
+        
+    if color is None:
+        color = mkColor('l')
+    if hsv is not None:
+        color = hsvColor(*hsv)
+    else:
+        color = mkColor(color)
+        
+    pen = QtGui.QPen(QtGui.QBrush(color), width)
+    pen.setCosmetic(cosmetic)
+    if style is not None:
+        pen.setStyle(style)
+    if dash is not None:
+        pen.setDashPattern(dash)
+    return pen
+
+def hsvColor(hue, sat=1.0, val=1.0, alpha=1.0):
+    """Generate a QColor from HSVa values. (all arguments are float 0.0-1.0)"""
+    c = QtGui.QColor()
+    c.setHsvF(hue, sat, val, alpha)
+    return c
+
+    
+def colorTuple(c):
+    """Return a tuple (R,G,B,A) from a QColor"""
+    return (c.red(), c.green(), c.blue(), c.alpha())
+
+def colorStr(c):
+    """Generate a hex string code from a QColor"""
+    return ('%02x'*4) % colorTuple(c)
+
+def intColor(index, hues=9, values=1, maxValue=255, minValue=150, maxHue=360, minHue=0, sat=255, alpha=255, **kargs):
+    """
+    Creates a QColor from a single index. Useful for stepping through a predefined list of colors.
+    
+    The argument *index* determines which color from the set will be returned. All other arguments determine what the set of predefined colors will be
+     
+    Colors are chosen by cycling across hues while varying the value (brightness). 
+    By default, this selects from a list of 9 hues."""
+    hues = int(hues)
+    values = int(values)
+    ind = int(index) % (hues * values)
+    indh = ind % hues
+    indv = ind / hues
+    if values > 1:
+        v = minValue + indv * ((maxValue-minValue) / (values-1))
+    else:
+        v = maxValue
+    h = minHue + (indh * (maxHue-minHue)) / hues
+    
+    c = QtGui.QColor()
+    c.setHsv(h, sat, v)
+    c.setAlpha(alpha)
+    return c
+
+def glColor(*args, **kargs):
+    """
+    Convert a color to OpenGL color format (r,g,b,a) floats 0.0-1.0
+    Accepts same arguments as :func:`mkColor <pyqtgraph.mkColor>`.
+    """
+    c = mkColor(*args, **kargs)
+    return (c.red()/255., c.green()/255., c.blue()/255., c.alpha()/255.)
+
+    
+
+def makeArrowPath(headLen=20, tipAngle=20, tailLen=20, tailWidth=3, baseAngle=0):
+    """
+    Construct a path outlining an arrow with the given dimensions.
+    The arrow points in the -x direction with tip positioned at 0,0.
+    If *tipAngle* is supplied (in degrees), it overrides *headWidth*.
+    If *tailLen* is None, no tail will be drawn.
+    """
+    headWidth = headLen * np.tan(tipAngle * 0.5 * np.pi/180.)
+    path = QtGui.QPainterPath()
+    path.moveTo(0,0)
+    path.lineTo(headLen, -headWidth)
+    if tailLen is None:
+        innerY = headLen - headWidth * np.tan(baseAngle*np.pi/180.)
+        path.lineTo(innerY, 0)
+    else:
+        tailWidth *= 0.5
+        innerY = headLen - (headWidth-tailWidth) * np.tan(baseAngle*np.pi/180.)
+        path.lineTo(innerY, -tailWidth)
+        path.lineTo(headLen + tailLen, -tailWidth)
+        path.lineTo(headLen + tailLen, tailWidth)
+        path.lineTo(innerY, tailWidth)
+    path.lineTo(headLen, headWidth)
+    path.lineTo(0,0)
+    return path
+    
+    
+    
+def affineSlice(data, shape, origin, vectors, axes, order=1, returnCoords=False, **kargs):
+    """
+    Take a slice of any orientation through an array. This is useful for extracting sections of multi-dimensional arrays such as MRI images for viewing as 1D or 2D data.
+    
+    The slicing axes are aribtrary; they do not need to be orthogonal to the original data or even to each other. It is possible to use this function to extract arbitrary linear, rectangular, or parallelepiped shapes from within larger datasets. The original data is interpolated onto a new array of coordinates using scipy.ndimage.map_coordinates if it is available (see the scipy documentation for more information about this). If scipy is not available, then a slower implementation of map_coordinates is used.
+    
+    For a graphical interface to this function, see :func:`ROI.getArrayRegion <pyqtgraph.ROI.getArrayRegion>`
+    
+    ==============  ====================================================================================================
+    **Arguments:**
+    *data*          (ndarray) the original dataset
+    *shape*         the shape of the slice to take (Note the return value may have more dimensions than len(shape))
+    *origin*        the location in the original dataset that will become the origin of the sliced data.
+    *vectors*       list of unit vectors which point in the direction of the slice axes. Each vector must have the same 
+                    length as *axes*. If the vectors are not unit length, the result will be scaled relative to the 
+                    original data. If the vectors are not orthogonal, the result will be sheared relative to the 
+                    original data.
+    *axes*          The axes in the original dataset which correspond to the slice *vectors*
+    *order*         The order of spline interpolation. Default is 1 (linear). See scipy.ndimage.map_coordinates
+                    for more information.
+    *returnCoords*  If True, return a tuple (result, coords) where coords is the array of coordinates used to select
+                    values from the original dataset.
+    *All extra keyword arguments are passed to scipy.ndimage.map_coordinates.*
+    --------------------------------------------------------------------------------------------------------------------
+    ==============  ====================================================================================================
+    
+    Note the following must be true: 
+        
+        | len(shape) == len(vectors) 
+        | len(origin) == len(axes) == len(vectors[i])
+        
+    Example: start with a 4D fMRI data set, take a diagonal-planar slice out of the last 3 axes
+        
+        * data = array with dims (time, x, y, z) = (100, 40, 40, 40)
+        * The plane to pull out is perpendicular to the vector (x,y,z) = (1,1,1) 
+        * The origin of the slice will be at (x,y,z) = (40, 0, 0)
+        * We will slice a 20x20 plane from each timepoint, giving a final shape (100, 20, 20)
+        
+    The call for this example would look like::
+        
+        affineSlice(data, shape=(20,20), origin=(40,0,0), vectors=((-1, 1, 0), (-1, 0, 1)), axes=(1,2,3))
+    
+    """
+    try:
+        import scipy.ndimage
+        have_scipy = True
+    except ImportError:
+        have_scipy = False
+    have_scipy = False
+
+    # sanity check
+    if len(shape) != len(vectors):
+        raise Exception("shape and vectors must have same length.")
+    if len(origin) != len(axes):
+        raise Exception("origin and axes must have same length.")
+    for v in vectors:
+        if len(v) != len(axes):
+            raise Exception("each vector must be same length as axes.")
+        
+    shape = list(map(np.ceil, shape))
+
+    ## transpose data so slice axes come first
+    trAx = list(range(data.ndim))
+    for x in axes:
+        trAx.remove(x)
+    tr1 = tuple(axes) + tuple(trAx)
+    data = data.transpose(tr1)
+    #print "tr1:", tr1
+    ## dims are now [(slice axes), (other axes)]
+    
+    ## make sure vectors are arrays
+    if not isinstance(vectors, np.ndarray):
+        vectors = np.array(vectors)
+    if not isinstance(origin, np.ndarray):
+        origin = np.array(origin)
+    origin.shape = (len(axes),) + (1,)*len(shape)
+    
+    ## Build array of sample locations. 
+    grid = np.mgrid[tuple([slice(0,x) for x in shape])]  ## mesh grid of indexes
+    x = (grid[np.newaxis,...] * vectors.transpose()[(Ellipsis,) + (np.newaxis,)*len(shape)]).sum(axis=1)  ## magic
+    x += origin
+
+    ## iterate manually over unused axes since map_coordinates won't do it for us
+    if have_scipy:
+        extraShape = data.shape[len(axes):]
+        output = np.empty(tuple(shape) + extraShape, dtype=data.dtype)
+        for inds in np.ndindex(*extraShape):
+            ind = (Ellipsis,) + inds
+            output[ind] = scipy.ndimage.map_coordinates(data[ind], x, order=order, **kargs)
+    else:
+        # map_coordinates expects the indexes as the first axis, whereas
+        # interpolateArray expects indexes at the last axis. 
+        tr = tuple(range(1,x.ndim)) + (0,)
+        output = interpolateArray(data, x.transpose(tr))
+    
+    tr = list(range(output.ndim))
+    trb = []
+    for i in range(min(axes)):
+        ind = tr1.index(i) + (len(shape)-len(axes))
+        tr.remove(ind)
+        trb.append(ind)
+    tr2 = tuple(trb+tr)
+
+    ## Untranspose array before returning
+    output = output.transpose(tr2)
+    if returnCoords:
+        return (output, x)
+    else:
+        return output
+
+def interpolateArray(data, x, default=0.0):
+    """
+    N-dimensional interpolation similar to scipy.ndimage.map_coordinates.
+    
+    This function returns linearly-interpolated values sampled from a regular
+    grid of data. 
+    
+    *data* is an array of any shape containing the values to be interpolated.
+    *x* is an array with (shape[-1] <= data.ndim) containing the locations
+        within *data* to interpolate. 
+    
+    Returns array of shape (x.shape[:-1] + data.shape[x.shape[-1]:])
+    
+    For example, assume we have the following 2D image data::
+    
+        >>> data = np.array([[1,   2,   4  ],
+                             [10,  20,  40 ],
+                             [100, 200, 400]])
+        
+    To compute a single interpolated point from this data::
+        
+        >>> x = np.array([(0.5, 0.5)])
+        >>> interpolateArray(data, x)
+        array([ 8.25])
+        
+    To compute a 1D list of interpolated locations:: 
+        
+        >>> x = np.array([(0.5, 0.5),
+                          (1.0, 1.0),
+                          (1.0, 2.0),
+                          (1.5, 0.0)])
+        >>> interpolateArray(data, x)
+        array([  8.25,  20.  ,  40.  ,  55.  ])
+        
+    To compute a 2D array of interpolated locations::
+    
+        >>> x = np.array([[(0.5, 0.5), (1.0, 2.0)],
+                          [(1.0, 1.0), (1.5, 0.0)]])
+        >>> interpolateArray(data, x)
+        array([[  8.25,  40.  ],
+               [ 20.  ,  55.  ]])
+               
+    ..and so on. The *x* argument may have any shape as long as 
+    ```x.shape[-1] <= data.ndim```. In the case that 
+    ```x.shape[-1] < data.ndim```, then the remaining axes are simply 
+    broadcasted as usual. For example, we can interpolate one location
+    from an entire row of the data::
+    
+        >>> x = np.array([[0.5]])
+        >>> interpolateArray(data, x)
+        array([[  5.5,  11. ,  22. ]])
+
+    This is useful for interpolating from arrays of colors, vertexes, etc.
+    """
+    prof = debug.Profiler()
+    
+    nd = data.ndim
+    md = x.shape[-1]
+    if md > nd:
+        raise TypeError("x.shape[-1] must be less than or equal to data.ndim")
+
+    # First we generate arrays of indexes that are needed to 
+    # extract the data surrounding each point
+    fields = np.mgrid[(slice(0,2),) * md]
+    xmin = np.floor(x).astype(int)
+    xmax = xmin + 1
+    indexes = np.concatenate([xmin[np.newaxis, ...], xmax[np.newaxis, ...]])
+    fieldInds = []
+    totalMask = np.ones(x.shape[:-1], dtype=bool) # keep track of out-of-bound indexes
+    for ax in range(md):
+        mask = (xmin[...,ax] >= 0) & (x[...,ax] <= data.shape[ax]-1) 
+        # keep track of points that need to be set to default
+        totalMask &= mask
+        
+        # ..and keep track of indexes that are out of bounds 
+        # (note that when x[...,ax] == data.shape[ax], then xmax[...,ax] will be out
+        #  of bounds, but the interpolation will work anyway)
+        mask &= (xmax[...,ax] < data.shape[ax])
+        axisIndex = indexes[...,ax][fields[ax]]
+        axisIndex[axisIndex < 0] = 0
+        axisIndex[axisIndex >= data.shape[ax]] = 0
+        fieldInds.append(axisIndex)
+    prof()
+
+    # Get data values surrounding each requested point
+    fieldData = data[tuple(fieldInds)]
+    prof()
+    
+    ## Interpolate
+    s = np.empty((md,) + fieldData.shape, dtype=float)
+    dx = x - xmin
+    # reshape fields for arithmetic against dx
+    for ax in range(md):
+        f1 = fields[ax].reshape(fields[ax].shape + (1,)*(dx.ndim-1))
+        sax = f1 * dx[...,ax] + (1-f1) * (1-dx[...,ax])
+        sax = sax.reshape(sax.shape + (1,) * (s.ndim-1-sax.ndim))
+        s[ax] = sax
+    s = np.product(s, axis=0)
+    result = fieldData * s
+    for i in range(md):
+        result = result.sum(axis=0)
+
+    prof()
+
+    if totalMask.ndim > 0:
+        result[~totalMask] = default
+    else:
+        if totalMask is False:
+            result[:] = default
+
+    prof()
+    return result
+
+
+def subArray(data, offset, shape, stride):
+    """
+    Unpack a sub-array from *data* using the specified offset, shape, and stride.
+    
+    Note that *stride* is specified in array elements, not bytes.
+    For example, we have a 2x3 array packed in a 1D array as follows::
+    
+        data = [_, _, 00, 01, 02, _, 10, 11, 12, _]
+        
+    Then we can unpack the sub-array with this call::
+    
+        subArray(data, offset=2, shape=(2, 3), stride=(4, 1))
+        
+    ..which returns::
+    
+        [[00, 01, 02],
+         [10, 11, 12]]
+         
+    This function operates only on the first axis of *data*. So changing 
+    the input in the example above to have shape (10, 7) would cause the
+    output to have shape (2, 3, 7).
+    """
+    #data = data.flatten()
+    data = data[offset:]
+    shape = tuple(shape)
+    stride = tuple(stride)
+    extraShape = data.shape[1:]
+    #print data.shape, offset, shape, stride
+    for i in range(len(shape)):
+        mask = (slice(None),) * i + (slice(None, shape[i] * stride[i]),)
+        newShape = shape[:i+1]
+        if i < len(shape)-1:
+            newShape += (stride[i],)
+        newShape += extraShape 
+        #print i, mask, newShape
+        #print "start:\n", data.shape, data
+        data = data[mask]
+        #print "mask:\n", data.shape, data
+        data = data.reshape(newShape)
+        #print "reshape:\n", data.shape, data
+    
+    return data
+
+
+def transformToArray(tr):
+    """
+    Given a QTransform, return a 3x3 numpy array.
+    Given a QMatrix4x4, return a 4x4 numpy array.
+    
+    Example: map an array of x,y coordinates through a transform::
+    
+        ## coordinates to map are (1,5), (2,6), (3,7), and (4,8)
+        coords = np.array([[1,2,3,4], [5,6,7,8], [1,1,1,1]])  # the extra '1' coordinate is needed for translation to work
+        
+        ## Make an example transform
+        tr = QtGui.QTransform()
+        tr.translate(3,4)
+        tr.scale(2, 0.1)
+        
+        ## convert to array
+        m = pg.transformToArray()[:2]  # ignore the perspective portion of the transformation
+        
+        ## map coordinates through transform
+        mapped = np.dot(m, coords)
+    """
+    #return np.array([[tr.m11(), tr.m12(), tr.m13()],[tr.m21(), tr.m22(), tr.m23()],[tr.m31(), tr.m32(), tr.m33()]])
+    ## The order of elements given by the method names m11..m33 is misleading--
+    ## It is most common for x,y translation to occupy the positions 1,3 and 2,3 in
+    ## a transformation matrix. However, with QTransform these values appear at m31 and m32.
+    ## So the correct interpretation is transposed:
+    if isinstance(tr, QtGui.QTransform):
+        return np.array([[tr.m11(), tr.m21(), tr.m31()], [tr.m12(), tr.m22(), tr.m32()], [tr.m13(), tr.m23(), tr.m33()]])
+    elif isinstance(tr, QtGui.QMatrix4x4):
+        return np.array(tr.copyDataTo()).reshape(4,4)
+    else:
+        raise Exception("Transform argument must be either QTransform or QMatrix4x4.")
+
+def transformCoordinates(tr, coords, transpose=False):
+    """
+    Map a set of 2D or 3D coordinates through a QTransform or QMatrix4x4.
+    The shape of coords must be (2,...) or (3,...)
+    The mapping will _ignore_ any perspective transformations.
+    
+    For coordinate arrays with ndim=2, this is basically equivalent to matrix multiplication.
+    Most arrays, however, prefer to put the coordinate axis at the end (eg. shape=(...,3)). To 
+    allow this, use transpose=True.
+    
+    """
+    
+    if transpose:
+        ## move last axis to beginning. This transposition will be reversed before returning the mapped coordinates.
+        coords = coords.transpose((coords.ndim-1,) + tuple(range(0,coords.ndim-1)))
+    
+    nd = coords.shape[0]
+    if isinstance(tr, np.ndarray):
+        m = tr
+    else:
+        m = transformToArray(tr)
+        m = m[:m.shape[0]-1]  # remove perspective
+    
+    ## If coords are 3D and tr is 2D, assume no change for Z axis
+    if m.shape == (2,3) and nd == 3:
+        m2 = np.zeros((3,4))
+        m2[:2, :2] = m[:2,:2]
+        m2[:2, 3] = m[:2,2]
+        m2[2,2] = 1
+        m = m2
+    
+    ## if coords are 2D and tr is 3D, ignore Z axis
+    if m.shape == (3,4) and nd == 2:
+        m2 = np.empty((2,3))
+        m2[:,:2] = m[:2,:2]
+        m2[:,2] = m[:2,3]
+        m = m2
+    
+    ## reshape tr and coords to prepare for multiplication
+    m = m.reshape(m.shape + (1,)*(coords.ndim-1))
+    coords = coords[np.newaxis, ...]
+    
+    # separate scale/rotate and translation    
+    translate = m[:,-1]  
+    m = m[:, :-1]
+    
+    ## map coordinates and return
+    mapped = (m*coords).sum(axis=1)  ## apply scale/rotate
+    mapped += translate
+    
+    if transpose:
+        ## move first axis to end.
+        mapped = mapped.transpose(tuple(range(1,mapped.ndim)) + (0,))
+    return mapped
+    
+    
+
+    
+def solve3DTransform(points1, points2):
+    """
+    Find a 3D transformation matrix that maps points1 onto points2.
+    Points must be specified as either lists of 4 Vectors or 
+    (4, 3) arrays.
+    """
+    import numpy.linalg
+    pts = []
+    for inp in (points1, points2):
+        if isinstance(inp, np.ndarray):
+            A = np.empty((4,4), dtype=float)
+            A[:,:3] = inp[:,:3]
+            A[:,3] = 1.0
+        else:
+            A = np.array([[inp[i].x(), inp[i].y(), inp[i].z(), 1] for i in range(4)])
+        pts.append(A)
+    
+    ## solve 3 sets of linear equations to determine transformation matrix elements
+    matrix = np.zeros((4,4))
+    for i in range(3):
+        ## solve Ax = B; x is one row of the desired transformation matrix
+        matrix[i] = numpy.linalg.solve(pts[0], pts[1][:,i])  
+    
+    return matrix
+    
+def solveBilinearTransform(points1, points2):
+    """
+    Find a bilinear transformation matrix (2x4) that maps points1 onto points2.
+    Points must be specified as a list of 4 Vector, Point, QPointF, etc.
+    
+    To use this matrix to map a point [x,y]::
+    
+        mapped = np.dot(matrix, [x*y, x, y, 1])
+    """
+    import numpy.linalg
+    ## A is 4 rows (points) x 4 columns (xy, x, y, 1)
+    ## B is 4 rows (points) x 2 columns (x, y)
+    A = np.array([[points1[i].x()*points1[i].y(), points1[i].x(), points1[i].y(), 1] for i in range(4)])
+    B = np.array([[points2[i].x(), points2[i].y()] for i in range(4)])
+    
+    ## solve 2 sets of linear equations to determine transformation matrix elements
+    matrix = np.zeros((2,4))
+    for i in range(2):
+        matrix[i] = numpy.linalg.solve(A, B[:,i])  ## solve Ax = B; x is one row of the desired transformation matrix
+    
+    return matrix
+    
+def rescaleData(data, scale, offset, dtype=None):
+    """Return data rescaled and optionally cast to a new dtype::
+    
+        data => (data-offset) * scale
+        
+    Uses scipy.weave (if available) to improve performance.
+    """
+    if dtype is None:
+        dtype = data.dtype
+    else:
+        dtype = np.dtype(dtype)
+    
+    try:
+        if not getConfigOption('useWeave'):
+            raise Exception('Weave is disabled; falling back to slower version.')
+        try:
+            import scipy.weave
+        except ImportError:
+            raise Exception('scipy.weave is not importable; falling back to slower version.')
+        
+        ## require native dtype when using weave
+        if not data.dtype.isnative:
+            data = data.astype(data.dtype.newbyteorder('='))
+        if not dtype.isnative:
+            weaveDtype = dtype.newbyteorder('=')
+        else:
+            weaveDtype = dtype
+        
+        newData = np.empty((data.size,), dtype=weaveDtype)
+        flat = np.ascontiguousarray(data).reshape(data.size)
+        size = data.size
+        
+        code = """
+        double sc = (double)scale;
+        double off = (double)offset;
+        for( int i=0; i<size; i++ ) {
+            newData[i] = ((double)flat[i] - off) * sc;
+        }
+        """
+        scipy.weave.inline(code, ['flat', 'newData', 'size', 'offset', 'scale'], compiler='gcc')
+        if dtype != weaveDtype:
+            newData = newData.astype(dtype)
+        data = newData.reshape(data.shape)
+    except:
+        if getConfigOption('useWeave'):
+            if getConfigOption('weaveDebug'):
+                debug.printExc("Error; disabling weave.")
+            setConfigOptions(useWeave=False)
+        
+        #p = np.poly1d([scale, -offset*scale])
+        #data = p(data).astype(dtype)
+        d2 = data-offset
+        d2 *= scale
+        data = d2.astype(dtype)
+    return data
+    
+def applyLookupTable(data, lut):
+    """
+    Uses values in *data* as indexes to select values from *lut*.
+    The returned data has shape data.shape + lut.shape[1:]
+    
+    Note: color gradient lookup tables can be generated using GradientWidget.
+    """
+    if data.dtype.kind not in ('i', 'u'):
+        data = data.astype(int)
+    
+    return np.take(lut, data, axis=0, mode='clip')  
+    
+
+def makeRGBA(*args, **kwds):
+    """Equivalent to makeARGB(..., useRGBA=True)"""
+    kwds['useRGBA'] = True
+    return makeARGB(*args, **kwds)
+
+def makeARGB(data, lut=None, levels=None, scale=None, useRGBA=False): 
+    """ 
+    Convert an array of values into an ARGB array suitable for building QImages, OpenGL textures, etc.
+    
+    Returns the ARGB array (values 0-255) and a boolean indicating whether there is alpha channel data.
+    This is a two stage process:
+    
+        1) Rescale the data based on the values in the *levels* argument (min, max).
+        2) Determine the final output by passing the rescaled values through a lookup table.
+   
+    Both stages are optional.
+    
+    ============== ==================================================================================
+    **Arguments:**
+    data           numpy array of int/float types. If 
+    levels         List [min, max]; optionally rescale data before converting through the
+                   lookup table. The data is rescaled such that min->0 and max->*scale*::
+                   
+                      rescaled = (clip(data, min, max) - min) * (*scale* / (max - min))
+                   
+                   It is also possible to use a 2D (N,2) array of values for levels. In this case,
+                   it is assumed that each pair of min,max values in the levels array should be 
+                   applied to a different subset of the input data (for example, the input data may 
+                   already have RGB values and the levels are used to independently scale each 
+                   channel). The use of this feature requires that levels.shape[0] == data.shape[-1].
+    scale          The maximum value to which data will be rescaled before being passed through the 
+                   lookup table (or returned if there is no lookup table). By default this will
+                   be set to the length of the lookup table, or 256 is no lookup table is provided.
+                   For OpenGL color specifications (as in GLColor4f) use scale=1.0
+    lut            Optional lookup table (array with dtype=ubyte).
+                   Values in data will be converted to color by indexing directly from lut.
+                   The output data shape will be input.shape + lut.shape[1:].
+                   
+                   Note: the output of makeARGB will have the same dtype as the lookup table, so
+                   for conversion to QImage, the dtype must be ubyte.
+                   
+                   Lookup tables can be built using GradientWidget.
+    useRGBA        If True, the data is returned in RGBA order (useful for building OpenGL textures). 
+                   The default is False, which returns in ARGB order for use with QImage 
+                   (Note that 'ARGB' is a term used by the Qt documentation; the _actual_ order 
+                   is BGRA).
+    ============== ==================================================================================
+    """
+    profile = debug.Profiler()
+    
+    if lut is not None and not isinstance(lut, np.ndarray):
+        lut = np.array(lut)
+    if levels is not None and not isinstance(levels, np.ndarray):
+        levels = np.array(levels)
+    
+    if levels is not None:
+        if levels.ndim == 1:
+            if len(levels) != 2:
+                raise Exception('levels argument must have length 2')
+        elif levels.ndim == 2:
+            if lut is not None and lut.ndim > 1:
+                raise Exception('Cannot make ARGB data when bot levels and lut have ndim > 2')
+            if levels.shape != (data.shape[-1], 2):
+                raise Exception('levels must have shape (data.shape[-1], 2)')
+        else:
+            print(levels)
+            raise Exception("levels argument must be 1D or 2D.")
+
+    profile()
+
+    if scale is None:
+        if lut is not None:
+            scale = lut.shape[0]
+        else:
+            scale = 255.
+
+    ## Apply levels if given
+    if levels is not None:
+        
+        if isinstance(levels, np.ndarray) and levels.ndim == 2:
+            ## we are going to rescale each channel independently
+            if levels.shape[0] != data.shape[-1]:
+                raise Exception("When rescaling multi-channel data, there must be the same number of levels as channels (data.shape[-1] == levels.shape[0])")
+            newData = np.empty(data.shape, dtype=int)
+            for i in range(data.shape[-1]):
+                minVal, maxVal = levels[i]
+                if minVal == maxVal:
+                    maxVal += 1e-16
+                newData[...,i] = rescaleData(data[...,i], scale/(maxVal-minVal), minVal, dtype=int)
+            data = newData
+        else:
+            minVal, maxVal = levels
+            if minVal == maxVal:
+                maxVal += 1e-16
+            if maxVal == minVal:
+                data = rescaleData(data, 1, minVal, dtype=int)
+            else:
+                data = rescaleData(data, scale/(maxVal-minVal), minVal, dtype=int)
+
+    profile()
+
+    ## apply LUT if given
+    if lut is not None:
+        data = applyLookupTable(data, lut)
+    else:
+        if data.dtype is not np.ubyte:
+            data = np.clip(data, 0, 255).astype(np.ubyte)
+
+    profile()
+
+    ## copy data into ARGB ordered array
+    imgData = np.empty(data.shape[:2]+(4,), dtype=np.ubyte)
+
+    profile()
+
+    if useRGBA:
+        order = [0,1,2,3] ## array comes out RGBA
+    else:
+        order = [2,1,0,3] ## for some reason, the colors line up as BGR in the final image.
+        
+    if data.ndim == 2:
+        # This is tempting:
+        #   imgData[..., :3] = data[..., np.newaxis]
+        # ..but it turns out this is faster:
+        for i in range(3):
+            imgData[..., i] = data
+    elif data.shape[2] == 1:
+        for i in range(3):
+            imgData[..., i] = data[..., 0]
+    else:
+        for i in range(0, data.shape[2]):
+            imgData[..., i] = data[..., order[i]] 
+        
+    profile()
+        
+    if data.ndim == 2 or data.shape[2] == 3:
+        alpha = False
+        imgData[..., 3] = 255
+    else:
+        alpha = True
+        
+    profile()
+    return imgData, alpha
+
+
+def makeQImage(imgData, alpha=None, copy=True, transpose=True):
+    """
+    Turn an ARGB array into QImage.
+    By default, the data is copied; changes to the array will not
+    be reflected in the image. The image will be given a 'data' attribute
+    pointing to the array which shares its data to prevent python
+    freeing that memory while the image is in use.
+    
+    ============== ===================================================================
+    **Arguments:**
+    imgData        Array of data to convert. Must have shape (width, height, 3 or 4) 
+                   and dtype=ubyte. The order of values in the 3rd axis must be 
+                   (b, g, r, a).
+    alpha          If True, the QImage returned will have format ARGB32. If False,
+                   the format will be RGB32. By default, _alpha_ is True if
+                   array.shape[2] == 4.
+    copy           If True, the data is copied before converting to QImage.
+                   If False, the new QImage points directly to the data in the array.
+                   Note that the array must be contiguous for this to work
+                   (see numpy.ascontiguousarray).
+    transpose      If True (the default), the array x/y axes are transposed before 
+                   creating the image. Note that Qt expects the axes to be in 
+                   (height, width) order whereas pyqtgraph usually prefers the 
+                   opposite.
+    ============== ===================================================================    
+    """
+    ## create QImage from buffer
+    profile = debug.Profiler()
+    
+    ## If we didn't explicitly specify alpha, check the array shape.
+    if alpha is None:
+        alpha = (imgData.shape[2] == 4)
+        
+    copied = False
+    if imgData.shape[2] == 3:  ## need to make alpha channel (even if alpha==False; QImage requires 32 bpp)
+        if copy is True:
+            d2 = np.empty(imgData.shape[:2] + (4,), dtype=imgData.dtype)
+            d2[:,:,:3] = imgData
+            d2[:,:,3] = 255
+            imgData = d2
+            copied = True
+        else:
+            raise Exception('Array has only 3 channels; cannot make QImage without copying.')
+    
+    if alpha:
+        imgFormat = QtGui.QImage.Format_ARGB32
+    else:
+        imgFormat = QtGui.QImage.Format_RGB32
+        
+    if transpose:
+        imgData = imgData.transpose((1, 0, 2))  ## QImage expects the row/column order to be opposite
+
+    profile()
+
+    if not imgData.flags['C_CONTIGUOUS']:
+        if copy is False:
+            extra = ' (try setting transpose=False)' if transpose else ''
+            raise Exception('Array is not contiguous; cannot make QImage without copying.'+extra)
+        imgData = np.ascontiguousarray(imgData)
+        copied = True
+        
+    if copy is True and copied is False:
+        imgData = imgData.copy()
+        
+    if USE_PYSIDE:
+        ch = ctypes.c_char.from_buffer(imgData, 0)
+        img = QtGui.QImage(ch, imgData.shape[1], imgData.shape[0], imgFormat)
+    else:
+        #addr = ctypes.addressof(ctypes.c_char.from_buffer(imgData, 0))
+        ## PyQt API for QImage changed between 4.9.3 and 4.9.6 (I don't know exactly which version it was)
+        ## So we first attempt the 4.9.6 API, then fall back to 4.9.3
+        #addr = ctypes.c_char.from_buffer(imgData, 0)
+        #try:
+            #img = QtGui.QImage(addr, imgData.shape[1], imgData.shape[0], imgFormat)
+        #except TypeError:  
+            #addr = ctypes.addressof(addr)
+            #img = QtGui.QImage(addr, imgData.shape[1], imgData.shape[0], imgFormat)
+        try:
+            img = QtGui.QImage(imgData.ctypes.data, imgData.shape[1], imgData.shape[0], imgFormat)
+        except:
+            if copy:
+                # does not leak memory, is not mutable
+                img = QtGui.QImage(buffer(imgData), imgData.shape[1], imgData.shape[0], imgFormat)
+            else:
+                # mutable, but leaks memory
+                img = QtGui.QImage(memoryview(imgData), imgData.shape[1], imgData.shape[0], imgFormat)
+                
+    img.data = imgData
+    return img
+    #try:
+        #buf = imgData.data
+    #except AttributeError:  ## happens when image data is non-contiguous
+        #buf = imgData.data
+        
+    #profiler()
+    #qimage = QtGui.QImage(buf, imgData.shape[1], imgData.shape[0], imgFormat)
+    #profiler()
+    #qimage.data = imgData
+    #return qimage
+
+def imageToArray(img, copy=False, transpose=True):
+    """
+    Convert a QImage into numpy array. The image must have format RGB32, ARGB32, or ARGB32_Premultiplied.
+    By default, the image is not copied; changes made to the array will appear in the QImage as well (beware: if 
+    the QImage is collected before the array, there may be trouble).
+    The array will have shape (width, height, (b,g,r,a)).
+    """
+    fmt = img.format()
+    ptr = img.bits()
+    if USE_PYSIDE:
+        arr = np.frombuffer(ptr, dtype=np.ubyte)
+    else:
+        ptr.setsize(img.byteCount())
+        arr = np.asarray(ptr)
+        if img.byteCount() != arr.size * arr.itemsize:
+            # Required for Python 2.6, PyQt 4.10
+            # If this works on all platforms, then there is no need to use np.asarray..
+            arr = np.frombuffer(ptr, np.ubyte, img.byteCount())
+    
+    if fmt == img.Format_RGB32:
+        arr = arr.reshape(img.height(), img.width(), 3)
+    elif fmt == img.Format_ARGB32 or fmt == img.Format_ARGB32_Premultiplied:
+        arr = arr.reshape(img.height(), img.width(), 4)
+    
+    if copy:
+        arr = arr.copy()
+        
+    if transpose:
+        return arr.transpose((1,0,2))
+    else:
+        return arr
+    
+def colorToAlpha(data, color):
+    """
+    Given an RGBA image in *data*, convert *color* to be transparent. 
+    *data* must be an array (w, h, 3 or 4) of ubyte values and *color* must be 
+    an array (3) of ubyte values.
+    This is particularly useful for use with images that have a black or white background.
+    
+    Algorithm is taken from Gimp's color-to-alpha function in plug-ins/common/colortoalpha.c
+    Credit:
+        /*
+        * Color To Alpha plug-in v1.0 by Seth Burgess, sjburges@gimp.org 1999/05/14
+        *  with algorithm by clahey
+        */
+    
+    """
+    data = data.astype(float)
+    if data.shape[-1] == 3:  ## add alpha channel if needed
+        d2 = np.empty(data.shape[:2]+(4,), dtype=data.dtype)
+        d2[...,:3] = data
+        d2[...,3] = 255
+        data = d2
+    
+    color = color.astype(float)
+    alpha = np.zeros(data.shape[:2]+(3,), dtype=float)
+    output = data.copy()
+    
+    for i in [0,1,2]:
+        d = data[...,i]
+        c = color[i]
+        mask = d > c
+        alpha[...,i][mask] = (d[mask] - c) / (255. - c)
+        imask = d < c
+        alpha[...,i][imask] = (c - d[imask]) / c
+    
+    output[...,3] = alpha.max(axis=2) * 255.
+    
+    mask = output[...,3] >= 1.0  ## avoid zero division while processing alpha channel
+    correction = 255. / output[...,3][mask]  ## increase value to compensate for decreased alpha
+    for i in [0,1,2]:
+        output[...,i][mask] = ((output[...,i][mask]-color[i]) * correction) + color[i]
+        output[...,3][mask] *= data[...,3][mask] / 255.  ## combine computed and previous alpha values
+    
+    #raise Exception()
+    return np.clip(output, 0, 255).astype(np.ubyte)
+
+def gaussianFilter(data, sigma):
+    """
+    Drop-in replacement for scipy.ndimage.gaussian_filter.
+    
+    (note: results are only approximately equal to the output of
+     gaussian_filter)
+    """
+    if np.isscalar(sigma):
+        sigma = (sigma,) * data.ndim
+        
+    baseline = data.mean()
+    filtered = data - baseline
+    for ax in range(data.ndim):
+        s = sigma[ax]
+        if s == 0:
+            continue
+        
+        # generate 1D gaussian kernel
+        ksize = int(s * 6)
+        x = np.arange(-ksize, ksize)
+        kernel = np.exp(-x**2 / (2*s**2))
+        kshape = [1,] * data.ndim
+        kshape[ax] = len(kernel)
+        kernel = kernel.reshape(kshape)
+        
+        # convolve as product of FFTs
+        shape = data.shape[ax] + ksize
+        scale = 1.0 / (abs(s) * (2*np.pi)**0.5)
+        filtered = scale * np.fft.irfft(np.fft.rfft(filtered, shape, axis=ax) * 
+                                        np.fft.rfft(kernel, shape, axis=ax), 
+                                        axis=ax)
+        
+        # clip off extra data
+        sl = [slice(None)] * data.ndim
+        sl[ax] = slice(filtered.shape[ax]-data.shape[ax],None,None)
+        filtered = filtered[sl]
+    return filtered + baseline
+    
+    
+def downsample(data, n, axis=0, xvals='subsample'):
+    """Downsample by averaging points together across axis.
+    If multiple axes are specified, runs once per axis.
+    If a metaArray is given, then the axis values can be either subsampled
+    or downsampled to match.
+    """
+    ma = None
+    if (hasattr(data, 'implements') and data.implements('MetaArray')):
+        ma = data
+        data = data.view(np.ndarray)
+        
+    
+    if hasattr(axis, '__len__'):
+        if not hasattr(n, '__len__'):
+            n = [n]*len(axis)
+        for i in range(len(axis)):
+            data = downsample(data, n[i], axis[i])
+        return data
+    
+    if n <= 1:
+        return data
+    nPts = int(data.shape[axis] / n)
+    s = list(data.shape)
+    s[axis] = nPts
+    s.insert(axis+1, n)
+    sl = [slice(None)] * data.ndim
+    sl[axis] = slice(0, nPts*n)
+    d1 = data[tuple(sl)]
+    #print d1.shape, s
+    d1.shape = tuple(s)
+    d2 = d1.mean(axis+1)
+    
+    if ma is None:
+        return d2
+    else:
+        info = ma.infoCopy()
+        if 'values' in info[axis]:
+            if xvals == 'subsample':
+                info[axis]['values'] = info[axis]['values'][::n][:nPts]
+            elif xvals == 'downsample':
+                info[axis]['values'] = downsample(info[axis]['values'], n)
+        return MetaArray(d2, info=info)
+
+
+def arrayToQPath(x, y, connect='all'):
+    """Convert an array of x,y coordinats to QPainterPath as efficiently as possible.
+    The *connect* argument may be 'all', indicating that each point should be
+    connected to the next; 'pairs', indicating that each pair of points
+    should be connected, or an array of int32 values (0 or 1) indicating
+    connections.
+    """
+
+    ## Create all vertices in path. The method used below creates a binary format so that all
+    ## vertices can be read in at once. This binary format may change in future versions of Qt,
+    ## so the original (slower) method is left here for emergencies:
+        #path.moveTo(x[0], y[0])
+        #if connect == 'all':
+            #for i in range(1, y.shape[0]):
+                #path.lineTo(x[i], y[i])
+        #elif connect == 'pairs':
+            #for i in range(1, y.shape[0]):
+                #if i%2 == 0:
+                    #path.lineTo(x[i], y[i])
+                #else:
+                    #path.moveTo(x[i], y[i])
+        #elif isinstance(connect, np.ndarray):
+            #for i in range(1, y.shape[0]):
+                #if connect[i] == 1:
+                    #path.lineTo(x[i], y[i])
+                #else:
+                    #path.moveTo(x[i], y[i])
+        #else:
+            #raise Exception('connect argument must be "all", "pairs", or array')
+
+    ## Speed this up using >> operator
+    ## Format is:
+    ##    numVerts(i4)   0(i4)
+    ##    x(f8)   y(f8)   0(i4)    <-- 0 means this vertex does not connect
+    ##    x(f8)   y(f8)   1(i4)    <-- 1 means this vertex connects to the previous vertex
+    ##    ...
+    ##    0(i4)
+    ##
+    ## All values are big endian--pack using struct.pack('>d') or struct.pack('>i')
+
+    path = QtGui.QPainterPath()
+
+    #profiler = debug.Profiler()
+    n = x.shape[0]
+    # create empty array, pad with extra space on either end
+    arr = np.empty(n+2, dtype=[('x', '>f8'), ('y', '>f8'), ('c', '>i4')])
+    # write first two integers
+    #profiler('allocate empty')
+    byteview = arr.view(dtype=np.ubyte)
+    byteview[:12] = 0
+    byteview.data[12:20] = struct.pack('>ii', n, 0)
+    #profiler('pack header')
+    # Fill array with vertex values
+    arr[1:-1]['x'] = x
+    arr[1:-1]['y'] = y
+
+    # decide which points are connected by lines
+    if connect == 'pairs':
+        connect = np.empty((n/2,2), dtype=np.int32)
+        if connect.size != n:
+            raise Exception("x,y array lengths must be multiple of 2 to use connect='pairs'")
+        connect[:,0] = 1
+        connect[:,1] = 0
+        connect = connect.flatten()
+    if connect == 'finite':
+        connect = np.isfinite(x) & np.isfinite(y)
+        arr[1:-1]['c'] = connect
+    if connect == 'all':
+        arr[1:-1]['c'] = 1
+    elif isinstance(connect, np.ndarray):
+        arr[1:-1]['c'] = connect
+    else:
+        raise Exception('connect argument must be "all", "pairs", or array')
+
+    #profiler('fill array')
+    # write last 0
+    lastInd = 20*(n+1)
+    byteview.data[lastInd:lastInd+4] = struct.pack('>i', 0)
+    #profiler('footer')
+    # create datastream object and stream into path
+
+    ## Avoiding this method because QByteArray(str) leaks memory in PySide
+    #buf = QtCore.QByteArray(arr.data[12:lastInd+4])  # I think one unnecessary copy happens here
+
+    path.strn = byteview.data[12:lastInd+4] # make sure data doesn't run away
+    try:
+        buf = QtCore.QByteArray.fromRawData(path.strn)
+    except TypeError:
+        buf = QtCore.QByteArray(bytes(path.strn))
+    #profiler('create buffer')
+    ds = QtCore.QDataStream(buf)
+
+    ds >> path
+    #profiler('load')
+
+    return path
+
+#def isosurface(data, level):
+    #"""
+    #Generate isosurface from volumetric data using marching tetrahedra algorithm.
+    #See Paul Bourke, "Polygonising a Scalar Field Using Tetrahedrons"  (http://local.wasp.uwa.edu.au/~pbourke/geometry/polygonise/)
+    
+    #*data*   3D numpy array of scalar values
+    #*level*  The level at which to generate an isosurface
+    #"""
+    
+    #facets = []
+    
+    ### mark everything below the isosurface level
+    #mask = data < level
+    
+    #### make eight sub-fields 
+    #fields = np.empty((2,2,2), dtype=object)
+    #slices = [slice(0,-1), slice(1,None)]
+    #for i in [0,1]:
+        #for j in [0,1]:
+            #for k in [0,1]:
+                #fields[i,j,k] = mask[slices[i], slices[j], slices[k]]
+    
+    
+    
+    ### split each cell into 6 tetrahedra
+    ### these all have the same 'orienation'; points 1,2,3 circle 
+    ### clockwise around point 0
+    #tetrahedra = [
+        #[(0,1,0), (1,1,1), (0,1,1), (1,0,1)],
+        #[(0,1,0), (0,1,1), (0,0,1), (1,0,1)],
+        #[(0,1,0), (0,0,1), (0,0,0), (1,0,1)],
+        #[(0,1,0), (0,0,0), (1,0,0), (1,0,1)],
+        #[(0,1,0), (1,0,0), (1,1,0), (1,0,1)],
+        #[(0,1,0), (1,1,0), (1,1,1), (1,0,1)]
+    #]
+    
+    ### each tetrahedron will be assigned an index
+    ### which determines how to generate its facets.
+    ### this structure is: 
+    ###    facets[index][facet1, facet2, ...]
+    ### where each facet is triangular and its points are each 
+    ### interpolated between two points on the tetrahedron
+    ###    facet = [(p1a, p1b), (p2a, p2b), (p3a, p3b)]
+    ### facet points always circle clockwise if you are looking 
+    ### at them from below the isosurface.
+    #indexFacets = [
+        #[],  ## all above
+        #[[(0,1), (0,2), (0,3)]],  # 0 below
+        #[[(1,0), (1,3), (1,2)]],   # 1 below
+        #[[(0,2), (1,3), (1,2)], [(0,2), (0,3), (1,3)]],   # 0,1 below
+        #[[(2,0), (2,1), (2,3)]],   # 2 below
+        #[[(0,3), (1,2), (2,3)], [(0,3), (0,1), (1,2)]],   # 0,2 below
+        #[[(1,0), (2,3), (2,0)], [(1,0), (1,3), (2,3)]],   # 1,2 below
+        #[[(3,0), (3,1), (3,2)]],   # 3 above
+        #[[(3,0), (3,2), (3,1)]],   # 3 below
+        #[[(1,0), (2,0), (2,3)], [(1,0), (2,3), (1,3)]],   # 0,3 below
+        #[[(0,3), (2,3), (1,2)], [(0,3), (1,2), (0,1)]],   # 1,3 below
+        #[[(2,0), (2,3), (2,1)]], # 0,1,3 below
+        #[[(0,2), (1,2), (1,3)], [(0,2), (1,3), (0,3)]],   # 2,3 below
+        #[[(1,0), (1,2), (1,3)]], # 0,2,3 below
+        #[[(0,1), (0,3), (0,2)]], # 1,2,3 below
+        #[]  ## all below
+    #]
+    
+    #for tet in tetrahedra:
+        
+        ### get the 4 fields for this tetrahedron
+        #tetFields = [fields[c] for c in tet]
+        
+        ### generate an index for each grid cell
+        #index = tetFields[0] + tetFields[1]*2 + tetFields[2]*4 + tetFields[3]*8
+        
+        ### add facets
+        #for i in xrange(index.shape[0]):                 # data x-axis
+            #for j in xrange(index.shape[1]):             # data y-axis
+                #for k in xrange(index.shape[2]):         # data z-axis
+                    #for f in indexFacets[index[i,j,k]]:  # faces to generate for this tet
+                        #pts = []
+                        #for l in [0,1,2]:      # points in this face
+                            #p1 = tet[f[l][0]]  # tet corner 1
+                            #p2 = tet[f[l][1]]  # tet corner 2
+                            #pts.append([(p1[x]+p2[x])*0.5+[i,j,k][x]+0.5 for x in [0,1,2]]) ## interpolate between tet corners
+                        #facets.append(pts)
+
+    #return facets
+    
+
+def isocurve(data, level, connected=False, extendToEdge=False, path=False):
+    """
+    Generate isocurve from 2D data using marching squares algorithm.
+    
+    ============== =========================================================
+    **Arguments:**
+    data           2D numpy array of scalar values
+    level          The level at which to generate an isosurface
+    connected      If False, return a single long list of point pairs
+                   If True, return multiple long lists of connected point 
+                   locations. (This is slower but better for drawing 
+                   continuous lines)
+    extendToEdge   If True, extend the curves to reach the exact edges of 
+                   the data. 
+    path           if True, return a QPainterPath rather than a list of 
+                   vertex coordinates. This forces connected=True.
+    ============== =========================================================
+    
+    This function is SLOW; plenty of room for optimization here.
+    """    
+    
+    if path is True:
+        connected = True
+    
+    if extendToEdge:
+        d2 = np.empty((data.shape[0]+2, data.shape[1]+2), dtype=data.dtype)
+        d2[1:-1, 1:-1] = data
+        d2[0, 1:-1] = data[0]
+        d2[-1, 1:-1] = data[-1]
+        d2[1:-1, 0] = data[:, 0]
+        d2[1:-1, -1] = data[:, -1]
+        d2[0,0] = d2[0,1]
+        d2[0,-1] = d2[1,-1]
+        d2[-1,0] = d2[-1,1]
+        d2[-1,-1] = d2[-1,-2]
+        data = d2
+    
+    sideTable = [
+        [],
+        [0,1],
+        [1,2],
+        [0,2],
+        [0,3],
+        [1,3],
+        [0,1,2,3],
+        [2,3],
+        [2,3],
+        [0,1,2,3],
+        [1,3],
+        [0,3],
+        [0,2],
+        [1,2],
+        [0,1],
+        []
+        ]
+    
+    edgeKey=[
+        [(0,1), (0,0)],
+        [(0,0), (1,0)],
+        [(1,0), (1,1)],
+        [(1,1), (0,1)]
+        ]
+    
+    
+    lines = []
+    
+    ## mark everything below the isosurface level
+    mask = data < level
+    
+    ### make four sub-fields and compute indexes for grid cells
+    index = np.zeros([x-1 for x in data.shape], dtype=np.ubyte)
+    fields = np.empty((2,2), dtype=object)
+    slices = [slice(0,-1), slice(1,None)]
+    for i in [0,1]:
+        for j in [0,1]:
+            fields[i,j] = mask[slices[i], slices[j]]
+            #vertIndex = i - 2*j*i + 3*j + 4*k  ## this is just to match Bourk's vertex numbering scheme
+            vertIndex = i+2*j
+            #print i,j,k," : ", fields[i,j,k], 2**vertIndex
+            index += fields[i,j] * 2**vertIndex
+            #print index
+    #print index
+    
+    ## add lines
+    for i in range(index.shape[0]):                 # data x-axis
+        for j in range(index.shape[1]):             # data y-axis     
+            sides = sideTable[index[i,j]]
+            for l in range(0, len(sides), 2):     ## faces for this grid cell
+                edges = sides[l:l+2]
+                pts = []
+                for m in [0,1]:      # points in this face
+                    p1 = edgeKey[edges[m]][0] # p1, p2 are points at either side of an edge
+                    p2 = edgeKey[edges[m]][1]
+                    v1 = data[i+p1[0], j+p1[1]] # v1 and v2 are the values at p1 and p2
+                    v2 = data[i+p2[0], j+p2[1]]
+                    f = (level-v1) / (v2-v1)
+                    fi = 1.0 - f
+                    p = (    ## interpolate between corners
+                        p1[0]*fi + p2[0]*f + i + 0.5, 
+                        p1[1]*fi + p2[1]*f + j + 0.5
+                        )
+                    if extendToEdge:
+                        ## check bounds
+                        p = (
+                            min(data.shape[0]-2, max(0, p[0]-1)),
+                            min(data.shape[1]-2, max(0, p[1]-1)),                        
+                        )
+                    if connected:
+                        gridKey = i + (1 if edges[m]==2 else 0), j + (1 if edges[m]==3 else 0), edges[m]%2
+                        pts.append((p, gridKey))  ## give the actual position and a key identifying the grid location (for connecting segments)
+                    else:
+                        pts.append(p)
+                
+                lines.append(pts)
+
+    if not connected:
+        return lines
+                
+    ## turn disjoint list of segments into continuous lines
+
+    #lines = [[2,5], [5,4], [3,4], [1,3], [6,7], [7,8], [8,6], [11,12], [12,15], [11,13], [13,14]]
+    #lines = [[(float(a), a), (float(b), b)] for a,b in lines]
+    points = {}  ## maps each point to its connections
+    for a,b in lines:
+        if a[1] not in points:
+            points[a[1]] = []
+        points[a[1]].append([a,b])
+        if b[1] not in points:
+            points[b[1]] = []
+        points[b[1]].append([b,a])
+
+    ## rearrange into chains
+    for k in list(points.keys()):
+        try:
+            chains = points[k]
+        except KeyError:   ## already used this point elsewhere
+            continue
+        #print "===========", k
+        for chain in chains:
+            #print "  chain:", chain
+            x = None
+            while True:
+                if x == chain[-1][1]:
+                    break ## nothing left to do on this chain
+                    
+                x = chain[-1][1]
+                if x == k:  
+                    break ## chain has looped; we're done and can ignore the opposite chain
+                y = chain[-2][1]
+                connects = points[x]
+                for conn in connects[:]:
+                    if conn[1][1] != y:
+                        #print "    ext:", conn
+                        chain.extend(conn[1:])
+                #print "    del:", x
+                del points[x]
+            if chain[0][1] == chain[-1][1]:  # looped chain; no need to continue the other direction
+                chains.pop()
+                break
+                
+
+    ## extract point locations 
+    lines = []
+    for chain in points.values():
+        if len(chain) == 2:
+            chain = chain[1][1:][::-1] + chain[0]  # join together ends of chain
+        else:
+            chain = chain[0]
+        lines.append([p[0] for p in chain])
+    
+    if not path:
+        return lines ## a list of pairs of points
+    
+    path = QtGui.QPainterPath()
+    for line in lines:
+        path.moveTo(*line[0])
+        for p in line[1:]:
+            path.lineTo(*p)
+    
+    return path
+    
+    
+def traceImage(image, values, smooth=0.5):
+    """
+    Convert an image to a set of QPainterPath curves.
+    One curve will be generated for each item in *values*; each curve outlines the area
+    of the image that is closer to its value than to any others.
+    
+    If image is RGB or RGBA, then the shape of values should be (nvals, 3/4)
+    The parameter *smooth* is expressed in pixels.
+    """
+    try:
+        import scipy.ndimage as ndi
+    except ImportError:
+        raise Exception("traceImage() requires the package scipy.ndimage, but it is not importable.")
+    
+    if values.ndim == 2:
+        values = values.T
+    values = values[np.newaxis, np.newaxis, ...].astype(float)
+    image = image[..., np.newaxis].astype(float)
+    diff = np.abs(image-values)
+    if values.ndim == 4:
+        diff = diff.sum(axis=2)
+        
+    labels = np.argmin(diff, axis=2)
+    
+    paths = []
+    for i in range(diff.shape[-1]):    
+        d = (labels==i).astype(float)
+        d = gaussianFilter(d, (smooth, smooth))
+        lines = isocurve(d, 0.5, connected=True, extendToEdge=True)
+        path = QtGui.QPainterPath()
+        for line in lines:
+            path.moveTo(*line[0])
+            for p in line[1:]:
+                path.lineTo(*p)
+        
+        paths.append(path)
+    return paths
+    
+    
+    
+IsosurfaceDataCache = None
+def isosurface(data, level):
+    """
+    Generate isosurface from volumetric data using marching cubes algorithm.
+    See Paul Bourke, "Polygonising a Scalar Field"  
+    (http://paulbourke.net/geometry/polygonise/)
+    
+    *data*   3D numpy array of scalar values
+    *level*  The level at which to generate an isosurface
+    
+    Returns an array of vertex coordinates (Nv, 3) and an array of 
+    per-face vertex indexes (Nf, 3)    
+    """
+    ## For improvement, see:
+    ## 
+    ## Efficient implementation of Marching Cubes' cases with topological guarantees.
+    ## Thomas Lewiner, Helio Lopes, Antonio Wilson Vieira and Geovan Tavares.
+    ## Journal of Graphics Tools 8(2): pp. 1-15 (december 2003)
+    
+    ## Precompute lookup tables on the first run
+    global IsosurfaceDataCache
+    if IsosurfaceDataCache is None:
+        ## map from grid cell index to edge index.
+        ## grid cell index tells us which corners are below the isosurface,
+        ## edge index tells us which edges are cut by the isosurface.
+        ## (Data stolen from Bourk; see above.)
+        edgeTable = np.array([
+            0x0  , 0x109, 0x203, 0x30a, 0x406, 0x50f, 0x605, 0x70c,
+            0x80c, 0x905, 0xa0f, 0xb06, 0xc0a, 0xd03, 0xe09, 0xf00,
+            0x190, 0x99 , 0x393, 0x29a, 0x596, 0x49f, 0x795, 0x69c,
+            0x99c, 0x895, 0xb9f, 0xa96, 0xd9a, 0xc93, 0xf99, 0xe90,
+            0x230, 0x339, 0x33 , 0x13a, 0x636, 0x73f, 0x435, 0x53c,
+            0xa3c, 0xb35, 0x83f, 0x936, 0xe3a, 0xf33, 0xc39, 0xd30,
+            0x3a0, 0x2a9, 0x1a3, 0xaa , 0x7a6, 0x6af, 0x5a5, 0x4ac,
+            0xbac, 0xaa5, 0x9af, 0x8a6, 0xfaa, 0xea3, 0xda9, 0xca0,
+            0x460, 0x569, 0x663, 0x76a, 0x66 , 0x16f, 0x265, 0x36c,
+            0xc6c, 0xd65, 0xe6f, 0xf66, 0x86a, 0x963, 0xa69, 0xb60,
+            0x5f0, 0x4f9, 0x7f3, 0x6fa, 0x1f6, 0xff , 0x3f5, 0x2fc,
+            0xdfc, 0xcf5, 0xfff, 0xef6, 0x9fa, 0x8f3, 0xbf9, 0xaf0,
+            0x650, 0x759, 0x453, 0x55a, 0x256, 0x35f, 0x55 , 0x15c,
+            0xe5c, 0xf55, 0xc5f, 0xd56, 0xa5a, 0xb53, 0x859, 0x950,
+            0x7c0, 0x6c9, 0x5c3, 0x4ca, 0x3c6, 0x2cf, 0x1c5, 0xcc ,
+            0xfcc, 0xec5, 0xdcf, 0xcc6, 0xbca, 0xac3, 0x9c9, 0x8c0,
+            0x8c0, 0x9c9, 0xac3, 0xbca, 0xcc6, 0xdcf, 0xec5, 0xfcc,
+            0xcc , 0x1c5, 0x2cf, 0x3c6, 0x4ca, 0x5c3, 0x6c9, 0x7c0,
+            0x950, 0x859, 0xb53, 0xa5a, 0xd56, 0xc5f, 0xf55, 0xe5c,
+            0x15c, 0x55 , 0x35f, 0x256, 0x55a, 0x453, 0x759, 0x650,
+            0xaf0, 0xbf9, 0x8f3, 0x9fa, 0xef6, 0xfff, 0xcf5, 0xdfc,
+            0x2fc, 0x3f5, 0xff , 0x1f6, 0x6fa, 0x7f3, 0x4f9, 0x5f0,
+            0xb60, 0xa69, 0x963, 0x86a, 0xf66, 0xe6f, 0xd65, 0xc6c,
+            0x36c, 0x265, 0x16f, 0x66 , 0x76a, 0x663, 0x569, 0x460,
+            0xca0, 0xda9, 0xea3, 0xfaa, 0x8a6, 0x9af, 0xaa5, 0xbac,
+            0x4ac, 0x5a5, 0x6af, 0x7a6, 0xaa , 0x1a3, 0x2a9, 0x3a0,
+            0xd30, 0xc39, 0xf33, 0xe3a, 0x936, 0x83f, 0xb35, 0xa3c,
+            0x53c, 0x435, 0x73f, 0x636, 0x13a, 0x33 , 0x339, 0x230,
+            0xe90, 0xf99, 0xc93, 0xd9a, 0xa96, 0xb9f, 0x895, 0x99c,
+            0x69c, 0x795, 0x49f, 0x596, 0x29a, 0x393, 0x99 , 0x190,
+            0xf00, 0xe09, 0xd03, 0xc0a, 0xb06, 0xa0f, 0x905, 0x80c,
+            0x70c, 0x605, 0x50f, 0x406, 0x30a, 0x203, 0x109, 0x0   
+            ], dtype=np.uint16)
+        
+        ## Table of triangles to use for filling each grid cell.
+        ## Each set of three integers tells us which three edges to
+        ## draw a triangle between.
+        ## (Data stolen from Bourk; see above.)
+        triTable = [
+            [],
+            [0, 8, 3],
+            [0, 1, 9],
+            [1, 8, 3, 9, 8, 1],
+            [1, 2, 10],
+            [0, 8, 3, 1, 2, 10],
+            [9, 2, 10, 0, 2, 9],
+            [2, 8, 3, 2, 10, 8, 10, 9, 8],
+            [3, 11, 2],
+            [0, 11, 2, 8, 11, 0],
+            [1, 9, 0, 2, 3, 11],
+            [1, 11, 2, 1, 9, 11, 9, 8, 11],
+            [3, 10, 1, 11, 10, 3],
+            [0, 10, 1, 0, 8, 10, 8, 11, 10],
+            [3, 9, 0, 3, 11, 9, 11, 10, 9],
+            [9, 8, 10, 10, 8, 11],
+            [4, 7, 8],
+            [4, 3, 0, 7, 3, 4],
+            [0, 1, 9, 8, 4, 7],
+            [4, 1, 9, 4, 7, 1, 7, 3, 1],
+            [1, 2, 10, 8, 4, 7],
+            [3, 4, 7, 3, 0, 4, 1, 2, 10],
+            [9, 2, 10, 9, 0, 2, 8, 4, 7],
+            [2, 10, 9, 2, 9, 7, 2, 7, 3, 7, 9, 4],
+            [8, 4, 7, 3, 11, 2],
+            [11, 4, 7, 11, 2, 4, 2, 0, 4],
+            [9, 0, 1, 8, 4, 7, 2, 3, 11],
+            [4, 7, 11, 9, 4, 11, 9, 11, 2, 9, 2, 1],
+            [3, 10, 1, 3, 11, 10, 7, 8, 4],
+            [1, 11, 10, 1, 4, 11, 1, 0, 4, 7, 11, 4],
+            [4, 7, 8, 9, 0, 11, 9, 11, 10, 11, 0, 3],
+            [4, 7, 11, 4, 11, 9, 9, 11, 10],
+            [9, 5, 4],
+            [9, 5, 4, 0, 8, 3],
+            [0, 5, 4, 1, 5, 0],
+            [8, 5, 4, 8, 3, 5, 3, 1, 5],
+            [1, 2, 10, 9, 5, 4],
+            [3, 0, 8, 1, 2, 10, 4, 9, 5],
+            [5, 2, 10, 5, 4, 2, 4, 0, 2],
+            [2, 10, 5, 3, 2, 5, 3, 5, 4, 3, 4, 8],
+            [9, 5, 4, 2, 3, 11],
+            [0, 11, 2, 0, 8, 11, 4, 9, 5],
+            [0, 5, 4, 0, 1, 5, 2, 3, 11],
+            [2, 1, 5, 2, 5, 8, 2, 8, 11, 4, 8, 5],
+            [10, 3, 11, 10, 1, 3, 9, 5, 4],
+            [4, 9, 5, 0, 8, 1, 8, 10, 1, 8, 11, 10],
+            [5, 4, 0, 5, 0, 11, 5, 11, 10, 11, 0, 3],
+            [5, 4, 8, 5, 8, 10, 10, 8, 11],
+            [9, 7, 8, 5, 7, 9],
+            [9, 3, 0, 9, 5, 3, 5, 7, 3],
+            [0, 7, 8, 0, 1, 7, 1, 5, 7],
+            [1, 5, 3, 3, 5, 7],
+            [9, 7, 8, 9, 5, 7, 10, 1, 2],
+            [10, 1, 2, 9, 5, 0, 5, 3, 0, 5, 7, 3],
+            [8, 0, 2, 8, 2, 5, 8, 5, 7, 10, 5, 2],
+            [2, 10, 5, 2, 5, 3, 3, 5, 7],
+            [7, 9, 5, 7, 8, 9, 3, 11, 2],
+            [9, 5, 7, 9, 7, 2, 9, 2, 0, 2, 7, 11],
+            [2, 3, 11, 0, 1, 8, 1, 7, 8, 1, 5, 7],
+            [11, 2, 1, 11, 1, 7, 7, 1, 5],
+            [9, 5, 8, 8, 5, 7, 10, 1, 3, 10, 3, 11],
+            [5, 7, 0, 5, 0, 9, 7, 11, 0, 1, 0, 10, 11, 10, 0],
+            [11, 10, 0, 11, 0, 3, 10, 5, 0, 8, 0, 7, 5, 7, 0],
+            [11, 10, 5, 7, 11, 5],
+            [10, 6, 5],
+            [0, 8, 3, 5, 10, 6],
+            [9, 0, 1, 5, 10, 6],
+            [1, 8, 3, 1, 9, 8, 5, 10, 6],
+            [1, 6, 5, 2, 6, 1],
+            [1, 6, 5, 1, 2, 6, 3, 0, 8],
+            [9, 6, 5, 9, 0, 6, 0, 2, 6],
+            [5, 9, 8, 5, 8, 2, 5, 2, 6, 3, 2, 8],
+            [2, 3, 11, 10, 6, 5],
+            [11, 0, 8, 11, 2, 0, 10, 6, 5],
+            [0, 1, 9, 2, 3, 11, 5, 10, 6],
+            [5, 10, 6, 1, 9, 2, 9, 11, 2, 9, 8, 11],
+            [6, 3, 11, 6, 5, 3, 5, 1, 3],
+            [0, 8, 11, 0, 11, 5, 0, 5, 1, 5, 11, 6],
+            [3, 11, 6, 0, 3, 6, 0, 6, 5, 0, 5, 9],
+            [6, 5, 9, 6, 9, 11, 11, 9, 8],
+            [5, 10, 6, 4, 7, 8],
+            [4, 3, 0, 4, 7, 3, 6, 5, 10],
+            [1, 9, 0, 5, 10, 6, 8, 4, 7],
+            [10, 6, 5, 1, 9, 7, 1, 7, 3, 7, 9, 4],
+            [6, 1, 2, 6, 5, 1, 4, 7, 8],
+            [1, 2, 5, 5, 2, 6, 3, 0, 4, 3, 4, 7],
+            [8, 4, 7, 9, 0, 5, 0, 6, 5, 0, 2, 6],
+            [7, 3, 9, 7, 9, 4, 3, 2, 9, 5, 9, 6, 2, 6, 9],
+            [3, 11, 2, 7, 8, 4, 10, 6, 5],
+            [5, 10, 6, 4, 7, 2, 4, 2, 0, 2, 7, 11],
+            [0, 1, 9, 4, 7, 8, 2, 3, 11, 5, 10, 6],
+            [9, 2, 1, 9, 11, 2, 9, 4, 11, 7, 11, 4, 5, 10, 6],
+            [8, 4, 7, 3, 11, 5, 3, 5, 1, 5, 11, 6],
+            [5, 1, 11, 5, 11, 6, 1, 0, 11, 7, 11, 4, 0, 4, 11],
+            [0, 5, 9, 0, 6, 5, 0, 3, 6, 11, 6, 3, 8, 4, 7],
+            [6, 5, 9, 6, 9, 11, 4, 7, 9, 7, 11, 9],
+            [10, 4, 9, 6, 4, 10],
+            [4, 10, 6, 4, 9, 10, 0, 8, 3],
+            [10, 0, 1, 10, 6, 0, 6, 4, 0],
+            [8, 3, 1, 8, 1, 6, 8, 6, 4, 6, 1, 10],
+            [1, 4, 9, 1, 2, 4, 2, 6, 4],
+            [3, 0, 8, 1, 2, 9, 2, 4, 9, 2, 6, 4],
+            [0, 2, 4, 4, 2, 6],
+            [8, 3, 2, 8, 2, 4, 4, 2, 6],
+            [10, 4, 9, 10, 6, 4, 11, 2, 3],
+            [0, 8, 2, 2, 8, 11, 4, 9, 10, 4, 10, 6],
+            [3, 11, 2, 0, 1, 6, 0, 6, 4, 6, 1, 10],
+            [6, 4, 1, 6, 1, 10, 4, 8, 1, 2, 1, 11, 8, 11, 1],
+            [9, 6, 4, 9, 3, 6, 9, 1, 3, 11, 6, 3],
+            [8, 11, 1, 8, 1, 0, 11, 6, 1, 9, 1, 4, 6, 4, 1],
+            [3, 11, 6, 3, 6, 0, 0, 6, 4],
+            [6, 4, 8, 11, 6, 8],
+            [7, 10, 6, 7, 8, 10, 8, 9, 10],
+            [0, 7, 3, 0, 10, 7, 0, 9, 10, 6, 7, 10],
+            [10, 6, 7, 1, 10, 7, 1, 7, 8, 1, 8, 0],
+            [10, 6, 7, 10, 7, 1, 1, 7, 3],
+            [1, 2, 6, 1, 6, 8, 1, 8, 9, 8, 6, 7],
+            [2, 6, 9, 2, 9, 1, 6, 7, 9, 0, 9, 3, 7, 3, 9],
+            [7, 8, 0, 7, 0, 6, 6, 0, 2],
+            [7, 3, 2, 6, 7, 2],
+            [2, 3, 11, 10, 6, 8, 10, 8, 9, 8, 6, 7],
+            [2, 0, 7, 2, 7, 11, 0, 9, 7, 6, 7, 10, 9, 10, 7],
+            [1, 8, 0, 1, 7, 8, 1, 10, 7, 6, 7, 10, 2, 3, 11],
+            [11, 2, 1, 11, 1, 7, 10, 6, 1, 6, 7, 1],
+            [8, 9, 6, 8, 6, 7, 9, 1, 6, 11, 6, 3, 1, 3, 6],
+            [0, 9, 1, 11, 6, 7],
+            [7, 8, 0, 7, 0, 6, 3, 11, 0, 11, 6, 0],
+            [7, 11, 6],
+            [7, 6, 11],
+            [3, 0, 8, 11, 7, 6],
+            [0, 1, 9, 11, 7, 6],
+            [8, 1, 9, 8, 3, 1, 11, 7, 6],
+            [10, 1, 2, 6, 11, 7],
+            [1, 2, 10, 3, 0, 8, 6, 11, 7],
+            [2, 9, 0, 2, 10, 9, 6, 11, 7],
+            [6, 11, 7, 2, 10, 3, 10, 8, 3, 10, 9, 8],
+            [7, 2, 3, 6, 2, 7],
+            [7, 0, 8, 7, 6, 0, 6, 2, 0],
+            [2, 7, 6, 2, 3, 7, 0, 1, 9],
+            [1, 6, 2, 1, 8, 6, 1, 9, 8, 8, 7, 6],
+            [10, 7, 6, 10, 1, 7, 1, 3, 7],
+            [10, 7, 6, 1, 7, 10, 1, 8, 7, 1, 0, 8],
+            [0, 3, 7, 0, 7, 10, 0, 10, 9, 6, 10, 7],
+            [7, 6, 10, 7, 10, 8, 8, 10, 9],
+            [6, 8, 4, 11, 8, 6],
+            [3, 6, 11, 3, 0, 6, 0, 4, 6],
+            [8, 6, 11, 8, 4, 6, 9, 0, 1],
+            [9, 4, 6, 9, 6, 3, 9, 3, 1, 11, 3, 6],
+            [6, 8, 4, 6, 11, 8, 2, 10, 1],
+            [1, 2, 10, 3, 0, 11, 0, 6, 11, 0, 4, 6],
+            [4, 11, 8, 4, 6, 11, 0, 2, 9, 2, 10, 9],
+            [10, 9, 3, 10, 3, 2, 9, 4, 3, 11, 3, 6, 4, 6, 3],
+            [8, 2, 3, 8, 4, 2, 4, 6, 2],
+            [0, 4, 2, 4, 6, 2],
+            [1, 9, 0, 2, 3, 4, 2, 4, 6, 4, 3, 8],
+            [1, 9, 4, 1, 4, 2, 2, 4, 6],
+            [8, 1, 3, 8, 6, 1, 8, 4, 6, 6, 10, 1],
+            [10, 1, 0, 10, 0, 6, 6, 0, 4],
+            [4, 6, 3, 4, 3, 8, 6, 10, 3, 0, 3, 9, 10, 9, 3],
+            [10, 9, 4, 6, 10, 4],
+            [4, 9, 5, 7, 6, 11],
+            [0, 8, 3, 4, 9, 5, 11, 7, 6],
+            [5, 0, 1, 5, 4, 0, 7, 6, 11],
+            [11, 7, 6, 8, 3, 4, 3, 5, 4, 3, 1, 5],
+            [9, 5, 4, 10, 1, 2, 7, 6, 11],
+            [6, 11, 7, 1, 2, 10, 0, 8, 3, 4, 9, 5],
+            [7, 6, 11, 5, 4, 10, 4, 2, 10, 4, 0, 2],
+            [3, 4, 8, 3, 5, 4, 3, 2, 5, 10, 5, 2, 11, 7, 6],
+            [7, 2, 3, 7, 6, 2, 5, 4, 9],
+            [9, 5, 4, 0, 8, 6, 0, 6, 2, 6, 8, 7],
+            [3, 6, 2, 3, 7, 6, 1, 5, 0, 5, 4, 0],
+            [6, 2, 8, 6, 8, 7, 2, 1, 8, 4, 8, 5, 1, 5, 8],
+            [9, 5, 4, 10, 1, 6, 1, 7, 6, 1, 3, 7],
+            [1, 6, 10, 1, 7, 6, 1, 0, 7, 8, 7, 0, 9, 5, 4],
+            [4, 0, 10, 4, 10, 5, 0, 3, 10, 6, 10, 7, 3, 7, 10],
+            [7, 6, 10, 7, 10, 8, 5, 4, 10, 4, 8, 10],
+            [6, 9, 5, 6, 11, 9, 11, 8, 9],
+            [3, 6, 11, 0, 6, 3, 0, 5, 6, 0, 9, 5],
+            [0, 11, 8, 0, 5, 11, 0, 1, 5, 5, 6, 11],
+            [6, 11, 3, 6, 3, 5, 5, 3, 1],
+            [1, 2, 10, 9, 5, 11, 9, 11, 8, 11, 5, 6],
+            [0, 11, 3, 0, 6, 11, 0, 9, 6, 5, 6, 9, 1, 2, 10],
+            [11, 8, 5, 11, 5, 6, 8, 0, 5, 10, 5, 2, 0, 2, 5],
+            [6, 11, 3, 6, 3, 5, 2, 10, 3, 10, 5, 3],
+            [5, 8, 9, 5, 2, 8, 5, 6, 2, 3, 8, 2],
+            [9, 5, 6, 9, 6, 0, 0, 6, 2],
+            [1, 5, 8, 1, 8, 0, 5, 6, 8, 3, 8, 2, 6, 2, 8],
+            [1, 5, 6, 2, 1, 6],
+            [1, 3, 6, 1, 6, 10, 3, 8, 6, 5, 6, 9, 8, 9, 6],
+            [10, 1, 0, 10, 0, 6, 9, 5, 0, 5, 6, 0],
+            [0, 3, 8, 5, 6, 10],
+            [10, 5, 6],
+            [11, 5, 10, 7, 5, 11],
+            [11, 5, 10, 11, 7, 5, 8, 3, 0],
+            [5, 11, 7, 5, 10, 11, 1, 9, 0],
+            [10, 7, 5, 10, 11, 7, 9, 8, 1, 8, 3, 1],
+            [11, 1, 2, 11, 7, 1, 7, 5, 1],
+            [0, 8, 3, 1, 2, 7, 1, 7, 5, 7, 2, 11],
+            [9, 7, 5, 9, 2, 7, 9, 0, 2, 2, 11, 7],
+            [7, 5, 2, 7, 2, 11, 5, 9, 2, 3, 2, 8, 9, 8, 2],
+            [2, 5, 10, 2, 3, 5, 3, 7, 5],
+            [8, 2, 0, 8, 5, 2, 8, 7, 5, 10, 2, 5],
+            [9, 0, 1, 5, 10, 3, 5, 3, 7, 3, 10, 2],
+            [9, 8, 2, 9, 2, 1, 8, 7, 2, 10, 2, 5, 7, 5, 2],
+            [1, 3, 5, 3, 7, 5],
+            [0, 8, 7, 0, 7, 1, 1, 7, 5],
+            [9, 0, 3, 9, 3, 5, 5, 3, 7],
+            [9, 8, 7, 5, 9, 7],
+            [5, 8, 4, 5, 10, 8, 10, 11, 8],
+            [5, 0, 4, 5, 11, 0, 5, 10, 11, 11, 3, 0],
+            [0, 1, 9, 8, 4, 10, 8, 10, 11, 10, 4, 5],
+            [10, 11, 4, 10, 4, 5, 11, 3, 4, 9, 4, 1, 3, 1, 4],
+            [2, 5, 1, 2, 8, 5, 2, 11, 8, 4, 5, 8],
+            [0, 4, 11, 0, 11, 3, 4, 5, 11, 2, 11, 1, 5, 1, 11],
+            [0, 2, 5, 0, 5, 9, 2, 11, 5, 4, 5, 8, 11, 8, 5],
+            [9, 4, 5, 2, 11, 3],
+            [2, 5, 10, 3, 5, 2, 3, 4, 5, 3, 8, 4],
+            [5, 10, 2, 5, 2, 4, 4, 2, 0],
+            [3, 10, 2, 3, 5, 10, 3, 8, 5, 4, 5, 8, 0, 1, 9],
+            [5, 10, 2, 5, 2, 4, 1, 9, 2, 9, 4, 2],
+            [8, 4, 5, 8, 5, 3, 3, 5, 1],
+            [0, 4, 5, 1, 0, 5],
+            [8, 4, 5, 8, 5, 3, 9, 0, 5, 0, 3, 5],
+            [9, 4, 5],
+            [4, 11, 7, 4, 9, 11, 9, 10, 11],
+            [0, 8, 3, 4, 9, 7, 9, 11, 7, 9, 10, 11],
+            [1, 10, 11, 1, 11, 4, 1, 4, 0, 7, 4, 11],
+            [3, 1, 4, 3, 4, 8, 1, 10, 4, 7, 4, 11, 10, 11, 4],
+            [4, 11, 7, 9, 11, 4, 9, 2, 11, 9, 1, 2],
+            [9, 7, 4, 9, 11, 7, 9, 1, 11, 2, 11, 1, 0, 8, 3],
+            [11, 7, 4, 11, 4, 2, 2, 4, 0],
+            [11, 7, 4, 11, 4, 2, 8, 3, 4, 3, 2, 4],
+            [2, 9, 10, 2, 7, 9, 2, 3, 7, 7, 4, 9],
+            [9, 10, 7, 9, 7, 4, 10, 2, 7, 8, 7, 0, 2, 0, 7],
+            [3, 7, 10, 3, 10, 2, 7, 4, 10, 1, 10, 0, 4, 0, 10],
+            [1, 10, 2, 8, 7, 4],
+            [4, 9, 1, 4, 1, 7, 7, 1, 3],
+            [4, 9, 1, 4, 1, 7, 0, 8, 1, 8, 7, 1],
+            [4, 0, 3, 7, 4, 3],
+            [4, 8, 7],
+            [9, 10, 8, 10, 11, 8],
+            [3, 0, 9, 3, 9, 11, 11, 9, 10],
+            [0, 1, 10, 0, 10, 8, 8, 10, 11],
+            [3, 1, 10, 11, 3, 10],
+            [1, 2, 11, 1, 11, 9, 9, 11, 8],
+            [3, 0, 9, 3, 9, 11, 1, 2, 9, 2, 11, 9],
+            [0, 2, 11, 8, 0, 11],
+            [3, 2, 11],
+            [2, 3, 8, 2, 8, 10, 10, 8, 9],
+            [9, 10, 2, 0, 9, 2],
+            [2, 3, 8, 2, 8, 10, 0, 1, 8, 1, 10, 8],
+            [1, 10, 2],
+            [1, 3, 8, 9, 1, 8],
+            [0, 9, 1],
+            [0, 3, 8],
+            []
+        ]    
+        edgeShifts = np.array([  ## maps edge ID (0-11) to (x,y,z) cell offset and edge ID (0-2)
+            [0, 0, 0, 0],   
+            [1, 0, 0, 1],
+            [0, 1, 0, 0],
+            [0, 0, 0, 1],
+            [0, 0, 1, 0],
+            [1, 0, 1, 1],
+            [0, 1, 1, 0],
+            [0, 0, 1, 1],
+            [0, 0, 0, 2],
+            [1, 0, 0, 2],
+            [1, 1, 0, 2],
+            [0, 1, 0, 2],
+            #[9, 9, 9, 9]  ## fake
+        ], dtype=np.uint16) # don't use ubyte here! This value gets added to cell index later; will need the extra precision.
+        nTableFaces = np.array([len(f)/3 for f in triTable], dtype=np.ubyte)
+        faceShiftTables = [None]
+        for i in range(1,6):
+            ## compute lookup table of index: vertexes mapping
+            faceTableI = np.zeros((len(triTable), i*3), dtype=np.ubyte)
+            faceTableInds = np.argwhere(nTableFaces == i)
+            faceTableI[faceTableInds[:,0]] = np.array([triTable[j] for j in faceTableInds])
+            faceTableI = faceTableI.reshape((len(triTable), i, 3))
+            faceShiftTables.append(edgeShifts[faceTableI])
+            
+        ## Let's try something different:
+        #faceTable = np.empty((256, 5, 3, 4), dtype=np.ubyte)   # (grid cell index, faces, vertexes, edge lookup)
+        #for i,f in enumerate(triTable):
+            #f = np.array(f + [12] * (15-len(f))).reshape(5,3)
+            #faceTable[i] = edgeShifts[f]
+        
+        
+        IsosurfaceDataCache = (faceShiftTables, edgeShifts, edgeTable, nTableFaces)
+    else:
+        faceShiftTables, edgeShifts, edgeTable, nTableFaces = IsosurfaceDataCache
+
+
+    
+    ## mark everything below the isosurface level
+    mask = data < level
+    
+    ### make eight sub-fields and compute indexes for grid cells
+    index = np.zeros([x-1 for x in data.shape], dtype=np.ubyte)
+    fields = np.empty((2,2,2), dtype=object)
+    slices = [slice(0,-1), slice(1,None)]
+    for i in [0,1]:
+        for j in [0,1]:
+            for k in [0,1]:
+                fields[i,j,k] = mask[slices[i], slices[j], slices[k]]
+                vertIndex = i - 2*j*i + 3*j + 4*k  ## this is just to match Bourk's vertex numbering scheme
+                index += fields[i,j,k] * 2**vertIndex
+    
+    ### Generate table of edges that have been cut
+    cutEdges = np.zeros([x+1 for x in index.shape]+[3], dtype=np.uint32)
+    edges = edgeTable[index]
+    for i, shift in enumerate(edgeShifts[:12]):        
+        slices = [slice(shift[j],cutEdges.shape[j]+(shift[j]-1)) for j in range(3)]
+        cutEdges[slices[0], slices[1], slices[2], shift[3]] += edges & 2**i
+    
+    ## for each cut edge, interpolate to see where exactly the edge is cut and generate vertex positions
+    m = cutEdges > 0
+    vertexInds = np.argwhere(m)   ## argwhere is slow!
+    vertexes = vertexInds[:,:3].astype(np.float32)
+    dataFlat = data.reshape(data.shape[0]*data.shape[1]*data.shape[2])
+    
+    ## re-use the cutEdges array as a lookup table for vertex IDs
+    cutEdges[vertexInds[:,0], vertexInds[:,1], vertexInds[:,2], vertexInds[:,3]] = np.arange(vertexInds.shape[0])
+    
+    for i in [0,1,2]:
+        vim = vertexInds[:,3] == i
+        vi = vertexInds[vim, :3]
+        viFlat = (vi * (np.array(data.strides[:3]) // data.itemsize)[np.newaxis,:]).sum(axis=1)
+        v1 = dataFlat[viFlat]
+        v2 = dataFlat[viFlat + data.strides[i]//data.itemsize]
+        vertexes[vim,i] += (level-v1) / (v2-v1)
+    
+    ### compute the set of vertex indexes for each face. 
+    
+    ## This works, but runs a bit slower.
+    #cells = np.argwhere((index != 0) & (index != 255))  ## all cells with at least one face
+    #cellInds = index[cells[:,0], cells[:,1], cells[:,2]]
+    #verts = faceTable[cellInds]
+    #mask = verts[...,0,0] != 9
+    #verts[...,:3] += cells[:,np.newaxis,np.newaxis,:]  ## we now have indexes into cutEdges
+    #verts = verts[mask]
+    #faces = cutEdges[verts[...,0], verts[...,1], verts[...,2], verts[...,3]]  ## and these are the vertex indexes we want.
+    
+    
+    ## To allow this to be vectorized efficiently, we count the number of faces in each 
+    ## grid cell and handle each group of cells with the same number together.
+    ## determine how many faces to assign to each grid cell
+    nFaces = nTableFaces[index]
+    totFaces = nFaces.sum()
+    faces = np.empty((totFaces, 3), dtype=np.uint32)
+    ptr = 0
+    #import debug
+    #p = debug.Profiler()
+    
+    ## this helps speed up an indexing operation later on
+    cs = np.array(cutEdges.strides)//cutEdges.itemsize
+    cutEdges = cutEdges.flatten()
+
+    ## this, strangely, does not seem to help.
+    #ins = np.array(index.strides)/index.itemsize
+    #index = index.flatten()
+
+    for i in range(1,6):
+        ### expensive:
+        #profiler()
+        cells = np.argwhere(nFaces == i)  ## all cells which require i faces  (argwhere is expensive)
+        #profiler()
+        if cells.shape[0] == 0:
+            continue
+        cellInds = index[cells[:,0], cells[:,1], cells[:,2]]   ## index values of cells to process for this round
+        #profiler()
+        
+        ### expensive:
+        verts = faceShiftTables[i][cellInds]
+        #profiler()
+        verts[...,:3] += cells[:,np.newaxis,np.newaxis,:]  ## we now have indexes into cutEdges
+        verts = verts.reshape((verts.shape[0]*i,)+verts.shape[2:])
+        #profiler()
+        
+        ### expensive:
+        verts = (verts * cs[np.newaxis, np.newaxis, :]).sum(axis=2)
+        vertInds = cutEdges[verts]
+        #profiler()
+        nv = vertInds.shape[0]
+        #profiler()
+        faces[ptr:ptr+nv] = vertInds #.reshape((nv, 3))
+        #profiler()
+        ptr += nv
+        
+    return vertexes, faces
+
+
+    
+def invertQTransform(tr):
+    """Return a QTransform that is the inverse of *tr*.
+    Rasises an exception if tr is not invertible.
+    
+    Note that this function is preferred over QTransform.inverted() due to
+    bugs in that method. (specifically, Qt has floating-point precision issues
+    when determining whether a matrix is invertible)
+    """
+    try:
+        import numpy.linalg
+        arr = np.array([[tr.m11(), tr.m12(), tr.m13()], [tr.m21(), tr.m22(), tr.m23()], [tr.m31(), tr.m32(), tr.m33()]])
+        inv = numpy.linalg.inv(arr)
+        return QtGui.QTransform(inv[0,0], inv[0,1], inv[0,2], inv[1,0], inv[1,1], inv[1,2], inv[2,0], inv[2,1])
+    except ImportError:
+        inv = tr.inverted()
+        if inv[1] is False:
+            raise Exception("Transform is not invertible.")
+        return inv[0]
+    
+    
+def pseudoScatter(data, spacing=None, shuffle=True, bidir=False):
+    """
+    Used for examining the distribution of values in a set. Produces scattering as in beeswarm or column scatter plots.
+    
+    Given a list of x-values, construct a set of y-values such that an x,y scatter-plot
+    will not have overlapping points (it will look similar to a histogram).
+    """
+    inds = np.arange(len(data))
+    if shuffle:
+        np.random.shuffle(inds)
+        
+    data = data[inds]
+    
+    if spacing is None:
+        spacing = 2.*np.std(data)/len(data)**0.5
+    s2 = spacing**2
+    
+    yvals = np.empty(len(data))
+    if len(data) == 0:
+        return yvals
+    yvals[0] = 0
+    for i in range(1,len(data)):
+        x = data[i]     # current x value to be placed
+        x0 = data[:i]   # all x values already placed
+        y0 = yvals[:i]  # all y values already placed
+        y = 0
+        
+        dx = (x0-x)**2  # x-distance to each previous point
+        xmask = dx < s2  # exclude anything too far away
+        
+        if xmask.sum() > 0:
+            if bidir:
+                dirs = [-1, 1]
+            else:
+                dirs = [1]
+            yopts = []
+            for direction in dirs:
+                y = 0
+                dx2 = dx[xmask]
+                dy = (s2 - dx2)**0.5   
+                limits = np.empty((2,len(dy)))  # ranges of y-values to exclude
+                limits[0] = y0[xmask] - dy
+                limits[1] = y0[xmask] + dy    
+                while True:
+                    # ignore anything below this y-value
+                    if direction > 0:
+                        mask = limits[1] >= y
+                    else:
+                        mask = limits[0] <= y
+                        
+                    limits2 = limits[:,mask]
+                    
+                    # are we inside an excluded region?
+                    mask = (limits2[0] < y) & (limits2[1] > y)
+                    if mask.sum() == 0:
+                        break
+                        
+                    if direction > 0:
+                        y = limits2[:,mask].max()
+                    else:
+                        y = limits2[:,mask].min()
+                yopts.append(y)
+            if bidir:
+                y = yopts[0] if -yopts[0] < yopts[1] else yopts[1]
+            else:
+                y = yopts[0]
+        yvals[i] = y
+    
+    return yvals[np.argsort(inds)]  ## un-shuffle values before returning
+
+
+
+def toposort(deps, nodes=None, seen=None, stack=None, depth=0):
+    """Topological sort. Arguments are:
+      deps    dictionary describing dependencies where a:[b,c] means "a depends on b and c"
+      nodes   optional, specifies list of starting nodes (these should be the nodes 
+              which are not depended on by any other nodes). Other candidate starting
+              nodes will be ignored.
+              
+    Example::
+
+        # Sort the following graph:
+        # 
+        #   B ──┬─────> C <── D
+        #       │       │       
+        #   E <─┴─> A <─┘
+        #     
+        deps = {'a': ['b', 'c'], 'c': ['b', 'd'], 'e': ['b']}
+        toposort(deps)
+         => ['b', 'd', 'c', 'a', 'e']
+    """
+    # fill in empty dep lists
+    deps = deps.copy()
+    for k,v in list(deps.items()):
+        for k in v:
+            if k not in deps:
+                deps[k] = []
+    
+    if nodes is None:
+        ## run through deps to find nodes that are not depended upon
+        rem = set()
+        for dep in deps.values():
+            rem |= set(dep)
+        nodes = set(deps.keys()) - rem
+    if seen is None:
+        seen = set()
+        stack = []
+    sorted = []
+    for n in nodes:
+        if n in stack:
+            raise Exception("Cyclic dependency detected", stack + [n])
+        if n in seen:
+            continue
+        seen.add(n)
+        sorted.extend( toposort(deps, deps[n], seen, stack+[n], depth=depth+1))
+        sorted.append(n)
+    return sorted
diff --git a/libs/pyqtgraph/graphicsItems/ArrowItem.py b/libs/pyqtgraph/graphicsItems/ArrowItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..77e6195f28b58a13889eac2c3bf0fd5e40b11c93
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/ArrowItem.py
@@ -0,0 +1,126 @@
+from ..Qt import QtGui, QtCore
+from .. import functions as fn
+import numpy as np
+__all__ = ['ArrowItem']
+
+class ArrowItem(QtGui.QGraphicsPathItem):
+    """
+    For displaying scale-invariant arrows.
+    For arrows pointing to a location on a curve, see CurveArrow
+    
+    """
+    
+    
+    def __init__(self, **opts):
+        """
+        Arrows can be initialized with any keyword arguments accepted by 
+        the setStyle() method.
+        """
+        self.opts = {}
+        QtGui.QGraphicsPathItem.__init__(self, opts.get('parent', None))
+
+        if 'size' in opts:
+            opts['headLen'] = opts['size']
+        if 'width' in opts:
+            opts['headWidth'] = opts['width']
+        defaultOpts = {
+            'pxMode': True,
+            'angle': -150,   ## If the angle is 0, the arrow points left
+            'pos': (0,0),
+            'headLen': 20,
+            'tipAngle': 25,
+            'baseAngle': 0,
+            'tailLen': None,
+            'tailWidth': 3,
+            'pen': (200,200,200),
+            'brush': (50,50,200),
+        }
+        defaultOpts.update(opts)
+        
+        self.setStyle(**defaultOpts)
+        
+        self.rotate(self.opts['angle'])
+        self.moveBy(*self.opts['pos'])
+    
+    def setStyle(self, **opts):
+        """
+        Changes the appearance of the arrow.
+        All arguments are optional:
+        
+        ======================  =================================================
+        **Keyword Arguments:**
+        angle                   Orientation of the arrow in degrees. Default is
+                                0; arrow pointing to the left.
+        headLen                 Length of the arrow head, from tip to base.
+                                default=20
+        headWidth               Width of the arrow head at its base.
+        tipAngle                Angle of the tip of the arrow in degrees. Smaller
+                                values make a 'sharper' arrow. If tipAngle is
+                                specified, ot overrides headWidth. default=25
+        baseAngle               Angle of the base of the arrow head. Default is
+                                0, which means that the base of the arrow head
+                                is perpendicular to the arrow tail.
+        tailLen                 Length of the arrow tail, measured from the base
+                                of the arrow head to the end of the tail. If
+                                this value is None, no tail will be drawn.
+                                default=None
+        tailWidth               Width of the tail. default=3
+        pen                     The pen used to draw the outline of the arrow.
+        brush                   The brush used to fill the arrow.
+        ======================  =================================================
+        """
+        self.opts.update(opts)
+        
+        opt = dict([(k,self.opts[k]) for k in ['headLen', 'tipAngle', 'baseAngle', 'tailLen', 'tailWidth']])
+        self.path = fn.makeArrowPath(**opt)
+        self.setPath(self.path)
+        
+        self.setPen(fn.mkPen(self.opts['pen']))
+        self.setBrush(fn.mkBrush(self.opts['brush']))
+        
+        if self.opts['pxMode']:
+            self.setFlags(self.flags() | self.ItemIgnoresTransformations)
+        else:
+            self.setFlags(self.flags() & ~self.ItemIgnoresTransformations)
+        
+    def paint(self, p, *args):
+        p.setRenderHint(QtGui.QPainter.Antialiasing)
+        QtGui.QGraphicsPathItem.paint(self, p, *args)
+        
+        #p.setPen(fn.mkPen('r'))
+        #p.setBrush(fn.mkBrush(None))
+        #p.drawRect(self.boundingRect())
+
+    def shape(self):
+        #if not self.opts['pxMode']:
+            #return QtGui.QGraphicsPathItem.shape(self)
+        return self.path
+    
+    ## dataBounds and pixelPadding methods are provided to ensure ViewBox can
+    ## properly auto-range 
+    def dataBounds(self, ax, frac, orthoRange=None):
+        pw = 0
+        pen = self.pen()
+        if not pen.isCosmetic():
+            pw = pen.width() * 0.7072
+        if self.opts['pxMode']:
+            return [0,0]
+        else:
+            br = self.boundingRect()
+            if ax == 0:
+                return [br.left()-pw, br.right()+pw]
+            else:
+                return [br.top()-pw, br.bottom()+pw]
+        
+    def pixelPadding(self):
+        pad = 0
+        if self.opts['pxMode']:
+            br = self.boundingRect()
+            pad += (br.width()**2 + br.height()**2) ** 0.5
+        pen = self.pen()
+        if pen.isCosmetic():
+            pad += max(1, pen.width()) * 0.7072
+        return pad
+        
+        
+    
diff --git a/libs/pyqtgraph/graphicsItems/AxisItem.py b/libs/pyqtgraph/graphicsItems/AxisItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..b125cb7e5bdd3e2665a84014565676cae91beb2e
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/AxisItem.py
@@ -0,0 +1,1076 @@
+from ..Qt import QtGui, QtCore
+from ..python2_3 import asUnicode
+import numpy as np
+from ..Point import Point
+from .. import debug as debug
+import weakref
+from .. import functions as fn
+from .. import getConfigOption
+from .GraphicsWidget import GraphicsWidget
+
+__all__ = ['AxisItem']
+class AxisItem(GraphicsWidget):
+    """
+    GraphicsItem showing a single plot axis with ticks, values, and label.
+    Can be configured to fit on any side of a plot, and can automatically synchronize its displayed scale with ViewBox items.
+    Ticks can be extended to draw a grid.
+    If maxTickLength is negative, ticks point into the plot. 
+    """
+    
+    def __init__(self, orientation, pen=None, linkView=None, parent=None, maxTickLength=-5, showValues=True):
+        """
+        ==============  ===============================================================
+        **Arguments:**
+        orientation     one of 'left', 'right', 'top', or 'bottom'
+        maxTickLength   (px) maximum length of ticks to draw. Negative values draw
+                        into the plot, positive values draw outward.
+        linkView        (ViewBox) causes the range of values displayed in the axis
+                        to be linked to the visible range of a ViewBox.
+        showValues      (bool) Whether to display values adjacent to ticks 
+        pen             (QPen) Pen used when drawing ticks.
+        ==============  ===============================================================
+        """
+        
+        GraphicsWidget.__init__(self, parent)
+        self.label = QtGui.QGraphicsTextItem(self)
+        self.picture = None
+        self.orientation = orientation
+        if orientation not in ['left', 'right', 'top', 'bottom']:
+            raise Exception("Orientation argument must be one of 'left', 'right', 'top', or 'bottom'.")
+        if orientation in ['left', 'right']:
+            self.label.rotate(-90)
+            
+        self.style = {
+            'tickTextOffset': [5, 2],  ## (horizontal, vertical) spacing between text and axis 
+            'tickTextWidth': 30,  ## space reserved for tick text
+            'tickTextHeight': 18, 
+            'autoExpandTextSpace': True,  ## automatically expand text space if needed
+            'tickFont': None,
+            'stopAxisAtTick': (False, False),  ## whether axis is drawn to edge of box or to last tick 
+            'textFillLimits': [  ## how much of the axis to fill up with tick text, maximally. 
+                (0, 0.8),    ## never fill more than 80% of the axis
+                (2, 0.6),    ## If we already have 2 ticks with text, fill no more than 60% of the axis
+                (4, 0.4),    ## If we already have 4 ticks with text, fill no more than 40% of the axis
+                (6, 0.2),    ## If we already have 6 ticks with text, fill no more than 20% of the axis
+                ],
+            'showValues': showValues,
+            'tickLength': maxTickLength,
+            'maxTickLevel': 2,
+            'maxTextLevel': 2,
+        }
+        
+        self.textWidth = 30  ## Keeps track of maximum width / height of tick text 
+        self.textHeight = 18
+        
+        # If the user specifies a width / height, remember that setting
+        # indefinitely.
+        self.fixedWidth = None
+        self.fixedHeight = None
+        
+        self.labelText = ''
+        self.labelUnits = ''
+        self.labelUnitPrefix=''
+        self.labelStyle = {}
+        self.logMode = False
+        self.tickFont = None
+        
+        self._tickLevels = None  ## used to override the automatic ticking system with explicit ticks
+        self._tickSpacing = None  # used to override default tickSpacing method
+        self.scale = 1.0
+        self.autoSIPrefix = True
+        self.autoSIPrefixScale = 1.0
+        
+        self.setRange(0, 1)
+        
+        if pen is None:
+            self.setPen()
+        else:
+            self.setPen(pen)
+        
+        self._linkedView = None
+        if linkView is not None:
+            self.linkToView(linkView)
+        
+        self.showLabel(False)
+        
+        self.grid = False
+        #self.setCacheMode(self.DeviceCoordinateCache)
+
+    def setStyle(self, **kwds):
+        """
+        Set various style options.
+        
+        =================== =======================================================
+        Keyword Arguments:
+        tickLength          (int) The maximum length of ticks in pixels. 
+                            Positive values point toward the text; negative 
+                            values point away.
+        tickTextOffset      (int) reserved spacing between text and axis in px
+        tickTextWidth       (int) Horizontal space reserved for tick text in px
+        tickTextHeight      (int) Vertical space reserved for tick text in px
+        autoExpandTextSpace (bool) Automatically expand text space if the tick
+                            strings become too long.
+        tickFont            (QFont or None) Determines the font used for tick 
+                            values. Use None for the default font.
+        stopAxisAtTick      (tuple: (bool min, bool max)) If True, the axis 
+                            line is drawn only as far as the last tick. 
+                            Otherwise, the line is drawn to the edge of the 
+                            AxisItem boundary.
+        textFillLimits      (list of (tick #, % fill) tuples). This structure
+                            determines how the AxisItem decides how many ticks 
+                            should have text appear next to them. Each tuple in
+                            the list specifies what fraction of the axis length
+                            may be occupied by text, given the number of ticks
+                            that already have text displayed. For example::
+                            
+                                [(0, 0.8), # Never fill more than 80% of the axis
+                                 (2, 0.6), # If we already have 2 ticks with text, 
+                                           # fill no more than 60% of the axis
+                                 (4, 0.4), # If we already have 4 ticks with text, 
+                                           # fill no more than 40% of the axis
+                                 (6, 0.2)] # If we already have 6 ticks with text, 
+                                           # fill no more than 20% of the axis
+                                
+        showValues          (bool) indicates whether text is displayed adjacent
+                            to ticks.
+        =================== =======================================================
+        
+        Added in version 0.9.9
+        """
+        for kwd,value in kwds.items():
+            if kwd not in self.style:
+                raise NameError("%s is not a valid style argument." % kwd)
+            
+            if kwd in ('tickLength', 'tickTextOffset', 'tickTextWidth', 'tickTextHeight'):
+                if not isinstance(value, int):
+                    raise ValueError("Argument '%s' must be int" % kwd)
+            
+            if kwd == 'tickTextOffset':
+                if self.orientation in ('left', 'right'):
+                    self.style['tickTextOffset'][0] = value
+                else:
+                    self.style['tickTextOffset'][1] = value
+            elif kwd == 'stopAxisAtTick':
+                try:
+                    assert len(value) == 2 and isinstance(value[0], bool) and isinstance(value[1], bool)
+                except:
+                    raise ValueError("Argument 'stopAxisAtTick' must have type (bool, bool)")
+                self.style[kwd] = value
+            else:
+                self.style[kwd] = value
+        
+        self.picture = None
+        self._adjustSize()
+        self.update()
+        
+    def close(self):
+        self.scene().removeItem(self.label)
+        self.label = None
+        self.scene().removeItem(self)
+        
+    def setGrid(self, grid):
+        """Set the alpha value (0-255) for the grid, or False to disable.
+        
+        When grid lines are enabled, the axis tick lines are extended to cover
+        the extent of the linked ViewBox, if any.
+        """
+        self.grid = grid
+        self.picture = None
+        self.prepareGeometryChange()
+        self.update()
+        
+    def setLogMode(self, log):
+        """
+        If *log* is True, then ticks are displayed on a logarithmic scale and values
+        are adjusted accordingly. (This is usually accessed by changing the log mode 
+        of a :func:`PlotItem <pyqtgraph.PlotItem.setLogMode>`)
+        """
+        self.logMode = log
+        self.picture = None
+        self.update()
+        
+    def setTickFont(self, font):
+        self.tickFont = font
+        self.picture = None
+        self.prepareGeometryChange()
+        ## Need to re-allocate space depending on font size?
+        
+        self.update()
+        
+    def resizeEvent(self, ev=None):
+        #s = self.size()
+        
+        ## Set the position of the label
+        nudge = 5
+        br = self.label.boundingRect()
+        p = QtCore.QPointF(0, 0)
+        if self.orientation == 'left':
+            p.setY(int(self.size().height()/2 + br.width()/2))
+            p.setX(-nudge)
+        elif self.orientation == 'right':
+            p.setY(int(self.size().height()/2 + br.width()/2))
+            p.setX(int(self.size().width()-br.height()+nudge))
+        elif self.orientation == 'top':
+            p.setY(-nudge)
+            p.setX(int(self.size().width()/2. - br.width()/2.))
+        elif self.orientation == 'bottom':
+            p.setX(int(self.size().width()/2. - br.width()/2.))
+            p.setY(int(self.size().height()-br.height()+nudge))
+        self.label.setPos(p)
+        self.picture = None
+        
+    def showLabel(self, show=True):
+        """Show/hide the label text for this axis."""
+        #self.drawLabel = show
+        self.label.setVisible(show)
+        if self.orientation in ['left', 'right']:
+            self._updateWidth()
+        else:
+            self._updateHeight()
+        if self.autoSIPrefix:
+            self.updateAutoSIPrefix()
+        
+    def setLabel(self, text=None, units=None, unitPrefix=None, **args):
+        """Set the text displayed adjacent to the axis.
+        
+        ==============  =============================================================
+        **Arguments:**
+        text            The text (excluding units) to display on the label for this
+                        axis.
+        units           The units for this axis. Units should generally be given
+                        without any scaling prefix (eg, 'V' instead of 'mV'). The
+                        scaling prefix will be automatically prepended based on the
+                        range of data displayed.
+        **args          All extra keyword arguments become CSS style options for
+                        the <span> tag which will surround the axis label and units.
+        ==============  =============================================================
+        
+        The final text generated for the label will look like::
+        
+            <span style="...options...">{text} (prefix{units})</span>
+            
+        Each extra keyword argument will become a CSS option in the above template. 
+        For example, you can set the font size and color of the label::
+        
+            labelStyle = {'color': '#FFF', 'font-size': '14pt'}
+            axis.setLabel('label text', units='V', **labelStyle)
+        
+        """
+        if text is not None:
+            self.labelText = text
+            self.showLabel()
+        if units is not None:
+            self.labelUnits = units
+            self.showLabel()
+        if unitPrefix is not None:
+            self.labelUnitPrefix = unitPrefix
+        if len(args) > 0:
+            self.labelStyle = args
+        self.label.setHtml(self.labelString())
+        self._adjustSize()
+        self.picture = None
+        self.update()
+            
+    def labelString(self):
+        if self.labelUnits == '':
+            if not self.autoSIPrefix or self.autoSIPrefixScale == 1.0:
+                units = ''
+            else:
+                units = asUnicode('(x%g)') % (1.0/self.autoSIPrefixScale)
+        else:
+            #print repr(self.labelUnitPrefix), repr(self.labelUnits)
+            units = asUnicode('(%s%s)') % (asUnicode(self.labelUnitPrefix), asUnicode(self.labelUnits))
+            
+        s = asUnicode('%s %s') % (asUnicode(self.labelText), asUnicode(units))
+        
+        style = ';'.join(['%s: %s' % (k, self.labelStyle[k]) for k in self.labelStyle])
+        
+        return asUnicode("<span style='%s'>%s</span>") % (style, asUnicode(s))
+    
+    def _updateMaxTextSize(self, x):
+        ## Informs that the maximum tick size orthogonal to the axis has
+        ## changed; we use this to decide whether the item needs to be resized
+        ## to accomodate.
+        if self.orientation in ['left', 'right']:
+            mx = max(self.textWidth, x)
+            if mx > self.textWidth or mx < self.textWidth-10:
+                self.textWidth = mx
+                if self.style['autoExpandTextSpace'] is True:
+                    self._updateWidth()
+                    #return True  ## size has changed
+        else:
+            mx = max(self.textHeight, x)
+            if mx > self.textHeight or mx < self.textHeight-10:
+                self.textHeight = mx
+                if self.style['autoExpandTextSpace'] is True:
+                    self._updateHeight()
+                    #return True  ## size has changed
+        
+    def _adjustSize(self):
+        if self.orientation in ['left', 'right']:
+            self._updateWidth()
+        else:
+            self._updateHeight()
+    
+    def setHeight(self, h=None):
+        """Set the height of this axis reserved for ticks and tick labels.
+        The height of the axis label is automatically added.
+        
+        If *height* is None, then the value will be determined automatically
+        based on the size of the tick text."""
+        self.fixedHeight = h
+        self._updateHeight()
+        
+    def _updateHeight(self):
+        if not self.isVisible():
+            h = 0
+        else:
+            if self.fixedHeight is None:
+                if not self.style['showValues']:
+                    h = 0
+                elif self.style['autoExpandTextSpace'] is True:
+                    h = self.textHeight
+                else:
+                    h = self.style['tickTextHeight']
+                h += self.style['tickTextOffset'][1] if self.style['showValues'] else 0
+                h += max(0, self.style['tickLength'])
+                if self.label.isVisible():
+                    h += self.label.boundingRect().height() * 0.8
+            else:
+                h = self.fixedHeight
+        
+        self.setMaximumHeight(h)
+        self.setMinimumHeight(h)
+        self.picture = None
+        
+    def setWidth(self, w=None):
+        """Set the width of this axis reserved for ticks and tick labels.
+        The width of the axis label is automatically added.
+        
+        If *width* is None, then the value will be determined automatically
+        based on the size of the tick text."""
+        self.fixedWidth = w
+        self._updateWidth()
+        
+    def _updateWidth(self):
+        if not self.isVisible():
+            w = 0
+        else:
+            if self.fixedWidth is None:
+                if not self.style['showValues']:
+                    w = 0
+                elif self.style['autoExpandTextSpace'] is True:
+                    w = self.textWidth
+                else:
+                    w = self.style['tickTextWidth']
+                w += self.style['tickTextOffset'][0] if self.style['showValues'] else 0
+                w += max(0, self.style['tickLength'])
+                if self.label.isVisible():
+                    w += self.label.boundingRect().height() * 0.8  ## bounding rect is usually an overestimate
+            else:
+                w = self.fixedWidth
+        
+        self.setMaximumWidth(w)
+        self.setMinimumWidth(w)
+        self.picture = None
+        
+    def pen(self):
+        if self._pen is None:
+            return fn.mkPen(getConfigOption('foreground'))
+        return fn.mkPen(self._pen)
+        
+    def setPen(self, *args, **kwargs):
+        """
+        Set the pen used for drawing text, axes, ticks, and grid lines.
+        If no arguments are given, the default foreground color will be used 
+        (see :func:`setConfigOption <pyqtgraph.setConfigOption>`).
+        """
+        self.picture = None
+        if args or kwargs:
+            self._pen = fn.mkPen(*args, **kwargs)
+        else:
+            self._pen = fn.mkPen(getConfigOption('foreground'))
+        self.labelStyle['color'] = '#' + fn.colorStr(self._pen.color())[:6]
+        self.setLabel()
+        self.update()
+        
+    def setScale(self, scale=None):
+        """
+        Set the value scaling for this axis. 
+        
+        Setting this value causes the axis to draw ticks and tick labels as if
+        the view coordinate system were scaled. By default, the axis scaling is 
+        1.0.
+        """
+        # Deprecated usage, kept for backward compatibility
+        if scale is None:  
+            scale = 1.0
+            self.enableAutoSIPrefix(True)
+            
+        if scale != self.scale:
+            self.scale = scale
+            self.setLabel()
+            self.picture = None
+            self.update()
+        
+    def enableAutoSIPrefix(self, enable=True):
+        """
+        Enable (or disable) automatic SI prefix scaling on this axis. 
+        
+        When enabled, this feature automatically determines the best SI prefix 
+        to prepend to the label units, while ensuring that axis values are scaled
+        accordingly. 
+        
+        For example, if the axis spans values from -0.1 to 0.1 and has units set 
+        to 'V' then the axis would display values -100 to 100
+        and the units would appear as 'mV'
+        
+        This feature is enabled by default, and is only available when a suffix
+        (unit string) is provided to display on the label.
+        """
+        self.autoSIPrefix = enable
+        self.updateAutoSIPrefix()
+        
+    def updateAutoSIPrefix(self):
+        if self.label.isVisible():
+            (scale, prefix) = fn.siScale(max(abs(self.range[0]*self.scale), abs(self.range[1]*self.scale)))
+            if self.labelUnits == '' and prefix in ['k', 'm']:  ## If we are not showing units, wait until 1e6 before scaling.
+                scale = 1.0
+                prefix = ''
+            self.setLabel(unitPrefix=prefix)
+        else:
+            scale = 1.0
+        
+        self.autoSIPrefixScale = scale
+        self.picture = None
+        self.update()
+        
+        
+    def setRange(self, mn, mx):
+        """Set the range of values displayed by the axis.
+        Usually this is handled automatically by linking the axis to a ViewBox with :func:`linkToView <pyqtgraph.AxisItem.linkToView>`"""
+        if any(np.isinf((mn, mx))) or any(np.isnan((mn, mx))):
+            raise Exception("Not setting range to [%s, %s]" % (str(mn), str(mx)))
+        self.range = [mn, mx]
+        if self.autoSIPrefix:
+            self.updateAutoSIPrefix()
+        self.picture = None
+        self.update()
+        
+    def linkedView(self):
+        """Return the ViewBox this axis is linked to"""
+        if self._linkedView is None:
+            return None
+        else:
+            return self._linkedView()
+        
+    def linkToView(self, view):
+        """Link this axis to a ViewBox, causing its displayed range to match the visible range of the view."""
+        oldView = self.linkedView()
+        self._linkedView = weakref.ref(view)
+        if self.orientation in ['right', 'left']:
+            if oldView is not None:
+                oldView.sigYRangeChanged.disconnect(self.linkedViewChanged)
+            view.sigYRangeChanged.connect(self.linkedViewChanged)
+        else:
+            if oldView is not None:
+                oldView.sigXRangeChanged.disconnect(self.linkedViewChanged)
+            view.sigXRangeChanged.connect(self.linkedViewChanged)
+        
+        if oldView is not None:
+            oldView.sigResized.disconnect(self.linkedViewChanged)
+        view.sigResized.connect(self.linkedViewChanged)
+        
+    def linkedViewChanged(self, view, newRange=None):
+        if self.orientation in ['right', 'left']:
+            if newRange is None:
+                newRange = view.viewRange()[1]
+            if view.yInverted():
+                self.setRange(*newRange[::-1])
+            else:
+                self.setRange(*newRange)
+        else:
+            if newRange is None:
+                newRange = view.viewRange()[0]
+            if view.xInverted():
+                self.setRange(*newRange[::-1])
+            else:
+                self.setRange(*newRange)
+        
+    def boundingRect(self):
+        linkedView = self.linkedView()
+        if linkedView is None or self.grid is False:
+            rect = self.mapRectFromParent(self.geometry())
+            ## extend rect if ticks go in negative direction
+            ## also extend to account for text that flows past the edges
+            tl = self.style['tickLength']
+            if self.orientation == 'left':
+                rect = rect.adjusted(0, -15, -min(0,tl), 15)
+            elif self.orientation == 'right':
+                rect = rect.adjusted(min(0,tl), -15, 0, 15)
+            elif self.orientation == 'top':
+                rect = rect.adjusted(-15, 0, 15, -min(0,tl))
+            elif self.orientation == 'bottom':
+                rect = rect.adjusted(-15, min(0,tl), 15, 0)
+            return rect
+        else:
+            return self.mapRectFromParent(self.geometry()) | linkedView.mapRectToItem(self, linkedView.boundingRect())
+        
+    def paint(self, p, opt, widget):
+        profiler = debug.Profiler()
+        if self.picture is None:
+            try:
+                picture = QtGui.QPicture()
+                painter = QtGui.QPainter(picture)
+                specs = self.generateDrawSpecs(painter)
+                profiler('generate specs')
+                if specs is not None:
+                    self.drawPicture(painter, *specs)
+                    profiler('draw picture')
+            finally:
+                painter.end()
+            self.picture = picture
+        #p.setRenderHint(p.Antialiasing, False)   ## Sometimes we get a segfault here ???
+        #p.setRenderHint(p.TextAntialiasing, True)
+        self.picture.play(p)
+
+    def setTicks(self, ticks):
+        """Explicitly determine which ticks to display.
+        This overrides the behavior specified by tickSpacing(), tickValues(), and tickStrings()
+        The format for *ticks* looks like::
+
+            [
+                [ (majorTickValue1, majorTickString1), (majorTickValue2, majorTickString2), ... ],
+                [ (minorTickValue1, minorTickString1), (minorTickValue2, minorTickString2), ... ],
+                ...
+            ]
+        
+        If *ticks* is None, then the default tick system will be used instead.
+        """
+        self._tickLevels = ticks
+        self.picture = None
+        self.update()
+    
+    def setTickSpacing(self, major=None, minor=None, levels=None):
+        """
+        Explicitly determine the spacing of major and minor ticks. This 
+        overrides the default behavior of the tickSpacing method, and disables
+        the effect of setTicks(). Arguments may be either *major* and *minor*, 
+        or *levels* which is a list of (spacing, offset) tuples for each 
+        tick level desired.
+        
+        If no arguments are given, then the default behavior of tickSpacing
+        is enabled.
+        
+        Examples::
+        
+            # two levels, all offsets = 0
+            axis.setTickSpacing(5, 1)
+            # three levels, all offsets = 0
+            axis.setTickSpacing([(3, 0), (1, 0), (0.25, 0)])
+            # reset to default
+            axis.setTickSpacing()
+        """
+        
+        if levels is None:
+            if major is None:
+                levels = None
+            else:
+                levels = [(major, 0), (minor, 0)]
+        self._tickSpacing = levels
+        self.picture = None
+        self.update()
+        
+
+    def tickSpacing(self, minVal, maxVal, size):
+        """Return values describing the desired spacing and offset of ticks.
+        
+        This method is called whenever the axis needs to be redrawn and is a 
+        good method to override in subclasses that require control over tick locations.
+        
+        The return value must be a list of tuples, one for each set of ticks::
+        
+            [
+                (major tick spacing, offset),
+                (minor tick spacing, offset),
+                (sub-minor tick spacing, offset),
+                ...
+            ]
+        """
+        # First check for override tick spacing
+        if self._tickSpacing is not None:
+            return self._tickSpacing
+        
+        dif = abs(maxVal - minVal)
+        if dif == 0:
+            return []
+        
+        ## decide optimal minor tick spacing in pixels (this is just aesthetics)
+        optimalTickCount = max(2., np.log(size))
+        
+        ## optimal minor tick spacing 
+        optimalSpacing = dif / optimalTickCount
+        
+        ## the largest power-of-10 spacing which is smaller than optimal
+        p10unit = 10 ** np.floor(np.log10(optimalSpacing))
+        
+        ## Determine major/minor tick spacings which flank the optimal spacing.
+        intervals = np.array([1., 2., 10., 20., 100.]) * p10unit
+        minorIndex = 0
+        while intervals[minorIndex+1] <= optimalSpacing:
+            minorIndex += 1
+            
+        levels = [
+            (intervals[minorIndex+2], 0),
+            (intervals[minorIndex+1], 0),
+            #(intervals[minorIndex], 0)    ## Pretty, but eats up CPU
+        ]
+        
+        if self.style['maxTickLevel'] >= 2:
+            ## decide whether to include the last level of ticks
+            minSpacing = min(size / 20., 30.)
+            maxTickCount = size / minSpacing
+            if dif / intervals[minorIndex] <= maxTickCount:
+                levels.append((intervals[minorIndex], 0))
+            return levels
+        
+        
+        
+        ##### This does not work -- switching between 2/5 confuses the automatic text-level-selection
+        ### Determine major/minor tick spacings which flank the optimal spacing.
+        #intervals = np.array([1., 2., 5., 10., 20., 50., 100.]) * p10unit
+        #minorIndex = 0
+        #while intervals[minorIndex+1] <= optimalSpacing:
+            #minorIndex += 1
+            
+        ### make sure we never see 5 and 2 at the same time
+        #intIndexes = [
+            #[0,1,3],
+            #[0,2,3],
+            #[2,3,4],
+            #[3,4,6],
+            #[3,5,6],
+        #][minorIndex]
+        
+        #return [
+            #(intervals[intIndexes[2]], 0),
+            #(intervals[intIndexes[1]], 0),
+            #(intervals[intIndexes[0]], 0)
+        #]
+        
+    def tickValues(self, minVal, maxVal, size):
+        """
+        Return the values and spacing of ticks to draw::
+        
+            [  
+                (spacing, [major ticks]), 
+                (spacing, [minor ticks]), 
+                ... 
+            ]
+        
+        By default, this method calls tickSpacing to determine the correct tick locations.
+        This is a good method to override in subclasses.
+        """
+        minVal, maxVal = sorted((minVal, maxVal))
+        
+
+        minVal *= self.scale  
+        maxVal *= self.scale
+        #size *= self.scale
+            
+        ticks = []
+        tickLevels = self.tickSpacing(minVal, maxVal, size)
+        allValues = np.array([])
+        for i in range(len(tickLevels)):
+            spacing, offset = tickLevels[i]
+            
+            ## determine starting tick
+            start = (np.ceil((minVal-offset) / spacing) * spacing) + offset
+            
+            ## determine number of ticks
+            num = int((maxVal-start) / spacing) + 1
+            values = (np.arange(num) * spacing + start) / self.scale
+            ## remove any ticks that were present in higher levels
+            ## we assume here that if the difference between a tick value and a previously seen tick value
+            ## is less than spacing/100, then they are 'equal' and we can ignore the new tick.
+            values = list(filter(lambda x: all(np.abs(allValues-x) > spacing*0.01), values) )
+            allValues = np.concatenate([allValues, values])
+            ticks.append((spacing/self.scale, values))
+            
+        if self.logMode:
+            return self.logTickValues(minVal, maxVal, size, ticks)
+        
+        
+        #nticks = []
+        #for t in ticks:
+            #nvals = []
+            #for v in t[1]:
+                #nvals.append(v/self.scale)
+            #nticks.append((t[0]/self.scale,nvals))
+        #ticks = nticks
+            
+        return ticks
+    
+    def logTickValues(self, minVal, maxVal, size, stdTicks):
+        
+        ## start with the tick spacing given by tickValues().
+        ## Any level whose spacing is < 1 needs to be converted to log scale
+        
+        ticks = []
+        for (spacing, t) in stdTicks:
+            if spacing >= 1.0:
+                ticks.append((spacing, t))
+        
+        if len(ticks) < 3:
+            v1 = int(np.floor(minVal))
+            v2 = int(np.ceil(maxVal))
+            #major = list(range(v1+1, v2))
+            
+            minor = []
+            for v in range(v1, v2):
+                minor.extend(v + np.log10(np.arange(1, 10)))
+            minor = [x for x in minor if x>minVal and x<maxVal]
+            ticks.append((None, minor))
+        return ticks
+
+    def tickStrings(self, values, scale, spacing):
+        """Return the strings that should be placed next to ticks. This method is called 
+        when redrawing the axis and is a good method to override in subclasses.
+        The method is called with a list of tick values, a scaling factor (see below), and the 
+        spacing between ticks (this is required since, in some instances, there may be only 
+        one tick and thus no other way to determine the tick spacing)
+        
+        The scale argument is used when the axis label is displaying units which may have an SI scaling prefix.
+        When determining the text to display, use value*scale to correctly account for this prefix.
+        For example, if the axis label's units are set to 'V', then a tick value of 0.001 might
+        be accompanied by a scale value of 1000. This indicates that the label is displaying 'mV', and 
+        thus the tick should display 0.001 * 1000 = 1.
+        """
+        if self.logMode:
+            return self.logTickStrings(values, scale, spacing)
+        
+        places = max(0, np.ceil(-np.log10(spacing*scale)))
+        strings = []
+        for v in values:
+            vs = v * scale
+            if abs(vs) < .001 or abs(vs) >= 10000:
+                vstr = "%g" % vs
+            else:
+                vstr = ("%%0.%df" % places) % vs
+            strings.append(vstr)
+        return strings
+        
+    def logTickStrings(self, values, scale, spacing):
+        return ["%0.1g"%x for x in 10 ** np.array(values).astype(float)]
+        
+    def generateDrawSpecs(self, p):
+        """
+        Calls tickValues() and tickStrings() to determine where and how ticks should
+        be drawn, then generates from this a set of drawing commands to be 
+        interpreted by drawPicture().
+        """
+        profiler = debug.Profiler()
+
+        #bounds = self.boundingRect()
+        bounds = self.mapRectFromParent(self.geometry())
+        
+        linkedView = self.linkedView()
+        if linkedView is None or self.grid is False:
+            tickBounds = bounds
+        else:
+            tickBounds = linkedView.mapRectToItem(self, linkedView.boundingRect())
+        
+        if self.orientation == 'left':
+            span = (bounds.topRight(), bounds.bottomRight())
+            tickStart = tickBounds.right()
+            tickStop = bounds.right()
+            tickDir = -1
+            axis = 0
+        elif self.orientation == 'right':
+            span = (bounds.topLeft(), bounds.bottomLeft())
+            tickStart = tickBounds.left()
+            tickStop = bounds.left()
+            tickDir = 1
+            axis = 0
+        elif self.orientation == 'top':
+            span = (bounds.bottomLeft(), bounds.bottomRight())
+            tickStart = tickBounds.bottom()
+            tickStop = bounds.bottom()
+            tickDir = -1
+            axis = 1
+        elif self.orientation == 'bottom':
+            span = (bounds.topLeft(), bounds.topRight())
+            tickStart = tickBounds.top()
+            tickStop = bounds.top()
+            tickDir = 1
+            axis = 1
+        #print tickStart, tickStop, span
+        
+        ## determine size of this item in pixels
+        points = list(map(self.mapToDevice, span))
+        if None in points:
+            return
+        lengthInPixels = Point(points[1] - points[0]).length()
+        if lengthInPixels == 0:
+            return
+
+        # Determine major / minor / subminor axis ticks
+        if self._tickLevels is None:
+            tickLevels = self.tickValues(self.range[0], self.range[1], lengthInPixels)
+            tickStrings = None
+        else:
+            ## parse self.tickLevels into the formats returned by tickLevels() and tickStrings()
+            tickLevels = []
+            tickStrings = []
+            for level in self._tickLevels:
+                values = []
+                strings = []
+                tickLevels.append((None, values))
+                tickStrings.append(strings)
+                for val, strn in level:
+                    values.append(val)
+                    strings.append(strn)
+        
+        ## determine mapping between tick values and local coordinates
+        dif = self.range[1] - self.range[0]
+        if dif == 0:
+            xScale = 1
+            offset = 0
+        else:
+            if axis == 0:
+                xScale = -bounds.height() / dif
+                offset = self.range[0] * xScale - bounds.height()
+            else:
+                xScale = bounds.width() / dif
+                offset = self.range[0] * xScale
+            
+        xRange = [x * xScale - offset for x in self.range]
+        xMin = min(xRange)
+        xMax = max(xRange)
+        
+        profiler('init')
+            
+        tickPositions = [] # remembers positions of previously drawn ticks
+        
+        ## compute coordinates to draw ticks
+        ## draw three different intervals, long ticks first
+        tickSpecs = []
+        for i in range(len(tickLevels)):
+            tickPositions.append([])
+            ticks = tickLevels[i][1]
+        
+            ## length of tick
+            tickLength = self.style['tickLength'] / ((i*0.5)+1.0)
+                
+            lineAlpha = 255 / (i+1)
+            if self.grid is not False:
+                lineAlpha *= self.grid/255. * np.clip((0.05  * lengthInPixels / (len(ticks)+1)), 0., 1.)
+            
+            for v in ticks:
+                ## determine actual position to draw this tick
+                x = (v * xScale) - offset
+                if x < xMin or x > xMax:  ## last check to make sure no out-of-bounds ticks are drawn
+                    tickPositions[i].append(None)
+                    continue
+                tickPositions[i].append(x)
+                
+                p1 = [x, x]
+                p2 = [x, x]
+                p1[axis] = tickStart
+                p2[axis] = tickStop
+                if self.grid is False:
+                    p2[axis] += tickLength*tickDir
+                tickPen = self.pen()
+                color = tickPen.color()
+                color.setAlpha(lineAlpha)
+                tickPen.setColor(color)
+                tickSpecs.append((tickPen, Point(p1), Point(p2)))
+        profiler('compute ticks')
+
+        
+        if self.style['stopAxisAtTick'][0] is True:
+            stop = max(span[0].y(), min(map(min, tickPositions)))
+            if axis == 0:
+                span[0].setY(stop)
+            else:
+                span[0].setX(stop)
+        if self.style['stopAxisAtTick'][1] is True:
+            stop = min(span[1].y(), max(map(max, tickPositions)))
+            if axis == 0:
+                span[1].setY(stop)
+            else:
+                span[1].setX(stop)
+        axisSpec = (self.pen(), span[0], span[1])
+
+        
+        textOffset = self.style['tickTextOffset'][axis]  ## spacing between axis and text
+        #if self.style['autoExpandTextSpace'] is True:
+            #textWidth = self.textWidth
+            #textHeight = self.textHeight
+        #else:
+            #textWidth = self.style['tickTextWidth'] ## space allocated for horizontal text
+            #textHeight = self.style['tickTextHeight'] ## space allocated for horizontal text
+            
+        textSize2 = 0
+        textRects = []
+        textSpecs = []  ## list of draw
+        
+        # If values are hidden, return early
+        if not self.style['showValues']:
+            return (axisSpec, tickSpecs, textSpecs)
+            
+        for i in range(min(len(tickLevels), self.style['maxTextLevel']+1)):
+            ## Get the list of strings to display for this level
+            if tickStrings is None:
+                spacing, values = tickLevels[i]
+                strings = self.tickStrings(values, self.autoSIPrefixScale * self.scale, spacing)
+            else:
+                strings = tickStrings[i]
+                
+            if len(strings) == 0:
+                continue
+            
+            ## ignore strings belonging to ticks that were previously ignored
+            for j in range(len(strings)):
+                if tickPositions[i][j] is None:
+                    strings[j] = None
+
+            ## Measure density of text; decide whether to draw this level
+            rects = []
+            for s in strings:
+                if s is None:
+                    rects.append(None)
+                else:
+                    br = p.boundingRect(QtCore.QRectF(0, 0, 100, 100), QtCore.Qt.AlignCenter, asUnicode(s))
+                    ## boundingRect is usually just a bit too large
+                    ## (but this probably depends on per-font metrics?)
+                    br.setHeight(br.height() * 0.8)
+                    
+                    rects.append(br)
+                    textRects.append(rects[-1])
+            
+            if len(textRects) > 0:
+                ## measure all text, make sure there's enough room
+                if axis == 0:
+                    textSize = np.sum([r.height() for r in textRects])
+                    textSize2 = np.max([r.width() for r in textRects])
+                else:
+                    textSize = np.sum([r.width() for r in textRects])
+                    textSize2 = np.max([r.height() for r in textRects])
+            else:
+                textSize = 0
+                textSize2 = 0
+
+            if i > 0:  ## always draw top level
+                ## If the strings are too crowded, stop drawing text now.
+                ## We use three different crowding limits based on the number
+                ## of texts drawn so far.
+                textFillRatio = float(textSize) / lengthInPixels
+                finished = False
+                for nTexts, limit in self.style['textFillLimits']:
+                    if len(textSpecs) >= nTexts and textFillRatio >= limit:
+                        finished = True
+                        break
+                if finished:
+                    break
+            
+            #spacing, values = tickLevels[best]
+            #strings = self.tickStrings(values, self.scale, spacing)
+            # Determine exactly where tick text should be drawn
+            for j in range(len(strings)):
+                vstr = strings[j]
+                if vstr is None: ## this tick was ignored because it is out of bounds
+                    continue
+                vstr = asUnicode(vstr)
+                x = tickPositions[i][j]
+                #textRect = p.boundingRect(QtCore.QRectF(0, 0, 100, 100), QtCore.Qt.AlignCenter, vstr)
+                textRect = rects[j]
+                height = textRect.height()
+                width = textRect.width()
+                #self.textHeight = height
+                offset = max(0,self.style['tickLength']) + textOffset
+                if self.orientation == 'left':
+                    textFlags = QtCore.Qt.TextDontClip|QtCore.Qt.AlignRight|QtCore.Qt.AlignVCenter
+                    rect = QtCore.QRectF(tickStop-offset-width, x-(height/2), width, height)
+                elif self.orientation == 'right':
+                    textFlags = QtCore.Qt.TextDontClip|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter
+                    rect = QtCore.QRectF(tickStop+offset, x-(height/2), width, height)
+                elif self.orientation == 'top':
+                    textFlags = QtCore.Qt.TextDontClip|QtCore.Qt.AlignCenter|QtCore.Qt.AlignBottom
+                    rect = QtCore.QRectF(x-width/2., tickStop-offset-height, width, height)
+                elif self.orientation == 'bottom':
+                    textFlags = QtCore.Qt.TextDontClip|QtCore.Qt.AlignCenter|QtCore.Qt.AlignTop
+                    rect = QtCore.QRectF(x-width/2., tickStop+offset, width, height)
+
+                #p.setPen(self.pen())
+                #p.drawText(rect, textFlags, vstr)
+                textSpecs.append((rect, textFlags, vstr))
+        profiler('compute text')
+            
+        ## update max text size if needed.
+        self._updateMaxTextSize(textSize2)
+        
+        return (axisSpec, tickSpecs, textSpecs)
+    
+    def drawPicture(self, p, axisSpec, tickSpecs, textSpecs):
+        profiler = debug.Profiler()
+
+        p.setRenderHint(p.Antialiasing, False)
+        p.setRenderHint(p.TextAntialiasing, True)
+        
+        ## draw long line along axis
+        pen, p1, p2 = axisSpec
+        p.setPen(pen)
+        p.drawLine(p1, p2)
+        p.translate(0.5,0)  ## resolves some damn pixel ambiguity
+        
+        ## draw ticks
+        for pen, p1, p2 in tickSpecs:
+            p.setPen(pen)
+            p.drawLine(p1, p2)
+        profiler('draw ticks')
+
+        ## Draw all text
+        if self.tickFont is not None:
+            p.setFont(self.tickFont)
+        p.setPen(self.pen())
+        for rect, flags, text in textSpecs:
+            p.drawText(rect, flags, text)
+            #p.drawRect(rect)
+        profiler('draw text')
+
+    def show(self):
+        GraphicsWidget.show(self)
+        if self.orientation in ['left', 'right']:
+            self._updateWidth()
+        else:
+            self._updateHeight()
+        
+    def hide(self):
+        GraphicsWidget.hide(self)
+        if self.orientation in ['left', 'right']:
+            self._updateWidth()
+        else:
+            self._updateHeight()
+
+    def wheelEvent(self, ev):
+        if self.linkedView() is None: 
+            return
+        if self.orientation in ['left', 'right']:
+            self.linkedView().wheelEvent(ev, axis=1)
+        else:
+            self.linkedView().wheelEvent(ev, axis=0)
+        ev.accept()
+        
+    def mouseDragEvent(self, event):
+        if self.linkedView() is None: 
+            return
+        if self.orientation in ['left', 'right']:
+            return self.linkedView().mouseDragEvent(event, axis=1)
+        else:
+            return self.linkedView().mouseDragEvent(event, axis=0)
+        
+    def mouseClickEvent(self, event):
+        if self.linkedView() is None: 
+            return
+        return self.linkedView().mouseClickEvent(event)
diff --git a/libs/pyqtgraph/graphicsItems/BarGraphItem.py b/libs/pyqtgraph/graphicsItems/BarGraphItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..a1d5d02957702c4ec084a7fd9a1bff392e3f3046
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/BarGraphItem.py
@@ -0,0 +1,168 @@
+from ..Qt import QtGui, QtCore
+from .GraphicsObject import GraphicsObject
+from .. import getConfigOption
+from .. import functions as fn
+import numpy as np
+
+
+__all__ = ['BarGraphItem']
+
+class BarGraphItem(GraphicsObject):
+    def __init__(self, **opts):
+        """
+        Valid keyword options are:
+        x, x0, x1, y, y0, y1, width, height, pen, brush
+        
+        x specifies the x-position of the center of the bar.
+        x0, x1 specify left and right edges of the bar, respectively.
+        width specifies distance from x0 to x1.
+        You may specify any combination:
+            
+            x, width
+            x0, width
+            x1, width
+            x0, x1
+            
+        Likewise y, y0, y1, and height. 
+        If only height is specified, then y0 will be set to 0
+        
+        Example uses:
+        
+            BarGraphItem(x=range(5), height=[1,5,2,4,3], width=0.5)
+            
+        
+        """
+        GraphicsObject.__init__(self)
+        self.opts = dict(
+            x=None,
+            y=None,
+            x0=None,
+            y0=None,
+            x1=None,
+            y1=None,
+            height=None,
+            width=None,
+            pen=None,
+            brush=None,
+            pens=None,
+            brushes=None,
+        )
+        self._shape = None
+        self.picture = None
+        self.setOpts(**opts)
+        
+    def setOpts(self, **opts):
+        self.opts.update(opts)
+        self.picture = None
+        self._shape = None
+        self.update()
+        self.informViewBoundsChanged()
+        
+    def drawPicture(self):
+        self.picture = QtGui.QPicture()
+        self._shape = QtGui.QPainterPath()
+        p = QtGui.QPainter(self.picture)
+        
+        pen = self.opts['pen']
+        pens = self.opts['pens']
+        
+        if pen is None and pens is None:
+            pen = getConfigOption('foreground')
+        
+        brush = self.opts['brush']
+        brushes = self.opts['brushes']
+        if brush is None and brushes is None:
+            brush = (128, 128, 128)
+        
+        def asarray(x):
+            if x is None or np.isscalar(x) or isinstance(x, np.ndarray):
+                return x
+            return np.array(x)
+
+        
+        x = asarray(self.opts.get('x'))
+        x0 = asarray(self.opts.get('x0'))
+        x1 = asarray(self.opts.get('x1'))
+        width = asarray(self.opts.get('width'))
+        
+        if x0 is None:
+            if width is None:
+                raise Exception('must specify either x0 or width')
+            if x1 is not None:
+                x0 = x1 - width
+            elif x is not None:
+                x0 = x - width/2.
+            else:
+                raise Exception('must specify at least one of x, x0, or x1')
+        if width is None:
+            if x1 is None:
+                raise Exception('must specify either x1 or width')
+            width = x1 - x0
+            
+        y = asarray(self.opts.get('y'))
+        y0 = asarray(self.opts.get('y0'))
+        y1 = asarray(self.opts.get('y1'))
+        height = asarray(self.opts.get('height'))
+
+        if y0 is None:
+            if height is None:
+                y0 = 0
+            elif y1 is not None:
+                y0 = y1 - height
+            elif y is not None:
+                y0 = y - height/2.
+            else:
+                y0 = 0
+        if height is None:
+            if y1 is None:
+                raise Exception('must specify either y1 or height')
+            height = y1 - y0
+        
+        p.setPen(fn.mkPen(pen))
+        p.setBrush(fn.mkBrush(brush))
+        for i in range(len(x0)):
+            if pens is not None:
+                p.setPen(fn.mkPen(pens[i]))
+            if brushes is not None:
+                p.setBrush(fn.mkBrush(brushes[i]))
+                
+            if np.isscalar(x0):
+                x = x0
+            else:
+                x = x0[i]
+            if np.isscalar(y0):
+                y = y0
+            else:
+                y = y0[i]
+            if np.isscalar(width):
+                w = width
+            else:
+                w = width[i]
+            if np.isscalar(height):
+                h = height
+            else:
+                h = height[i]
+                
+                
+            rect = QtCore.QRectF(x, y, w, h)
+            p.drawRect(rect)
+            self._shape.addRect(rect)
+            
+        p.end()
+        self.prepareGeometryChange()
+        
+        
+    def paint(self, p, *args):
+        if self.picture is None:
+            self.drawPicture()
+        self.picture.play(p)
+            
+    def boundingRect(self):
+        if self.picture is None:
+            self.drawPicture()
+        return QtCore.QRectF(self.picture.boundingRect())
+    
+    def shape(self):
+        if self.picture is None:
+            self.drawPicture()
+        return self._shape
diff --git a/libs/pyqtgraph/graphicsItems/ButtonItem.py b/libs/pyqtgraph/graphicsItems/ButtonItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..1c796823bf53ea3a21abe62f635b67a14dd1a884
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/ButtonItem.py
@@ -0,0 +1,58 @@
+from ..Qt import QtGui, QtCore
+from .GraphicsObject import GraphicsObject
+
+__all__ = ['ButtonItem']
+class ButtonItem(GraphicsObject):
+    """Button graphicsItem displaying an image."""
+    
+    clicked = QtCore.Signal(object)
+    
+    def __init__(self, imageFile=None, width=None, parentItem=None, pixmap=None):
+        self.enabled = True
+        GraphicsObject.__init__(self)
+        if imageFile is not None:
+            self.setImageFile(imageFile)
+        elif pixmap is not None:
+            self.setPixmap(pixmap)
+            
+        if width is not None:
+            s = float(width) / self.pixmap.width()
+            self.scale(s, s)
+        if parentItem is not None:
+            self.setParentItem(parentItem)
+        self.setOpacity(0.7)
+        
+    def setImageFile(self, imageFile):        
+        self.setPixmap(QtGui.QPixmap(imageFile))
+        
+    def setPixmap(self, pixmap):
+        self.pixmap = pixmap
+        self.update()
+        
+    def mouseClickEvent(self, ev):
+        if self.enabled:
+            self.clicked.emit(self)
+        
+    def mouseHoverEvent(self, ev):
+        if not self.enabled:
+            return
+        if ev.isEnter():
+            self.setOpacity(1.0)
+        else:
+            self.setOpacity(0.7)
+
+    def disable(self):
+        self.enabled = False
+        self.setOpacity(0.4)
+        
+    def enable(self):
+        self.enabled = True
+        self.setOpacity(0.7)
+        
+    def paint(self, p, *args):
+        p.setRenderHint(p.Antialiasing)
+        p.drawPixmap(0, 0, self.pixmap)
+        
+    def boundingRect(self):
+        return QtCore.QRectF(self.pixmap.rect())
+        
diff --git a/libs/pyqtgraph/graphicsItems/CurvePoint.py b/libs/pyqtgraph/graphicsItems/CurvePoint.py
new file mode 100644
index 0000000000000000000000000000000000000000..bb6beebcd1637e431a39509cb5a796c4ab29a2c0
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/CurvePoint.py
@@ -0,0 +1,117 @@
+from ..Qt import QtGui, QtCore
+from . import ArrowItem
+import numpy as np
+from ..Point import Point
+import weakref
+from .GraphicsObject import GraphicsObject
+
+__all__ = ['CurvePoint', 'CurveArrow']
+class CurvePoint(GraphicsObject):
+    """A GraphicsItem that sets its location to a point on a PlotCurveItem.
+    Also rotates to be tangent to the curve.
+    The position along the curve is a Qt property, and thus can be easily animated.
+    
+    Note: This class does not display anything; see CurveArrow for an applied example
+    """
+    
+    def __init__(self, curve, index=0, pos=None, rotate=True):
+        """Position can be set either as an index referring to the sample number or
+        the position 0.0 - 1.0
+        If *rotate* is True, then the item rotates to match the tangent of the curve.
+        """
+        
+        GraphicsObject.__init__(self)
+        #QObjectWorkaround.__init__(self)
+        self._rotate = rotate
+        self.curve = weakref.ref(curve)
+        self.setParentItem(curve)
+        self.setProperty('position', 0.0)
+        self.setProperty('index', 0)
+        
+        if hasattr(self, 'ItemHasNoContents'):
+            self.setFlags(self.flags() | self.ItemHasNoContents)
+        
+        if pos is not None:
+            self.setPos(pos)
+        else:
+            self.setIndex(index)
+            
+    def setPos(self, pos):
+        self.setProperty('position', float(pos))## cannot use numpy types here, MUST be python float.
+        
+    def setIndex(self, index):
+        self.setProperty('index', int(index))  ## cannot use numpy types here, MUST be python int.
+        
+    def event(self, ev):
+        if not isinstance(ev, QtCore.QDynamicPropertyChangeEvent) or self.curve() is None:
+            return False
+            
+        if ev.propertyName() == 'index':
+            index = self.property('index')
+            if 'QVariant' in repr(index):
+                index = index.toInt()[0]
+        elif ev.propertyName() == 'position':
+            index = None
+        else:
+            return False
+            
+        (x, y) = self.curve().getData()
+        if index is None:
+            #print ev.propertyName(), self.property('position').toDouble()[0], self.property('position').typeName()
+            pos = self.property('position')
+            if 'QVariant' in repr(pos):   ## need to support 2 APIs  :(
+                pos = pos.toDouble()[0]
+            index = (len(x)-1) * np.clip(pos, 0.0, 1.0)
+            
+        if index != int(index):  ## interpolate floating-point values
+            i1 = int(index)
+            i2 = np.clip(i1+1, 0, len(x)-1)
+            s2 = index-i1
+            s1 = 1.0-s2
+            newPos = (x[i1]*s1+x[i2]*s2, y[i1]*s1+y[i2]*s2)
+        else:
+            index = int(index)
+            i1 = np.clip(index-1, 0, len(x)-1)
+            i2 = np.clip(index+1, 0, len(x)-1)
+            newPos = (x[index], y[index])
+            
+        p1 = self.parentItem().mapToScene(QtCore.QPointF(x[i1], y[i1]))
+        p2 = self.parentItem().mapToScene(QtCore.QPointF(x[i2], y[i2]))
+        ang = np.arctan2(p2.y()-p1.y(), p2.x()-p1.x()) ## returns radians
+        self.resetTransform()
+        if self._rotate:
+            self.rotate(180+ ang * 180 / np.pi) ## takes degrees
+        QtGui.QGraphicsItem.setPos(self, *newPos)
+        return True
+        
+    def boundingRect(self):
+        return QtCore.QRectF()
+        
+    def paint(self, *args):
+        pass
+    
+    def makeAnimation(self, prop='position', start=0.0, end=1.0, duration=10000, loop=1):
+        anim = QtCore.QPropertyAnimation(self, prop)
+        anim.setDuration(duration)
+        anim.setStartValue(start)
+        anim.setEndValue(end)
+        anim.setLoopCount(loop)
+        return anim
+
+
+class CurveArrow(CurvePoint):
+    """Provides an arrow that points to any specific sample on a PlotCurveItem.
+    Provides properties that can be animated."""
+    
+    def __init__(self, curve, index=0, pos=None, **opts):
+        CurvePoint.__init__(self, curve, index=index, pos=pos)
+        if opts.get('pxMode', True):
+            opts['pxMode'] = False
+            self.setFlags(self.flags() | self.ItemIgnoresTransformations)
+        opts['angle'] = 0
+        self.arrow = ArrowItem.ArrowItem(**opts)
+        self.arrow.setParentItem(self)
+        
+    def setStyle(self, **opts):
+        return self.arrow.setStyle(**opts)
+        
diff --git a/libs/pyqtgraph/graphicsItems/ErrorBarItem.py b/libs/pyqtgraph/graphicsItems/ErrorBarItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..986c5140da755cf1c4d1d1ee301e6f1484b74b7d
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/ErrorBarItem.py
@@ -0,0 +1,149 @@
+from ..Qt import QtGui, QtCore
+from .GraphicsObject import GraphicsObject
+from .. import getConfigOption
+from .. import functions as fn
+
+__all__ = ['ErrorBarItem']
+
+class ErrorBarItem(GraphicsObject):
+    def __init__(self, **opts):
+        """
+        All keyword arguments are passed to setData().
+        """
+        GraphicsObject.__init__(self)
+        self.opts = dict(
+            x=None,
+            y=None,
+            height=None,
+            width=None,
+            top=None,
+            bottom=None,
+            left=None,
+            right=None,
+            beam=None,
+            pen=None
+        )
+        self.setData(**opts)
+
+    def setData(self, **opts):
+        """
+        Update the data in the item. All arguments are optional.
+        
+        Valid keyword options are:
+        x, y, height, width, top, bottom, left, right, beam, pen
+        
+        * x and y must be numpy arrays specifying the coordinates of data points.
+        * height, width, top, bottom, left, right, and beam may be numpy arrays,
+          single values, or None to disable. All values should be positive.
+        * top, bottom, left, and right specify the lengths of bars extending
+          in each direction.
+        * If height is specified, it overrides top and bottom.
+        * If width is specified, it overrides left and right.
+        * beam specifies the width of the beam at the end of each bar.
+        * pen may be any single argument accepted by pg.mkPen().
+        
+        This method was added in version 0.9.9. For prior versions, use setOpts.
+        """
+        self.opts.update(opts)
+        self.path = None
+        self.update()
+        self.prepareGeometryChange()
+        self.informViewBoundsChanged()
+        
+    def setOpts(self, **opts):
+        # for backward compatibility
+        self.setData(**opts)
+        
+    def drawPath(self):
+        p = QtGui.QPainterPath()
+        
+        x, y = self.opts['x'], self.opts['y']
+        if x is None or y is None:
+            return
+        
+        beam = self.opts['beam']
+        
+        
+        height, top, bottom = self.opts['height'], self.opts['top'], self.opts['bottom']
+        if height is not None or top is not None or bottom is not None:
+            ## draw vertical error bars
+            if height is not None:
+                y1 = y - height/2.
+                y2 = y + height/2.
+            else:
+                if bottom is None:
+                    y1 = y
+                else:
+                    y1 = y - bottom
+                if top is None:
+                    y2 = y
+                else:
+                    y2 = y + top
+            
+            for i in range(len(x)):
+                p.moveTo(x[i], y1[i])
+                p.lineTo(x[i], y2[i])
+                
+            if beam is not None and beam > 0:
+                x1 = x - beam/2.
+                x2 = x + beam/2.
+                if height is not None or top is not None:
+                    for i in range(len(x)):
+                        p.moveTo(x1[i], y2[i])
+                        p.lineTo(x2[i], y2[i])
+                if height is not None or bottom is not None:
+                    for i in range(len(x)):
+                        p.moveTo(x1[i], y1[i])
+                        p.lineTo(x2[i], y1[i])
+        
+        width, right, left = self.opts['width'], self.opts['right'], self.opts['left']
+        if width is not None or right is not None or left is not None:
+            ## draw vertical error bars
+            if width is not None:
+                x1 = x - width/2.
+                x2 = x + width/2.
+            else:
+                if left is None:
+                    x1 = x
+                else:
+                    x1 = x - left
+                if right is None:
+                    x2 = x
+                else:
+                    x2 = x + right
+            
+            for i in range(len(x)):
+                p.moveTo(x1[i], y[i])
+                p.lineTo(x2[i], y[i])
+                
+            if beam is not None and beam > 0:
+                y1 = y - beam/2.
+                y2 = y + beam/2.
+                if width is not None or right is not None:
+                    for i in range(len(x)):
+                        p.moveTo(x2[i], y1[i])
+                        p.lineTo(x2[i], y2[i])
+                if width is not None or left is not None:
+                    for i in range(len(x)):
+                        p.moveTo(x1[i], y1[i])
+                        p.lineTo(x1[i], y2[i])
+                    
+        self.path = p
+        self.prepareGeometryChange()
+        
+        
+    def paint(self, p, *args):
+        if self.path is None:
+            self.drawPath()
+        pen = self.opts['pen']
+        if pen is None:
+            pen = getConfigOption('foreground')
+        p.setPen(fn.mkPen(pen))
+        p.drawPath(self.path)
+            
+    def boundingRect(self):
+        if self.path is None:
+            self.drawPath()
+        return self.path.boundingRect()
+    
+        
\ No newline at end of file
diff --git a/libs/pyqtgraph/graphicsItems/FillBetweenItem.py b/libs/pyqtgraph/graphicsItems/FillBetweenItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..d297ee63e96b8e371a88e2398fcb517ec6792f24
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/FillBetweenItem.py
@@ -0,0 +1,80 @@
+from ..Qt import QtGui, USE_PYQT5, USE_PYQT4, USE_PYSIDE
+from .. import functions as fn
+from .PlotDataItem import PlotDataItem
+from .PlotCurveItem import PlotCurveItem
+
+class FillBetweenItem(QtGui.QGraphicsPathItem):
+    """
+    GraphicsItem filling the space between two PlotDataItems.
+    """
+    def __init__(self, curve1=None, curve2=None, brush=None, pen=None):
+        QtGui.QGraphicsPathItem.__init__(self)
+        self.curves = None
+        if curve1 is not None and curve2 is not None:
+            self.setCurves(curve1, curve2)
+        elif curve1 is not None or curve2 is not None:
+            raise Exception("Must specify two curves to fill between.")
+
+        if brush is not None:
+            self.setBrush(brush)
+        self.setPen(pen)
+        self.updatePath()
+        
+    def setBrush(self, *args, **kwds):
+        QtGui.QGraphicsPathItem.setBrush(self, fn.mkBrush(*args, **kwds))
+        
+    def setPen(self, *args, **kwds):
+        QtGui.QGraphicsPathItem.setPen(self, fn.mkPen(*args, **kwds))
+
+    def setCurves(self, curve1, curve2):
+        """Set the curves to fill between.
+        
+        Arguments must be instances of PlotDataItem or PlotCurveItem.
+        
+        Added in version 0.9.9
+        """
+        if self.curves is not None:
+            for c in self.curves:
+                try:
+                    c.sigPlotChanged.disconnect(self.curveChanged)
+                except (TypeError, RuntimeError):
+                    pass
+
+        curves = [curve1, curve2]
+        for c in curves:
+            if not isinstance(c, PlotDataItem) and not isinstance(c, PlotCurveItem):
+                raise TypeError("Curves must be PlotDataItem or PlotCurveItem.")
+        self.curves = curves
+        curve1.sigPlotChanged.connect(self.curveChanged)
+        curve2.sigPlotChanged.connect(self.curveChanged)
+        self.setZValue(min(curve1.zValue(), curve2.zValue())-1)
+        self.curveChanged()
+
+    def setBrush(self, *args, **kwds):
+        """Change the fill brush. Acceps the same arguments as pg.mkBrush()"""
+        QtGui.QGraphicsPathItem.setBrush(self, fn.mkBrush(*args, **kwds))
+
+    def curveChanged(self):
+        self.updatePath()
+
+    def updatePath(self):
+        if self.curves is None:
+            self.setPath(QtGui.QPainterPath())
+            return
+        paths = []
+        for c in self.curves:
+            if isinstance(c, PlotDataItem):
+                paths.append(c.curve.getPath())
+            elif isinstance(c, PlotCurveItem):
+                paths.append(c.getPath())
+
+        path = QtGui.QPainterPath()
+        transform = QtGui.QTransform()
+        p1 = paths[0].toSubpathPolygons(transform)
+        p2 = paths[1].toReversed().toSubpathPolygons(transform)
+        if len(p1) == 0 or len(p2) == 0:
+            self.setPath(QtGui.QPainterPath())
+            return
+
+        path.addPolygon(p1[0] + p2[0])
+        self.setPath(path)
diff --git a/libs/pyqtgraph/graphicsItems/GradientEditorItem.py b/libs/pyqtgraph/graphicsItems/GradientEditorItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..0679321ac7f0267750ef1ed3de8cc167246dbc7f
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/GradientEditorItem.py
@@ -0,0 +1,935 @@
+from ..Qt import QtGui, QtCore
+from ..python2_3 import sortList
+from .. import functions as fn
+from .GraphicsObject import GraphicsObject
+from .GraphicsWidget import GraphicsWidget
+from ..widgets.SpinBox import SpinBox
+import weakref
+from ..pgcollections import OrderedDict
+from ..colormap import ColorMap
+
+import numpy as np
+
+__all__ = ['TickSliderItem', 'GradientEditorItem']
+
+
+Gradients = OrderedDict([
+    ('thermal', {'ticks': [(0.3333, (185, 0, 0, 255)), (0.6666, (255, 220, 0, 255)), (1, (255, 255, 255, 255)), (0, (0, 0, 0, 255))], 'mode': 'rgb'}),
+    ('flame', {'ticks': [(0.2, (7, 0, 220, 255)), (0.5, (236, 0, 134, 255)), (0.8, (246, 246, 0, 255)), (1.0, (255, 255, 255, 255)), (0.0, (0, 0, 0, 255))], 'mode': 'rgb'}),
+    ('yellowy', {'ticks': [(0.0, (0, 0, 0, 255)), (0.2328863796753704, (32, 0, 129, 255)), (0.8362738179251941, (255, 255, 0, 255)), (0.5257586450247, (115, 15, 255, 255)), (1.0, (255, 255, 255, 255))], 'mode': 'rgb'} ),
+    ('bipolar', {'ticks': [(0.0, (0, 255, 255, 255)), (1.0, (255, 255, 0, 255)), (0.5, (0, 0, 0, 255)), (0.25, (0, 0, 255, 255)), (0.75, (255, 0, 0, 255))], 'mode': 'rgb'}),
+    ('spectrum', {'ticks': [(1.0, (255, 0, 255, 255)), (0.0, (255, 0, 0, 255))], 'mode': 'hsv'}),
+    ('cyclic', {'ticks': [(0.0, (255, 0, 4, 255)), (1.0, (255, 0, 0, 255))], 'mode': 'hsv'}),
+    ('greyclip', {'ticks': [(0.0, (0, 0, 0, 255)), (0.99, (255, 255, 255, 255)), (1.0, (255, 0, 0, 255))], 'mode': 'rgb'}),
+    ('grey', {'ticks': [(0.0, (0, 0, 0, 255)), (1.0, (255, 255, 255, 255))], 'mode': 'rgb'}),
+])
+
+
+
+
+
+class TickSliderItem(GraphicsWidget):
+    ## public class
+    """**Bases:** :class:`GraphicsWidget <pyqtgraph.GraphicsWidget>`
+    
+    A rectangular item with tick marks along its length that can (optionally) be moved by the user."""
+        
+    def __init__(self, orientation='bottom', allowAdd=True, **kargs):
+        """
+        ==============  =================================================================================
+        **Arguments:**
+        orientation     Set the orientation of the gradient. Options are: 'left', 'right'
+                        'top', and 'bottom'.
+        allowAdd        Specifies whether ticks can be added to the item by the user.
+        tickPen         Default is white. Specifies the color of the outline of the ticks.
+                        Can be any of the valid arguments for :func:`mkPen <pyqtgraph.mkPen>`
+        ==============  =================================================================================
+        """
+        ## public
+        GraphicsWidget.__init__(self)
+        self.orientation = orientation
+        self.length = 100
+        self.tickSize = 15
+        self.ticks = {}
+        self.maxDim = 20
+        self.allowAdd = allowAdd
+        if 'tickPen' in kargs:
+            self.tickPen = fn.mkPen(kargs['tickPen'])
+        else:
+            self.tickPen = fn.mkPen('w')
+            
+        self.orientations = {
+            'left': (90, 1, 1), 
+            'right': (90, 1, 1), 
+            'top': (0, 1, -1), 
+            'bottom': (0, 1, 1)
+        }
+        
+        self.setOrientation(orientation)
+        #self.setFrameStyle(QtGui.QFrame.NoFrame | QtGui.QFrame.Plain)
+        #self.setBackgroundRole(QtGui.QPalette.NoRole)
+        #self.setMouseTracking(True)
+        
+    #def boundingRect(self):
+        #return self.mapRectFromParent(self.geometry()).normalized()
+        
+    #def shape(self):  ## No idea why this is necessary, but rotated items do not receive clicks otherwise.
+        #p = QtGui.QPainterPath()
+        #p.addRect(self.boundingRect())
+        #return p
+        
+    def paint(self, p, opt, widget):
+        #p.setPen(fn.mkPen('g', width=3))
+        #p.drawRect(self.boundingRect())
+        return
+        
+    def keyPressEvent(self, ev):
+        ev.ignore()
+
+    def setMaxDim(self, mx=None):
+        if mx is None:
+            mx = self.maxDim
+        else:
+            self.maxDim = mx
+            
+        if self.orientation in ['bottom', 'top']:
+            self.setFixedHeight(mx)
+            self.setMaximumWidth(16777215)
+        else:
+            self.setFixedWidth(mx)
+            self.setMaximumHeight(16777215)
+            
+    
+    def setOrientation(self, orientation):
+        ## public
+        """Set the orientation of the TickSliderItem.
+        
+        ==============  ===================================================================
+        **Arguments:**
+        orientation     Options are: 'left', 'right', 'top', 'bottom'
+                        The orientation option specifies which side of the slider the
+                        ticks are on, as well as whether the slider is vertical ('right'
+                        and 'left') or horizontal ('top' and 'bottom').
+        ==============  ===================================================================
+        """
+        self.orientation = orientation
+        self.setMaxDim()
+        self.resetTransform()
+        ort = orientation
+        if ort == 'top':
+            transform = QtGui.QTransform.fromScale(1, -1)
+            transform.translate(0, -self.height())
+            self.setTransform(transform)
+        elif ort == 'left':
+            transform = QtGui.QTransform()
+            transform.rotate(270)
+            transform.scale(1, -1)
+            transform.translate(-self.height(), -self.maxDim)
+            self.setTransform(transform)
+        elif ort == 'right':
+            transform = QtGui.QTransform()
+            transform.rotate(270)
+            transform.translate(-self.height(), 0)
+            self.setTransform(transform)
+        elif ort != 'bottom':
+            raise Exception("%s is not a valid orientation. Options are 'left', 'right', 'top', and 'bottom'" %str(ort))
+        
+        self.translate(self.tickSize/2., 0)
+    
+    def addTick(self, x, color=None, movable=True):
+        ## public
+        """
+        Add a tick to the item.
+        
+        ==============  ==================================================================
+        **Arguments:**
+        x               Position where tick should be added.
+        color           Color of added tick. If color is not specified, the color will be
+                        white.
+        movable         Specifies whether the tick is movable with the mouse.
+        ==============  ==================================================================
+        """        
+        
+        if color is None:
+            color = QtGui.QColor(255,255,255)
+        tick = Tick(self, [x*self.length, 0], color, movable, self.tickSize, pen=self.tickPen)
+        self.ticks[tick] = x
+        tick.setParentItem(self)
+        return tick
+    
+    def removeTick(self, tick):
+        ## public
+        """
+        Removes the specified tick.
+        """
+        del self.ticks[tick]
+        tick.setParentItem(None)
+        if self.scene() is not None:
+            self.scene().removeItem(tick)
+    
+    def tickMoved(self, tick, pos):
+        #print "tick changed"
+        ## Correct position of tick if it has left bounds.
+        newX = min(max(0, pos.x()), self.length)
+        pos.setX(newX)
+        tick.setPos(pos)
+        self.ticks[tick] = float(newX) / self.length
+    
+    def tickMoveFinished(self, tick):
+        pass
+    
+    def tickClicked(self, tick, ev):
+        if ev.button() == QtCore.Qt.RightButton:
+            self.removeTick(tick)
+    
+    def widgetLength(self):
+        if self.orientation in ['bottom', 'top']:
+            return self.width()
+        else:
+            return self.height()
+    
+    def resizeEvent(self, ev):
+        wlen = max(40, self.widgetLength())
+        self.setLength(wlen-self.tickSize-2)
+        self.setOrientation(self.orientation)
+        #bounds = self.scene().itemsBoundingRect()
+        #bounds.setLeft(min(-self.tickSize*0.5, bounds.left()))
+        #bounds.setRight(max(self.length + self.tickSize, bounds.right()))
+        #self.setSceneRect(bounds)
+        #self.fitInView(bounds, QtCore.Qt.KeepAspectRatio)
+        
+    def setLength(self, newLen):
+        #private
+        for t, x in list(self.ticks.items()):
+            t.setPos(x * newLen + 1, t.pos().y())
+        self.length = float(newLen)
+        
+    #def mousePressEvent(self, ev):
+        #QtGui.QGraphicsView.mousePressEvent(self, ev)
+        #self.ignoreRelease = False
+        #for i in self.items(ev.pos()):
+            #if isinstance(i, Tick):
+                #self.ignoreRelease = True
+                #break
+        ##if len(self.items(ev.pos())) > 0:  ## Let items handle their own clicks
+            ##self.ignoreRelease = True
+        
+    #def mouseReleaseEvent(self, ev):
+        #QtGui.QGraphicsView.mouseReleaseEvent(self, ev)
+        #if self.ignoreRelease:
+            #return
+            
+        #pos = self.mapToScene(ev.pos())
+            
+        #if ev.button() == QtCore.Qt.LeftButton and self.allowAdd:
+            #if pos.x() < 0 or pos.x() > self.length:
+                #return
+            #if pos.y() < 0 or pos.y() > self.tickSize:
+                #return
+            #pos.setX(min(max(pos.x(), 0), self.length))
+            #self.addTick(pos.x()/self.length)
+        #elif ev.button() == QtCore.Qt.RightButton:
+            #self.showMenu(ev)
+            
+    def mouseClickEvent(self, ev):
+        if ev.button() == QtCore.Qt.LeftButton and self.allowAdd:
+            pos = ev.pos()
+            if pos.x() < 0 or pos.x() > self.length:
+                return
+            if pos.y() < 0 or pos.y() > self.tickSize:
+                return
+            pos.setX(min(max(pos.x(), 0), self.length))
+            self.addTick(pos.x()/self.length)
+        elif ev.button() == QtCore.Qt.RightButton:
+            self.showMenu(ev)
+
+        #if  ev.button() == QtCore.Qt.RightButton:
+            #if self.moving:
+                #ev.accept()
+                #self.setPos(self.startPosition)
+                #self.moving = False
+                #self.sigMoving.emit(self)
+                #self.sigMoved.emit(self)
+            #else:
+                #pass
+                #self.view().tickClicked(self, ev)
+                ###remove
+
+    def hoverEvent(self, ev):
+        if (not ev.isExit()) and ev.acceptClicks(QtCore.Qt.LeftButton):
+            ev.acceptClicks(QtCore.Qt.RightButton)
+            ## show ghost tick
+            #self.currentPen = fn.mkPen(255, 0,0)
+        #else:
+            #self.currentPen = self.pen
+        #self.update()
+        
+    def showMenu(self, ev):
+        pass
+
+    def setTickColor(self, tick, color):
+        """Set the color of the specified tick.
+        
+        ==============  ==================================================================
+        **Arguments:**
+        tick            Can be either an integer corresponding to the index of the tick
+                        or a Tick object. Ex: if you had a slider with 3 ticks and you
+                        wanted to change the middle tick, the index would be 1.
+        color           The color to make the tick. Can be any argument that is valid for
+                        :func:`mkBrush <pyqtgraph.mkBrush>`
+        ==============  ==================================================================
+        """
+        tick = self.getTick(tick)
+        tick.color = color
+        tick.update()
+        #tick.setBrush(QtGui.QBrush(QtGui.QColor(tick.color)))
+
+    def setTickValue(self, tick, val):
+        ## public
+        """
+        Set the position (along the slider) of the tick.
+        
+        ==============   ==================================================================
+        **Arguments:**
+        tick             Can be either an integer corresponding to the index of the tick
+                         or a Tick object. Ex: if you had a slider with 3 ticks and you
+                         wanted to change the middle tick, the index would be 1.
+        val              The desired position of the tick. If val is < 0, position will be
+                         set to 0. If val is > 1, position will be set to 1.
+        ==============   ==================================================================
+        """
+        tick = self.getTick(tick)
+        val = min(max(0.0, val), 1.0)
+        x = val * self.length
+        pos = tick.pos()
+        pos.setX(x)
+        tick.setPos(pos)
+        self.ticks[tick] = val
+        self.updateGradient()
+        
+    def tickValue(self, tick):
+        ## public
+        """Return the value (from 0.0 to 1.0) of the specified tick.
+        
+        ==============  ==================================================================
+        **Arguments:**
+        tick            Can be either an integer corresponding to the index of the tick
+                        or a Tick object. Ex: if you had a slider with 3 ticks and you
+                        wanted the value of the middle tick, the index would be 1.
+        ==============  ==================================================================
+        """
+        tick = self.getTick(tick)
+        return self.ticks[tick]
+        
+    def getTick(self, tick):
+        ## public
+        """Return the Tick object at the specified index.
+        
+        ==============  ==================================================================
+        **Arguments:**
+        tick            An integer corresponding to the index of the desired tick. If the
+                        argument is not an integer it will be returned unchanged.
+        ==============  ==================================================================
+        """
+        if type(tick) is int:
+            tick = self.listTicks()[tick][0]
+        return tick
+
+    #def mouseMoveEvent(self, ev):
+        #QtGui.QGraphicsView.mouseMoveEvent(self, ev)
+
+    def listTicks(self):
+        """Return a sorted list of all the Tick objects on the slider."""
+        ## public
+        ticks = list(self.ticks.items())
+        sortList(ticks, lambda a,b: cmp(a[1], b[1]))  ## see pyqtgraph.python2_3.sortList
+        return ticks
+
+
+class GradientEditorItem(TickSliderItem):
+    """
+    **Bases:** :class:`TickSliderItem <pyqtgraph.TickSliderItem>`
+    
+    An item that can be used to define a color gradient. Implements common pre-defined gradients that are 
+    customizable by the user. :class: `GradientWidget <pyqtgraph.GradientWidget>` provides a widget
+    with a GradientEditorItem that can be added to a GUI. 
+    
+    ================================ ===========================================================
+    **Signals:**
+    sigGradientChanged(self)         Signal is emitted anytime the gradient changes. The signal 
+                                     is emitted in real time while ticks are being dragged or 
+                                     colors are being changed.
+    sigGradientChangeFinished(self)  Signal is emitted when the gradient is finished changing.
+    ================================ ===========================================================    
+ 
+    """
+    
+    sigGradientChanged = QtCore.Signal(object)
+    sigGradientChangeFinished = QtCore.Signal(object)
+    
+    def __init__(self, *args, **kargs):
+        """
+        Create a new GradientEditorItem. 
+        All arguments are passed to :func:`TickSliderItem.__init__ <pyqtgraph.TickSliderItem.__init__>`
+        
+        ===============  =================================================================================
+        **Arguments:**
+        orientation      Set the orientation of the gradient. Options are: 'left', 'right'
+                         'top', and 'bottom'.
+        allowAdd         Default is True. Specifies whether ticks can be added to the item.
+        tickPen          Default is white. Specifies the color of the outline of the ticks.
+                         Can be any of the valid arguments for :func:`mkPen <pyqtgraph.mkPen>`
+        ===============  =================================================================================
+        """
+        self.currentTick = None
+        self.currentTickColor = None
+        self.rectSize = 15
+        self.gradRect = QtGui.QGraphicsRectItem(QtCore.QRectF(0, self.rectSize, 100, self.rectSize))
+        self.backgroundRect = QtGui.QGraphicsRectItem(QtCore.QRectF(0, -self.rectSize, 100, self.rectSize))
+        self.backgroundRect.setBrush(QtGui.QBrush(QtCore.Qt.DiagCrossPattern))
+        self.colorMode = 'rgb'
+        
+        TickSliderItem.__init__(self, *args, **kargs)
+        
+        self.colorDialog = QtGui.QColorDialog()
+        self.colorDialog.setOption(QtGui.QColorDialog.ShowAlphaChannel, True)
+        self.colorDialog.setOption(QtGui.QColorDialog.DontUseNativeDialog, True)
+        
+        self.colorDialog.currentColorChanged.connect(self.currentColorChanged)
+        self.colorDialog.rejected.connect(self.currentColorRejected)
+        self.colorDialog.accepted.connect(self.currentColorAccepted)
+        
+        self.backgroundRect.setParentItem(self)
+        self.gradRect.setParentItem(self)
+        
+        self.setMaxDim(self.rectSize + self.tickSize)
+        
+        self.rgbAction = QtGui.QAction('RGB', self)
+        self.rgbAction.setCheckable(True)
+        self.rgbAction.triggered.connect(lambda: self.setColorMode('rgb'))
+        self.hsvAction = QtGui.QAction('HSV', self)
+        self.hsvAction.setCheckable(True)
+        self.hsvAction.triggered.connect(lambda: self.setColorMode('hsv'))
+            
+        self.menu = QtGui.QMenu()
+        
+        ## build context menu of gradients
+        l = self.length
+        self.length = 100
+        global Gradients
+        for g in Gradients:
+            px = QtGui.QPixmap(100, 15)
+            p = QtGui.QPainter(px)
+            self.restoreState(Gradients[g])
+            grad = self.getGradient()
+            brush = QtGui.QBrush(grad)
+            p.fillRect(QtCore.QRect(0, 0, 100, 15), brush)
+            p.end()
+            label = QtGui.QLabel()
+            label.setPixmap(px)
+            label.setContentsMargins(1, 1, 1, 1)
+            act = QtGui.QWidgetAction(self)
+            act.setDefaultWidget(label)
+            act.triggered.connect(self.contextMenuClicked)
+            act.name = g
+            self.menu.addAction(act)
+        self.length = l
+        self.menu.addSeparator()
+        self.menu.addAction(self.rgbAction)
+        self.menu.addAction(self.hsvAction)
+        
+        
+        for t in list(self.ticks.keys()):
+            self.removeTick(t)
+        self.addTick(0, QtGui.QColor(0,0,0), True)
+        self.addTick(1, QtGui.QColor(255,0,0), True)
+        self.setColorMode('rgb')
+        self.updateGradient()
+    
+    def setOrientation(self, orientation):
+        ## public
+        """
+        Set the orientation of the GradientEditorItem. 
+        
+        ==============  ===================================================================
+        **Arguments:**
+        orientation     Options are: 'left', 'right', 'top', 'bottom'
+                        The orientation option specifies which side of the gradient the
+                        ticks are on, as well as whether the gradient is vertical ('right'
+                        and 'left') or horizontal ('top' and 'bottom').
+        ==============  ===================================================================
+        """
+        TickSliderItem.setOrientation(self, orientation)
+        self.translate(0, self.rectSize)
+    
+    def showMenu(self, ev):
+        #private
+        self.menu.popup(ev.screenPos().toQPoint())
+    
+    def contextMenuClicked(self, b=None):
+        #private
+        #global Gradients
+        act = self.sender()
+        self.loadPreset(act.name)
+        
+    def loadPreset(self, name):
+        """
+        Load a predefined gradient. 
+    
+        """ ## TODO: provide image with names of defined gradients
+        #global Gradients
+        self.restoreState(Gradients[name])
+    
+    def setColorMode(self, cm):
+        """
+        Set the color mode for the gradient. Options are: 'hsv', 'rgb'
+        
+        """
+        
+        ## public
+        if cm not in ['rgb', 'hsv']:
+            raise Exception("Unknown color mode %s. Options are 'rgb' and 'hsv'." % str(cm))
+        
+        try:
+            self.rgbAction.blockSignals(True)
+            self.hsvAction.blockSignals(True)
+            self.rgbAction.setChecked(cm == 'rgb')
+            self.hsvAction.setChecked(cm == 'hsv')
+        finally:
+            self.rgbAction.blockSignals(False)
+            self.hsvAction.blockSignals(False)
+        self.colorMode = cm
+        self.updateGradient()
+        
+    def colorMap(self):
+        """Return a ColorMap object representing the current state of the editor."""
+        if self.colorMode == 'hsv':
+            raise NotImplementedError('hsv colormaps not yet supported')
+        pos = []
+        color = []
+        for t,x in self.listTicks():
+            pos.append(x)
+            c = t.color
+            color.append([c.red(), c.green(), c.blue(), c.alpha()])
+        return ColorMap(np.array(pos), np.array(color, dtype=np.ubyte))
+        
+    def updateGradient(self):
+        #private
+        self.gradient = self.getGradient()
+        self.gradRect.setBrush(QtGui.QBrush(self.gradient))
+        self.sigGradientChanged.emit(self)
+        
+    def setLength(self, newLen):
+        #private (but maybe public)
+        TickSliderItem.setLength(self, newLen)
+        self.backgroundRect.setRect(1, -self.rectSize, newLen, self.rectSize)
+        self.gradRect.setRect(1, -self.rectSize, newLen, self.rectSize)
+        self.updateGradient()
+        
+    def currentColorChanged(self, color):
+        #private
+        if color.isValid() and self.currentTick is not None:
+            self.setTickColor(self.currentTick, color)
+            self.updateGradient()
+            
+    def currentColorRejected(self):
+        #private
+        self.setTickColor(self.currentTick, self.currentTickColor)
+        self.updateGradient()
+        
+    def currentColorAccepted(self):
+        self.sigGradientChangeFinished.emit(self)
+        
+    def tickClicked(self, tick, ev):
+        #private
+        if ev.button() == QtCore.Qt.LeftButton:
+            self.raiseColorDialog(tick)
+        elif ev.button() == QtCore.Qt.RightButton:
+            self.raiseTickContextMenu(tick, ev)
+            
+    def raiseColorDialog(self, tick):
+        if not tick.colorChangeAllowed:
+            return
+        self.currentTick = tick
+        self.currentTickColor = tick.color
+        self.colorDialog.setCurrentColor(tick.color)
+        self.colorDialog.open()
+        
+    def raiseTickContextMenu(self, tick, ev):
+        self.tickMenu = TickMenu(tick, self)
+        self.tickMenu.popup(ev.screenPos().toQPoint())
+    
+    def tickMoved(self, tick, pos):
+        #private
+        TickSliderItem.tickMoved(self, tick, pos)
+        self.updateGradient()
+
+    def tickMoveFinished(self, tick):
+        self.sigGradientChangeFinished.emit(self)
+    
+
+    def getGradient(self):
+        """Return a QLinearGradient object."""
+        g = QtGui.QLinearGradient(QtCore.QPointF(0,0), QtCore.QPointF(self.length,0))
+        if self.colorMode == 'rgb':
+            ticks = self.listTicks()
+            g.setStops([(x, QtGui.QColor(t.color)) for t,x in ticks])
+        elif self.colorMode == 'hsv':  ## HSV mode is approximated for display by interpolating 10 points between each stop
+            ticks = self.listTicks()
+            stops = []
+            stops.append((ticks[0][1], ticks[0][0].color))
+            for i in range(1,len(ticks)):
+                x1 = ticks[i-1][1]
+                x2 = ticks[i][1]
+                dx = (x2-x1) / 10.
+                for j in range(1,10):
+                    x = x1 + dx*j
+                    stops.append((x, self.getColor(x)))
+                stops.append((x2, self.getColor(x2)))
+            g.setStops(stops)
+        return g
+        
+    def getColor(self, x, toQColor=True):
+        """
+        Return a color for a given value.
+        
+        ==============  ==================================================================
+        **Arguments:**
+        x               Value (position on gradient) of requested color.
+        toQColor        If true, returns a QColor object, else returns a (r,g,b,a) tuple.
+        ==============  ==================================================================
+        """
+        ticks = self.listTicks()
+        if x <= ticks[0][1]:
+            c = ticks[0][0].color
+            if toQColor:
+                return QtGui.QColor(c)  # always copy colors before handing them out
+            else:
+                return (c.red(), c.green(), c.blue(), c.alpha())
+        if x >= ticks[-1][1]:
+            c = ticks[-1][0].color
+            if toQColor:
+                return QtGui.QColor(c)  # always copy colors before handing them out
+            else:
+                return (c.red(), c.green(), c.blue(), c.alpha())
+            
+        x2 = ticks[0][1]
+        for i in range(1,len(ticks)):
+            x1 = x2
+            x2 = ticks[i][1]
+            if x1 <= x and x2 >= x:
+                break
+                
+        dx = (x2-x1)
+        if dx == 0:
+            f = 0.
+        else:
+            f = (x-x1) / dx
+        c1 = ticks[i-1][0].color
+        c2 = ticks[i][0].color
+        if self.colorMode == 'rgb':
+            r = c1.red() * (1.-f) + c2.red() * f
+            g = c1.green() * (1.-f) + c2.green() * f
+            b = c1.blue() * (1.-f) + c2.blue() * f
+            a = c1.alpha() * (1.-f) + c2.alpha() * f
+            if toQColor:
+                return QtGui.QColor(int(r), int(g), int(b), int(a))
+            else:
+                return (r,g,b,a)
+        elif self.colorMode == 'hsv':
+            h1,s1,v1,_ = c1.getHsv()
+            h2,s2,v2,_ = c2.getHsv()
+            h = h1 * (1.-f) + h2 * f
+            s = s1 * (1.-f) + s2 * f
+            v = v1 * (1.-f) + v2 * f
+            c = QtGui.QColor()
+            c.setHsv(h,s,v)
+            if toQColor:
+                return c
+            else:
+                return (c.red(), c.green(), c.blue(), c.alpha())
+                    
+    def getLookupTable(self, nPts, alpha=None):
+        """
+        Return an RGB(A) lookup table (ndarray). 
+        
+        ==============  ============================================================================
+        **Arguments:**
+        nPts            The number of points in the returned lookup table.
+        alpha           True, False, or None - Specifies whether or not alpha values are included
+                        in the table.If alpha is None, alpha will be automatically determined.
+        ==============  ============================================================================
+        """
+        if alpha is None:
+            alpha = self.usesAlpha()
+        if alpha:
+            table = np.empty((nPts,4), dtype=np.ubyte)
+        else:
+            table = np.empty((nPts,3), dtype=np.ubyte)
+            
+        for i in range(nPts):
+            x = float(i)/(nPts-1)
+            color = self.getColor(x, toQColor=False)
+            table[i] = color[:table.shape[1]]
+            
+        return table
+    
+    def usesAlpha(self):
+        """Return True if any ticks have an alpha < 255"""
+        
+        ticks = self.listTicks()
+        for t in ticks:
+            if t[0].color.alpha() < 255:
+                return True
+            
+        return False
+            
+    def isLookupTrivial(self):
+        """Return True if the gradient has exactly two stops in it: black at 0.0 and white at 1.0"""
+        ticks = self.listTicks()
+        if len(ticks) != 2:
+            return False
+        if ticks[0][1] != 0.0 or ticks[1][1] != 1.0:
+            return False
+        c1 = fn.colorTuple(ticks[0][0].color)
+        c2 = fn.colorTuple(ticks[1][0].color)
+        if c1 != (0,0,0,255) or c2 != (255,255,255,255):
+            return False
+        return True
+
+
+    def mouseReleaseEvent(self, ev):
+        #private
+        TickSliderItem.mouseReleaseEvent(self, ev)
+        self.updateGradient()
+        
+    def addTick(self, x, color=None, movable=True, finish=True):
+        """
+        Add a tick to the gradient. Return the tick.
+        
+        ==============  ==================================================================
+        **Arguments:**
+        x               Position where tick should be added.
+        color           Color of added tick. If color is not specified, the color will be
+                        the color of the gradient at the specified position.
+        movable         Specifies whether the tick is movable with the mouse.
+        ==============  ==================================================================
+        """
+        
+        
+        if color is None:
+            color = self.getColor(x)
+        t = TickSliderItem.addTick(self, x, color=color, movable=movable)
+        t.colorChangeAllowed = True
+        t.removeAllowed = True
+        
+        if finish:
+            self.sigGradientChangeFinished.emit(self)
+        return t
+
+
+    def removeTick(self, tick, finish=True):
+        TickSliderItem.removeTick(self, tick)
+        if finish:
+            self.updateGradient()
+            self.sigGradientChangeFinished.emit(self)
+        
+        
+    def saveState(self):
+        """
+        Return a dictionary with parameters for rebuilding the gradient. Keys will include:
+        
+           - 'mode': hsv or rgb
+           - 'ticks': a list of tuples (pos, (r,g,b,a))
+        """
+        ## public
+        ticks = []
+        for t in self.ticks:
+            c = t.color
+            ticks.append((self.ticks[t], (c.red(), c.green(), c.blue(), c.alpha())))
+        state = {'mode': self.colorMode, 'ticks': ticks}
+        return state
+        
+    def restoreState(self, state):
+        """
+        Restore the gradient specified in state.
+        
+        ==============  ====================================================================
+        **Arguments:**
+        state           A dictionary with same structure as those returned by
+                        :func:`saveState <pyqtgraph.GradientEditorItem.saveState>`
+                      
+                        Keys must include:
+                      
+                            - 'mode': hsv or rgb
+                            - 'ticks': a list of tuples (pos, (r,g,b,a))
+        ==============  ====================================================================
+        """
+        ## public
+        self.setColorMode(state['mode'])
+        for t in list(self.ticks.keys()):
+            self.removeTick(t, finish=False)
+        for t in state['ticks']:
+            c = QtGui.QColor(*t[1])
+            self.addTick(t[0], c, finish=False)
+        self.updateGradient()
+        self.sigGradientChangeFinished.emit(self)
+        
+    def setColorMap(self, cm):
+        self.setColorMode('rgb')
+        for t in list(self.ticks.keys()):
+            self.removeTick(t, finish=False)
+        colors = cm.getColors(mode='qcolor')
+        for i in range(len(cm.pos)):
+            x = cm.pos[i]
+            c = colors[i]
+            self.addTick(x, c, finish=False)
+        self.updateGradient()
+        self.sigGradientChangeFinished.emit(self)
+
+
+class Tick(QtGui.QGraphicsWidget):  ## NOTE: Making this a subclass of GraphicsObject instead results in
+                                    ## activating this bug: https://bugreports.qt-project.org/browse/PYSIDE-86
+    ## private class
+
+    # When making Tick a subclass of QtGui.QGraphicsObject as origin,
+    # ..GraphicsScene.items(self, *args) will get Tick object as a
+    # class of QtGui.QMultimediaWidgets.QGraphicsVideoItem in python2.7-PyQt5(5.4.0)
+
+    sigMoving = QtCore.Signal(object)
+    sigMoved = QtCore.Signal(object)
+    
+    def __init__(self, view, pos, color, movable=True, scale=10, pen='w'):
+        self.movable = movable
+        self.moving = False
+        self.view = weakref.ref(view)
+        self.scale = scale
+        self.color = color
+        self.pen = fn.mkPen(pen)
+        self.hoverPen = fn.mkPen(255,255,0)
+        self.currentPen = self.pen
+        self.pg = QtGui.QPainterPath(QtCore.QPointF(0,0))
+        self.pg.lineTo(QtCore.QPointF(-scale/3**0.5, scale))
+        self.pg.lineTo(QtCore.QPointF(scale/3**0.5, scale))
+        self.pg.closeSubpath()
+        
+        QtGui.QGraphicsObject.__init__(self)
+        self.setPos(pos[0], pos[1])
+        if self.movable:
+            self.setZValue(1)
+        else:
+            self.setZValue(0)
+
+    def boundingRect(self):
+        return self.pg.boundingRect()
+    
+    def shape(self):
+        return self.pg
+
+    def paint(self, p, *args):
+        p.setRenderHints(QtGui.QPainter.Antialiasing)
+        p.fillPath(self.pg, fn.mkBrush(self.color))
+        
+        p.setPen(self.currentPen)
+        p.drawPath(self.pg)
+
+
+    def mouseDragEvent(self, ev):
+        if self.movable and ev.button() == QtCore.Qt.LeftButton:
+            if ev.isStart():
+                self.moving = True
+                self.cursorOffset = self.pos() - self.mapToParent(ev.buttonDownPos())
+                self.startPosition = self.pos()
+            ev.accept()
+            
+            if not self.moving:
+                return
+                
+            newPos = self.cursorOffset + self.mapToParent(ev.pos())
+            newPos.setY(self.pos().y())
+            
+            self.setPos(newPos)
+            self.view().tickMoved(self, newPos)
+            self.sigMoving.emit(self)
+            if ev.isFinish():
+                self.moving = False
+                self.sigMoved.emit(self)
+                self.view().tickMoveFinished(self)
+
+    def mouseClickEvent(self, ev):
+        if  ev.button() == QtCore.Qt.RightButton and self.moving:
+            ev.accept()
+            self.setPos(self.startPosition)
+            self.view().tickMoved(self, self.startPosition)
+            self.moving = False
+            self.sigMoving.emit(self)
+            self.sigMoved.emit(self)
+        else:
+            self.view().tickClicked(self, ev)
+            ##remove
+
+    def hoverEvent(self, ev):
+        if (not ev.isExit()) and ev.acceptDrags(QtCore.Qt.LeftButton):
+            ev.acceptClicks(QtCore.Qt.LeftButton)
+            ev.acceptClicks(QtCore.Qt.RightButton)
+            self.currentPen = self.hoverPen
+        else:
+            self.currentPen = self.pen
+        self.update()
+        
+
+class TickMenu(QtGui.QMenu):
+    
+    def __init__(self, tick, sliderItem):
+        QtGui.QMenu.__init__(self)
+        
+        self.tick = weakref.ref(tick)
+        self.sliderItem = weakref.ref(sliderItem)
+        
+        self.removeAct = self.addAction("Remove Tick", lambda: self.sliderItem().removeTick(tick))
+        if (not self.tick().removeAllowed) or len(self.sliderItem().ticks) < 3:
+            self.removeAct.setEnabled(False)
+            
+        positionMenu = self.addMenu("Set Position")
+        w = QtGui.QWidget()
+        l = QtGui.QGridLayout()
+        w.setLayout(l)
+        
+        value = sliderItem.tickValue(tick)
+        self.fracPosSpin = SpinBox()
+        self.fracPosSpin.setOpts(value=value, bounds=(0.0, 1.0), step=0.01, decimals=2)
+        #self.dataPosSpin = SpinBox(value=dataVal)
+        #self.dataPosSpin.setOpts(decimals=3, siPrefix=True)
+                
+        l.addWidget(QtGui.QLabel("Position:"), 0,0)
+        l.addWidget(self.fracPosSpin, 0, 1)
+        #l.addWidget(QtGui.QLabel("Position (data units):"), 1, 0)
+        #l.addWidget(self.dataPosSpin, 1,1)
+        
+        #if self.sliderItem().dataParent is None:
+        #    self.dataPosSpin.setEnabled(False)
+        
+        a = QtGui.QWidgetAction(self)
+        a.setDefaultWidget(w)
+        positionMenu.addAction(a)        
+        
+        self.fracPosSpin.sigValueChanging.connect(self.fractionalValueChanged)
+        #self.dataPosSpin.valueChanged.connect(self.dataValueChanged)
+        
+        colorAct = self.addAction("Set Color", lambda: self.sliderItem().raiseColorDialog(self.tick()))
+        if not self.tick().colorChangeAllowed:
+            colorAct.setEnabled(False)
+
+    def fractionalValueChanged(self, x):
+        self.sliderItem().setTickValue(self.tick(), self.fracPosSpin.value())
+        #if self.sliderItem().dataParent is not None:
+        #    self.dataPosSpin.blockSignals(True)
+        #    self.dataPosSpin.setValue(self.sliderItem().tickDataValue(self.tick()))
+        #    self.dataPosSpin.blockSignals(False)
+            
+    #def dataValueChanged(self, val):
+    #    self.sliderItem().setTickValue(self.tick(), val, dataUnits=True)
+    #    self.fracPosSpin.blockSignals(True)
+    #    self.fracPosSpin.setValue(self.sliderItem().tickValue(self.tick()))
+    #    self.fracPosSpin.blockSignals(False)
+
diff --git a/libs/pyqtgraph/graphicsItems/GradientLegend.py b/libs/pyqtgraph/graphicsItems/GradientLegend.py
new file mode 100644
index 0000000000000000000000000000000000000000..28c2cd6388f979d33953cd65d7e84b99430fd1de
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/GradientLegend.py
@@ -0,0 +1,114 @@
+from ..Qt import QtGui, QtCore
+from .UIGraphicsItem import *
+from .. import functions as fn
+
+__all__ = ['GradientLegend']
+
+class GradientLegend(UIGraphicsItem):
+    """
+    Draws a color gradient rectangle along with text labels denoting the value at specific 
+    points along the gradient.
+    """
+    
+    def __init__(self, size, offset):
+        self.size = size
+        self.offset = offset
+        UIGraphicsItem.__init__(self)
+        self.setAcceptedMouseButtons(QtCore.Qt.NoButton)
+        self.brush = QtGui.QBrush(QtGui.QColor(200,0,0))
+        self.pen = QtGui.QPen(QtGui.QColor(0,0,0))
+        self.labels = {'max': 1, 'min': 0}
+        self.gradient = QtGui.QLinearGradient()
+        self.gradient.setColorAt(0, QtGui.QColor(0,0,0))
+        self.gradient.setColorAt(1, QtGui.QColor(255,0,0))
+        
+    def setGradient(self, g):
+        self.gradient = g
+        self.update()
+        
+    def setIntColorScale(self, minVal, maxVal, *args, **kargs):
+        colors = [fn.intColor(i, maxVal-minVal, *args, **kargs) for i in range(minVal, maxVal)]
+        g = QtGui.QLinearGradient()
+        for i in range(len(colors)):
+            x = float(i)/len(colors)
+            g.setColorAt(x, colors[i])
+        self.setGradient(g)
+        if 'labels' not in kargs:
+            self.setLabels({str(minVal/10.): 0, str(maxVal): 1})
+        else:
+            self.setLabels({kargs['labels'][0]:0, kargs['labels'][1]:1})
+        
+    def setLabels(self, l):
+        """Defines labels to appear next to the color scale. Accepts a dict of {text: value} pairs"""
+        self.labels = l
+        self.update()
+        
+    def paint(self, p, opt, widget):
+        UIGraphicsItem.paint(self, p, opt, widget)
+        rect = self.boundingRect()   ## Boundaries of visible area in scene coords.
+        unit = self.pixelSize()       ## Size of one view pixel in scene coords.
+        if unit[0] is None:  
+            return
+        
+        ## determine max width of all labels
+        labelWidth = 0
+        labelHeight = 0
+        for k in self.labels:
+            b = p.boundingRect(QtCore.QRectF(0, 0, 0, 0), QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter, str(k))
+            labelWidth = max(labelWidth, b.width())
+            labelHeight = max(labelHeight, b.height())
+            
+        labelWidth *= unit[0]
+        labelHeight *= unit[1]
+        
+        textPadding = 2  # in px
+        
+        if self.offset[0] < 0:
+            x3 = rect.right() + unit[0] * self.offset[0]
+            x2 = x3 - labelWidth - unit[0]*textPadding*2
+            x1 = x2 - unit[0] * self.size[0]
+        else:
+            x1 = rect.left() + unit[0] * self.offset[0]
+            x2 = x1 + unit[0] * self.size[0]
+            x3 = x2 + labelWidth + unit[0]*textPadding*2
+        if self.offset[1] < 0:
+            y2 = rect.top() - unit[1] * self.offset[1]
+            y1 = y2 + unit[1] * self.size[1]
+        else:
+            y1 = rect.bottom() - unit[1] * self.offset[1]
+            y2 = y1 - unit[1] * self.size[1]
+        self.b = [x1,x2,x3,y1,y2,labelWidth]
+            
+        ## Draw background
+        p.setPen(self.pen)
+        p.setBrush(QtGui.QBrush(QtGui.QColor(255,255,255,100)))
+        rect = QtCore.QRectF(
+            QtCore.QPointF(x1 - unit[0]*textPadding, y1 + labelHeight/2 + unit[1]*textPadding), 
+            QtCore.QPointF(x3, y2 - labelHeight/2 - unit[1]*textPadding)
+        )
+        p.drawRect(rect)
+        
+        
+        ## Have to scale painter so that text and gradients are correct size. Bleh.
+        p.scale(unit[0], unit[1])
+        
+        ## Draw color bar
+        self.gradient.setStart(0, y1/unit[1])
+        self.gradient.setFinalStop(0, y2/unit[1])
+        p.setBrush(self.gradient)
+        rect = QtCore.QRectF(
+            QtCore.QPointF(x1/unit[0], y1/unit[1]), 
+            QtCore.QPointF(x2/unit[0], y2/unit[1])
+        )
+        p.drawRect(rect)
+        
+        
+        ## draw labels
+        p.setPen(QtGui.QPen(QtGui.QColor(0,0,0)))
+        tx = x2 + unit[0]*textPadding
+        lh = labelHeight/unit[1]
+        for k in self.labels:
+            y = y1 + self.labels[k] * (y2-y1)
+            p.drawText(QtCore.QRectF(tx/unit[0], y/unit[1] - lh/2.0, 1000, lh), QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter, str(k))
+        
+        
diff --git a/libs/pyqtgraph/graphicsItems/GraphItem.py b/libs/pyqtgraph/graphicsItems/GraphItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..c80138fb505e798685129d05cad420ae149165ce
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/GraphItem.py
@@ -0,0 +1,147 @@
+from .. import functions as fn
+from .GraphicsObject import GraphicsObject
+from .ScatterPlotItem import ScatterPlotItem
+from ..Qt import QtGui, QtCore
+import numpy as np
+from .. import getConfigOption
+
+__all__ = ['GraphItem']
+
+
+class GraphItem(GraphicsObject):
+    """A GraphItem displays graph information as
+    a set of nodes connected by lines (as in 'graph theory', not 'graphics'). 
+    Useful for drawing networks, trees, etc.
+    """
+
+    def __init__(self, **kwds):
+        GraphicsObject.__init__(self)
+        self.scatter = ScatterPlotItem()
+        self.scatter.setParentItem(self)
+        self.adjacency = None
+        self.pos = None
+        self.picture = None
+        self.pen = 'default'
+        self.setData(**kwds)
+        
+    def setData(self, **kwds):
+        """
+        Change the data displayed by the graph. 
+        
+        ==============  =======================================================================
+        **Arguments:**
+        pos             (N,2) array of the positions of each node in the graph.
+        adj             (M,2) array of connection data. Each row contains indexes
+                        of two nodes that are connected.
+        pen             The pen to use when drawing lines between connected
+                        nodes. May be one of:
+                     
+                        * QPen
+                        * a single argument to pass to pg.mkPen
+                        * a record array of length M
+                          with fields (red, green, blue, alpha, width). Note
+                          that using this option may have a significant performance
+                          cost.
+                        * None (to disable connection drawing)
+                        * 'default' to use the default foreground color.
+                     
+        symbolPen       The pen(s) used for drawing nodes.
+        symbolBrush     The brush(es) used for drawing nodes.
+        ``**opts``      All other keyword arguments are given to
+                        :func:`ScatterPlotItem.setData() <pyqtgraph.ScatterPlotItem.setData>`
+                        to affect the appearance of nodes (symbol, size, brush,
+                        etc.)
+        ==============  =======================================================================
+        """
+        if 'adj' in kwds:
+            self.adjacency = kwds.pop('adj')
+            if self.adjacency.dtype.kind not in 'iu':
+                raise Exception("adjacency array must have int or unsigned type.")
+            self._update()
+        if 'pos' in kwds:
+            self.pos = kwds['pos']
+            self._update()
+        if 'pen' in kwds:
+            self.setPen(kwds.pop('pen'))
+            self._update()
+            
+        if 'symbolPen' in kwds:    
+            kwds['pen'] = kwds.pop('symbolPen')
+        if 'symbolBrush' in kwds:    
+            kwds['brush'] = kwds.pop('symbolBrush')
+        self.scatter.setData(**kwds)
+        self.informViewBoundsChanged()
+
+    def _update(self):
+        self.picture = None
+        self.prepareGeometryChange()
+        self.update()
+
+    def setPen(self, *args, **kwargs):
+        """
+        Set the pen used to draw graph lines.
+        May be: 
+        
+        * None to disable line drawing
+        * Record array with fields (red, green, blue, alpha, width)
+        * Any set of arguments and keyword arguments accepted by 
+          :func:`mkPen <pyqtgraph.mkPen>`.
+        * 'default' to use the default foreground color.
+        """
+        if len(args) == 1 and len(kwargs) == 0:
+            self.pen = args[0]
+        else:
+            self.pen = fn.mkPen(*args, **kwargs)
+        self.picture = None
+        self.update()
+
+    def generatePicture(self):
+        self.picture = QtGui.QPicture()
+        if self.pen is None or self.pos is None or self.adjacency is None:
+            return
+        
+        p = QtGui.QPainter(self.picture)
+        try:
+            pts = self.pos[self.adjacency]
+            pen = self.pen
+            if isinstance(pen, np.ndarray):
+                lastPen = None
+                for i in range(pts.shape[0]):
+                    pen = self.pen[i]
+                    if np.any(pen != lastPen):
+                        lastPen = pen
+                        if pen.dtype.fields is None:
+                            p.setPen(fn.mkPen(color=(pen[0], pen[1], pen[2], pen[3]), width=1))                            
+                        else:
+                            p.setPen(fn.mkPen(color=(pen['red'], pen['green'], pen['blue'], pen['alpha']), width=pen['width']))
+                    p.drawLine(QtCore.QPointF(*pts[i][0]), QtCore.QPointF(*pts[i][1]))
+            else:
+                if pen == 'default':
+                    pen = getConfigOption('foreground')
+                p.setPen(fn.mkPen(pen))
+                pts = pts.reshape((pts.shape[0]*pts.shape[1], pts.shape[2]))
+                path = fn.arrayToQPath(x=pts[:,0], y=pts[:,1], connect='pairs')
+                p.drawPath(path)
+        finally:
+            p.end()
+
+    def paint(self, p, *args):
+        if self.picture == None:
+            self.generatePicture()
+        if getConfigOption('antialias') is True:
+            p.setRenderHint(p.Antialiasing)
+        self.picture.play(p)
+        
+    def boundingRect(self):
+        return self.scatter.boundingRect()
+        
+    def dataBounds(self, *args, **kwds):
+        return self.scatter.dataBounds(*args, **kwds)
+    
+    def pixelPadding(self):
+        return self.scatter.pixelPadding()
+        
+        
+        
+        
+
diff --git a/libs/pyqtgraph/graphicsItems/GraphicsItem.py b/libs/pyqtgraph/graphicsItems/GraphicsItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..2ca3519359cc52ec76bb8ada3c105992d034e67d
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/GraphicsItem.py
@@ -0,0 +1,585 @@
+from ..Qt import QtGui, QtCore, isQObjectAlive
+from ..GraphicsScene import GraphicsScene
+from ..Point import Point
+from .. import functions as fn
+import weakref
+import operator
+from ..util.lru_cache import LRUCache
+
+
+class GraphicsItem(object):
+    """
+    **Bases:** :class:`object`
+
+    Abstract class providing useful methods to GraphicsObject and GraphicsWidget.
+    (This is required because we cannot have multiple inheritance with QObject subclasses.)
+
+    A note about Qt's GraphicsView framework:
+
+    The GraphicsView system places a lot of emphasis on the notion that the graphics within the scene should be device independent--you should be able to take the same graphics and display them on screens of different resolutions, printers, export to SVG, etc. This is nice in principle, but causes me a lot of headache in practice. It means that I have to circumvent all the device-independent expectations any time I want to operate in pixel coordinates rather than arbitrary scene coordinates. A lot of the code in GraphicsItem is devoted to this task--keeping track of view widgets and device transforms, computing the size and shape of a pixel in local item coordinates, etc. Note that in item coordinates, a pixel does not have to be square or even rectangular, so just asking how to increase a bounding rect by 2px can be a rather complex task.
+    """
+    _pixelVectorGlobalCache = LRUCache(100, 70)
+    
+    def __init__(self, register=True):
+        if not hasattr(self, '_qtBaseClass'):
+            for b in self.__class__.__bases__:
+                if issubclass(b, QtGui.QGraphicsItem):
+                    self.__class__._qtBaseClass = b
+                    break
+        if not hasattr(self, '_qtBaseClass'):
+            raise Exception('Could not determine Qt base class for GraphicsItem: %s' % str(self))
+        
+        self._pixelVectorCache = [None, None]
+        self._viewWidget = None
+        self._viewBox = None
+        self._connectedView = None
+        self._exportOpts = False   ## If False, not currently exporting. Otherwise, contains dict of export options.
+        if register:
+            GraphicsScene.registerObject(self)  ## workaround for pyqt bug in graphicsscene.items()
+                    
+
+                    
+                    
+    def getViewWidget(self):
+        """
+        Return the view widget for this item. 
+        
+        If the scene has multiple views, only the first view is returned.
+        The return value is cached; clear the cached value with forgetViewWidget().
+        If the view has been deleted by Qt, return None.
+        """
+        if self._viewWidget is None:
+            scene = self.scene()
+            if scene is None:
+                return None
+            views = scene.views()
+            if len(views) < 1:
+                return None
+            self._viewWidget = weakref.ref(self.scene().views()[0])
+            
+        v = self._viewWidget()
+        if v is not None and not isQObjectAlive(v):
+            return None
+            
+        return v
+    
+    def forgetViewWidget(self):
+        self._viewWidget = None
+    
+    def getViewBox(self):
+        """
+        Return the first ViewBox or GraphicsView which bounds this item's visible space.
+        If this item is not contained within a ViewBox, then the GraphicsView is returned.
+        If the item is contained inside nested ViewBoxes, then the inner-most ViewBox is returned.
+        The result is cached; clear the cache with forgetViewBox()
+        """
+        if self._viewBox is None:
+            p = self
+            while True:
+                try:
+                    p = p.parentItem()
+                except RuntimeError:  ## sometimes happens as items are being removed from a scene and collected.
+                    return None
+                if p is None:
+                    vb = self.getViewWidget()
+                    if vb is None:
+                        return None
+                    else:
+                        self._viewBox = weakref.ref(vb)
+                        break
+                if hasattr(p, 'implements') and p.implements('ViewBox'):
+                    self._viewBox = weakref.ref(p)
+                    break
+        return self._viewBox()  ## If we made it this far, _viewBox is definitely not None
+
+    def forgetViewBox(self):
+        self._viewBox = None
+        
+        
+    def deviceTransform(self, viewportTransform=None):
+        """
+        Return the transform that converts local item coordinates to device coordinates (usually pixels).
+        Extends deviceTransform to automatically determine the viewportTransform.
+        """
+        if self._exportOpts is not False and 'painter' in self._exportOpts: ## currently exporting; device transform may be different.
+            return self._exportOpts['painter'].deviceTransform() * self.sceneTransform()
+            
+        if viewportTransform is None:
+            view = self.getViewWidget()
+            if view is None:
+                return None
+            viewportTransform = view.viewportTransform()
+        dt = self._qtBaseClass.deviceTransform(self, viewportTransform)
+        
+        #xmag = abs(dt.m11())+abs(dt.m12())
+        #ymag = abs(dt.m21())+abs(dt.m22())
+        #if xmag * ymag == 0: 
+        if dt.determinant() == 0:  ## occurs when deviceTransform is invalid because widget has not been displayed
+            return None
+        else:
+            return dt
+        
+    def viewTransform(self):
+        """Return the transform that maps from local coordinates to the item's ViewBox coordinates
+        If there is no ViewBox, return the scene transform.
+        Returns None if the item does not have a view."""
+        view = self.getViewBox()
+        if view is None:
+            return None
+        if hasattr(view, 'implements') and view.implements('ViewBox'):
+            tr = self.itemTransform(view.innerSceneItem())
+            if isinstance(tr, tuple):
+                tr = tr[0]   ## difference between pyside and pyqt
+            return tr
+        else:
+            return self.sceneTransform()
+            #return self.deviceTransform(view.viewportTransform())
+
+
+
+    def getBoundingParents(self):
+        """Return a list of parents to this item that have child clipping enabled."""
+        p = self
+        parents = []
+        while True:
+            p = p.parentItem()
+            if p is None:
+                break
+            if p.flags() & self.ItemClipsChildrenToShape:
+                parents.append(p)
+        return parents
+    
+    def viewRect(self):
+        """Return the bounds (in item coordinates) of this item's ViewBox or GraphicsWidget"""
+        view = self.getViewBox()
+        if view is None:
+            return None
+        bounds = self.mapRectFromView(view.viewRect())
+        if bounds is None:
+            return None
+
+        bounds = bounds.normalized()
+        
+        ## nah.
+        #for p in self.getBoundingParents():
+            #bounds &= self.mapRectFromScene(p.sceneBoundingRect())
+            
+        return bounds
+        
+        
+        
+    def pixelVectors(self, direction=None):
+        """Return vectors in local coordinates representing the width and height of a view pixel.
+        If direction is specified, then return vectors parallel and orthogonal to it.
+        
+        Return (None, None) if pixel size is not yet defined (usually because the item has not yet been displayed)
+        or if pixel size is below floating-point precision limit.
+        """
+        
+        ## This is an expensive function that gets called very frequently.
+        ## We have two levels of cache to try speeding things up.
+        
+        dt = self.deviceTransform()
+        if dt is None:
+            return None, None
+            
+        ## Ignore translation. If the translation is much larger than the scale
+        ## (such as when looking at unix timestamps), we can get floating-point errors.
+        dt.setMatrix(dt.m11(), dt.m12(), 0, dt.m21(), dt.m22(), 0, 0, 0, 1)
+        
+        ## check local cache
+        if direction is None and dt == self._pixelVectorCache[0]:
+            return tuple(map(Point, self._pixelVectorCache[1]))  ## return a *copy*
+        
+        ## check global cache
+        #key = (dt.m11(), dt.m21(), dt.m31(), dt.m12(), dt.m22(), dt.m32(), dt.m31(), dt.m32())
+        key = (dt.m11(), dt.m21(), dt.m12(), dt.m22())
+        pv = self._pixelVectorGlobalCache.get(key, None)
+        if direction is None and pv is not None:
+            self._pixelVectorCache = [dt, pv]
+            return tuple(map(Point,pv))  ## return a *copy*
+        
+        
+        if direction is None:
+            direction = QtCore.QPointF(1, 0)  
+        if direction.manhattanLength() == 0:
+            raise Exception("Cannot compute pixel length for 0-length vector.")
+            
+        ## attempt to re-scale direction vector to fit within the precision of the coordinate system
+        ## Here's the problem: we need to map the vector 'direction' from the item to the device, via transform 'dt'.
+        ## In some extreme cases, this mapping can fail unless the length of 'direction' is cleverly chosen.
+        ## Example:
+        ##   dt = [ 1, 0,    2 
+        ##          0, 2, 1e20
+        ##          0, 0,    1 ]
+        ## Then we map the origin (0,0) and direction (0,1) and get:
+        ##    o' = 2,1e20
+        ##    d' = 2,1e20  <-- should be 1e20+2, but this can't be represented with a 32-bit float
+        ##    
+        ##    |o' - d'|  == 0    <-- this is the problem.
+        
+        ## Perhaps the easiest solution is to exclude the transformation column from dt. Does this cause any other problems?
+        
+        #if direction.x() == 0:
+            #r = abs(dt.m32())/(abs(dt.m12()) + abs(dt.m22()))
+            ##r = 1.0/(abs(dt.m12()) + abs(dt.m22()))
+        #elif direction.y() == 0:
+            #r = abs(dt.m31())/(abs(dt.m11()) + abs(dt.m21()))
+            ##r = 1.0/(abs(dt.m11()) + abs(dt.m21()))
+        #else:
+            #r = ((abs(dt.m32())/(abs(dt.m12()) + abs(dt.m22()))) * (abs(dt.m31())/(abs(dt.m11()) + abs(dt.m21()))))**0.5
+        #if r == 0:
+            #r = 1.  ## shouldn't need to do this; probably means the math above is wrong?
+        #directionr = direction * r
+        directionr = direction
+        
+        ## map direction vector onto device
+        #viewDir = Point(dt.map(directionr) - dt.map(Point(0,0)))
+        #mdirection = dt.map(directionr)
+        dirLine = QtCore.QLineF(QtCore.QPointF(0,0), directionr)
+        viewDir = dt.map(dirLine)
+        if viewDir.length() == 0:
+            return None, None   ##  pixel size cannot be represented on this scale
+           
+        ## get unit vector and orthogonal vector (length of pixel)
+        #orthoDir = Point(viewDir[1], -viewDir[0])  ## orthogonal to line in pixel-space
+        try:  
+            normView = viewDir.unitVector()
+            #normView = viewDir.norm()  ## direction of one pixel orthogonal to line
+            normOrtho = normView.normalVector()
+            #normOrtho = orthoDir.norm()
+        except:
+            raise Exception("Invalid direction %s" %directionr)
+            
+        ## map back to item 
+        dti = fn.invertQTransform(dt)
+        #pv = Point(dti.map(normView)-dti.map(Point(0,0))), Point(dti.map(normOrtho)-dti.map(Point(0,0)))
+        pv = Point(dti.map(normView).p2()), Point(dti.map(normOrtho).p2())
+        self._pixelVectorCache[1] = pv
+        self._pixelVectorCache[0] = dt
+        self._pixelVectorGlobalCache[key] = pv
+        return self._pixelVectorCache[1]
+    
+        
+    def pixelLength(self, direction, ortho=False):
+        """Return the length of one pixel in the direction indicated (in local coordinates)
+        If ortho=True, then return the length of one pixel orthogonal to the direction indicated.
+        
+        Return None if pixel size is not yet defined (usually because the item has not yet been displayed).
+        """
+        normV, orthoV = self.pixelVectors(direction)
+        if normV == None or orthoV == None:
+            return None
+        if ortho:
+            return orthoV.length()
+        return normV.length()
+        
+
+    def pixelSize(self):
+        ## deprecated
+        v = self.pixelVectors()
+        if v == (None, None):
+            return None, None
+        return (v[0].x()**2+v[0].y()**2)**0.5, (v[1].x()**2+v[1].y()**2)**0.5
+
+    def pixelWidth(self):
+        ## deprecated
+        vt = self.deviceTransform()
+        if vt is None:
+            return 0
+        vt = fn.invertQTransform(vt)
+        return vt.map(QtCore.QLineF(0, 0, 1, 0)).length()
+        
+    def pixelHeight(self):
+        ## deprecated
+        vt = self.deviceTransform()
+        if vt is None:
+            return 0
+        vt = fn.invertQTransform(vt)
+        return vt.map(QtCore.QLineF(0, 0, 0, 1)).length()
+        #return Point(vt.map(QtCore.QPointF(0, 1))-vt.map(QtCore.QPointF(0, 0))).length()
+        
+        
+    def mapToDevice(self, obj):
+        """
+        Return *obj* mapped from local coordinates to device coordinates (pixels).
+        If there is no device mapping available, return None.
+        """
+        vt = self.deviceTransform()
+        if vt is None:
+            return None
+        return vt.map(obj)
+        
+    def mapFromDevice(self, obj):
+        """
+        Return *obj* mapped from device coordinates (pixels) to local coordinates.
+        If there is no device mapping available, return None.
+        """
+        vt = self.deviceTransform()
+        if vt is None:
+            return None
+        if isinstance(obj, QtCore.QPoint):
+            obj = QtCore.QPointF(obj)
+        vt = fn.invertQTransform(vt)
+        return vt.map(obj)
+
+    def mapRectToDevice(self, rect):
+        """
+        Return *rect* mapped from local coordinates to device coordinates (pixels).
+        If there is no device mapping available, return None.
+        """
+        vt = self.deviceTransform()
+        if vt is None:
+            return None
+        return vt.mapRect(rect)
+
+    def mapRectFromDevice(self, rect):
+        """
+        Return *rect* mapped from device coordinates (pixels) to local coordinates.
+        If there is no device mapping available, return None.
+        """
+        vt = self.deviceTransform()
+        if vt is None:
+            return None
+        vt = fn.invertQTransform(vt)
+        return vt.mapRect(rect)
+    
+    def mapToView(self, obj):
+        vt = self.viewTransform()
+        if vt is None:
+            return None
+        return vt.map(obj)
+        
+    def mapRectToView(self, obj):
+        vt = self.viewTransform()
+        if vt is None:
+            return None
+        return vt.mapRect(obj)
+        
+    def mapFromView(self, obj):
+        vt = self.viewTransform()
+        if vt is None:
+            return None
+        vt = fn.invertQTransform(vt)
+        return vt.map(obj)
+
+    def mapRectFromView(self, obj):
+        vt = self.viewTransform()
+        if vt is None:
+            return None
+        vt = fn.invertQTransform(vt)
+        return vt.mapRect(obj)
+
+    def pos(self):
+        return Point(self._qtBaseClass.pos(self))
+    
+    def viewPos(self):
+        return self.mapToView(self.mapFromParent(self.pos()))
+    
+    def parentItem(self):
+        ## PyQt bug -- some items are returned incorrectly.
+        return GraphicsScene.translateGraphicsItem(self._qtBaseClass.parentItem(self))
+        
+    def setParentItem(self, parent):
+        ## Workaround for Qt bug: https://bugreports.qt-project.org/browse/QTBUG-18616
+        if parent is not None:
+            pscene = parent.scene()
+            if pscene is not None and self.scene() is not pscene:
+                pscene.addItem(self)
+        return self._qtBaseClass.setParentItem(self, parent)
+    
+    def childItems(self):
+        ## PyQt bug -- some child items are returned incorrectly.
+        return list(map(GraphicsScene.translateGraphicsItem, self._qtBaseClass.childItems(self)))
+
+
+    def sceneTransform(self):
+        ## Qt bug: do no allow access to sceneTransform() until 
+        ## the item has a scene.
+        
+        if self.scene() is None:
+            return self.transform()
+        else:
+            return self._qtBaseClass.sceneTransform(self)
+
+
+    def transformAngle(self, relativeItem=None):
+        """Return the rotation produced by this item's transform (this assumes there is no shear in the transform)
+        If relativeItem is given, then the angle is determined relative to that item.
+        """
+        if relativeItem is None:
+            relativeItem = self.parentItem()
+            
+
+        tr = self.itemTransform(relativeItem)
+        if isinstance(tr, tuple):  ## difference between pyside and pyqt
+            tr = tr[0]
+        #vec = tr.map(Point(1,0)) - tr.map(Point(0,0))
+        vec = tr.map(QtCore.QLineF(0,0,1,0))
+        #return Point(vec).angle(Point(1,0))
+        return vec.angleTo(QtCore.QLineF(vec.p1(), vec.p1()+QtCore.QPointF(1,0)))
+        
+    #def itemChange(self, change, value):
+        #ret = self._qtBaseClass.itemChange(self, change, value)
+        #if change == self.ItemParentHasChanged or change == self.ItemSceneHasChanged:
+            #print "Item scene changed:", self
+            #self.setChildScene(self)  ## This is bizarre.
+        #return ret
+
+    #def setChildScene(self, ch):
+        #scene = self.scene()
+        #for ch2 in ch.childItems():
+            #if ch2.scene() is not scene:
+                #print "item", ch2, "has different scene:", ch2.scene(), scene
+                #scene.addItem(ch2)
+                #QtGui.QApplication.processEvents()
+                #print "   --> ", ch2.scene()
+            #self.setChildScene(ch2)
+
+    def parentChanged(self):
+        """Called when the item's parent has changed. 
+        This method handles connecting / disconnecting from ViewBox signals
+        to make sure viewRangeChanged works properly. It should generally be 
+        extended, not overridden."""
+        self._updateView()
+        
+
+    def _updateView(self):
+        ## called to see whether this item has a new view to connect to
+        ## NOTE: This is called from GraphicsObject.itemChange or GraphicsWidget.itemChange.
+
+        ## It is possible this item has moved to a different ViewBox or widget;
+        ## clear out previously determined references to these.
+        self.forgetViewBox()
+        self.forgetViewWidget()
+        
+        ## check for this item's current viewbox or view widget
+        view = self.getViewBox()
+        #if view is None:
+            ##print "  no view"
+            #return
+
+        oldView = None
+        if self._connectedView is not None:
+            oldView = self._connectedView()
+            
+        if view is oldView:
+            #print "  already have view", view
+            return
+
+        ## disconnect from previous view
+        if oldView is not None:
+            for signal, slot in [('sigRangeChanged', self.viewRangeChanged),
+                                 ('sigDeviceRangeChanged', self.viewRangeChanged), 
+                                 ('sigTransformChanged', self.viewTransformChanged), 
+                                 ('sigDeviceTransformChanged', self.viewTransformChanged)]:
+                try:
+                    getattr(oldView, signal).disconnect(slot)
+                except (TypeError, AttributeError, RuntimeError):
+                    # TypeError and RuntimeError are from pyqt and pyside, respectively
+                    pass
+            
+            self._connectedView = None
+
+        ## connect to new view
+        if view is not None:
+            #print "connect:", self, view
+            if hasattr(view, 'sigDeviceRangeChanged'):
+                # connect signals from GraphicsView
+                view.sigDeviceRangeChanged.connect(self.viewRangeChanged)
+                view.sigDeviceTransformChanged.connect(self.viewTransformChanged)
+            else:
+                # connect signals from ViewBox
+                view.sigRangeChanged.connect(self.viewRangeChanged)
+                view.sigTransformChanged.connect(self.viewTransformChanged)
+            self._connectedView = weakref.ref(view)
+            self.viewRangeChanged()
+            self.viewTransformChanged()
+        
+        ## inform children that their view might have changed
+        self._replaceView(oldView)
+        
+        self.viewChanged(view, oldView)
+        
+    def viewChanged(self, view, oldView):
+        """Called when this item's view has changed
+        (ie, the item has been added to or removed from a ViewBox)"""
+        pass
+        
+    def _replaceView(self, oldView, item=None):
+        if item is None:
+            item = self
+        for child in item.childItems():
+            if isinstance(child, GraphicsItem):
+                if child.getViewBox() is oldView:
+                    child._updateView()
+                        #self._replaceView(oldView, child)
+            else:
+                self._replaceView(oldView, child)
+        
+        
+
+    def viewRangeChanged(self):
+        """
+        Called whenever the view coordinates of the ViewBox containing this item have changed.
+        """
+        pass
+    
+    def viewTransformChanged(self):
+        """
+        Called whenever the transformation matrix of the view has changed.
+        (eg, the view range has changed or the view was resized)
+        """
+        pass
+    
+    #def prepareGeometryChange(self):
+        #self._qtBaseClass.prepareGeometryChange(self)
+        #self.informViewBoundsChanged()
+        
+    def informViewBoundsChanged(self):
+        """
+        Inform this item's container ViewBox that the bounds of this item have changed.
+        This is used by ViewBox to react if auto-range is enabled.
+        """
+        view = self.getViewBox()
+        if view is not None and hasattr(view, 'implements') and view.implements('ViewBox'):
+            view.itemBoundsChanged(self)  ## inform view so it can update its range if it wants
+    
+    def childrenShape(self):
+        """Return the union of the shapes of all descendants of this item in local coordinates."""
+        childs = self.allChildItems()
+        shapes = [self.mapFromItem(c, c.shape()) for c in self.allChildItems()]
+        return reduce(operator.add, shapes)
+    
+    def allChildItems(self, root=None):
+        """Return list of the entire item tree descending from this item."""
+        if root is None:
+            root = self
+        tree = []
+        for ch in root.childItems():
+            tree.append(ch)
+            tree.extend(self.allChildItems(ch))
+        return tree
+    
+    
+    def setExportMode(self, export, opts=None):
+        """
+        This method is called by exporters to inform items that they are being drawn for export
+        with a specific set of options. Items access these via self._exportOptions.
+        When exporting is complete, _exportOptions is set to False.
+        """
+        if opts is None:
+            opts = {}
+        if export:
+            self._exportOpts = opts
+            #if 'antialias' not in opts:
+                #self._exportOpts['antialias'] = True
+        else:
+            self._exportOpts = False
+    
+    #def update(self):
+        #self._qtBaseClass.update(self)
+        #print "Update:", self
+
+    def getContextMenus(self, event):
+        return [self.getMenu()] if hasattr(self, "getMenu") else []
diff --git a/libs/pyqtgraph/graphicsItems/GraphicsLayout.py b/libs/pyqtgraph/graphicsItems/GraphicsLayout.py
new file mode 100644
index 0000000000000000000000000000000000000000..6ec38fb5774e7439bde64c43117293f6fc4404c0
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/GraphicsLayout.py
@@ -0,0 +1,171 @@
+from ..Qt import QtGui, QtCore
+from .. import functions as fn
+from .GraphicsWidget import GraphicsWidget
+## Must be imported at the end to avoid cyclic-dependency hell:
+from .ViewBox import ViewBox
+from .PlotItem import PlotItem
+from .LabelItem import LabelItem
+
+__all__ = ['GraphicsLayout']
+class GraphicsLayout(GraphicsWidget):
+    """
+    Used for laying out GraphicsWidgets in a grid.
+    This is usually created automatically as part of a :class:`GraphicsWindow <pyqtgraph.GraphicsWindow>` or :class:`GraphicsLayoutWidget <pyqtgraph.GraphicsLayoutWidget>`.
+    """
+
+
+    def __init__(self, parent=None, border=None):
+        GraphicsWidget.__init__(self, parent)
+        if border is True:
+            border = (100,100,100)
+        self.border = border
+        self.layout = QtGui.QGraphicsGridLayout()
+        self.setLayout(self.layout)
+        self.items = {}  ## item: [(row, col), (row, col), ...]  lists all cells occupied by the item
+        self.rows = {}   ## row: {col1: item1, col2: item2, ...}    maps cell location to item
+        self.currentRow = 0
+        self.currentCol = 0
+        self.setSizePolicy(QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding))
+    
+    #def resizeEvent(self, ev):
+        #ret = GraphicsWidget.resizeEvent(self, ev)
+        #print self.pos(), self.mapToDevice(self.rect().topLeft())
+        #return ret
+
+    def setBorder(self, *args, **kwds):
+        """
+        Set the pen used to draw border between cells.
+        
+        See :func:`mkPen <pyqtgraph.mkPen>` for arguments.        
+        """
+        self.border = fn.mkPen(*args, **kwds)
+        self.update()
+    
+    def nextRow(self):
+        """Advance to next row for automatic item placement"""
+        self.currentRow += 1
+        self.currentCol = -1
+        self.nextColumn()
+        
+    def nextColumn(self):
+        """Advance to next available column
+        (generally only for internal use--called by addItem)"""
+        self.currentCol += 1
+        while self.getItem(self.currentRow, self.currentCol) is not None:
+            self.currentCol += 1
+        
+    def nextCol(self, *args, **kargs):
+        """Alias of nextColumn"""
+        return self.nextColumn(*args, **kargs)
+        
+    def addPlot(self, row=None, col=None, rowspan=1, colspan=1, **kargs):
+        """
+        Create a PlotItem and place it in the next available cell (or in the cell specified)
+        All extra keyword arguments are passed to :func:`PlotItem.__init__ <pyqtgraph.PlotItem.__init__>`
+        Returns the created item.
+        """
+        plot = PlotItem(**kargs)
+        self.addItem(plot, row, col, rowspan, colspan)
+        return plot
+        
+    def addViewBox(self, row=None, col=None, rowspan=1, colspan=1, **kargs):
+        """
+        Create a ViewBox and place it in the next available cell (or in the cell specified)
+        All extra keyword arguments are passed to :func:`ViewBox.__init__ <pyqtgraph.ViewBox.__init__>`
+        Returns the created item.
+        """
+        vb = ViewBox(**kargs)
+        self.addItem(vb, row, col, rowspan, colspan)
+        return vb
+        
+    def addLabel(self, text=' ', row=None, col=None, rowspan=1, colspan=1, **kargs):
+        """
+        Create a LabelItem with *text* and place it in the next available cell (or in the cell specified)
+        All extra keyword arguments are passed to :func:`LabelItem.__init__ <pyqtgraph.LabelItem.__init__>`
+        Returns the created item.
+        
+        To create a vertical label, use *angle* = -90.
+        """
+        text = LabelItem(text, **kargs)
+        self.addItem(text, row, col, rowspan, colspan)
+        return text
+        
+    def addLayout(self, row=None, col=None, rowspan=1, colspan=1, **kargs):
+        """
+        Create an empty GraphicsLayout and place it in the next available cell (or in the cell specified)
+        All extra keyword arguments are passed to :func:`GraphicsLayout.__init__ <pyqtgraph.GraphicsLayout.__init__>`
+        Returns the created item.
+        """
+        layout = GraphicsLayout(**kargs)
+        self.addItem(layout, row, col, rowspan, colspan)
+        return layout
+        
+    def addItem(self, item, row=None, col=None, rowspan=1, colspan=1):
+        """
+        Add an item to the layout and place it in the next available cell (or in the cell specified).
+        The item must be an instance of a QGraphicsWidget subclass.
+        """
+        if row is None:
+            row = self.currentRow
+        if col is None:
+            col = self.currentCol
+            
+        self.items[item] = []
+        for i in range(rowspan):
+            for j in range(colspan):
+                row2 = row + i
+                col2 = col + j
+                if row2 not in self.rows:
+                    self.rows[row2] = {}
+                self.rows[row2][col2] = item
+                self.items[item].append((row2, col2))
+        
+        self.layout.addItem(item, row, col, rowspan, colspan)
+        self.nextColumn()
+
+    def getItem(self, row, col):
+        """Return the item in (*row*, *col*). If the cell is empty, return None."""
+        return self.rows.get(row, {}).get(col, None)
+
+    def boundingRect(self):
+        return self.rect()
+        
+    def paint(self, p, *args):
+        if self.border is None:
+            return
+        p.setPen(fn.mkPen(self.border))
+        for i in self.items:
+            r = i.mapRectToParent(i.boundingRect())
+            p.drawRect(r)
+    
+    def itemIndex(self, item):
+        for i in range(self.layout.count()):
+            if self.layout.itemAt(i).graphicsItem() is item:
+                return i
+        raise Exception("Could not determine index of item " + str(item))
+    
+    def removeItem(self, item):
+        """Remove *item* from the layout."""
+        ind = self.itemIndex(item)
+        self.layout.removeAt(ind)
+        self.scene().removeItem(item)
+        
+        for r,c in self.items[item]:
+            del self.rows[r][c]
+        del self.items[item]
+        self.update()
+    
+    def clear(self):
+        items = []
+        for i in list(self.items.keys()):
+            self.removeItem(i)
+
+    def setContentsMargins(self, *args):
+        # Wrap calls to layout. This should happen automatically, but there
+        # seems to be a Qt bug:
+        # http://stackoverflow.com/questions/27092164/margins-in-pyqtgraphs-graphicslayout
+        self.layout.setContentsMargins(*args)
+
+    def setSpacing(self, *args):
+        self.layout.setSpacing(*args)
+    
\ No newline at end of file
diff --git a/libs/pyqtgraph/graphicsItems/GraphicsObject.py b/libs/pyqtgraph/graphicsItems/GraphicsObject.py
new file mode 100644
index 0000000000000000000000000000000000000000..015a78c6607d48705e8f8fa061ffd6f0bfcd65c1
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/GraphicsObject.py
@@ -0,0 +1,39 @@
+from ..Qt import QtGui, QtCore, USE_PYSIDE
+if not USE_PYSIDE:
+    import sip
+from .GraphicsItem import GraphicsItem
+
+__all__ = ['GraphicsObject']
+class GraphicsObject(GraphicsItem, QtGui.QGraphicsObject):
+    """
+    **Bases:** :class:`GraphicsItem <pyqtgraph.graphicsItems.GraphicsItem>`, :class:`QtGui.QGraphicsObject`
+
+    Extension of QGraphicsObject with some useful methods (provided by :class:`GraphicsItem <pyqtgraph.graphicsItems.GraphicsItem>`)
+    """
+    _qtBaseClass = QtGui.QGraphicsObject
+    def __init__(self, *args):
+        self.__inform_view_on_changes = True
+        QtGui.QGraphicsObject.__init__(self, *args)
+        self.setFlag(self.ItemSendsGeometryChanges)
+        GraphicsItem.__init__(self)
+        
+    def itemChange(self, change, value):
+        ret = QtGui.QGraphicsObject.itemChange(self, change, value)
+        if change in [self.ItemParentHasChanged, self.ItemSceneHasChanged]:
+            self.parentChanged()
+        try:
+            inform_view_on_change = self.__inform_view_on_changes
+        except AttributeError:
+            # It's possible that the attribute was already collected when the itemChange happened
+            # (if it was triggered during the gc of the object).
+            pass
+        else:
+            if inform_view_on_change and change in [self.ItemPositionHasChanged, self.ItemTransformHasChanged]:
+                self.informViewBoundsChanged()
+            
+        ## workaround for pyqt bug:
+        ## http://www.riverbankcomputing.com/pipermail/pyqt/2012-August/031818.html
+        if not USE_PYSIDE and change == self.ItemParentChange and isinstance(ret, QtGui.QGraphicsItem):
+            ret = sip.cast(ret, QtGui.QGraphicsItem)
+
+        return ret
diff --git a/libs/pyqtgraph/graphicsItems/GraphicsWidget.py b/libs/pyqtgraph/graphicsItems/GraphicsWidget.py
new file mode 100644
index 0000000000000000000000000000000000000000..c379ce8e583760b2242e18aca3b7d421389d4be7
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/GraphicsWidget.py
@@ -0,0 +1,59 @@
+from ..Qt import QtGui, QtCore  
+from ..GraphicsScene import GraphicsScene
+from .GraphicsItem import GraphicsItem
+
+__all__ = ['GraphicsWidget']
+
+class GraphicsWidget(GraphicsItem, QtGui.QGraphicsWidget):
+    
+    _qtBaseClass = QtGui.QGraphicsWidget
+    def __init__(self, *args, **kargs):
+        """
+        **Bases:** :class:`GraphicsItem <pyqtgraph.GraphicsItem>`, :class:`QtGui.QGraphicsWidget`
+        
+        Extends QGraphicsWidget with several helpful methods and workarounds for PyQt bugs. 
+        Most of the extra functionality is inherited from :class:`GraphicsItem <pyqtgraph.GraphicsItem>`.
+        """
+        QtGui.QGraphicsWidget.__init__(self, *args, **kargs)
+        GraphicsItem.__init__(self)
+        
+        ## done by GraphicsItem init
+        #GraphicsScene.registerObject(self)  ## workaround for pyqt bug in graphicsscene.items()
+
+    # Removed due to https://bugreports.qt-project.org/browse/PYSIDE-86
+    #def itemChange(self, change, value):
+        ## BEWARE: Calling QGraphicsWidget.itemChange can lead to crashing!
+        ##ret = QtGui.QGraphicsWidget.itemChange(self, change, value)  ## segv occurs here
+        ## The default behavior is just to return the value argument, so we'll do that
+        ## without calling the original method.
+        #ret = value
+        #if change in [self.ItemParentHasChanged, self.ItemSceneHasChanged]:
+            #self._updateView()
+        #return ret
+
+    def setFixedHeight(self, h):
+        self.setMaximumHeight(h)
+        self.setMinimumHeight(h)
+
+    def setFixedWidth(self, h):
+        self.setMaximumWidth(h)
+        self.setMinimumWidth(h)
+        
+    def height(self):
+        return self.geometry().height()
+    
+    def width(self):
+        return self.geometry().width()
+
+    def boundingRect(self):
+        br = self.mapRectFromParent(self.geometry()).normalized()
+        #print "bounds:", br
+        return br
+        
+    def shape(self):  ## No idea why this is necessary, but rotated items do not receive clicks otherwise.
+        p = QtGui.QPainterPath()
+        p.addRect(self.boundingRect())
+        #print "shape:", p.boundingRect()
+        return p
+
+
diff --git a/libs/pyqtgraph/graphicsItems/GraphicsWidgetAnchor.py b/libs/pyqtgraph/graphicsItems/GraphicsWidgetAnchor.py
new file mode 100644
index 0000000000000000000000000000000000000000..251bc0c8ee5513509fb005f34e03c415da345c91
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/GraphicsWidgetAnchor.py
@@ -0,0 +1,110 @@
+from ..Qt import QtGui, QtCore
+from ..Point import Point
+
+
+class GraphicsWidgetAnchor(object):
+    """
+    Class used to allow GraphicsWidgets to anchor to a specific position on their
+    parent. The item will be automatically repositioned if the parent is resized. 
+    This is used, for example, to anchor a LegendItem to a corner of its parent 
+    PlotItem.
+
+    """
+
+    def __init__(self):
+        self.__parent = None
+        self.__parentAnchor = None
+        self.__itemAnchor = None
+        self.__offset = (0,0)
+        if hasattr(self, 'geometryChanged'):
+            self.geometryChanged.connect(self.__geometryChanged)
+
+    def anchor(self, itemPos, parentPos, offset=(0,0)):
+        """
+        Anchors the item at its local itemPos to the item's parent at parentPos.
+        Both positions are expressed in values relative to the size of the item or parent;
+        a value of 0 indicates left or top edge, while 1 indicates right or bottom edge.
+        
+        Optionally, offset may be specified to introduce an absolute offset. 
+        
+        Example: anchor a box such that its upper-right corner is fixed 10px left
+        and 10px down from its parent's upper-right corner::
+        
+            box.anchor(itemPos=(1,0), parentPos=(1,0), offset=(-10,10))
+        """
+        parent = self.parentItem()
+        if parent is None:
+            raise Exception("Cannot anchor; parent is not set.")
+        
+        if self.__parent is not parent:
+            if self.__parent is not None:
+                self.__parent.geometryChanged.disconnect(self.__geometryChanged)
+                
+            self.__parent = parent
+            parent.geometryChanged.connect(self.__geometryChanged)
+        
+        self.__itemAnchor = itemPos
+        self.__parentAnchor = parentPos
+        self.__offset = offset
+        self.__geometryChanged()
+    
+
+    def autoAnchor(self, pos, relative=True):
+        """
+        Set the position of this item relative to its parent by automatically 
+        choosing appropriate anchor settings.
+        
+        If relative is True, one corner of the item will be anchored to 
+        the appropriate location on the parent with no offset. The anchored
+        corner will be whichever is closest to the parent's boundary.
+        
+        If relative is False, one corner of the item will be anchored to the same
+        corner of the parent, with an absolute offset to achieve the correct
+        position. 
+        """
+        pos = Point(pos)
+        br = self.mapRectToParent(self.boundingRect()).translated(pos - self.pos())
+        pbr = self.parentItem().boundingRect()
+        anchorPos = [0,0]
+        parentPos = Point()
+        itemPos = Point()
+        if abs(br.left() - pbr.left()) < abs(br.right() - pbr.right()):
+            anchorPos[0] = 0
+            parentPos[0] = pbr.left()
+            itemPos[0] = br.left()
+        else:
+            anchorPos[0] = 1
+            parentPos[0] = pbr.right()
+            itemPos[0] = br.right()
+
+        if abs(br.top() - pbr.top()) < abs(br.bottom() - pbr.bottom()):
+            anchorPos[1] = 0
+            parentPos[1] = pbr.top()
+            itemPos[1] = br.top()
+        else:
+            anchorPos[1] = 1
+            parentPos[1] = pbr.bottom()
+            itemPos[1] = br.bottom()
+        
+        if relative:
+            relPos = [(itemPos[0]-pbr.left()) / pbr.width(), (itemPos[1]-pbr.top()) / pbr.height()]
+            self.anchor(anchorPos, relPos)
+        else:
+            offset = itemPos - parentPos
+            self.anchor(anchorPos, anchorPos, offset)
+    
+    def __geometryChanged(self):
+        if self.__parent is None:
+            return
+        if self.__itemAnchor is None:
+            return
+            
+        o = self.mapToParent(Point(0,0))
+        a = self.boundingRect().bottomRight() * Point(self.__itemAnchor)
+        a = self.mapToParent(a)
+        p = self.__parent.boundingRect().bottomRight() * Point(self.__parentAnchor)
+        off = Point(self.__offset)
+        pos = p + (o-a) + off
+        self.setPos(pos)
+        
+        
\ No newline at end of file
diff --git a/libs/pyqtgraph/graphicsItems/GridItem.py b/libs/pyqtgraph/graphicsItems/GridItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..87f90a6281d4f704b284871a6bad5a9827af8f5d
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/GridItem.py
@@ -0,0 +1,120 @@
+from ..Qt import QtGui, QtCore
+from .UIGraphicsItem import *
+import numpy as np
+from ..Point import Point
+from .. import functions as fn
+
+__all__ = ['GridItem']
+class GridItem(UIGraphicsItem):
+    """
+    **Bases:** :class:`UIGraphicsItem <pyqtgraph.UIGraphicsItem>`
+    
+    Displays a rectangular grid of lines indicating major divisions within a coordinate system.
+    Automatically determines what divisions to use.
+    """
+    
+    def __init__(self):
+        UIGraphicsItem.__init__(self)
+        #QtGui.QGraphicsItem.__init__(self, *args)
+        #self.setFlag(QtGui.QGraphicsItem.ItemClipsToShape)
+        #self.setCacheMode(QtGui.QGraphicsItem.DeviceCoordinateCache)
+        
+        self.picture = None
+        
+        
+    def viewRangeChanged(self):
+        UIGraphicsItem.viewRangeChanged(self)
+        self.picture = None
+        #UIGraphicsItem.viewRangeChanged(self)
+        #self.update()
+        
+    def paint(self, p, opt, widget):
+        #p.setPen(QtGui.QPen(QtGui.QColor(100, 100, 100)))
+        #p.drawRect(self.boundingRect())
+        #UIGraphicsItem.paint(self, p, opt, widget)
+        ### draw picture
+        if self.picture is None:
+            #print "no pic, draw.."
+            self.generatePicture()
+        p.drawPicture(QtCore.QPointF(0, 0), self.picture)
+        #p.setPen(QtGui.QPen(QtGui.QColor(255,0,0)))
+        #p.drawLine(0, -100, 0, 100)
+        #p.drawLine(-100, 0, 100, 0)
+        #print "drawing Grid."
+        
+        
+    def generatePicture(self):
+        self.picture = QtGui.QPicture()
+        p = QtGui.QPainter()
+        p.begin(self.picture)
+        
+        dt = fn.invertQTransform(self.viewTransform())
+        vr = self.getViewWidget().rect()
+        unit = self.pixelWidth(), self.pixelHeight()
+        dim = [vr.width(), vr.height()]
+        lvr = self.boundingRect()
+        ul = np.array([lvr.left(), lvr.top()])
+        br = np.array([lvr.right(), lvr.bottom()])
+        
+        texts = []
+        
+        if ul[1] > br[1]:
+            x = ul[1]
+            ul[1] = br[1]
+            br[1] = x
+        for i in [2,1,0]:   ## Draw three different scales of grid
+            dist = br-ul
+            nlTarget = 10.**i
+            d = 10. ** np.floor(np.log10(abs(dist/nlTarget))+0.5)
+            ul1 = np.floor(ul / d) * d
+            br1 = np.ceil(br / d) * d
+            dist = br1-ul1
+            nl = (dist / d) + 0.5
+            #print "level", i
+            #print "  dim", dim
+            #print "  dist", dist
+            #print "  d", d
+            #print "  nl", nl
+            for ax in range(0,2):  ## Draw grid for both axes
+                ppl = dim[ax] / nl[ax]
+                c = np.clip(3.*(ppl-3), 0., 30.)
+                linePen = QtGui.QPen(QtGui.QColor(255, 255, 255, c)) 
+                textPen = QtGui.QPen(QtGui.QColor(255, 255, 255, c*2)) 
+                #linePen.setCosmetic(True)
+                #linePen.setWidth(1)
+                bx = (ax+1) % 2
+                for x in range(0, int(nl[ax])):
+                    linePen.setCosmetic(False)
+                    if ax == 0:
+                        linePen.setWidthF(self.pixelWidth())
+                        #print "ax 0 height", self.pixelHeight()
+                    else:
+                        linePen.setWidthF(self.pixelHeight())
+                        #print "ax 1 width", self.pixelWidth()
+                    p.setPen(linePen)
+                    p1 = np.array([0.,0.])
+                    p2 = np.array([0.,0.])
+                    p1[ax] = ul1[ax] + x * d[ax]
+                    p2[ax] = p1[ax]
+                    p1[bx] = ul[bx]
+                    p2[bx] = br[bx]
+                    ## don't draw lines that are out of bounds.
+                    if p1[ax] < min(ul[ax], br[ax]) or p1[ax] > max(ul[ax], br[ax]):
+                        continue
+                    p.drawLine(QtCore.QPointF(p1[0], p1[1]), QtCore.QPointF(p2[0], p2[1]))
+                    if i < 2:
+                        p.setPen(textPen)
+                        if ax == 0:
+                            x = p1[0] + unit[0]
+                            y = ul[1] + unit[1] * 8.
+                        else:
+                            x = ul[0] + unit[0]*3
+                            y = p1[1] + unit[1]
+                        texts.append((QtCore.QPointF(x, y), "%g"%p1[ax]))
+        tr = self.deviceTransform()
+        #tr.scale(1.5, 1.5)
+        p.setWorldTransform(fn.invertQTransform(tr))
+        for t in texts:
+            x = tr.map(t[0]) + Point(0.5, 0.5)
+            p.drawText(x, t[1])
+        p.end()
diff --git a/libs/pyqtgraph/graphicsItems/HistogramLUTItem.py b/libs/pyqtgraph/graphicsItems/HistogramLUTItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..c46dbbbef9d0c3a309769954b9d0c5fc8a7c0ac5
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/HistogramLUTItem.py
@@ -0,0 +1,215 @@
+"""
+GraphicsWidget displaying an image histogram along with gradient editor. Can be used to adjust the appearance of images.
+"""
+
+
+from ..Qt import QtGui, QtCore
+from .. import functions as fn
+from .GraphicsWidget import GraphicsWidget
+from .ViewBox import *
+from .GradientEditorItem import *
+from .LinearRegionItem import *
+from .PlotDataItem import *
+from .AxisItem import *
+from .GridItem import *
+from ..Point import Point
+from .. import functions as fn
+import numpy as np
+from .. import debug as debug
+
+import weakref
+
+__all__ = ['HistogramLUTItem']
+
+
+class HistogramLUTItem(GraphicsWidget):
+    """
+    This is a graphicsWidget which provides controls for adjusting the display of an image.
+    Includes:
+
+    - Image histogram 
+    - Movable region over histogram to select black/white levels
+    - Gradient editor to define color lookup table for single-channel images
+    """
+    
+    sigLookupTableChanged = QtCore.Signal(object)
+    sigLevelsChanged = QtCore.Signal(object)
+    sigLevelChangeFinished = QtCore.Signal(object)
+    
+    def __init__(self, image=None, fillHistogram=True):
+        """
+        If *image* (ImageItem) is provided, then the control will be automatically linked to the image and changes to the control will be immediately reflected in the image's appearance.
+        By default, the histogram is rendered with a fill. For performance, set *fillHistogram* = False.
+        """
+        GraphicsWidget.__init__(self)
+        self.lut = None
+        self.imageItem = lambda: None  # fake a dead weakref
+        
+        self.layout = QtGui.QGraphicsGridLayout()
+        self.setLayout(self.layout)
+        self.layout.setContentsMargins(1,1,1,1)
+        self.layout.setSpacing(0)
+        self.vb = ViewBox(parent=self)
+        self.vb.setMaximumWidth(152)
+        self.vb.setMinimumWidth(45)
+        self.vb.setMouseEnabled(x=False, y=True)
+        self.gradient = GradientEditorItem()
+        self.gradient.setOrientation('right')
+        self.gradient.loadPreset('grey')
+        self.region = LinearRegionItem([0, 1], LinearRegionItem.Horizontal)
+        self.region.setZValue(1000)
+        self.vb.addItem(self.region)
+        self.axis = AxisItem('left', linkView=self.vb, maxTickLength=-10, parent=self)
+        self.layout.addItem(self.axis, 0, 0)
+        self.layout.addItem(self.vb, 0, 1)
+        self.layout.addItem(self.gradient, 0, 2)
+        self.range = None
+        self.gradient.setFlag(self.gradient.ItemStacksBehindParent)
+        self.vb.setFlag(self.gradient.ItemStacksBehindParent)
+        
+        #self.grid = GridItem()
+        #self.vb.addItem(self.grid)
+        
+        self.gradient.sigGradientChanged.connect(self.gradientChanged)
+        self.region.sigRegionChanged.connect(self.regionChanging)
+        self.region.sigRegionChangeFinished.connect(self.regionChanged)
+        self.vb.sigRangeChanged.connect(self.viewRangeChanged)
+        self.plot = PlotDataItem()
+        self.plot.rotate(90)
+        self.fillHistogram(fillHistogram)
+            
+        self.vb.addItem(self.plot)
+        self.autoHistogramRange()
+        
+        if image is not None:
+            self.setImageItem(image)
+        #self.setSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding)
+        
+    def fillHistogram(self, fill=True, level=0.0, color=(100, 100, 200)):
+        if fill:
+            self.plot.setFillLevel(level)
+            self.plot.setFillBrush(color)
+        else:
+            self.plot.setFillLevel(None)
+        
+    #def sizeHint(self, *args):
+        #return QtCore.QSizeF(115, 200)
+        
+    def paint(self, p, *args):
+        pen = self.region.lines[0].pen
+        rgn = self.getLevels()
+        p1 = self.vb.mapFromViewToItem(self, Point(self.vb.viewRect().center().x(), rgn[0]))
+        p2 = self.vb.mapFromViewToItem(self, Point(self.vb.viewRect().center().x(), rgn[1]))
+        gradRect = self.gradient.mapRectToParent(self.gradient.gradRect.rect())
+        for pen in [fn.mkPen('k', width=3), pen]:
+            p.setPen(pen)
+            p.drawLine(p1, gradRect.bottomLeft())
+            p.drawLine(p2, gradRect.topLeft())
+            p.drawLine(gradRect.topLeft(), gradRect.topRight())
+            p.drawLine(gradRect.bottomLeft(), gradRect.bottomRight())
+        #p.drawRect(self.boundingRect())
+        
+        
+    def setHistogramRange(self, mn, mx, padding=0.1):
+        """Set the Y range on the histogram plot. This disables auto-scaling."""
+        self.vb.enableAutoRange(self.vb.YAxis, False)
+        self.vb.setYRange(mn, mx, padding)
+        
+        #d = mx-mn
+        #mn -= d*padding
+        #mx += d*padding
+        #self.range = [mn,mx]
+        #self.updateRange()
+        #self.vb.setMouseEnabled(False, True)
+        #self.region.setBounds([mn,mx])
+        
+    def autoHistogramRange(self):
+        """Enable auto-scaling on the histogram plot."""
+        self.vb.enableAutoRange(self.vb.XYAxes)
+        #self.range = None
+        #self.updateRange()
+        #self.vb.setMouseEnabled(False, False)
+            
+    #def updateRange(self):
+        #self.vb.autoRange()
+        #if self.range is not None:
+            #self.vb.setYRange(*self.range)
+        #vr = self.vb.viewRect()
+        
+        #self.region.setBounds([vr.top(), vr.bottom()])
+
+    def setImageItem(self, img):
+        """Set an ImageItem to have its levels and LUT automatically controlled
+        by this HistogramLUTItem.
+        """
+        self.imageItem = weakref.ref(img)
+        img.sigImageChanged.connect(self.imageChanged)
+        img.setLookupTable(self.getLookupTable)  ## send function pointer, not the result
+        #self.gradientChanged()
+        self.regionChanged()
+        self.imageChanged(autoLevel=True)
+        #self.vb.autoRange()
+        
+    def viewRangeChanged(self):
+        self.update()
+    
+    def gradientChanged(self):
+        if self.imageItem() is not None:
+            if self.gradient.isLookupTrivial():
+                self.imageItem().setLookupTable(None) #lambda x: x.astype(np.uint8))
+            else:
+                self.imageItem().setLookupTable(self.getLookupTable)  ## send function pointer, not the result
+            
+        self.lut = None
+        #if self.imageItem is not None:
+            #self.imageItem.setLookupTable(self.gradient.getLookupTable(512))
+        self.sigLookupTableChanged.emit(self)
+
+    def getLookupTable(self, img=None, n=None, alpha=None):
+        """Return a lookup table from the color gradient defined by this 
+        HistogramLUTItem.
+        """
+        if n is None:
+            if img.dtype == np.uint8:
+                n = 256
+            else:
+                n = 512
+        if self.lut is None:
+            self.lut = self.gradient.getLookupTable(n, alpha=alpha)
+        return self.lut
+
+    def regionChanged(self):
+        #if self.imageItem is not None:
+            #self.imageItem.setLevels(self.region.getRegion())
+        self.sigLevelChangeFinished.emit(self)
+        #self.update()
+
+    def regionChanging(self):
+        if self.imageItem() is not None:
+            self.imageItem().setLevels(self.region.getRegion())
+        self.sigLevelsChanged.emit(self)
+        self.update()
+
+    def imageChanged(self, autoLevel=False, autoRange=False):
+        profiler = debug.Profiler()
+        h = self.imageItem().getHistogram()
+        profiler('get histogram')
+        if h[0] is None:
+            return
+        self.plot.setData(*h)
+        profiler('set plot')
+        if autoLevel:
+            mn = h[0][0]
+            mx = h[0][-1]
+            self.region.setRegion([mn, mx])
+            profiler('set region')
+            
+    def getLevels(self):
+        """Return the min and max levels.
+        """
+        return self.region.getRegion()
+        
+    def setLevels(self, mn, mx):
+        """Set the min and max levels.
+        """
+        self.region.setRegion([mn, mx])
diff --git a/libs/pyqtgraph/graphicsItems/ImageItem.py b/libs/pyqtgraph/graphicsItems/ImageItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..5b0414336bad36f0f6f00a1af1ef2174622fdd9f
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/ImageItem.py
@@ -0,0 +1,528 @@
+from __future__ import division
+
+from ..Qt import QtGui, QtCore
+import numpy as np
+import collections
+from .. import functions as fn
+from .. import debug as debug
+from .GraphicsObject import GraphicsObject
+from ..Point import Point
+
+__all__ = ['ImageItem']
+
+
+class ImageItem(GraphicsObject):
+    """
+    **Bases:** :class:`GraphicsObject <pyqtgraph.GraphicsObject>`
+    
+    GraphicsObject displaying an image. Optimized for rapid update (ie video display).
+    This item displays either a 2D numpy array (height, width) or
+    a 3D array (height, width, RGBa). This array is optionally scaled (see 
+    :func:`setLevels <pyqtgraph.ImageItem.setLevels>`) and/or colored
+    with a lookup table (see :func:`setLookupTable <pyqtgraph.ImageItem.setLookupTable>`)
+    before being displayed.
+    
+    ImageItem is frequently used in conjunction with 
+    :class:`HistogramLUTItem <pyqtgraph.HistogramLUTItem>` or 
+    :class:`HistogramLUTWidget <pyqtgraph.HistogramLUTWidget>` to provide a GUI
+    for controlling the levels and lookup table used to display the image.
+    """
+    
+    
+    sigImageChanged = QtCore.Signal()
+    sigRemoveRequested = QtCore.Signal(object)  # self; emitted when 'remove' is selected from context menu
+    
+    def __init__(self, image=None, **kargs):
+        """
+        See :func:`setImage <pyqtgraph.ImageItem.setImage>` for all allowed initialization arguments.
+        """
+        GraphicsObject.__init__(self)
+        self.menu = None
+        self.image = None   ## original image data
+        self.qimage = None  ## rendered image for display
+        
+        self.paintMode = None
+        
+        self.levels = None  ## [min, max] or [[redMin, redMax], ...]
+        self.lut = None
+        self.autoDownsample = False
+        
+        self.drawKernel = None
+        self.border = None
+        self.removable = False
+        
+        if image is not None:
+            self.setImage(image, **kargs)
+        else:
+            self.setOpts(**kargs)
+
+    def setCompositionMode(self, mode):
+        """Change the composition mode of the item (see QPainter::CompositionMode
+        in the Qt documentation). This is useful when overlaying multiple ImageItems.
+        
+        ============================================  ============================================================
+        **Most common arguments:**
+        QtGui.QPainter.CompositionMode_SourceOver     Default; image replaces the background if it
+                                                      is opaque. Otherwise, it uses the alpha channel to blend
+                                                      the image with the background.
+        QtGui.QPainter.CompositionMode_Overlay        The image color is mixed with the background color to 
+                                                      reflect the lightness or darkness of the background.
+        QtGui.QPainter.CompositionMode_Plus           Both the alpha and color of the image and background pixels 
+                                                      are added together.
+        QtGui.QPainter.CompositionMode_Multiply       The output is the image color multiplied by the background.
+        ============================================  ============================================================
+        """
+        self.paintMode = mode
+        self.update()
+
+    ## use setOpacity instead.
+    #def setAlpha(self, alpha):
+        #self.setOpacity(alpha)
+        #self.updateImage()
+        
+    def setBorder(self, b):
+        self.border = fn.mkPen(b)
+        self.update()
+        
+    def width(self):
+        if self.image is None:
+            return None
+        return self.image.shape[0]
+        
+    def height(self):
+        if self.image is None:
+            return None
+        return self.image.shape[1]
+
+    def boundingRect(self):
+        if self.image is None:
+            return QtCore.QRectF(0., 0., 0., 0.)
+        return QtCore.QRectF(0., 0., float(self.width()), float(self.height()))
+
+    #def setClipLevel(self, level=None):
+        #self.clipLevel = level
+        #self.updateImage()
+        
+    #def paint(self, p, opt, widget):
+        #pass
+        #if self.pixmap is not None:
+            #p.drawPixmap(0, 0, self.pixmap)
+            #print "paint"
+
+    def setLevels(self, levels, update=True):
+        """
+        Set image scaling levels. Can be one of:
+        
+        * [blackLevel, whiteLevel]
+        * [[minRed, maxRed], [minGreen, maxGreen], [minBlue, maxBlue]]
+            
+        Only the first format is compatible with lookup tables. See :func:`makeARGB <pyqtgraph.makeARGB>`
+        for more details on how levels are applied.
+        """
+        self.levels = levels
+        if update:
+            self.updateImage()
+        
+    def getLevels(self):
+        return self.levels
+        #return self.whiteLevel, self.blackLevel
+
+    def setLookupTable(self, lut, update=True):
+        """
+        Set the lookup table (numpy array) to use for this image. (see 
+        :func:`makeARGB <pyqtgraph.makeARGB>` for more information on how this is used).
+        Optionally, lut can be a callable that accepts the current image as an 
+        argument and returns the lookup table to use.
+        
+        Ordinarily, this table is supplied by a :class:`HistogramLUTItem <pyqtgraph.HistogramLUTItem>`
+        or :class:`GradientEditorItem <pyqtgraph.GradientEditorItem>`.
+        """
+        self.lut = lut
+        if update:
+            self.updateImage()
+
+    def setAutoDownsample(self, ads):
+        """
+        Set the automatic downsampling mode for this ImageItem.
+        
+        Added in version 0.9.9
+        """
+        self.autoDownsample = ads
+        self.qimage = None
+        self.update()
+
+    def setOpts(self, update=True, **kargs):
+        
+        if 'lut' in kargs:
+            self.setLookupTable(kargs['lut'], update=update)
+        if 'levels' in kargs:
+            self.setLevels(kargs['levels'], update=update)
+        #if 'clipLevel' in kargs:
+            #self.setClipLevel(kargs['clipLevel'])
+        if 'opacity' in kargs:
+            self.setOpacity(kargs['opacity'])
+        if 'compositionMode' in kargs:
+            self.setCompositionMode(kargs['compositionMode'])
+        if 'border' in kargs:
+            self.setBorder(kargs['border'])
+        if 'removable' in kargs:
+            self.removable = kargs['removable']
+            self.menu = None
+        if 'autoDownsample' in kargs:
+            self.setAutoDownsample(kargs['autoDownsample'])
+        if update:
+            self.update()
+
+    def setRect(self, rect):
+        """Scale and translate the image to fit within rect (must be a QRect or QRectF)."""
+        self.resetTransform()
+        self.translate(rect.left(), rect.top())
+        self.scale(rect.width() / self.width(), rect.height() / self.height())
+
+    def clear(self):
+        self.image = None
+        self.prepareGeometryChange()
+        self.informViewBoundsChanged()
+        self.update()
+
+    def setImage(self, image=None, autoLevels=None, **kargs):
+        """
+        Update the image displayed by this item. For more information on how the image
+        is processed before displaying, see :func:`makeARGB <pyqtgraph.makeARGB>`
+        
+        =================  =========================================================================
+        **Arguments:**
+        image              (numpy array) Specifies the image data. May be 2D (width, height) or 
+                           3D (width, height, RGBa). The array dtype must be integer or floating
+                           point of any bit depth. For 3D arrays, the third dimension must
+                           be of length 3 (RGB) or 4 (RGBA).
+        autoLevels         (bool) If True, this forces the image to automatically select 
+                           levels based on the maximum and minimum values in the data.
+                           By default, this argument is true unless the levels argument is
+                           given.
+        lut                (numpy array) The color lookup table to use when displaying the image.
+                           See :func:`setLookupTable <pyqtgraph.ImageItem.setLookupTable>`.
+        levels             (min, max) The minimum and maximum values to use when rescaling the image
+                           data. By default, this will be set to the minimum and maximum values 
+                           in the image. If the image array has dtype uint8, no rescaling is necessary.
+        opacity            (float 0.0-1.0)
+        compositionMode    see :func:`setCompositionMode <pyqtgraph.ImageItem.setCompositionMode>`
+        border             Sets the pen used when drawing the image border. Default is None.
+        autoDownsample     (bool) If True, the image is automatically downsampled to match the
+                           screen resolution. This improves performance for large images and 
+                           reduces aliasing.
+        =================  =========================================================================
+        """
+        profile = debug.Profiler()
+
+        gotNewData = False
+        if image is None:
+            if self.image is None:
+                return
+        else:
+            gotNewData = True
+            shapeChanged = (self.image is None or image.shape != self.image.shape)
+            self.image = image.view(np.ndarray)
+            if self.image.shape[0] > 2**15-1 or self.image.shape[1] > 2**15-1:
+                if 'autoDownsample' not in kargs:
+                    kargs['autoDownsample'] = True
+            if shapeChanged:
+                self.prepareGeometryChange()
+                self.informViewBoundsChanged()
+
+        profile()
+
+        if autoLevels is None:
+            if 'levels' in kargs:
+                autoLevels = False
+            else:
+                autoLevels = True
+        if autoLevels:
+            img = self.image
+            while img.size > 2**16:
+                img = img[::2, ::2]
+            mn, mx = img.min(), img.max()
+            if mn == mx:
+                mn = 0
+                mx = 255
+            kargs['levels'] = [mn,mx]
+
+        profile()
+
+        self.setOpts(update=False, **kargs)
+
+        profile()
+
+        self.qimage = None
+        self.update()
+
+        profile()
+
+        if gotNewData:
+            self.sigImageChanged.emit()
+
+
+    def updateImage(self, *args, **kargs):
+        ## used for re-rendering qimage from self.image.
+        
+        ## can we make any assumptions here that speed things up?
+        ## dtype, range, size are all the same?
+        defaults = {
+            'autoLevels': False,
+        }
+        defaults.update(kargs)
+        return self.setImage(*args, **defaults)
+
+    def render(self):
+        # Convert data to QImage for display.
+        
+        profile = debug.Profiler()
+        if self.image is None or self.image.size == 0:
+            return
+        if isinstance(self.lut, collections.Callable):
+            lut = self.lut(self.image)
+        else:
+            lut = self.lut
+
+        if self.autoDownsample:
+            # reduce dimensions of image based on screen resolution
+            o = self.mapToDevice(QtCore.QPointF(0,0))
+            x = self.mapToDevice(QtCore.QPointF(1,0))
+            y = self.mapToDevice(QtCore.QPointF(0,1))
+            w = Point(x-o).length()
+            h = Point(y-o).length()
+            xds = max(1, int(1/w))
+            yds = max(1, int(1/h))
+            image = fn.downsample(self.image, xds, axis=0)
+            image = fn.downsample(image, yds, axis=1)
+        else:
+            image = self.image
+        
+        argb, alpha = fn.makeARGB(image.transpose((1, 0, 2)[:image.ndim]), lut=lut, levels=self.levels)
+        self.qimage = fn.makeQImage(argb, alpha, transpose=False)
+
+    def paint(self, p, *args):
+        profile = debug.Profiler()
+        if self.image is None:
+            return
+        if self.qimage is None:
+            self.render()
+            if self.qimage is None:
+                return
+            profile('render QImage')
+        if self.paintMode is not None:
+            p.setCompositionMode(self.paintMode)
+            profile('set comp mode')
+
+        p.drawImage(QtCore.QRectF(0,0,self.image.shape[0],self.image.shape[1]), self.qimage)
+        profile('p.drawImage')
+        if self.border is not None:
+            p.setPen(self.border)
+            p.drawRect(self.boundingRect())
+
+    def save(self, fileName, *args):
+        """Save this image to file. Note that this saves the visible image (after scale/color changes), not the original data."""
+        if self.qimage is None:
+            self.render()
+        self.qimage.save(fileName, *args)
+
+    def getHistogram(self, bins='auto', step='auto', targetImageSize=200, targetHistogramSize=500, **kwds):
+        """Returns x and y arrays containing the histogram values for the current image.
+        For an explanation of the return format, see numpy.histogram().
+        
+        The *step* argument causes pixels to be skipped when computing the histogram to save time.
+        If *step* is 'auto', then a step is chosen such that the analyzed data has
+        dimensions roughly *targetImageSize* for each axis.
+        
+        The *bins* argument and any extra keyword arguments are passed to 
+        np.histogram(). If *bins* is 'auto', then a bin number is automatically
+        chosen based on the image characteristics:
+        
+        * Integer images will have approximately *targetHistogramSize* bins, 
+          with each bin having an integer width.
+        * All other types will have *targetHistogramSize* bins.
+        
+        This method is also used when automatically computing levels.
+        """
+        if self.image is None:
+            return None,None
+        if step == 'auto':
+            step = (np.ceil(self.image.shape[0] / targetImageSize),
+                    np.ceil(self.image.shape[1] / targetImageSize))
+        if np.isscalar(step):
+            step = (step, step)
+        stepData = self.image[::step[0], ::step[1]]
+        
+        if bins == 'auto':
+            if stepData.dtype.kind in "ui":
+                mn = stepData.min()
+                mx = stepData.max()
+                step = np.ceil((mx-mn) / 500.)
+                bins = np.arange(mn, mx+1.01*step, step, dtype=np.int)
+                if len(bins) == 0:
+                    bins = [mn, mx]
+            else:
+                bins = 500
+
+        kwds['bins'] = bins
+        hist = np.histogram(stepData, **kwds)
+        
+        return hist[1][:-1], hist[0]
+
+    def setPxMode(self, b):
+        """
+        Set whether the item ignores transformations and draws directly to screen pixels.
+        If True, the item will not inherit any scale or rotation transformations from its
+        parent items, but its position will be transformed as usual.
+        (see GraphicsItem::ItemIgnoresTransformations in the Qt documentation)
+        """
+        self.setFlag(self.ItemIgnoresTransformations, b)
+    
+    def setScaledMode(self):
+        self.setPxMode(False)
+
+    def getPixmap(self):
+        if self.qimage is None:
+            self.render()
+            if self.qimage is None:
+                return None
+        return QtGui.QPixmap.fromImage(self.qimage)
+    
+    def pixelSize(self):
+        """return scene-size of a single pixel in the image"""
+        br = self.sceneBoundingRect()
+        if self.image is None:
+            return 1,1
+        return br.width()/self.width(), br.height()/self.height()
+    
+    def viewTransformChanged(self):
+        if self.autoDownsample:
+            self.qimage = None
+            self.update()
+
+    #def mousePressEvent(self, ev):
+        #if self.drawKernel is not None and ev.button() == QtCore.Qt.LeftButton:
+            #self.drawAt(ev.pos(), ev)
+            #ev.accept()
+        #else:
+            #ev.ignore()
+        
+    #def mouseMoveEvent(self, ev):
+        ##print "mouse move", ev.pos()
+        #if self.drawKernel is not None:
+            #self.drawAt(ev.pos(), ev)
+    
+    #def mouseReleaseEvent(self, ev):
+        #pass
+
+    def mouseDragEvent(self, ev):
+        if ev.button() != QtCore.Qt.LeftButton:
+            ev.ignore()
+            return
+        elif self.drawKernel is not None:
+            ev.accept()
+            self.drawAt(ev.pos(), ev)
+
+    def mouseClickEvent(self, ev):
+        if ev.button() == QtCore.Qt.RightButton:
+            if self.raiseContextMenu(ev):
+                ev.accept()
+        if self.drawKernel is not None and ev.button() == QtCore.Qt.LeftButton:
+            self.drawAt(ev.pos(), ev)
+
+    def raiseContextMenu(self, ev):
+        menu = self.getMenu()
+        if menu is None:
+            return False
+        menu = self.scene().addParentContextMenus(self, menu, ev)
+        pos = ev.screenPos()
+        menu.popup(QtCore.QPoint(pos.x(), pos.y()))
+        return True
+
+    def getMenu(self):
+        if self.menu is None:
+            if not self.removable:
+                return None
+            self.menu = QtGui.QMenu()
+            self.menu.setTitle("Image")
+            remAct = QtGui.QAction("Remove image", self.menu)
+            remAct.triggered.connect(self.removeClicked)
+            self.menu.addAction(remAct)
+            self.menu.remAct = remAct
+        return self.menu
+        
+        
+    def hoverEvent(self, ev):
+        if not ev.isExit() and self.drawKernel is not None and ev.acceptDrags(QtCore.Qt.LeftButton):
+            ev.acceptClicks(QtCore.Qt.LeftButton) ## we don't use the click, but we also don't want anyone else to use it.
+            ev.acceptClicks(QtCore.Qt.RightButton)
+            #self.box.setBrush(fn.mkBrush('w'))
+        elif not ev.isExit() and self.removable:
+            ev.acceptClicks(QtCore.Qt.RightButton)  ## accept context menu clicks
+        #else:
+            #self.box.setBrush(self.brush)
+        #self.update()
+
+
+        
+    def tabletEvent(self, ev):
+        print(ev.device())
+        print(ev.pointerType())
+        print(ev.pressure())
+    
+    def drawAt(self, pos, ev=None):
+        pos = [int(pos.x()), int(pos.y())]
+        dk = self.drawKernel
+        kc = self.drawKernelCenter
+        sx = [0,dk.shape[0]]
+        sy = [0,dk.shape[1]]
+        tx = [pos[0] - kc[0], pos[0] - kc[0]+ dk.shape[0]]
+        ty = [pos[1] - kc[1], pos[1] - kc[1]+ dk.shape[1]]
+        
+        for i in [0,1]:
+            dx1 = -min(0, tx[i])
+            dx2 = min(0, self.image.shape[0]-tx[i])
+            tx[i] += dx1+dx2
+            sx[i] += dx1+dx2
+
+            dy1 = -min(0, ty[i])
+            dy2 = min(0, self.image.shape[1]-ty[i])
+            ty[i] += dy1+dy2
+            sy[i] += dy1+dy2
+
+        ts = (slice(tx[0],tx[1]), slice(ty[0],ty[1]))
+        ss = (slice(sx[0],sx[1]), slice(sy[0],sy[1]))
+        mask = self.drawMask
+        src = dk
+        
+        if isinstance(self.drawMode, collections.Callable):
+            self.drawMode(dk, self.image, mask, ss, ts, ev)
+        else:
+            src = src[ss]
+            if self.drawMode == 'set':
+                if mask is not None:
+                    mask = mask[ss]
+                    self.image[ts] = self.image[ts] * (1-mask) + src * mask
+                else:
+                    self.image[ts] = src
+            elif self.drawMode == 'add':
+                self.image[ts] += src
+            else:
+                raise Exception("Unknown draw mode '%s'" % self.drawMode)
+            self.updateImage()
+        
+    def setDrawKernel(self, kernel=None, mask=None, center=(0,0), mode='set'):
+        self.drawKernel = kernel
+        self.drawKernelCenter = center
+        self.drawMode = mode
+        self.drawMask = mask
+
+    def removeClicked(self):
+        ## Send remove event only after we have exited the menu event handler
+        self.removeTimer = QtCore.QTimer()
+        self.removeTimer.timeout.connect(self.emitRemoveRequested)
+        self.removeTimer.start(0)
+
+    def emitRemoveRequested(self):
+        self.removeTimer.timeout.disconnect(self.emitRemoveRequested)
+        self.sigRemoveRequested.emit(self)
diff --git a/libs/pyqtgraph/graphicsItems/InfiniteLine.py b/libs/pyqtgraph/graphicsItems/InfiniteLine.py
new file mode 100644
index 0000000000000000000000000000000000000000..240dfe97951ab4fa5e6dfeaafeb2a512396907dc
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/InfiniteLine.py
@@ -0,0 +1,242 @@
+from ..Qt import QtGui, QtCore
+from ..Point import Point
+from .GraphicsObject import GraphicsObject
+from .. import functions as fn
+import numpy as np
+import weakref
+
+
+__all__ = ['InfiniteLine']
+class InfiniteLine(GraphicsObject):
+    """
+    **Bases:** :class:`GraphicsObject <pyqtgraph.GraphicsObject>`
+    
+    Displays a line of infinite length.
+    This line may be dragged to indicate a position in data coordinates.
+    
+    =============================== ===================================================
+    **Signals:**
+    sigDragged(self)
+    sigPositionChangeFinished(self)
+    sigPositionChanged(self)
+    =============================== ===================================================
+    """
+    
+    sigDragged = QtCore.Signal(object)
+    sigPositionChangeFinished = QtCore.Signal(object)
+    sigPositionChanged = QtCore.Signal(object)
+    
+    def __init__(self, pos=None, angle=90, pen=None, movable=False, bounds=None):
+        """
+        =============== ==================================================================
+        **Arguments:**
+        pos             Position of the line. This can be a QPointF or a single value for
+                        vertical/horizontal lines.
+        angle           Angle of line in degrees. 0 is horizontal, 90 is vertical.
+        pen             Pen to use when drawing line. Can be any arguments that are valid
+                        for :func:`mkPen <pyqtgraph.mkPen>`. Default pen is transparent
+                        yellow.
+        movable         If True, the line can be dragged to a new position by the user.
+        bounds          Optional [min, max] bounding values. Bounds are only valid if the
+                        line is vertical or horizontal.
+        =============== ==================================================================
+        """
+        
+        GraphicsObject.__init__(self)
+        
+        if bounds is None:              ## allowed value boundaries for orthogonal lines
+            self.maxRange = [None, None]
+        else:
+            self.maxRange = bounds
+        self.moving = False
+        self.setMovable(movable)
+        self.mouseHovering = False
+        self.p = [0, 0]
+        self.setAngle(angle)
+        if pos is None:
+            pos = Point(0,0)
+        self.setPos(pos)
+
+        if pen is None:
+            pen = (200, 200, 100)
+        
+        self.setPen(pen)
+        self.setHoverPen(color=(255,0,0), width=self.pen.width())
+        self.currentPen = self.pen
+      
+    def setMovable(self, m):
+        """Set whether the line is movable by the user."""
+        self.movable = m
+        self.setAcceptHoverEvents(m)
+      
+    def setBounds(self, bounds):
+        """Set the (minimum, maximum) allowable values when dragging."""
+        self.maxRange = bounds
+        self.setValue(self.value())
+        
+    def setPen(self, *args, **kwargs):
+        """Set the pen for drawing the line. Allowable arguments are any that are valid 
+        for :func:`mkPen <pyqtgraph.mkPen>`."""
+        self.pen = fn.mkPen(*args, **kwargs)
+        if not self.mouseHovering:
+            self.currentPen = self.pen
+            self.update()
+        
+    def setHoverPen(self, *args, **kwargs):
+        """Set the pen for drawing the line while the mouse hovers over it. 
+        Allowable arguments are any that are valid 
+        for :func:`mkPen <pyqtgraph.mkPen>`.
+        
+        If the line is not movable, then hovering is also disabled.
+        
+        Added in version 0.9.9."""
+        self.hoverPen = fn.mkPen(*args, **kwargs)
+        if self.mouseHovering:
+            self.currentPen = self.hoverPen
+            self.update()
+        
+    def setAngle(self, angle):
+        """
+        Takes angle argument in degrees.
+        0 is horizontal; 90 is vertical.
+        
+        Note that the use of value() and setValue() changes if the line is 
+        not vertical or horizontal.
+        """
+        self.angle = ((angle+45) % 180) - 45   ##  -45 <= angle < 135
+        self.resetTransform()
+        self.rotate(self.angle)
+        self.update()
+        
+    def setPos(self, pos):
+        
+        if type(pos) in [list, tuple]:
+            newPos = pos
+        elif isinstance(pos, QtCore.QPointF):
+            newPos = [pos.x(), pos.y()]
+        else:
+            if self.angle == 90:
+                newPos = [pos, 0]
+            elif self.angle == 0:
+                newPos = [0, pos]
+            else:
+                raise Exception("Must specify 2D coordinate for non-orthogonal lines.")
+            
+        ## check bounds (only works for orthogonal lines)
+        if self.angle == 90:
+            if self.maxRange[0] is not None:    
+                newPos[0] = max(newPos[0], self.maxRange[0])
+            if self.maxRange[1] is not None:
+                newPos[0] = min(newPos[0], self.maxRange[1])
+        elif self.angle == 0:
+            if self.maxRange[0] is not None:
+                newPos[1] = max(newPos[1], self.maxRange[0])
+            if self.maxRange[1] is not None:
+                newPos[1] = min(newPos[1], self.maxRange[1])
+            
+        if self.p != newPos:
+            self.p = newPos
+            GraphicsObject.setPos(self, Point(self.p))
+            self.update()
+            self.sigPositionChanged.emit(self)
+
+    def getXPos(self):
+        return self.p[0]
+        
+    def getYPos(self):
+        return self.p[1]
+        
+    def getPos(self):
+        return self.p
+
+    def value(self):
+        """Return the value of the line. Will be a single number for horizontal and 
+        vertical lines, and a list of [x,y] values for diagonal lines."""
+        if self.angle%180 == 0:
+            return self.getYPos()
+        elif self.angle%180 == 90:
+            return self.getXPos()
+        else:
+            return self.getPos()
+                
+    def setValue(self, v):
+        """Set the position of the line. If line is horizontal or vertical, v can be 
+        a single value. Otherwise, a 2D coordinate must be specified (list, tuple and 
+        QPointF are all acceptable)."""
+        self.setPos(v)
+
+    ## broken in 4.7
+    #def itemChange(self, change, val):
+        #if change in [self.ItemScenePositionHasChanged, self.ItemSceneHasChanged]:
+            #self.updateLine()
+            #print "update", change
+            #print self.getBoundingParents()
+        #else:
+            #print "ignore", change
+        #return GraphicsObject.itemChange(self, change, val)
+                
+    def boundingRect(self):
+        #br = UIGraphicsItem.boundingRect(self)
+        br = self.viewRect()
+        ## add a 4-pixel radius around the line for mouse interaction.
+        
+        px = self.pixelLength(direction=Point(1,0), ortho=True)  ## get pixel length orthogonal to the line
+        if px is None:
+            px = 0
+        w = (max(4, self.pen.width()/2, self.hoverPen.width()/2)+1) * px
+        br.setBottom(-w)
+        br.setTop(w)
+        return br.normalized()
+    
+    def paint(self, p, *args):
+        br = self.boundingRect()
+        p.setPen(self.currentPen)
+        p.drawLine(Point(br.right(), 0), Point(br.left(), 0))
+        
+    def dataBounds(self, axis, frac=1.0, orthoRange=None):
+        if axis == 0:
+            return None   ## x axis should never be auto-scaled
+        else:
+            return (0,0)
+
+    def mouseDragEvent(self, ev):
+        if self.movable and ev.button() == QtCore.Qt.LeftButton:
+            if ev.isStart():
+                self.moving = True
+                self.cursorOffset = self.pos() - self.mapToParent(ev.buttonDownPos())
+                self.startPosition = self.pos()
+            ev.accept()
+            
+            if not self.moving:
+                return
+                
+            self.setPos(self.cursorOffset + self.mapToParent(ev.pos()))
+            self.sigDragged.emit(self)
+            if ev.isFinish():
+                self.moving = False
+                self.sigPositionChangeFinished.emit(self)
+            
+    def mouseClickEvent(self, ev):
+        if self.moving and ev.button() == QtCore.Qt.RightButton:
+            ev.accept()
+            self.setPos(self.startPosition)
+            self.moving = False
+            self.sigDragged.emit(self)
+            self.sigPositionChangeFinished.emit(self)
+
+    def hoverEvent(self, ev):
+        if (not ev.isExit()) and self.movable and ev.acceptDrags(QtCore.Qt.LeftButton):
+            self.setMouseHover(True)
+        else:
+            self.setMouseHover(False)
+
+    def setMouseHover(self, hover):
+        ## Inform the item that the mouse is (not) hovering over it
+        if self.mouseHovering == hover:
+            return
+        self.mouseHovering = hover
+        if hover:
+            self.currentPen = self.hoverPen
+        else:
+            self.currentPen = self.pen
+        self.update()
diff --git a/libs/pyqtgraph/graphicsItems/IsocurveItem.py b/libs/pyqtgraph/graphicsItems/IsocurveItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..4474e29aa6bdca88a3fd4b377c5aa360084a47e8
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/IsocurveItem.py
@@ -0,0 +1,117 @@
+
+
+from .GraphicsObject import *
+from .. import functions as fn
+from ..Qt import QtGui, QtCore
+
+
+class IsocurveItem(GraphicsObject):
+    """
+    **Bases:** :class:`GraphicsObject <pyqtgraph.GraphicsObject>`
+    
+    Item displaying an isocurve of a 2D array.To align this item correctly with an 
+    ImageItem,call isocurve.setParentItem(image)
+    """
+    
+
+    def __init__(self, data=None, level=0, pen='w'):
+        """
+        Create a new isocurve item. 
+        
+        ==============  ===============================================================
+        **Arguments:**
+        data            A 2-dimensional ndarray. Can be initialized as None, and set
+                        later using :func:`setData <pyqtgraph.IsocurveItem.setData>`
+        level           The cutoff value at which to draw the isocurve.
+        pen             The color of the curve item. Can be anything valid for
+                        :func:`mkPen <pyqtgraph.mkPen>`
+        ==============  ===============================================================
+        """
+        GraphicsObject.__init__(self)
+
+        self.level = level
+        self.data = None
+        self.path = None
+        self.setPen(pen)
+        self.setData(data, level)
+        
+    
+    def setData(self, data, level=None):
+        """
+        Set the data/image to draw isocurves for.
+        
+        ==============  ========================================================================
+        **Arguments:**
+        data            A 2-dimensional ndarray.
+        level           The cutoff value at which to draw the curve. If level is not specified,
+                        the previously set level is used.
+        ==============  ========================================================================
+        """
+        if level is None:
+            level = self.level
+        self.level = level
+        self.data = data
+        self.path = None
+        self.prepareGeometryChange()
+        self.update()
+        
+
+    def setLevel(self, level):
+        """Set the level at which the isocurve is drawn."""
+        self.level = level
+        self.path = None
+        self.prepareGeometryChange()
+        self.update()
+    
+
+    def setPen(self, *args, **kwargs):
+        """Set the pen used to draw the isocurve. Arguments can be any that are valid 
+        for :func:`mkPen <pyqtgraph.mkPen>`"""
+        self.pen = fn.mkPen(*args, **kwargs)
+        self.update()
+
+    def setBrush(self, *args, **kwargs):
+        """Set the brush used to draw the isocurve. Arguments can be any that are valid 
+        for :func:`mkBrush <pyqtgraph.mkBrush>`"""
+        self.brush = fn.mkBrush(*args, **kwargs)
+        self.update()
+
+        
+    def updateLines(self, data, level):
+        ##print "data:", data
+        ##print "level", level
+        #lines = fn.isocurve(data, level)
+        ##print len(lines)
+        #self.path = QtGui.QPainterPath()
+        #for line in lines:
+            #self.path.moveTo(*line[0])
+            #self.path.lineTo(*line[1])
+        #self.update()
+        self.setData(data, level)
+
+    def boundingRect(self):
+        if self.data is None:
+            return QtCore.QRectF()
+        if self.path is None:
+            self.generatePath()
+        return self.path.boundingRect()
+    
+    def generatePath(self):
+        if self.data is None:
+            self.path = None
+            return
+        lines = fn.isocurve(self.data, self.level, connected=True, extendToEdge=True)
+        self.path = QtGui.QPainterPath()
+        for line in lines:
+            self.path.moveTo(*line[0])
+            for p in line[1:]:
+                self.path.lineTo(*p)
+    
+    def paint(self, p, *args):
+        if self.data is None:
+            return
+        if self.path is None:
+            self.generatePath()
+        p.setPen(self.pen)
+        p.drawPath(self.path)
+    
\ No newline at end of file
diff --git a/libs/pyqtgraph/graphicsItems/ItemGroup.py b/libs/pyqtgraph/graphicsItems/ItemGroup.py
new file mode 100644
index 0000000000000000000000000000000000000000..4eb0ee0dd4e13b2b67abbba29c3e0b4f04756e3f
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/ItemGroup.py
@@ -0,0 +1,23 @@
+from ..Qt import QtGui, QtCore
+from .GraphicsObject import GraphicsObject
+
+__all__ = ['ItemGroup']
+class ItemGroup(GraphicsObject):
+    """
+    Replacement for QGraphicsItemGroup
+    """
+    
+    def __init__(self, *args):
+        GraphicsObject.__init__(self, *args)
+        if hasattr(self, "ItemHasNoContents"):
+            self.setFlag(self.ItemHasNoContents)
+    
+    def boundingRect(self):
+        return QtCore.QRectF()
+        
+    def paint(self, *args):
+        pass
+    
+    def addItem(self, item):
+        item.setParentItem(self)
+
diff --git a/libs/pyqtgraph/graphicsItems/LabelItem.py b/libs/pyqtgraph/graphicsItems/LabelItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..37980ee323d7012cb1cc0b4de871e91d747c2a11
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/LabelItem.py
@@ -0,0 +1,142 @@
+from ..Qt import QtGui, QtCore
+from .. import functions as fn
+from .GraphicsWidget import GraphicsWidget
+from .GraphicsWidgetAnchor import GraphicsWidgetAnchor
+from .. import getConfigOption
+
+
+__all__ = ['LabelItem']
+
+class LabelItem(GraphicsWidget, GraphicsWidgetAnchor):
+    """
+    GraphicsWidget displaying text.
+    Used mainly as axis labels, titles, etc.
+    
+    Note: To display text inside a scaled view (ViewBox, PlotWidget, etc) use TextItem
+    """
+    
+    
+    def __init__(self, text=' ', parent=None, angle=0, **args):
+        GraphicsWidget.__init__(self, parent)
+        GraphicsWidgetAnchor.__init__(self)
+        self.item = QtGui.QGraphicsTextItem(self)
+        self.opts = {
+            'color': None,
+            'justify': 'center'
+        }
+        self.opts.update(args)
+        self._sizeHint = {}
+        self.setText(text)
+        self.setAngle(angle)
+            
+    def setAttr(self, attr, value):
+        """Set default text properties. See setText() for accepted parameters."""
+        self.opts[attr] = value
+        
+    def setText(self, text, **args):
+        """Set the text and text properties in the label. Accepts optional arguments for auto-generating
+        a CSS style string:
+
+        ==================== ==============================
+        **Style Arguments:**
+        color                (str) example: 'CCFF00'
+        size                 (str) example: '8pt'
+        bold                 (bool)
+        italic               (bool)
+        ==================== ==============================
+        """
+        self.text = text
+        opts = self.opts
+        for k in args:
+            opts[k] = args[k]
+        
+        optlist = []
+        
+        color = self.opts['color']
+        if color is None:
+            color = getConfigOption('foreground')
+        color = fn.mkColor(color)
+        optlist.append('color: #' + fn.colorStr(color)[:6])
+        if 'size' in opts:
+            optlist.append('font-size: ' + opts['size'])
+        if 'bold' in opts and opts['bold'] in [True, False]:
+            optlist.append('font-weight: ' + {True:'bold', False:'normal'}[opts['bold']])
+        if 'italic' in opts and opts['italic'] in [True, False]:
+            optlist.append('font-style: ' + {True:'italic', False:'normal'}[opts['italic']])
+        full = "<span style='%s'>%s</span>" % ('; '.join(optlist), text)
+        #print full
+        self.item.setHtml(full)
+        self.updateMin()
+        self.resizeEvent(None)
+        self.updateGeometry()
+        
+    def resizeEvent(self, ev):
+        #c1 = self.boundingRect().center()
+        #c2 = self.item.mapToParent(self.item.boundingRect().center()) # + self.item.pos()
+        #dif = c1 - c2
+        #self.item.moveBy(dif.x(), dif.y())
+        #print c1, c2, dif, self.item.pos()
+        self.item.setPos(0,0)
+        bounds = self.itemRect()
+        left = self.mapFromItem(self.item, QtCore.QPointF(0,0)) - self.mapFromItem(self.item, QtCore.QPointF(1,0))
+        rect = self.rect()
+        
+        if self.opts['justify'] == 'left':
+            if left.x() != 0:
+                bounds.moveLeft(rect.left())
+            if left.y() < 0:
+                bounds.moveTop(rect.top())
+            elif left.y() > 0:
+                bounds.moveBottom(rect.bottom())
+                
+        elif self.opts['justify'] == 'center':
+            bounds.moveCenter(rect.center())
+            #bounds = self.itemRect()
+            #self.item.setPos(self.width()/2. - bounds.width()/2., 0)
+        elif self.opts['justify'] == 'right':
+            if left.x() != 0:
+                bounds.moveRight(rect.right())
+            if left.y() < 0:
+                bounds.moveBottom(rect.bottom())
+            elif left.y() > 0:
+                bounds.moveTop(rect.top())
+            #bounds = self.itemRect()
+            #self.item.setPos(self.width() - bounds.width(), 0)
+            
+        self.item.setPos(bounds.topLeft() - self.itemRect().topLeft())
+        self.updateMin()
+        
+    def setAngle(self, angle):
+        self.angle = angle
+        self.item.resetTransform()
+        self.item.rotate(angle)
+        self.updateMin()
+        
+        
+    def updateMin(self):
+        bounds = self.itemRect()
+        self.setMinimumWidth(bounds.width())
+        self.setMinimumHeight(bounds.height())
+        
+        self._sizeHint = {
+            QtCore.Qt.MinimumSize: (bounds.width(), bounds.height()),
+            QtCore.Qt.PreferredSize: (bounds.width(), bounds.height()),
+            QtCore.Qt.MaximumSize: (-1, -1),  #bounds.width()*2, bounds.height()*2),
+            QtCore.Qt.MinimumDescent: (0, 0)  ##?? what is this?
+        }
+        self.updateGeometry()
+        
+    def sizeHint(self, hint, constraint):
+        if hint not in self._sizeHint:
+            return QtCore.QSizeF(0, 0)
+        return QtCore.QSizeF(*self._sizeHint[hint])
+        
+    def itemRect(self):
+        return self.item.mapRectToParent(self.item.boundingRect())
+        
+    #def paint(self, p, *args):
+        #p.setPen(fn.mkPen('r'))
+        #p.drawRect(self.rect())
+        #p.setPen(fn.mkPen('g'))
+        #p.drawRect(self.itemRect())
+        
diff --git a/libs/pyqtgraph/graphicsItems/LegendItem.py b/libs/pyqtgraph/graphicsItems/LegendItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..20d6416e8faf4378a94f2274f7732dfa548f213b
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/LegendItem.py
@@ -0,0 +1,174 @@
+from .GraphicsWidget import GraphicsWidget
+from .LabelItem import LabelItem
+from ..Qt import QtGui, QtCore
+from .. import functions as fn
+from ..Point import Point
+from .ScatterPlotItem import ScatterPlotItem, drawSymbol
+from .PlotDataItem import PlotDataItem
+from .GraphicsWidgetAnchor import GraphicsWidgetAnchor
+__all__ = ['LegendItem']
+
+class LegendItem(GraphicsWidget, GraphicsWidgetAnchor):
+    """
+    Displays a legend used for describing the contents of a plot.
+    LegendItems are most commonly created by calling PlotItem.addLegend().
+
+    Note that this item should not be added directly to a PlotItem. Instead,
+    Make it a direct descendant of the PlotItem::
+
+        legend.setParentItem(plotItem)
+
+    """
+    def __init__(self, size=None, offset=None):
+        """
+        ==============  ===============================================================
+        **Arguments:**
+        size            Specifies the fixed size (width, height) of the legend. If
+                        this argument is omitted, the legend will autimatically resize
+                        to fit its contents.
+        offset          Specifies the offset position relative to the legend's parent.
+                        Positive values offset from the left or top; negative values
+                        offset from the right or bottom. If offset is None, the
+                        legend must be anchored manually by calling anchor() or
+                        positioned by calling setPos().
+        ==============  ===============================================================
+        
+        """
+        
+        
+        GraphicsWidget.__init__(self)
+        GraphicsWidgetAnchor.__init__(self)
+        self.setFlag(self.ItemIgnoresTransformations)
+        self.layout = QtGui.QGraphicsGridLayout()
+        self.setLayout(self.layout)
+        self.items = []
+        self.size = size
+        self.offset = offset
+        if size is not None:
+            self.setGeometry(QtCore.QRectF(0, 0, self.size[0], self.size[1]))
+        
+    def setParentItem(self, p):
+        ret = GraphicsWidget.setParentItem(self, p)
+        if self.offset is not None:
+            offset = Point(self.offset)
+            anchorx = 1 if offset[0] <= 0 else 0
+            anchory = 1 if offset[1] <= 0 else 0
+            anchor = (anchorx, anchory)
+            self.anchor(itemPos=anchor, parentPos=anchor, offset=offset)
+        return ret
+        
+    def addItem(self, item, name):
+        """
+        Add a new entry to the legend. 
+
+        ==============  ========================================================
+        **Arguments:**
+        item            A PlotDataItem from which the line and point style
+                        of the item will be determined or an instance of
+                        ItemSample (or a subclass), allowing the item display
+                        to be customized.
+        title           The title to display for this item. Simple HTML allowed.
+        ==============  ========================================================
+        """
+        label = LabelItem(name)
+        if isinstance(item, ItemSample):
+            sample = item
+        else:
+            sample = ItemSample(item)        
+        row = self.layout.rowCount()
+        self.items.append((sample, label))
+        self.layout.addItem(sample, row, 0)
+        self.layout.addItem(label, row, 1)
+        self.updateSize()
+    
+    def removeItem(self, name):
+        """
+        Removes one item from the legend. 
+
+        ==============  ========================================================
+        **Arguments:**
+        title           The title displayed for this item.
+        ==============  ========================================================
+        """
+        # Thanks, Ulrich!
+        # cycle for a match
+        for sample, label in self.items:
+            if label.text == name:  # hit
+                self.items.remove( (sample, label) )    # remove from itemlist
+                self.layout.removeItem(sample)          # remove from layout
+                sample.close()                          # remove from drawing
+                self.layout.removeItem(label)
+                label.close()
+                self.updateSize()                       # redraq box
+
+    def updateSize(self):
+        if self.size is not None:
+            return
+            
+        height = 0
+        width = 0
+        #print("-------")
+        for sample, label in self.items:
+            height += max(sample.height(), label.height()) + 3
+            width = max(width, sample.width()+label.width())
+            #print(width, height)
+        #print width, height
+        self.setGeometry(0, 0, width+25, height)
+    
+    def boundingRect(self):
+        return QtCore.QRectF(0, 0, self.width(), self.height())
+    
+    def paint(self, p, *args):
+        p.setPen(fn.mkPen(255,255,255,100))
+        p.setBrush(fn.mkBrush(100,100,100,50))
+        p.drawRect(self.boundingRect())
+
+    def hoverEvent(self, ev):
+        ev.acceptDrags(QtCore.Qt.LeftButton)
+        
+    def mouseDragEvent(self, ev):
+        if ev.button() == QtCore.Qt.LeftButton:
+            dpos = ev.pos() - ev.lastPos()
+            self.autoAnchor(self.pos() + dpos)
+        
+class ItemSample(GraphicsWidget):
+    """ Class responsible for drawing a single item in a LegendItem (sans label).
+    
+    This may be subclassed to draw custom graphics in a Legend.
+    """
+    ## Todo: make this more generic; let each item decide how it should be represented.
+    def __init__(self, item):
+        GraphicsWidget.__init__(self)
+        self.item = item
+    
+    def boundingRect(self):
+        return QtCore.QRectF(0, 0, 20, 20)
+        
+    def paint(self, p, *args):
+        #p.setRenderHint(p.Antialiasing)  # only if the data is antialiased.
+        opts = self.item.opts
+        
+        if opts.get('fillLevel',None) is not None and opts.get('fillBrush',None) is not None:
+            p.setBrush(fn.mkBrush(opts['fillBrush']))
+            p.setPen(fn.mkPen(None))
+            p.drawPolygon(QtGui.QPolygonF([QtCore.QPointF(2,18), QtCore.QPointF(18,2), QtCore.QPointF(18,18)]))
+        
+        if not isinstance(self.item, ScatterPlotItem):
+            p.setPen(fn.mkPen(opts['pen']))
+            p.drawLine(2, 18, 18, 2)
+        
+        symbol = opts.get('symbol', None)
+        if symbol is not None:
+            if isinstance(self.item, PlotDataItem):
+                opts = self.item.scatter.opts
+                
+            pen = fn.mkPen(opts['pen'])
+            brush = fn.mkBrush(opts['brush'])
+            size = opts['size']
+            
+            p.translate(10,10)
+            path = drawSymbol(p, symbol, size, pen, brush)
+        
+        
+        
+        
diff --git a/libs/pyqtgraph/graphicsItems/LinearRegionItem.py b/libs/pyqtgraph/graphicsItems/LinearRegionItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..e139190bc4d7a044fbe1edf3edc01e418dd159c8
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/LinearRegionItem.py
@@ -0,0 +1,290 @@
+from ..Qt import QtGui, QtCore
+from .UIGraphicsItem import UIGraphicsItem
+from .InfiniteLine import InfiniteLine
+from .. import functions as fn
+from .. import debug as debug
+
+__all__ = ['LinearRegionItem']
+
+class LinearRegionItem(UIGraphicsItem):
+    """
+    **Bases:** :class:`UIGraphicsItem <pyqtgraph.UIGraphicsItem>`
+    
+    Used for marking a horizontal or vertical region in plots.
+    The region can be dragged and is bounded by lines which can be dragged individually.
+    
+    ===============================  =============================================================================
+    **Signals:**
+    sigRegionChangeFinished(self)    Emitted when the user has finished dragging the region (or one of its lines)
+                                     and when the region is changed programatically.
+    sigRegionChanged(self)           Emitted while the user is dragging the region (or one of its lines)
+                                     and when the region is changed programatically.
+    ===============================  =============================================================================
+    """
+    
+    sigRegionChangeFinished = QtCore.Signal(object)
+    sigRegionChanged = QtCore.Signal(object)
+    Vertical = 0
+    Horizontal = 1
+    
+    def __init__(self, values=[0,1], orientation=None, brush=None, movable=True, bounds=None):
+        """Create a new LinearRegionItem.
+        
+        ==============  =====================================================================
+        **Arguments:**
+        values          A list of the positions of the lines in the region. These are not
+                        limits; limits can be set by specifying bounds.
+        orientation     Options are LinearRegionItem.Vertical or LinearRegionItem.Horizontal.
+                        If not specified it will be vertical.
+        brush           Defines the brush that fills the region. Can be any arguments that
+                        are valid for :func:`mkBrush <pyqtgraph.mkBrush>`. Default is
+                        transparent blue.
+        movable         If True, the region and individual lines are movable by the user; if
+                        False, they are static.
+        bounds          Optional [min, max] bounding values for the region
+        ==============  =====================================================================
+        """
+        
+        UIGraphicsItem.__init__(self)
+        if orientation is None:
+            orientation = LinearRegionItem.Vertical
+        self.orientation = orientation
+        self.bounds = QtCore.QRectF()
+        self.blockLineSignal = False
+        self.moving = False
+        self.mouseHovering = False
+        
+        if orientation == LinearRegionItem.Horizontal:
+            self.lines = [
+                InfiniteLine(QtCore.QPointF(0, values[0]), 0, movable=movable, bounds=bounds), 
+                InfiniteLine(QtCore.QPointF(0, values[1]), 0, movable=movable, bounds=bounds)]
+        elif orientation == LinearRegionItem.Vertical:
+            self.lines = [
+                InfiniteLine(QtCore.QPointF(values[1], 0), 90, movable=movable, bounds=bounds), 
+                InfiniteLine(QtCore.QPointF(values[0], 0), 90, movable=movable, bounds=bounds)]
+        else:
+            raise Exception('Orientation must be one of LinearRegionItem.Vertical or LinearRegionItem.Horizontal')
+        
+        
+        for l in self.lines:
+            l.setParentItem(self)
+            l.sigPositionChangeFinished.connect(self.lineMoveFinished)
+            l.sigPositionChanged.connect(self.lineMoved)
+            
+        if brush is None:
+            brush = QtGui.QBrush(QtGui.QColor(0, 0, 255, 50))
+        self.setBrush(brush)
+        
+        self.setMovable(movable)
+        
+    def getRegion(self):
+        """Return the values at the edges of the region."""
+        #if self.orientation[0] == 'h':
+            #r = (self.bounds.top(), self.bounds.bottom())
+        #else:
+            #r = (self.bounds.left(), self.bounds.right())
+        r = [self.lines[0].value(), self.lines[1].value()]
+        return (min(r), max(r))
+
+    def setRegion(self, rgn):
+        """Set the values for the edges of the region.
+        
+        ==============   ==============================================
+        **Arguments:**
+        rgn              A list or tuple of the lower and upper values.
+        ==============   ==============================================
+        """
+        if self.lines[0].value() == rgn[0] and self.lines[1].value() == rgn[1]:
+            return
+        self.blockLineSignal = True
+        self.lines[0].setValue(rgn[0])
+        self.blockLineSignal = False
+        self.lines[1].setValue(rgn[1])
+        #self.blockLineSignal = False
+        self.lineMoved()
+        self.lineMoveFinished()
+
+    def setBrush(self, *br, **kargs):
+        """Set the brush that fills the region. Can have any arguments that are valid
+        for :func:`mkBrush <pyqtgraph.mkBrush>`.
+        """
+        self.brush = fn.mkBrush(*br, **kargs)
+        self.currentBrush = self.brush
+
+    def setBounds(self, bounds):
+        """Optional [min, max] bounding values for the region. To have no bounds on the
+        region use [None, None].
+        Does not affect the current position of the region unless it is outside the new bounds. 
+        See :func:`setRegion <pyqtgraph.LinearRegionItem.setRegion>` to set the position 
+        of the region."""
+        for l in self.lines:
+            l.setBounds(bounds)
+        
+    def setMovable(self, m):
+        """Set lines to be movable by the user, or not. If lines are movable, they will 
+        also accept HoverEvents."""
+        for l in self.lines:
+            l.setMovable(m)
+        self.movable = m
+        self.setAcceptHoverEvents(m)
+
+    def boundingRect(self):
+        br = UIGraphicsItem.boundingRect(self)
+        rng = self.getRegion()
+        if self.orientation == LinearRegionItem.Vertical:
+            br.setLeft(rng[0])
+            br.setRight(rng[1])
+        else:
+            br.setTop(rng[0])
+            br.setBottom(rng[1])
+        return br.normalized()
+        
+    def paint(self, p, *args):
+        profiler = debug.Profiler()
+        UIGraphicsItem.paint(self, p, *args)
+        p.setBrush(self.currentBrush)
+        p.setPen(fn.mkPen(None))
+        p.drawRect(self.boundingRect())
+
+    def dataBounds(self, axis, frac=1.0, orthoRange=None):
+        if axis == self.orientation:
+            return self.getRegion()
+        else:
+            return None
+
+    def lineMoved(self):
+        if self.blockLineSignal:
+            return
+        self.prepareGeometryChange()
+        #self.emit(QtCore.SIGNAL('regionChanged'), self)
+        self.sigRegionChanged.emit(self)
+            
+    def lineMoveFinished(self):
+        #self.emit(QtCore.SIGNAL('regionChangeFinished'), self)
+        self.sigRegionChangeFinished.emit(self)
+        
+            
+    #def updateBounds(self):
+        #vb = self.view().viewRect()
+        #vals = [self.lines[0].value(), self.lines[1].value()]
+        #if self.orientation[0] == 'h':
+            #vb.setTop(min(vals))
+            #vb.setBottom(max(vals))
+        #else:
+            #vb.setLeft(min(vals))
+            #vb.setRight(max(vals))
+        #if vb != self.bounds:
+            #self.bounds = vb
+            #self.rect.setRect(vb)
+        
+    #def mousePressEvent(self, ev):
+        #if not self.movable:
+            #ev.ignore()
+            #return
+        #for l in self.lines:
+            #l.mousePressEvent(ev)  ## pass event to both lines so they move together
+        ##if self.movable and ev.button() == QtCore.Qt.LeftButton:
+            ##ev.accept()
+            ##self.pressDelta = self.mapToParent(ev.pos()) - QtCore.QPointF(*self.p)
+        ##else:
+            ##ev.ignore()
+            
+    #def mouseReleaseEvent(self, ev):
+        #for l in self.lines:
+            #l.mouseReleaseEvent(ev)
+            
+    #def mouseMoveEvent(self, ev):
+        ##print "move", ev.pos()
+        #if not self.movable:
+            #return
+        #self.lines[0].blockSignals(True)  # only want to update once
+        #for l in self.lines:
+            #l.mouseMoveEvent(ev)
+        #self.lines[0].blockSignals(False)
+        ##self.setPos(self.mapToParent(ev.pos()) - self.pressDelta)
+        ##self.emit(QtCore.SIGNAL('dragged'), self)
+
+    def mouseDragEvent(self, ev):
+        if not self.movable or int(ev.button() & QtCore.Qt.LeftButton) == 0:
+            return
+        ev.accept()
+        
+        if ev.isStart():
+            bdp = ev.buttonDownPos()
+            self.cursorOffsets = [l.pos() - bdp for l in self.lines]
+            self.startPositions = [l.pos() for l in self.lines]
+            self.moving = True
+            
+        if not self.moving:
+            return
+            
+        #delta = ev.pos() - ev.lastPos()
+        self.lines[0].blockSignals(True)  # only want to update once
+        for i, l in enumerate(self.lines):
+            l.setPos(self.cursorOffsets[i] + ev.pos())
+            #l.setPos(l.pos()+delta)
+            #l.mouseDragEvent(ev)
+        self.lines[0].blockSignals(False)
+        self.prepareGeometryChange()
+        
+        if ev.isFinish():
+            self.moving = False
+            self.sigRegionChangeFinished.emit(self)
+        else:
+            self.sigRegionChanged.emit(self)
+            
+    def mouseClickEvent(self, ev):
+        if self.moving and ev.button() == QtCore.Qt.RightButton:
+            ev.accept()
+            for i, l in enumerate(self.lines):
+                l.setPos(self.startPositions[i])
+            self.moving = False
+            self.sigRegionChanged.emit(self)
+            self.sigRegionChangeFinished.emit(self)
+
+
+    def hoverEvent(self, ev):
+        if self.movable and (not ev.isExit()) and ev.acceptDrags(QtCore.Qt.LeftButton):
+            self.setMouseHover(True)
+        else:
+            self.setMouseHover(False)
+            
+    def setMouseHover(self, hover):
+        ## Inform the item that the mouse is(not) hovering over it
+        if self.mouseHovering == hover:
+            return
+        self.mouseHovering = hover
+        if hover:
+            c = self.brush.color()
+            c.setAlpha(c.alpha() * 2)
+            self.currentBrush = fn.mkBrush(c)
+        else:
+            self.currentBrush = self.brush
+        self.update()
+
+    #def hoverEnterEvent(self, ev):
+        #print "rgn hover enter"
+        #ev.ignore()
+        #self.updateHoverBrush()
+
+    #def hoverMoveEvent(self, ev):
+        #print "rgn hover move"
+        #ev.ignore()
+        #self.updateHoverBrush()
+
+    #def hoverLeaveEvent(self, ev):
+        #print "rgn hover leave"
+        #ev.ignore()
+        #self.updateHoverBrush(False)
+        
+    #def updateHoverBrush(self, hover=None):
+        #if hover is None:
+            #scene = self.scene()
+            #hover = scene.claimEvent(self, QtCore.Qt.LeftButton, scene.Drag)
+        
+        #if hover:
+            #self.currentBrush = fn.mkBrush(255, 0,0,100)
+        #else:
+            #self.currentBrush = self.brush
+        #self.update()
+
diff --git a/libs/pyqtgraph/graphicsItems/MultiPlotItem.py b/libs/pyqtgraph/graphicsItems/MultiPlotItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..be775d4ab27668f915d98631aa6f25f621823dcf
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/MultiPlotItem.py
@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+"""
+MultiPlotItem.py -  Graphics item used for displaying an array of PlotItems
+Copyright 2010  Luke Campagnola
+Distributed under MIT/X11 license. See license.txt for more infomation.
+"""
+
+from numpy import ndarray
+from . import GraphicsLayout
+from ..metaarray import *
+
+
+__all__ = ['MultiPlotItem']
+class MultiPlotItem(GraphicsLayout.GraphicsLayout):
+    """
+    Automatically generates a grid of plots from a multi-dimensional array
+    """
+    def __init__(self, *args, **kwds):
+        GraphicsLayout.GraphicsLayout.__init__(self, *args, **kwds)
+        self.plots = []
+        
+
+    def plot(self, data):
+        #self.layout.clear()
+
+        if hasattr(data, 'implements') and data.implements('MetaArray'):
+            if data.ndim != 2:
+                raise Exception("MultiPlot currently only accepts 2D MetaArray.")
+            ic = data.infoCopy()
+            ax = 0
+            for i in [0, 1]:
+                if 'cols' in ic[i]:
+                    ax = i
+                    break
+            #print "Plotting using axis %d as columns (%d plots)" % (ax, data.shape[ax])
+            for i in range(data.shape[ax]):
+                pi = self.addPlot()
+                self.nextRow()
+                sl = [slice(None)] * 2
+                sl[ax] = i
+                pi.plot(data[tuple(sl)])
+                #self.layout.addItem(pi, i, 0)
+                self.plots.append((pi, i, 0))
+                info = ic[ax]['cols'][i]
+                title = info.get('title', info.get('name', None))
+                units = info.get('units', None)
+                pi.setLabel('left', text=title, units=units)
+            info = ic[1-ax]
+            title = info.get('title', info.get('name', None))
+            units = info.get('units', None)
+            pi.setLabel('bottom', text=title, units=units)
+        else:
+            raise Exception("Data type %s not (yet?) supported for MultiPlot." % type(data))
+
+    def close(self):
+        for p in self.plots:
+            p[0].close()
+        self.plots = None
+        self.clear()
+
+
+
diff --git a/libs/pyqtgraph/graphicsItems/PlotCurveItem.py b/libs/pyqtgraph/graphicsItems/PlotCurveItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..3d3e969dad3caf7a5decc6368d29119a5aa89143
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/PlotCurveItem.py
@@ -0,0 +1,598 @@
+from ..Qt import QtGui, QtCore
+try:
+    from ..Qt import QtOpenGL
+    HAVE_OPENGL = True
+except:
+    HAVE_OPENGL = False
+    
+import numpy as np
+from .GraphicsObject import GraphicsObject
+from .. import functions as fn
+from ..Point import Point
+import struct, sys
+from .. import getConfigOption
+from .. import debug
+
+__all__ = ['PlotCurveItem']
+class PlotCurveItem(GraphicsObject):
+    
+    
+    """
+    Class representing a single plot curve. Instances of this class are created
+    automatically as part of PlotDataItem; these rarely need to be instantiated
+    directly.
+    
+    Features:
+    
+    - Fast data update
+    - Fill under curve
+    - Mouse interaction
+    
+    ====================  ===============================================
+    **Signals:**
+    sigPlotChanged(self)  Emitted when the data being plotted has changed
+    sigClicked(self)      Emitted when the curve is clicked
+    ====================  ===============================================
+    """
+    
+    sigPlotChanged = QtCore.Signal(object)
+    sigClicked = QtCore.Signal(object)
+    
+    def __init__(self, *args, **kargs):
+        """
+        Forwards all arguments to :func:`setData <pyqtgraph.PlotCurveItem.setData>`.
+        
+        Some extra arguments are accepted as well:
+        
+        ==============  =======================================================
+        **Arguments:**
+        parent          The parent GraphicsObject (optional)
+        clickable       If True, the item will emit sigClicked when it is 
+                        clicked on. Defaults to False.
+        ==============  =======================================================
+        """
+        GraphicsObject.__init__(self, kargs.get('parent', None))
+        self.clear()
+            
+        ## this is disastrous for performance.
+        #self.setCacheMode(QtGui.QGraphicsItem.DeviceCoordinateCache)
+        
+        self.metaData = {}
+        self.opts = {
+            'pen': fn.mkPen('w'),
+            'shadowPen': None,
+            'fillLevel': None,
+            'brush': None,
+            'stepMode': False,
+            'name': None,
+            'antialias': getConfigOption('antialias'),
+            'connect': 'all',
+            'mouseWidth': 8, # width of shape responding to mouse click
+        }
+        self.setClickable(kargs.get('clickable', False))
+        self.setData(*args, **kargs)
+        
+    def implements(self, interface=None):
+        ints = ['plotData']
+        if interface is None:
+            return ints
+        return interface in ints
+    
+    def name(self):
+        return self.opts.get('name', None)
+    
+    def setClickable(self, s, width=None):
+        """Sets whether the item responds to mouse clicks.
+        
+        The *width* argument specifies the width in pixels orthogonal to the
+        curve that will respond to a mouse click.
+        """
+        self.clickable = s
+        if width is not None:
+            self.opts['mouseWidth'] = width
+            self._mouseShape = None
+            self._boundingRect = None        
+        
+        
+    def getData(self):
+        return self.xData, self.yData
+        
+    def dataBounds(self, ax, frac=1.0, orthoRange=None):
+        ## Need this to run as fast as possible.
+        ## check cache first:
+        cache = self._boundsCache[ax]
+        if cache is not None and cache[0] == (frac, orthoRange):
+            return cache[1]
+        
+        (x, y) = self.getData()
+        if x is None or len(x) == 0:
+            return (None, None)
+            
+        if ax == 0:
+            d = x
+            d2 = y
+        elif ax == 1:
+            d = y
+            d2 = x
+
+        ## If an orthogonal range is specified, mask the data now
+        if orthoRange is not None:
+            mask = (d2 >= orthoRange[0]) * (d2 <= orthoRange[1])
+            d = d[mask]
+            #d2 = d2[mask]
+            
+        if len(d) == 0:
+            return (None, None)
+
+        ## Get min/max (or percentiles) of the requested data range
+        if frac >= 1.0:
+            b = (np.nanmin(d), np.nanmax(d))
+        elif frac <= 0.0:
+            raise Exception("Value for parameter 'frac' must be > 0. (got %s)" % str(frac))
+        else:
+            mask = np.isfinite(d)
+            d = d[mask]
+            b = np.percentile(d, [50 * (1 - frac), 50 * (1 + frac)])
+
+        ## adjust for fill level
+        if ax == 1 and self.opts['fillLevel'] is not None:
+            b = (min(b[0], self.opts['fillLevel']), max(b[1], self.opts['fillLevel']))
+            
+        ## Add pen width only if it is non-cosmetic.
+        pen = self.opts['pen']
+        spen = self.opts['shadowPen']
+        if not pen.isCosmetic():
+            b = (b[0] - pen.widthF()*0.7072, b[1] + pen.widthF()*0.7072)
+        if spen is not None and not spen.isCosmetic() and spen.style() != QtCore.Qt.NoPen:
+            b = (b[0] - spen.widthF()*0.7072, b[1] + spen.widthF()*0.7072)
+            
+        self._boundsCache[ax] = [(frac, orthoRange), b]
+        return b
+            
+    def pixelPadding(self):
+        pen = self.opts['pen']
+        spen = self.opts['shadowPen']
+        w = 0
+        if pen.isCosmetic():
+            w += pen.widthF()*0.7072
+        if spen is not None and spen.isCosmetic() and spen.style() != QtCore.Qt.NoPen:
+            w = max(w, spen.widthF()*0.7072)
+        if self.clickable:
+            w = max(w, self.opts['mouseWidth']//2 + 1)
+        return w
+
+    def boundingRect(self):
+        if self._boundingRect is None:
+            (xmn, xmx) = self.dataBounds(ax=0)
+            (ymn, ymx) = self.dataBounds(ax=1)
+            if xmn is None:
+                return QtCore.QRectF()
+            
+            px = py = 0.0
+            pxPad = self.pixelPadding()
+            if pxPad > 0:
+                # determine length of pixel in local x, y directions    
+                px, py = self.pixelVectors()
+                try:
+                    px = 0 if px is None else px.length()
+                except OverflowError:
+                    px = 0
+                try:
+                    py = 0 if py is None else py.length()
+                except OverflowError:
+                    py = 0
+                
+                # return bounds expanded by pixel size
+                px *= pxPad
+                py *= pxPad
+            #px += self._maxSpotWidth * 0.5
+            #py += self._maxSpotWidth * 0.5
+            self._boundingRect = QtCore.QRectF(xmn-px, ymn-py, (2*px)+xmx-xmn, (2*py)+ymx-ymn)
+            
+        return self._boundingRect
+    
+    def viewTransformChanged(self):
+        self.invalidateBounds()
+        self.prepareGeometryChange()
+        
+    #def boundingRect(self):
+        #if self._boundingRect is None:
+            #(x, y) = self.getData()
+            #if x is None or y is None or len(x) == 0 or len(y) == 0:
+                #return QtCore.QRectF()
+                
+                
+            #if self.opts['shadowPen'] is not None:
+                #lineWidth = (max(self.opts['pen'].width(), self.opts['shadowPen'].width()) + 1)
+            #else:
+                #lineWidth = (self.opts['pen'].width()+1)
+                
+            
+            #pixels = self.pixelVectors()
+            #if pixels == (None, None):
+                #pixels = [Point(0,0), Point(0,0)]
+                
+            #xmin = x.min()
+            #xmax = x.max()
+            #ymin = y.min()
+            #ymax = y.max()
+            
+            #if self.opts['fillLevel'] is not None:
+                #ymin = min(ymin, self.opts['fillLevel'])
+                #ymax = max(ymax, self.opts['fillLevel'])
+                
+            #xmin -= pixels[0].x() * lineWidth
+            #xmax += pixels[0].x() * lineWidth
+            #ymin -= abs(pixels[1].y()) * lineWidth
+            #ymax += abs(pixels[1].y()) * lineWidth
+            
+            #self._boundingRect = QtCore.QRectF(xmin, ymin, xmax-xmin, ymax-ymin)
+        #return self._boundingRect
+
+        
+    def invalidateBounds(self):
+        self._boundingRect = None
+        self._boundsCache = [None, None]
+            
+    def setPen(self, *args, **kargs):
+        """Set the pen used to draw the curve."""
+        self.opts['pen'] = fn.mkPen(*args, **kargs)
+        self.invalidateBounds()
+        self.update()
+        
+    def setShadowPen(self, *args, **kargs):
+        """Set the shadow pen used to draw behind tyhe primary pen.
+        This pen must have a larger width than the primary 
+        pen to be visible.
+        """
+        self.opts['shadowPen'] = fn.mkPen(*args, **kargs)
+        self.invalidateBounds()
+        self.update()
+
+    def setBrush(self, *args, **kargs):
+        """Set the brush used when filling the area under the curve"""
+        self.opts['brush'] = fn.mkBrush(*args, **kargs)
+        self.invalidateBounds()
+        self.update()
+        
+    def setFillLevel(self, level):
+        """Set the level filled to when filling under the curve"""
+        self.opts['fillLevel'] = level
+        self.fillPath = None
+        self.invalidateBounds()
+        self.update()
+
+    def setData(self, *args, **kargs):
+        """
+        ==============  ========================================================
+        **Arguments:**
+        x, y            (numpy arrays) Data to show 
+        pen             Pen to use when drawing. Any single argument accepted by
+                        :func:`mkPen <pyqtgraph.mkPen>` is allowed.
+        shadowPen       Pen for drawing behind the primary pen. Usually this
+                        is used to emphasize the curve by providing a 
+                        high-contrast border. Any single argument accepted by
+                        :func:`mkPen <pyqtgraph.mkPen>` is allowed.
+        fillLevel       (float or None) Fill the area 'under' the curve to
+                        *fillLevel*
+        brush           QBrush to use when filling. Any single argument accepted
+                        by :func:`mkBrush <pyqtgraph.mkBrush>` is allowed.
+        antialias       (bool) Whether to use antialiasing when drawing. This
+                        is disabled by default because it decreases performance.
+        stepMode        If True, two orthogonal lines are drawn for each sample
+                        as steps. This is commonly used when drawing histograms.
+                        Note that in this case, len(x) == len(y) + 1
+        connect         Argument specifying how vertexes should be connected
+                        by line segments. Default is "all", indicating full
+                        connection. "pairs" causes only even-numbered segments
+                        to be drawn. "finite" causes segments to be omitted if
+                        they are attached to nan or inf values. For any other
+                        connectivity, specify an array of boolean values.
+        ==============  ========================================================
+        
+        If non-keyword arguments are used, they will be interpreted as
+        setData(y) for a single argument and setData(x, y) for two
+        arguments.
+        
+        
+        """
+        self.updateData(*args, **kargs)
+        
+    def updateData(self, *args, **kargs):
+        profiler = debug.Profiler()
+
+        if len(args) == 1:
+            kargs['y'] = args[0]
+        elif len(args) == 2:
+            kargs['x'] = args[0]
+            kargs['y'] = args[1]
+        
+        if 'y' not in kargs or kargs['y'] is None:
+            kargs['y'] = np.array([])
+        if 'x' not in kargs or kargs['x'] is None:
+            kargs['x'] = np.arange(len(kargs['y']))
+            
+        for k in ['x', 'y']:
+            data = kargs[k]
+            if isinstance(data, list):
+                data = np.array(data)
+                kargs[k] = data
+            if not isinstance(data, np.ndarray) or data.ndim > 1:
+                raise Exception("Plot data must be 1D ndarray.")
+            if 'complex' in str(data.dtype):
+                raise Exception("Can not plot complex data types.")
+            
+        profiler("data checks")
+        
+        #self.setCacheMode(QtGui.QGraphicsItem.NoCache)  ## Disabling and re-enabling the cache works around a bug in Qt 4.6 causing the cached results to display incorrectly
+                                                        ##    Test this bug with test_PlotWidget and zoom in on the animated plot
+        self.invalidateBounds()
+        self.prepareGeometryChange()
+        self.informViewBoundsChanged()
+        self.yData = kargs['y'].view(np.ndarray)
+        self.xData = kargs['x'].view(np.ndarray)
+        
+        profiler('copy')
+        
+        if 'stepMode' in kargs:
+            self.opts['stepMode'] = kargs['stepMode']
+        
+        if self.opts['stepMode'] is True:
+            if len(self.xData) != len(self.yData)+1:  ## allow difference of 1 for step mode plots
+                raise Exception("len(X) must be len(Y)+1 since stepMode=True (got %s and %s)" % (self.xData.shape, self.yData.shape))
+        else:
+            if self.xData.shape != self.yData.shape:  ## allow difference of 1 for step mode plots
+                raise Exception("X and Y arrays must be the same shape--got %s and %s." % (self.xData.shape, self.yData.shape))
+        
+        self.path = None
+        self.fillPath = None
+        self._mouseShape = None
+        #self.xDisp = self.yDisp = None
+        
+        if 'name' in kargs:
+            self.opts['name'] = kargs['name']
+        if 'connect' in kargs:
+            self.opts['connect'] = kargs['connect']
+        if 'pen' in kargs:
+            self.setPen(kargs['pen'])
+        if 'shadowPen' in kargs:
+            self.setShadowPen(kargs['shadowPen'])
+        if 'fillLevel' in kargs:
+            self.setFillLevel(kargs['fillLevel'])
+        if 'brush' in kargs:
+            self.setBrush(kargs['brush'])
+        if 'antialias' in kargs:
+            self.opts['antialias'] = kargs['antialias']
+        
+        
+        profiler('set')
+        self.update()
+        profiler('update')
+        self.sigPlotChanged.emit(self)
+        profiler('emit')
+        
+    def generatePath(self, x, y):
+        if self.opts['stepMode']:
+            ## each value in the x/y arrays generates 2 points.
+            x2 = np.empty((len(x),2), dtype=x.dtype)
+            x2[:] = x[:,np.newaxis]
+            if self.opts['fillLevel'] is None:
+                x = x2.reshape(x2.size)[1:-1]
+                y2 = np.empty((len(y),2), dtype=y.dtype)
+                y2[:] = y[:,np.newaxis]
+                y = y2.reshape(y2.size)
+            else:
+                ## If we have a fill level, add two extra points at either end
+                x = x2.reshape(x2.size)
+                y2 = np.empty((len(y)+2,2), dtype=y.dtype)
+                y2[1:-1] = y[:,np.newaxis]
+                y = y2.reshape(y2.size)[1:-1]
+                y[0] = self.opts['fillLevel']
+                y[-1] = self.opts['fillLevel']
+        
+        path = fn.arrayToQPath(x, y, connect=self.opts['connect'])
+        
+        return path
+
+
+    def getPath(self):
+        if self.path is None:
+            x,y = self.getData()
+            if x is None or len(x) == 0 or y is None or len(y) == 0:
+                self.path = QtGui.QPainterPath()
+            else:
+                self.path = self.generatePath(*self.getData())
+            self.fillPath = None
+            self._mouseShape = None
+            
+        return self.path
+
+    @debug.warnOnException  ## raising an exception here causes crash
+    def paint(self, p, opt, widget):
+        profiler = debug.Profiler()
+        if self.xData is None or len(self.xData) == 0:
+            return
+        
+        if HAVE_OPENGL and getConfigOption('enableExperimental') and isinstance(widget, QtOpenGL.QGLWidget):
+            self.paintGL(p, opt, widget)
+            return
+        
+        x = None
+        y = None
+        path = self.getPath()
+        
+        profiler('generate path')
+        
+        if self._exportOpts is not False:
+            aa = self._exportOpts.get('antialias', True)
+        else:
+            aa = self.opts['antialias']
+        
+        p.setRenderHint(p.Antialiasing, aa)
+        
+            
+        if self.opts['brush'] is not None and self.opts['fillLevel'] is not None:
+            if self.fillPath is None:
+                if x is None:
+                    x,y = self.getData()
+                p2 = QtGui.QPainterPath(self.path)
+                p2.lineTo(x[-1], self.opts['fillLevel'])
+                p2.lineTo(x[0], self.opts['fillLevel'])
+                p2.lineTo(x[0], y[0])
+                p2.closeSubpath()
+                self.fillPath = p2
+                
+            profiler('generate fill path')
+            p.fillPath(self.fillPath, self.opts['brush'])
+            profiler('draw fill path')
+            
+        sp = fn.mkPen(self.opts['shadowPen'])
+        cp = fn.mkPen(self.opts['pen'])
+ 
+        ## Copy pens and apply alpha adjustment
+        #sp = QtGui.QPen(self.opts['shadowPen'])
+        #cp = QtGui.QPen(self.opts['pen'])
+        #for pen in [sp, cp]:
+            #if pen is None:
+                #continue
+            #c = pen.color()
+            #c.setAlpha(c.alpha() * self.opts['alphaHint'])
+            #pen.setColor(c)
+            ##pen.setCosmetic(True)
+            
+            
+            
+        if sp is not None and sp.style() != QtCore.Qt.NoPen:
+            p.setPen(sp)
+            p.drawPath(path)
+        p.setPen(cp)
+        p.drawPath(path)
+        profiler('drawPath')
+        
+        #print "Render hints:", int(p.renderHints())
+        #p.setPen(QtGui.QPen(QtGui.QColor(255,0,0)))
+        #p.drawRect(self.boundingRect())
+        
+    def paintGL(self, p, opt, widget):
+        p.beginNativePainting()
+        import OpenGL.GL as gl
+        
+        ## set clipping viewport
+        view = self.getViewBox()
+        if view is not None:
+            rect = view.mapRectToItem(self, view.boundingRect())
+            #gl.glViewport(int(rect.x()), int(rect.y()), int(rect.width()), int(rect.height()))
+            
+            #gl.glTranslate(-rect.x(), -rect.y(), 0)
+            
+            gl.glEnable(gl.GL_STENCIL_TEST)
+            gl.glColorMask(gl.GL_FALSE, gl.GL_FALSE, gl.GL_FALSE, gl.GL_FALSE) # disable drawing to frame buffer
+            gl.glDepthMask(gl.GL_FALSE)  # disable drawing to depth buffer
+            gl.glStencilFunc(gl.GL_NEVER, 1, 0xFF)  
+            gl.glStencilOp(gl.GL_REPLACE, gl.GL_KEEP, gl.GL_KEEP)  
+            
+            ## draw stencil pattern
+            gl.glStencilMask(0xFF)
+            gl.glClear(gl.GL_STENCIL_BUFFER_BIT)
+            gl.glBegin(gl.GL_TRIANGLES)
+            gl.glVertex2f(rect.x(), rect.y())
+            gl.glVertex2f(rect.x()+rect.width(), rect.y())
+            gl.glVertex2f(rect.x(), rect.y()+rect.height())
+            gl.glVertex2f(rect.x()+rect.width(), rect.y()+rect.height())
+            gl.glVertex2f(rect.x()+rect.width(), rect.y())
+            gl.glVertex2f(rect.x(), rect.y()+rect.height())
+            gl.glEnd()
+                       
+            gl.glColorMask(gl.GL_TRUE, gl.GL_TRUE, gl.GL_TRUE, gl.GL_TRUE)
+            gl.glDepthMask(gl.GL_TRUE)
+            gl.glStencilMask(0x00)
+            gl.glStencilFunc(gl.GL_EQUAL, 1, 0xFF)
+            
+        try:
+            x, y = self.getData()
+            pos = np.empty((len(x), 2))
+            pos[:,0] = x
+            pos[:,1] = y
+            gl.glEnableClientState(gl.GL_VERTEX_ARRAY)
+            try:
+                gl.glVertexPointerf(pos)
+                pen = fn.mkPen(self.opts['pen'])
+                color = pen.color()
+                gl.glColor4f(color.red()/255., color.green()/255., color.blue()/255., color.alpha()/255.)
+                width = pen.width()
+                if pen.isCosmetic() and width < 1:
+                    width = 1
+                gl.glPointSize(width)
+                gl.glEnable(gl.GL_LINE_SMOOTH)
+                gl.glEnable(gl.GL_BLEND)
+                gl.glBlendFunc(gl.GL_SRC_ALPHA, gl.GL_ONE_MINUS_SRC_ALPHA)
+                gl.glHint(gl.GL_LINE_SMOOTH_HINT, gl.GL_NICEST)
+                gl.glDrawArrays(gl.GL_LINE_STRIP, 0, pos.size / pos.shape[-1])
+            finally:
+                gl.glDisableClientState(gl.GL_VERTEX_ARRAY)
+        finally:
+            p.endNativePainting()
+        
+    def clear(self):
+        self.xData = None  ## raw values
+        self.yData = None
+        self.xDisp = None  ## display values (after log / fft)
+        self.yDisp = None
+        self.path = None
+        self.fillPath = None
+        self._mouseShape = None
+        self._mouseBounds = None
+        self._boundsCache = [None, None]
+        #del self.xData, self.yData, self.xDisp, self.yDisp, self.path
+
+    def mouseShape(self):
+        """
+        Return a QPainterPath representing the clickable shape of the curve
+        
+        """
+        if self._mouseShape is None:
+            view = self.getViewBox()
+            if view is None:
+                return QtGui.QPainterPath()
+            stroker = QtGui.QPainterPathStroker()
+            path = self.getPath()
+            path = self.mapToItem(view, path)
+            stroker.setWidth(self.opts['mouseWidth'])
+            mousePath = stroker.createStroke(path)
+            self._mouseShape = self.mapFromItem(view, mousePath)
+        return self._mouseShape
+        
+    def mouseClickEvent(self, ev):
+        if not self.clickable or ev.button() != QtCore.Qt.LeftButton:
+            return
+        if self.mouseShape().contains(ev.pos()):
+            ev.accept()
+            self.sigClicked.emit(self)
+            
+
+
+class ROIPlotItem(PlotCurveItem):
+    """Plot curve that monitors an ROI and image for changes to automatically replot."""
+    def __init__(self, roi, data, img, axes=(0,1), xVals=None, color=None):
+        self.roi = roi
+        self.roiData = data
+        self.roiImg = img
+        self.axes = axes
+        self.xVals = xVals
+        PlotCurveItem.__init__(self, self.getRoiData(), x=self.xVals, color=color)
+        #roi.connect(roi, QtCore.SIGNAL('regionChanged'), self.roiChangedEvent)
+        roi.sigRegionChanged.connect(self.roiChangedEvent)
+        #self.roiChangedEvent()
+        
+    def getRoiData(self):
+        d = self.roi.getArrayRegion(self.roiData, self.roiImg, axes=self.axes)
+        if d is None:
+            return
+        while d.ndim > 1:
+            d = d.mean(axis=1)
+        return d
+        
+    def roiChangedEvent(self):
+        d = self.getRoiData()
+        self.updateData(d, self.xVals)
+
diff --git a/libs/pyqtgraph/graphicsItems/PlotDataItem.py b/libs/pyqtgraph/graphicsItems/PlotDataItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..520151a37c538621709e5c426d5301dadfa21c8f
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/PlotDataItem.py
@@ -0,0 +1,866 @@
+from .. import metaarray as metaarray
+from ..Qt import QtCore
+from .GraphicsObject import GraphicsObject
+from .PlotCurveItem import PlotCurveItem
+from .ScatterPlotItem import ScatterPlotItem
+import numpy as np
+from .. import functions as fn
+from .. import debug as debug
+from .. import getConfigOption
+
+class PlotDataItem(GraphicsObject):
+    """
+    **Bases:** :class:`GraphicsObject <pyqtgraph.GraphicsObject>`
+    
+    GraphicsItem for displaying plot curves, scatter plots, or both. 
+    While it is possible to use :class:`PlotCurveItem <pyqtgraph.PlotCurveItem>` or
+    :class:`ScatterPlotItem <pyqtgraph.ScatterPlotItem>` individually, this class
+    provides a unified interface to both. Instances of :class:`PlotDataItem` are 
+    usually created by plot() methods such as :func:`pyqtgraph.plot` and
+    :func:`PlotItem.plot() <pyqtgraph.PlotItem.plot>`.
+    
+    ============================== ==============================================
+    **Signals:**
+    sigPlotChanged(self)           Emitted when the data in this item is updated.  
+    sigClicked(self)               Emitted when the item is clicked.
+    sigPointsClicked(self, points) Emitted when a plot point is clicked
+                                   Sends the list of points under the mouse.
+    ============================== ==============================================
+    """
+    
+    sigPlotChanged = QtCore.Signal(object)
+    sigClicked = QtCore.Signal(object)
+    sigPointsClicked = QtCore.Signal(object, object)
+    
+    def __init__(self, *args, **kargs):
+        """
+        There are many different ways to create a PlotDataItem:
+        
+        **Data initialization arguments:** (x,y data only)
+        
+            =================================== ======================================
+            PlotDataItem(xValues, yValues)      x and y values may be any sequence (including ndarray) of real numbers
+            PlotDataItem(yValues)               y values only -- x will be automatically set to range(len(y))
+            PlotDataItem(x=xValues, y=yValues)  x and y given by keyword arguments
+            PlotDataItem(ndarray(Nx2))          numpy array with shape (N, 2) where x=data[:,0] and y=data[:,1]
+            =================================== ======================================
+        
+        **Data initialization arguments:** (x,y data AND may include spot style)
+        
+            ===========================   =========================================
+            PlotDataItem(recarray)        numpy array with dtype=[('x', float), ('y', float), ...]
+            PlotDataItem(list-of-dicts)   [{'x': x, 'y': y, ...},   ...] 
+            PlotDataItem(dict-of-lists)   {'x': [...], 'y': [...],  ...}           
+            PlotDataItem(MetaArray)       1D array of Y values with X sepecified as axis values 
+                                          OR 2D array with a column 'y' and extra columns as needed.
+            ===========================   =========================================
+        
+        **Line style keyword arguments:**
+
+            ==========   ==============================================================================
+            connect      Specifies how / whether vertexes should be connected. See
+                         :func:`arrayToQPath() <pyqtgraph.arrayToQPath>`
+            pen          Pen to use for drawing line between points.
+                         Default is solid grey, 1px width. Use None to disable line drawing.
+                         May be any single argument accepted by :func:`mkPen() <pyqtgraph.mkPen>`
+            shadowPen    Pen for secondary line to draw behind the primary line. disabled by default.
+                         May be any single argument accepted by :func:`mkPen() <pyqtgraph.mkPen>`
+            fillLevel    Fill the area between the curve and fillLevel
+            fillBrush    Fill to use when fillLevel is specified. 
+                         May be any single argument accepted by :func:`mkBrush() <pyqtgraph.mkBrush>`
+            stepMode     If True, two orthogonal lines are drawn for each sample
+                         as steps. This is commonly used when drawing histograms.
+                         Note that in this case, `len(x) == len(y) + 1`
+                         (added in version 0.9.9)
+            ==========   ==============================================================================
+        
+        **Point style keyword arguments:**  (see :func:`ScatterPlotItem.setData() <pyqtgraph.ScatterPlotItem.setData>` for more information)
+        
+            ============   =====================================================
+            symbol         Symbol to use for drawing points OR list of symbols, 
+                           one per point. Default is no symbol.
+                           Options are o, s, t, d, +, or any QPainterPath
+            symbolPen      Outline pen for drawing points OR list of pens, one 
+                           per point. May be any single argument accepted by 
+                           :func:`mkPen() <pyqtgraph.mkPen>`
+            symbolBrush    Brush for filling points OR list of brushes, one per 
+                           point. May be any single argument accepted by 
+                           :func:`mkBrush() <pyqtgraph.mkBrush>`
+            symbolSize     Diameter of symbols OR list of diameters.
+            pxMode         (bool) If True, then symbolSize is specified in 
+                           pixels. If False, then symbolSize is 
+                           specified in data coordinates.
+            ============   =====================================================
+        
+        **Optimization keyword arguments:**
+        
+            ================ =====================================================================
+            antialias        (bool) By default, antialiasing is disabled to improve performance.
+                             Note that in some cases (in particluar, when pxMode=True), points 
+                             will be rendered antialiased even if this is set to False.
+            decimate         deprecated.
+            downsample       (int) Reduce the number of samples displayed by this value
+            downsampleMethod 'subsample': Downsample by taking the first of N samples. 
+                             This method is fastest and least accurate.
+                             'mean': Downsample by taking the mean of N samples.
+                             'peak': Downsample by drawing a saw wave that follows the min 
+                             and max of the original data. This method produces the best 
+                             visual representation of the data but is slower.
+            autoDownsample   (bool) If True, resample the data before plotting to avoid plotting
+                             multiple line segments per pixel. This can improve performance when
+                             viewing very high-density data, but increases the initial overhead 
+                             and memory usage.
+            clipToView       (bool) If True, only plot data that is visible within the X range of
+                             the containing ViewBox. This can improve performance when plotting
+                             very large data sets where only a fraction of the data is visible
+                             at any time.
+            identical        *deprecated*
+            ================ =====================================================================
+        
+        **Meta-info keyword arguments:**
+        
+            ==========   ================================================
+            name         name of dataset. This would appear in a legend
+            ==========   ================================================
+        """
+        GraphicsObject.__init__(self)
+        self.setFlag(self.ItemHasNoContents)
+        self.xData = None
+        self.yData = None
+        self.xDisp = None
+        self.yDisp = None
+        #self.dataMask = None
+        #self.curves = []
+        #self.scatters = []
+        self.curve = PlotCurveItem()
+        self.scatter = ScatterPlotItem()
+        self.curve.setParentItem(self)
+        self.scatter.setParentItem(self)
+        
+        self.curve.sigClicked.connect(self.curveClicked)
+        self.scatter.sigClicked.connect(self.scatterClicked)
+        
+        
+        #self.clear()
+        self.opts = {
+            'connect': 'all',
+            
+            'fftMode': False,
+            'logMode': [False, False],
+            'alphaHint': 1.0,
+            'alphaMode': False,
+            
+            'pen': (200,200,200),
+            'shadowPen': None,
+            'fillLevel': None,
+            'fillBrush': None,
+            'stepMode': None, 
+            
+            'symbol': None,
+            'symbolSize': 10,
+            'symbolPen': (200,200,200),
+            'symbolBrush': (50, 50, 150),
+            'pxMode': True,
+            
+            'antialias': getConfigOption('antialias'),
+            'pointMode': None,
+            
+            'downsample': 1,
+            'autoDownsample': False,
+            'downsampleMethod': 'peak',
+            'autoDownsampleFactor': 5.,  # draw ~5 samples per pixel
+            'clipToView': False,
+            
+            'data': None,
+        }
+        self.setData(*args, **kargs)
+    
+    def implements(self, interface=None):
+        ints = ['plotData']
+        if interface is None:
+            return ints
+        return interface in ints
+    
+    def name(self):
+        return self.opts.get('name', None)
+    
+    def boundingRect(self):
+        return QtCore.QRectF()  ## let child items handle this
+
+    def setAlpha(self, alpha, auto):
+        if self.opts['alphaHint'] == alpha and self.opts['alphaMode'] == auto:
+            return
+        self.opts['alphaHint'] = alpha
+        self.opts['alphaMode'] = auto
+        self.setOpacity(alpha)
+        #self.update()
+        
+    def setFftMode(self, mode):
+        if self.opts['fftMode'] == mode:
+            return
+        self.opts['fftMode'] = mode
+        self.xDisp = self.yDisp = None
+        self.xClean = self.yClean = None
+        self.updateItems()
+        self.informViewBoundsChanged()
+    
+    def setLogMode(self, xMode, yMode):
+        if self.opts['logMode'] == [xMode, yMode]:
+            return
+        self.opts['logMode'] = [xMode, yMode]
+        self.xDisp = self.yDisp = None
+        self.xClean = self.yClean = None
+        self.updateItems()
+        self.informViewBoundsChanged()
+    
+    def setPointMode(self, mode):
+        if self.opts['pointMode'] == mode:
+            return
+        self.opts['pointMode'] = mode
+        self.update()
+        
+    def setPen(self, *args, **kargs):
+        """
+        | Sets the pen used to draw lines between points.
+        | *pen* can be a QPen or any argument accepted by :func:`pyqtgraph.mkPen() <pyqtgraph.mkPen>`
+        """
+        pen = fn.mkPen(*args, **kargs)
+        self.opts['pen'] = pen
+        #self.curve.setPen(pen)
+        #for c in self.curves:
+            #c.setPen(pen)
+        #self.update()
+        self.updateItems()
+        
+    def setShadowPen(self, *args, **kargs):
+        """
+        | Sets the shadow pen used to draw lines between points (this is for enhancing contrast or 
+          emphacizing data). 
+        | This line is drawn behind the primary pen (see :func:`setPen() <pyqtgraph.PlotDataItem.setPen>`)
+          and should generally be assigned greater width than the primary pen.
+        | *pen* can be a QPen or any argument accepted by :func:`pyqtgraph.mkPen() <pyqtgraph.mkPen>`
+        """
+        pen = fn.mkPen(*args, **kargs)
+        self.opts['shadowPen'] = pen
+        #for c in self.curves:
+            #c.setPen(pen)
+        #self.update()
+        self.updateItems()
+        
+    def setFillBrush(self, *args, **kargs):
+        brush = fn.mkBrush(*args, **kargs)
+        if self.opts['fillBrush'] == brush:
+            return
+        self.opts['fillBrush'] = brush
+        self.updateItems()
+        
+    def setBrush(self, *args, **kargs):
+        return self.setFillBrush(*args, **kargs)
+    
+    def setFillLevel(self, level):
+        if self.opts['fillLevel'] == level:
+            return
+        self.opts['fillLevel'] = level
+        self.updateItems()
+
+    def setSymbol(self, symbol):
+        if self.opts['symbol'] == symbol:
+            return
+        self.opts['symbol'] = symbol
+        #self.scatter.setSymbol(symbol)
+        self.updateItems()
+        
+    def setSymbolPen(self, *args, **kargs):
+        pen = fn.mkPen(*args, **kargs)
+        if self.opts['symbolPen'] == pen:
+            return
+        self.opts['symbolPen'] = pen
+        #self.scatter.setSymbolPen(pen)
+        self.updateItems()
+        
+    
+    
+    def setSymbolBrush(self, *args, **kargs):
+        brush = fn.mkBrush(*args, **kargs)
+        if self.opts['symbolBrush'] == brush:
+            return
+        self.opts['symbolBrush'] = brush
+        #self.scatter.setSymbolBrush(brush)
+        self.updateItems()
+    
+    
+    def setSymbolSize(self, size):
+        if self.opts['symbolSize'] == size:
+            return
+        self.opts['symbolSize'] = size
+        #self.scatter.setSymbolSize(symbolSize)
+        self.updateItems()
+
+    def setDownsampling(self, ds=None, auto=None, method=None):
+        """
+        Set the downsampling mode of this item. Downsampling reduces the number
+        of samples drawn to increase performance. 
+        
+        ==============  =================================================================
+        **Arguments:**
+        ds              (int) Reduce visible plot samples by this factor. To disable,
+                        set ds=1.
+        auto            (bool) If True, automatically pick *ds* based on visible range
+        mode            'subsample': Downsample by taking the first of N samples.
+                        This method is fastest and least accurate.
+                        'mean': Downsample by taking the mean of N samples.
+                        'peak': Downsample by drawing a saw wave that follows the min
+                        and max of the original data. This method produces the best
+                        visual representation of the data but is slower.
+        ==============  =================================================================
+        """
+        changed = False
+        if ds is not None:
+            if self.opts['downsample'] != ds:
+                changed = True
+                self.opts['downsample'] = ds
+                
+        if auto is not None and self.opts['autoDownsample'] != auto:
+            self.opts['autoDownsample'] = auto
+            changed = True
+                
+        if method is not None:
+            if self.opts['downsampleMethod'] != method:
+                changed = True
+                self.opts['downsampleMethod'] = method
+        
+        if changed:
+            self.xDisp = self.yDisp = None
+            self.updateItems()
+        
+    def setClipToView(self, clip):
+        if self.opts['clipToView'] == clip:
+            return
+        self.opts['clipToView'] = clip
+        self.xDisp = self.yDisp = None
+        self.updateItems()
+        
+        
+    def setData(self, *args, **kargs):
+        """
+        Clear any data displayed by this item and display new data.
+        See :func:`__init__() <pyqtgraph.PlotDataItem.__init__>` for details; it accepts the same arguments.
+        """
+        #self.clear()
+        profiler = debug.Profiler()
+        y = None
+        x = None
+        if len(args) == 1:
+            data = args[0]
+            dt = dataType(data)
+            if dt == 'empty':
+                pass
+            elif dt == 'listOfValues':
+                y = np.array(data)
+            elif dt == 'Nx2array':
+                x = data[:,0]
+                y = data[:,1]
+            elif dt == 'recarray' or dt == 'dictOfLists':
+                if 'x' in data:
+                    x = np.array(data['x'])
+                if 'y' in data:
+                    y = np.array(data['y'])
+            elif dt ==  'listOfDicts':
+                if 'x' in data[0]:
+                    x = np.array([d.get('x',None) for d in data])
+                if 'y' in data[0]:
+                    y = np.array([d.get('y',None) for d in data])
+                for k in ['data', 'symbolSize', 'symbolPen', 'symbolBrush', 'symbolShape']:
+                    if k in data:
+                        kargs[k] = [d.get(k, None) for d in data]
+            elif dt == 'MetaArray':
+                y = data.view(np.ndarray)
+                x = data.xvals(0).view(np.ndarray)
+            else:
+                raise Exception('Invalid data type %s' % type(data))
+            
+        elif len(args) == 2:
+            seq = ('listOfValues', 'MetaArray', 'empty')
+            dtyp = dataType(args[0]), dataType(args[1])
+            if dtyp[0] not in seq or dtyp[1] not in seq:
+                raise Exception('When passing two unnamed arguments, both must be a list or array of values. (got %s, %s)' % (str(type(args[0])), str(type(args[1]))))
+            if not isinstance(args[0], np.ndarray):
+                #x = np.array(args[0])
+                if dtyp[0] == 'MetaArray':
+                    x = args[0].asarray()
+                else:
+                    x = np.array(args[0])
+            else:
+                x = args[0].view(np.ndarray)
+            if not isinstance(args[1], np.ndarray):
+                #y = np.array(args[1])
+                if dtyp[1] == 'MetaArray':
+                    y = args[1].asarray()
+                else:
+                    y = np.array(args[1])
+            else:
+                y = args[1].view(np.ndarray)
+            
+        if 'x' in kargs:
+            x = kargs['x']
+        if 'y' in kargs:
+            y = kargs['y']
+
+        profiler('interpret data')
+        ## pull in all style arguments. 
+        ## Use self.opts to fill in anything not present in kargs.
+        
+        if 'name' in kargs:
+            self.opts['name'] = kargs['name']
+        if 'connect' in kargs:
+            self.opts['connect'] = kargs['connect']
+
+        ## if symbol pen/brush are given with no symbol, then assume symbol is 'o'
+        
+        if 'symbol' not in kargs and ('symbolPen' in kargs or 'symbolBrush' in kargs or 'symbolSize' in kargs):
+            kargs['symbol'] = 'o'
+            
+        if 'brush' in kargs:
+            kargs['fillBrush'] = kargs['brush']
+            
+        for k in list(self.opts.keys()):
+            if k in kargs:
+                self.opts[k] = kargs[k]
+                
+        #curveArgs = {}
+        #for k in ['pen', 'shadowPen', 'fillLevel', 'brush']:
+            #if k in kargs:
+                #self.opts[k] = kargs[k]
+            #curveArgs[k] = self.opts[k]
+            
+        #scatterArgs = {}
+        #for k,v in [('symbolPen','pen'), ('symbolBrush','brush'), ('symbol','symbol')]:
+            #if k in kargs:
+                #self.opts[k] = kargs[k]
+            #scatterArgs[v] = self.opts[k]
+        
+
+        if y is None:
+            return
+        if y is not None and x is None:
+            x = np.arange(len(y))
+        
+        if isinstance(x, list):
+            x = np.array(x)
+        if isinstance(y, list):
+            y = np.array(y)
+        
+        self.xData = x.view(np.ndarray)  ## one last check to make sure there are no MetaArrays getting by
+        self.yData = y.view(np.ndarray)
+        self.xClean = self.yClean = None
+        self.xDisp = None
+        self.yDisp = None
+        profiler('set data')
+        
+        self.updateItems()
+        profiler('update items')
+        
+        self.informViewBoundsChanged()
+        #view = self.getViewBox()
+        #if view is not None:
+            #view.itemBoundsChanged(self)  ## inform view so it can update its range if it wants
+        
+        self.sigPlotChanged.emit(self)
+        profiler('emit')
+
+    def updateItems(self):
+        
+        curveArgs = {}
+        for k,v in [('pen','pen'), ('shadowPen','shadowPen'), ('fillLevel','fillLevel'), ('fillBrush', 'brush'), ('antialias', 'antialias'), ('connect', 'connect'), ('stepMode', 'stepMode')]:
+            curveArgs[v] = self.opts[k]
+        
+        scatterArgs = {}
+        for k,v in [('symbolPen','pen'), ('symbolBrush','brush'), ('symbol','symbol'), ('symbolSize', 'size'), ('data', 'data'), ('pxMode', 'pxMode'), ('antialias', 'antialias')]:
+            if k in self.opts:
+                scatterArgs[v] = self.opts[k]
+        
+        x,y = self.getData()
+        #scatterArgs['mask'] = self.dataMask
+        
+        if curveArgs['pen'] is not None or (curveArgs['brush'] is not None and curveArgs['fillLevel'] is not None):
+            self.curve.setData(x=x, y=y, **curveArgs)
+            self.curve.show()
+        else:
+            self.curve.hide()
+        
+        if scatterArgs['symbol'] is not None:
+            self.scatter.setData(x=x, y=y, **scatterArgs)
+            self.scatter.show()
+        else:
+            self.scatter.hide()
+
+
+    def getData(self):
+        if self.xData is None:
+            return (None, None)
+        
+        #if self.xClean is None:
+            #nanMask = np.isnan(self.xData) | np.isnan(self.yData) | np.isinf(self.xData) | np.isinf(self.yData)
+            #if nanMask.any():
+                #self.dataMask = ~nanMask
+                #self.xClean = self.xData[self.dataMask]
+                #self.yClean = self.yData[self.dataMask]
+            #else:
+                #self.dataMask = None
+                #self.xClean = self.xData
+                #self.yClean = self.yData
+            
+        if self.xDisp is None:
+            x = self.xData
+            y = self.yData
+            
+            
+            #ds = self.opts['downsample']
+            #if isinstance(ds, int) and ds > 1:
+                #x = x[::ds]
+                ##y = resample(y[:len(x)*ds], len(x))  ## scipy.signal.resample causes nasty ringing
+                #y = y[::ds]
+            if self.opts['fftMode']:
+                x,y = self._fourierTransform(x, y)
+            if self.opts['logMode'][0]:
+                x = np.log10(x)
+            if self.opts['logMode'][1]:
+                y = np.log10(y)
+            #if any(self.opts['logMode']):  ## re-check for NANs after log
+                #nanMask = np.isinf(x) | np.isinf(y) | np.isnan(x) | np.isnan(y)
+                #if any(nanMask):
+                    #self.dataMask = ~nanMask
+                    #x = x[self.dataMask]
+                    #y = y[self.dataMask]
+                #else:
+                    #self.dataMask = None
+                    
+            ds = self.opts['downsample']
+            if not isinstance(ds, int):
+                ds = 1
+                
+            if self.opts['autoDownsample']:
+                # this option presumes that x-values have uniform spacing
+                range = self.viewRect()
+                if range is not None:
+                    dx = float(x[-1]-x[0]) / (len(x)-1)
+                    x0 = (range.left()-x[0]) / dx
+                    x1 = (range.right()-x[0]) / dx
+                    width = self.getViewBox().width()
+                    if width != 0.0:
+                        ds = int(max(1, int((x1-x0) / (width*self.opts['autoDownsampleFactor']))))
+                    ## downsampling is expensive; delay until after clipping.
+            
+            if self.opts['clipToView']:
+                view = self.getViewBox()
+                if view is None or not view.autoRangeEnabled()[0]:
+                    # this option presumes that x-values have uniform spacing
+                    range = self.viewRect()
+                    if range is not None and len(x) > 1:
+                        dx = float(x[-1]-x[0]) / (len(x)-1)
+                        # clip to visible region extended by downsampling value
+                        x0 = np.clip(int((range.left()-x[0])/dx)-1*ds , 0, len(x)-1)
+                        x1 = np.clip(int((range.right()-x[0])/dx)+2*ds , 0, len(x)-1)
+                        x = x[x0:x1]
+                        y = y[x0:x1]
+                    
+            if ds > 1:
+                if self.opts['downsampleMethod'] == 'subsample':
+                    x = x[::ds]
+                    y = y[::ds]
+                elif self.opts['downsampleMethod'] == 'mean':
+                    n = len(x) // ds
+                    x = x[:n*ds:ds]
+                    y = y[:n*ds].reshape(n,ds).mean(axis=1)
+                elif self.opts['downsampleMethod'] == 'peak':
+                    n = len(x) // ds
+                    x1 = np.empty((n,2))
+                    x1[:] = x[:n*ds:ds,np.newaxis]
+                    x = x1.reshape(n*2)
+                    y1 = np.empty((n,2))
+                    y2 = y[:n*ds].reshape((n, ds))
+                    y1[:,0] = y2.max(axis=1)
+                    y1[:,1] = y2.min(axis=1)
+                    y = y1.reshape(n*2)
+                
+                    
+            self.xDisp = x
+            self.yDisp = y
+        #print self.yDisp.shape, self.yDisp.min(), self.yDisp.max()
+        #print self.xDisp.shape, self.xDisp.min(), self.xDisp.max()
+        return self.xDisp, self.yDisp
+
+    def dataBounds(self, ax, frac=1.0, orthoRange=None):
+        """
+        Returns the range occupied by the data (along a specific axis) in this item.
+        This method is called by ViewBox when auto-scaling.
+
+        =============== =============================================================
+        **Arguments:**
+        ax              (0 or 1) the axis for which to return this item's data range
+        frac            (float 0.0-1.0) Specifies what fraction of the total data 
+                        range to return. By default, the entire range is returned.
+                        This allows the ViewBox to ignore large spikes in the data
+                        when auto-scaling.
+        orthoRange      ([min,max] or None) Specifies that only the data within the
+                        given range (orthogonal to *ax*) should me measured when 
+                        returning the data range. (For example, a ViewBox might ask
+                        what is the y-range of all data with x-values between min
+                        and max)
+        =============== =============================================================
+        """
+        
+        range = [None, None]
+        if self.curve.isVisible():
+            range = self.curve.dataBounds(ax, frac, orthoRange)
+        elif self.scatter.isVisible():
+            r2 = self.scatter.dataBounds(ax, frac, orthoRange)
+            range = [
+                r2[0] if range[0] is None else (range[0] if r2[0] is None else min(r2[0], range[0])),
+                r2[1] if range[1] is None else (range[1] if r2[1] is None else min(r2[1], range[1]))
+                ]
+        return range
+    
+    def pixelPadding(self):
+        """
+        Return the size in pixels that this item may draw beyond the values returned by dataBounds().
+        This method is called by ViewBox when auto-scaling.
+        """
+        pad = 0
+        if self.curve.isVisible():
+            pad = max(pad, self.curve.pixelPadding())
+        elif self.scatter.isVisible():
+            pad = max(pad, self.scatter.pixelPadding())
+        return pad
+        
+
+    def clear(self):
+        #for i in self.curves+self.scatters:
+            #if i.scene() is not None:
+                #i.scene().removeItem(i)
+        #self.curves = []
+        #self.scatters = []
+        self.xData = None
+        self.yData = None
+        #self.xClean = None
+        #self.yClean = None
+        self.xDisp = None
+        self.yDisp = None
+        self.curve.setData([])
+        self.scatter.setData([])
+            
+    def appendData(self, *args, **kargs):
+        pass
+    
+    def curveClicked(self):
+        self.sigClicked.emit(self)
+        
+    def scatterClicked(self, plt, points):
+        self.sigClicked.emit(self)
+        self.sigPointsClicked.emit(self, points)
+    
+    def viewRangeChanged(self):
+        # view range has changed; re-plot if needed
+        if self.opts['clipToView'] or self.opts['autoDownsample']:
+            self.xDisp = self.yDisp = None
+            self.updateItems()
+            
+    def _fourierTransform(self, x, y):
+        ## Perform fourier transform. If x values are not sampled uniformly,
+        ## then use np.interp to resample before taking fft.
+        dx = np.diff(x)
+        uniform = not np.any(np.abs(dx-dx[0]) > (abs(dx[0]) / 1000.))
+        if not uniform:
+            x2 = np.linspace(x[0], x[-1], len(x))
+            y = np.interp(x2, x, y)
+            x = x2
+        f = np.fft.fft(y) / len(y)
+        y = abs(f[1:len(f)/2])
+        dt = x[-1] - x[0]
+        x = np.linspace(0, 0.5*len(x)/dt, len(y))
+        return x, y
+    
+def dataType(obj):
+    if hasattr(obj, '__len__') and len(obj) == 0:
+        return 'empty'
+    if isinstance(obj, dict):
+        return 'dictOfLists'
+    elif isSequence(obj):
+        first = obj[0]
+        
+        if (hasattr(obj, 'implements') and obj.implements('MetaArray')):
+            return 'MetaArray'
+        elif isinstance(obj, np.ndarray):
+            if obj.ndim == 1:
+                if obj.dtype.names is None:
+                    return 'listOfValues'
+                else:
+                    return 'recarray'
+            elif obj.ndim == 2 and obj.dtype.names is None and obj.shape[1] == 2:
+                return 'Nx2array'
+            else:
+                raise Exception('array shape must be (N,) or (N,2); got %s instead' % str(obj.shape))
+        elif isinstance(first, dict):
+            return 'listOfDicts'
+        else:
+            return 'listOfValues'
+        
+        
+def isSequence(obj):
+    return hasattr(obj, '__iter__') or isinstance(obj, np.ndarray) or (hasattr(obj, 'implements') and obj.implements('MetaArray'))
+    
+            
+            
+#class TableData:
+    #"""
+    #Class for presenting multiple forms of tabular data through a consistent interface.
+    #May contain:
+        #- numpy record array
+        #- list-of-dicts (all dicts are _not_ required to have the same keys)
+        #- dict-of-lists
+        #- dict (single record)
+               #Note: if all the values in this record are lists, it will be interpreted as multiple records
+        
+    #Data can be accessed and modified by column, by row, or by value
+        #data[columnName]
+        #data[rowId]
+        #data[columnName, rowId] = value
+        #data[columnName] = [value, value, ...]
+        #data[rowId] = {columnName: value, ...}
+    #"""
+    
+    #def __init__(self, data):
+        #self.data = data
+        #if isinstance(data, np.ndarray):
+            #self.mode = 'array'
+        #elif isinstance(data, list):
+            #self.mode = 'list'
+        #elif isinstance(data, dict):
+            #types = set(map(type, data.values()))
+            ### dict may be a dict-of-lists or a single record
+            #types -= set([list, np.ndarray]) ## if dict contains any non-sequence values, it is probably a single record.
+            #if len(types) != 0:
+                #self.data = [self.data]
+                #self.mode = 'list'
+            #else:
+                #self.mode = 'dict'
+        #elif isinstance(data, TableData):
+            #self.data = data.data
+            #self.mode = data.mode
+        #else:
+            #raise TypeError(type(data))
+        
+        #for fn in ['__getitem__', '__setitem__']:
+            #setattr(self, fn, getattr(self, '_TableData'+fn+self.mode))
+        
+    #def originalData(self):
+        #return self.data
+    
+    #def toArray(self):
+        #if self.mode == 'array':
+            #return self.data
+        #if len(self) < 1:
+            ##return np.array([])  ## need to return empty array *with correct columns*, but this is very difficult, so just return None
+            #return None
+        #rec1 = self[0]
+        #dtype = functions.suggestRecordDType(rec1)
+        ##print rec1, dtype
+        #arr = np.empty(len(self), dtype=dtype)
+        #arr[0] = tuple(rec1.values())
+        #for i in xrange(1, len(self)):
+            #arr[i] = tuple(self[i].values())
+        #return arr
+            
+    #def __getitem__array(self, arg):
+        #if isinstance(arg, tuple):
+            #return self.data[arg[0]][arg[1]]
+        #else:
+            #return self.data[arg]
+            
+    #def __getitem__list(self, arg):
+        #if isinstance(arg, basestring):
+            #return [d.get(arg, None) for d in self.data]
+        #elif isinstance(arg, int):
+            #return self.data[arg]
+        #elif isinstance(arg, tuple):
+            #arg = self._orderArgs(arg)
+            #return self.data[arg[0]][arg[1]]
+        #else:
+            #raise TypeError(type(arg))
+        
+    #def __getitem__dict(self, arg):
+        #if isinstance(arg, basestring):
+            #return self.data[arg]
+        #elif isinstance(arg, int):
+            #return dict([(k, v[arg]) for k, v in self.data.iteritems()])
+        #elif isinstance(arg, tuple):
+            #arg = self._orderArgs(arg)
+            #return self.data[arg[1]][arg[0]]
+        #else:
+            #raise TypeError(type(arg))
+
+    #def __setitem__array(self, arg, val):
+        #if isinstance(arg, tuple):
+            #self.data[arg[0]][arg[1]] = val
+        #else:
+            #self.data[arg] = val
+
+    #def __setitem__list(self, arg, val):
+        #if isinstance(arg, basestring):
+            #if len(val) != len(self.data):
+                #raise Exception("Values (%d) and data set (%d) are not the same length." % (len(val), len(self.data)))
+            #for i, rec in enumerate(self.data):
+                #rec[arg] = val[i]
+        #elif isinstance(arg, int):
+            #self.data[arg] = val
+        #elif isinstance(arg, tuple):
+            #arg = self._orderArgs(arg)
+            #self.data[arg[0]][arg[1]] = val
+        #else:
+            #raise TypeError(type(arg))
+        
+    #def __setitem__dict(self, arg, val):
+        #if isinstance(arg, basestring):
+            #if len(val) != len(self.data[arg]):
+                #raise Exception("Values (%d) and data set (%d) are not the same length." % (len(val), len(self.data[arg])))
+            #self.data[arg] = val
+        #elif isinstance(arg, int):
+            #for k in self.data:
+                #self.data[k][arg] = val[k]
+        #elif isinstance(arg, tuple):
+            #arg = self._orderArgs(arg)
+            #self.data[arg[1]][arg[0]] = val
+        #else:
+            #raise TypeError(type(arg))
+
+    #def _orderArgs(self, args):
+        ### return args in (int, str) order
+        #if isinstance(args[0], basestring):
+            #return (args[1], args[0])
+        #else:
+            #return args
+        
+    #def __iter__(self):
+        #for i in xrange(len(self)):
+            #yield self[i]
+
+    #def __len__(self):
+        #if self.mode == 'array' or self.mode == 'list':
+            #return len(self.data)
+        #else:
+            #return max(map(len, self.data.values()))
+
+    #def columnNames(self):
+        #"""returns column names in no particular order"""
+        #if self.mode == 'array':
+            #return self.data.dtype.names
+        #elif self.mode == 'list':
+            #names = set()
+            #for row in self.data:
+                #names.update(row.keys())
+            #return list(names)
+        #elif self.mode == 'dict':
+            #return self.data.keys()
+            
+    #def keys(self):
+        #return self.columnNames()
diff --git a/libs/pyqtgraph/graphicsItems/PlotItem/PlotItem.py b/libs/pyqtgraph/graphicsItems/PlotItem/PlotItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..6e9c8240f7072518e334b72bebb907344401edc9
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/PlotItem/PlotItem.py
@@ -0,0 +1,1237 @@
+# -*- coding: utf-8 -*-
+"""
+PlotItem.py -  Graphics item implementing a scalable ViewBox with plotting powers.
+Copyright 2010  Luke Campagnola
+Distributed under MIT/X11 license. See license.txt for more infomation.
+
+This class is one of the workhorses of pyqtgraph. It implements a graphics item with 
+plots, labels, and scales which can be viewed inside a QGraphicsScene. If you want
+a widget that can be added to your GUI, see PlotWidget instead.
+
+This class is very heavily featured:
+  - Automatically creates and manages PlotCurveItems
+  - Fast display and update of plots
+  - Manages zoom/pan ViewBox, scale, and label elements
+  - Automatic scaling when data changes
+  - Control panel with a huge feature set including averaging, decimation,
+    display, power spectrum, svg/png export, plot linking, and more.
+"""
+from ...Qt import QtGui, QtCore, QT_LIB
+from ... import pixmaps
+import sys
+
+if QT_LIB == 'PyQt4':
+    from .plotConfigTemplate_pyqt import *
+elif QT_LIB == 'PySide':
+    from .plotConfigTemplate_pyside import *
+elif QT_LIB == 'PyQt5':
+    from .plotConfigTemplate_pyqt5 import *
+
+from ... import functions as fn
+from ...widgets.FileDialog import FileDialog
+import weakref
+import numpy as np
+import os
+from .. PlotDataItem import PlotDataItem
+from .. ViewBox import ViewBox
+from .. AxisItem import AxisItem
+from .. LabelItem import LabelItem
+from .. LegendItem import LegendItem
+from .. GraphicsWidget import GraphicsWidget
+from .. ButtonItem import ButtonItem
+from .. InfiniteLine import InfiniteLine
+from ...WidgetGroup import WidgetGroup
+
+__all__ = ['PlotItem']
+
+try:
+    from metaarray import *
+    HAVE_METAARRAY = True
+except:
+    HAVE_METAARRAY = False
+
+
+
+
+class PlotItem(GraphicsWidget):
+    
+    """
+    **Bases:** :class:`GraphicsWidget <pyqtgraph.GraphicsWidget>`
+    
+    Plot graphics item that can be added to any graphics scene. Implements axes, titles, and interactive viewbox. 
+    PlotItem also provides some basic analysis functionality that may be accessed from the context menu.
+    Use :func:`plot() <pyqtgraph.PlotItem.plot>` to create a new PlotDataItem and add it to the view.
+    Use :func:`addItem() <pyqtgraph.PlotItem.addItem>` to add any QGraphicsItem to the view.
+    
+    This class wraps several methods from its internal ViewBox:
+    :func:`setXRange <pyqtgraph.ViewBox.setXRange>`,
+    :func:`setYRange <pyqtgraph.ViewBox.setYRange>`,
+    :func:`setRange <pyqtgraph.ViewBox.setRange>`,
+    :func:`autoRange <pyqtgraph.ViewBox.autoRange>`,
+    :func:`setXLink <pyqtgraph.ViewBox.setXLink>`,
+    :func:`setYLink <pyqtgraph.ViewBox.setYLink>`,
+    :func:`setAutoPan <pyqtgraph.ViewBox.setAutoPan>`,
+    :func:`setAutoVisible <pyqtgraph.ViewBox.setAutoVisible>`,
+    :func:`setLimits <pyqtgraph.ViewBox.setLimits>`,
+    :func:`viewRect <pyqtgraph.ViewBox.viewRect>`,
+    :func:`viewRange <pyqtgraph.ViewBox.viewRange>`,
+    :func:`setMouseEnabled <pyqtgraph.ViewBox.setMouseEnabled>`,
+    :func:`enableAutoRange <pyqtgraph.ViewBox.enableAutoRange>`,
+    :func:`disableAutoRange <pyqtgraph.ViewBox.disableAutoRange>`,
+    :func:`setAspectLocked <pyqtgraph.ViewBox.setAspectLocked>`,
+    :func:`invertY <pyqtgraph.ViewBox.invertY>`,
+    :func:`invertX <pyqtgraph.ViewBox.invertX>`,
+    :func:`register <pyqtgraph.ViewBox.register>`,
+    :func:`unregister <pyqtgraph.ViewBox.unregister>`
+    
+    The ViewBox itself can be accessed by calling :func:`getViewBox() <pyqtgraph.PlotItem.getViewBox>` 
+    
+    ==================== =======================================================================
+    **Signals:**
+    sigYRangeChanged     wrapped from :class:`ViewBox <pyqtgraph.ViewBox>`
+    sigXRangeChanged     wrapped from :class:`ViewBox <pyqtgraph.ViewBox>`
+    sigRangeChanged      wrapped from :class:`ViewBox <pyqtgraph.ViewBox>`
+    ==================== =======================================================================
+    """
+    
+    sigRangeChanged = QtCore.Signal(object, object)    ## Emitted when the ViewBox range has changed
+    sigYRangeChanged = QtCore.Signal(object, object)   ## Emitted when the ViewBox Y range has changed
+    sigXRangeChanged = QtCore.Signal(object, object)   ## Emitted when the ViewBox X range has changed
+    
+    
+    lastFileDir = None
+    
+    def __init__(self, parent=None, name=None, labels=None, title=None, viewBox=None, axisItems=None, enableMenu=True, **kargs):
+        """
+        Create a new PlotItem. All arguments are optional.
+        Any extra keyword arguments are passed to PlotItem.plot().
+        
+        ==============  ==========================================================================================
+        **Arguments:**
+        *title*         Title to display at the top of the item. Html is allowed.
+        *labels*        A dictionary specifying the axis labels to display::
+                   
+                            {'left': (args), 'bottom': (args), ...}
+                     
+                        The name of each axis and the corresponding arguments are passed to 
+                        :func:`PlotItem.setLabel() <pyqtgraph.PlotItem.setLabel>`
+                        Optionally, PlotItem my also be initialized with the keyword arguments left,
+                        right, top, or bottom to achieve the same effect.
+        *name*          Registers a name for this view so that others may link to it
+        *viewBox*       If specified, the PlotItem will be constructed with this as its ViewBox.
+        *axisItems*     Optional dictionary instructing the PlotItem to use pre-constructed items
+                        for its axes. The dict keys must be axis names ('left', 'bottom', 'right', 'top')
+                        and the values must be instances of AxisItem (or at least compatible with AxisItem).
+        ==============  ==========================================================================================
+        """
+        
+        GraphicsWidget.__init__(self, parent)
+        
+        self.setSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
+        
+        ## Set up control buttons
+        path = os.path.dirname(__file__)
+        #self.autoImageFile = os.path.join(path, 'auto.png')
+        #self.lockImageFile = os.path.join(path, 'lock.png')
+        self.autoBtn = ButtonItem(pixmaps.getPixmap('auto'), 14, self)
+        self.autoBtn.mode = 'auto'
+        self.autoBtn.clicked.connect(self.autoBtnClicked)
+        #self.autoBtn.hide()
+        self.buttonsHidden = False ## whether the user has requested buttons to be hidden
+        self.mouseHovering = False
+        
+        self.layout = QtGui.QGraphicsGridLayout()
+        self.layout.setContentsMargins(1,1,1,1)
+        self.setLayout(self.layout)
+        self.layout.setHorizontalSpacing(0)
+        self.layout.setVerticalSpacing(0)
+        
+        if viewBox is None:
+            viewBox = ViewBox(parent=self)
+        self.vb = viewBox
+        self.vb.sigStateChanged.connect(self.viewStateChanged)
+        self.setMenuEnabled(enableMenu, enableMenu) ## en/disable plotitem and viewbox menus
+        
+        if name is not None:
+            self.vb.register(name)
+        self.vb.sigRangeChanged.connect(self.sigRangeChanged)
+        self.vb.sigXRangeChanged.connect(self.sigXRangeChanged)
+        self.vb.sigYRangeChanged.connect(self.sigYRangeChanged)
+        
+        self.layout.addItem(self.vb, 2, 1)
+        self.alpha = 1.0
+        self.autoAlpha = True
+        self.spectrumMode = False
+        
+        self.legend = None
+        
+        ## Create and place axis items
+        if axisItems is None:
+            axisItems = {}
+        self.axes = {}
+        for k, pos in (('top', (1,1)), ('bottom', (3,1)), ('left', (2,0)), ('right', (2,2))):
+            if k in axisItems:
+                axis = axisItems[k]
+            else:
+                axis = AxisItem(orientation=k, parent=self)
+            axis.linkToView(self.vb)
+            self.axes[k] = {'item': axis, 'pos': pos}
+            self.layout.addItem(axis, *pos)
+            axis.setZValue(-1000)
+            axis.setFlag(axis.ItemNegativeZStacksBehindParent)
+        
+        self.titleLabel = LabelItem('', size='11pt', parent=self)
+        self.layout.addItem(self.titleLabel, 0, 1)
+        self.setTitle(None)  ## hide
+        
+        
+        for i in range(4):
+            self.layout.setRowPreferredHeight(i, 0)
+            self.layout.setRowMinimumHeight(i, 0)
+            self.layout.setRowSpacing(i, 0)
+            self.layout.setRowStretchFactor(i, 1)
+            
+        for i in range(3):
+            self.layout.setColumnPreferredWidth(i, 0)
+            self.layout.setColumnMinimumWidth(i, 0)
+            self.layout.setColumnSpacing(i, 0)
+            self.layout.setColumnStretchFactor(i, 1)
+        self.layout.setRowStretchFactor(2, 100)
+        self.layout.setColumnStretchFactor(1, 100)
+        
+
+        self.items = []
+        self.curves = []
+        self.itemMeta = weakref.WeakKeyDictionary()
+        self.dataItems = []
+        self.paramList = {}
+        self.avgCurves = {}
+        
+        ### Set up context menu
+        
+        w = QtGui.QWidget()
+        self.ctrl = c = Ui_Form()
+        c.setupUi(w)
+        dv = QtGui.QDoubleValidator(self)
+        
+        menuItems = [
+            ('Transforms', c.transformGroup),
+            ('Downsample', c.decimateGroup),
+            ('Average', c.averageGroup),
+            ('Alpha', c.alphaGroup),
+            ('Grid', c.gridGroup),
+            ('Points', c.pointsGroup),
+        ]
+        
+        
+        self.ctrlMenu = QtGui.QMenu()
+        
+        self.ctrlMenu.setTitle('Plot Options')
+        self.subMenus = []
+        for name, grp in menuItems:
+            sm = QtGui.QMenu(name)
+            act = QtGui.QWidgetAction(self)
+            act.setDefaultWidget(grp)
+            sm.addAction(act)
+            self.subMenus.append(sm)
+            self.ctrlMenu.addMenu(sm)
+        
+        self.stateGroup = WidgetGroup()
+        for name, w in menuItems:
+            self.stateGroup.autoAdd(w)
+        
+        self.fileDialog = None
+        
+        c.alphaGroup.toggled.connect(self.updateAlpha)
+        c.alphaSlider.valueChanged.connect(self.updateAlpha)
+        c.autoAlphaCheck.toggled.connect(self.updateAlpha)
+
+        c.xGridCheck.toggled.connect(self.updateGrid)
+        c.yGridCheck.toggled.connect(self.updateGrid)
+        c.gridAlphaSlider.valueChanged.connect(self.updateGrid)
+
+        c.fftCheck.toggled.connect(self.updateSpectrumMode)
+        c.logXCheck.toggled.connect(self.updateLogMode)
+        c.logYCheck.toggled.connect(self.updateLogMode)
+
+        c.downsampleSpin.valueChanged.connect(self.updateDownsampling)
+        c.downsampleCheck.toggled.connect(self.updateDownsampling)
+        c.autoDownsampleCheck.toggled.connect(self.updateDownsampling)
+        c.subsampleRadio.toggled.connect(self.updateDownsampling)
+        c.meanRadio.toggled.connect(self.updateDownsampling)
+        c.clipToViewCheck.toggled.connect(self.updateDownsampling)
+
+        self.ctrl.avgParamList.itemClicked.connect(self.avgParamListClicked)
+        self.ctrl.averageGroup.toggled.connect(self.avgToggled)
+        
+        self.ctrl.maxTracesCheck.toggled.connect(self.updateDecimation)
+        self.ctrl.maxTracesSpin.valueChanged.connect(self.updateDecimation)
+        
+        self.hideAxis('right')
+        self.hideAxis('top')
+        self.showAxis('left')
+        self.showAxis('bottom')
+        
+        if labels is None:
+            labels = {}
+        for label in list(self.axes.keys()):
+            if label in kargs:
+                labels[label] = kargs[label]
+                del kargs[label]
+        for k in labels:
+            if isinstance(labels[k], basestring):
+                labels[k] = (labels[k],)
+            self.setLabel(k, *labels[k])
+                
+        if title is not None:
+            self.setTitle(title)
+        
+        if len(kargs) > 0:
+            self.plot(**kargs)
+        
+        
+    def implements(self, interface=None):
+        return interface in ['ViewBoxWrapper']
+
+    def getViewBox(self):
+        """Return the :class:`ViewBox <pyqtgraph.ViewBox>` contained within."""
+        return self.vb
+
+    
+    ## Wrap a few methods from viewBox. 
+    #Important: don't use a settattr(m, getattr(self.vb, m)) as we'd be leaving the viebox alive
+    #because we had a reference to an instance method (creating wrapper methods at runtime instead).
+    
+    for m in ['setXRange', 'setYRange', 'setXLink', 'setYLink', 'setAutoPan',         # NOTE: 
+              'setAutoVisible', 'setRange', 'autoRange', 'viewRect', 'viewRange',     # If you update this list, please 
+              'setMouseEnabled', 'setLimits', 'enableAutoRange', 'disableAutoRange',  # update the class docstring 
+              'setAspectLocked', 'invertY', 'invertX', 'register', 'unregister']:                # as well.
+                
+        def _create_method(name):
+            def method(self, *args, **kwargs):
+                return getattr(self.vb, name)(*args, **kwargs)
+            method.__name__ = name
+            return method
+        
+        locals()[m] = _create_method(m)
+        
+    del _create_method
+    
+    
+    def setLogMode(self, x=None, y=None):
+        """
+        Set log scaling for x and/or y axes.
+        This informs PlotDataItems to transform logarithmically and switches
+        the axes to use log ticking. 
+        
+        Note that *no other items* in the scene will be affected by
+        this; there is (currently) no generic way to redisplay a GraphicsItem
+        with log coordinates.
+        
+        """
+        if x is not None:
+            self.ctrl.logXCheck.setChecked(x)
+        if y is not None:
+            self.ctrl.logYCheck.setChecked(y)
+        
+    def showGrid(self, x=None, y=None, alpha=None):
+        """
+        Show or hide the grid for either axis.
+        
+        ==============  =====================================
+        **Arguments:**
+        x               (bool) Whether to show the X grid
+        y               (bool) Whether to show the Y grid
+        alpha           (0.0-1.0) Opacity of the grid
+        ==============  =====================================
+        """
+        if x is None and y is None and alpha is None:
+            raise Exception("Must specify at least one of x, y, or alpha.")  ## prevent people getting confused if they just call showGrid()
+        
+        if x is not None:
+            self.ctrl.xGridCheck.setChecked(x)
+        if y is not None:
+            self.ctrl.yGridCheck.setChecked(y)
+        if alpha is not None:
+            v = np.clip(alpha, 0, 1)*self.ctrl.gridAlphaSlider.maximum()
+            self.ctrl.gridAlphaSlider.setValue(v)
+        
+    #def paint(self, *args):
+        #prof = debug.Profiler()
+        #QtGui.QGraphicsWidget.paint(self, *args)
+        
+    ## bad idea. 
+    #def __getattr__(self, attr):  ## wrap ms
+        #return getattr(self.vb, attr)
+        
+    def close(self):
+        #print "delete", self
+        ## Most of this crap is needed to avoid PySide trouble. 
+        ## The problem seems to be whenever scene.clear() leads to deletion of widgets (either through proxies or qgraphicswidgets)
+        ## the solution is to manually remove all widgets before scene.clear() is called
+        if self.ctrlMenu is None: ## already shut down
+            return
+        self.ctrlMenu.setParent(None)
+        self.ctrlMenu = None
+        
+        self.autoBtn.setParent(None)
+        self.autoBtn = None
+        
+        for k in self.axes:
+            i = self.axes[k]['item']
+            i.close()
+            
+        self.axes = None
+        self.scene().removeItem(self.vb)
+        self.vb = None
+        
+    def registerPlot(self, name):   ## for backward compatibility
+        self.vb.register(name)
+        
+    def updateGrid(self, *args):
+        alpha = self.ctrl.gridAlphaSlider.value()
+        x = alpha if self.ctrl.xGridCheck.isChecked() else False
+        y = alpha if self.ctrl.yGridCheck.isChecked() else False
+        self.getAxis('top').setGrid(x)
+        self.getAxis('bottom').setGrid(x)
+        self.getAxis('left').setGrid(y)
+        self.getAxis('right').setGrid(y)
+
+    def viewGeometry(self):
+        """Return the screen geometry of the viewbox"""
+        v = self.scene().views()[0]
+        b = self.vb.mapRectToScene(self.vb.boundingRect())
+        wr = v.mapFromScene(b).boundingRect()
+        pos = v.mapToGlobal(v.pos())
+        wr.adjust(pos.x(), pos.y(), pos.x(), pos.y())
+        return wr
+
+
+    def avgToggled(self, b):
+        if b:
+            self.recomputeAverages()
+        for k in self.avgCurves:
+            self.avgCurves[k][1].setVisible(b)
+        
+    def avgParamListClicked(self, item):
+        name = str(item.text())
+        self.paramList[name] = (item.checkState() == QtCore.Qt.Checked)
+        self.recomputeAverages()
+        
+    def recomputeAverages(self):
+        if not self.ctrl.averageGroup.isChecked():
+            return
+        for k in self.avgCurves:
+            self.removeItem(self.avgCurves[k][1])
+        self.avgCurves = {}
+        for c in self.curves:
+            self.addAvgCurve(c)
+        self.replot()
+        
+    def addAvgCurve(self, curve):
+        ## Add a single curve into the pool of curves averaged together
+        
+        ## If there are plot parameters, then we need to determine which to average together.
+        remKeys = []
+        addKeys = []
+        if self.ctrl.avgParamList.count() > 0:
+        
+            ### First determine the key of the curve to which this new data should be averaged
+            for i in range(self.ctrl.avgParamList.count()):
+                item = self.ctrl.avgParamList.item(i)
+                if item.checkState() == QtCore.Qt.Checked:
+                    remKeys.append(str(item.text()))
+                else:
+                    addKeys.append(str(item.text()))
+                    
+            if len(remKeys) < 1:  ## In this case, there would be 1 average plot for each data plot; not useful.
+                return
+                
+        p = self.itemMeta.get(curve,{}).copy()
+        for k in p:
+            if type(k) is tuple:
+                p['.'.join(k)] = p[k]
+                del p[k]
+        for rk in remKeys:
+            if rk in p:
+                del p[rk]
+        for ak in addKeys:
+            if ak not in p:
+                p[ak] = None
+        key = tuple(p.items())
+        
+        ### Create a new curve if needed
+        if key not in self.avgCurves:
+            plot = PlotDataItem()
+            plot.setPen(fn.mkPen([0, 200, 0]))
+            plot.setShadowPen(fn.mkPen([0, 0, 0, 100], width=3))
+            plot.setAlpha(1.0, False)
+            plot.setZValue(100)
+            self.addItem(plot, skipAverage=True)
+            self.avgCurves[key] = [0, plot]
+        self.avgCurves[key][0] += 1
+        (n, plot) = self.avgCurves[key]
+        
+        ### Average data together
+        (x, y) = curve.getData()
+        if plot.yData is not None and y.shape == plot.yData.shape:
+            # note that if shapes do not match, then the average resets.
+            newData = plot.yData * (n-1) / float(n) + y * 1.0 / float(n)
+            plot.setData(plot.xData, newData)
+        else:
+            plot.setData(x, y)
+        
+    def autoBtnClicked(self):
+        if self.autoBtn.mode == 'auto':
+            self.enableAutoRange()
+            self.autoBtn.hide()
+        else:
+            self.disableAutoRange()
+            
+    def viewStateChanged(self):
+        self.updateButtons()
+            
+    def enableAutoScale(self):
+        """
+        Enable auto-scaling. The plot will continuously scale to fit the boundaries of its data.
+        """
+        print("Warning: enableAutoScale is deprecated. Use enableAutoRange(axis, enable) instead.")
+        self.vb.enableAutoRange(self.vb.XYAxes)
+
+    def addItem(self, item, *args, **kargs):
+        """
+        Add a graphics item to the view box. 
+        If the item has plot data (PlotDataItem, PlotCurveItem, ScatterPlotItem), it may
+        be included in analysis performed by the PlotItem.
+        """
+        self.items.append(item)
+        vbargs = {}
+        if 'ignoreBounds' in kargs:
+            vbargs['ignoreBounds'] = kargs['ignoreBounds']
+        self.vb.addItem(item, *args, **vbargs)
+        name = None
+        if hasattr(item, 'implements') and item.implements('plotData'):
+            name = item.name()
+            self.dataItems.append(item)
+            #self.plotChanged()
+            
+            params = kargs.get('params', {})
+            self.itemMeta[item] = params
+            #item.setMeta(params)
+            self.curves.append(item)
+            #self.addItem(c)
+            
+        if hasattr(item, 'setLogMode'):
+            item.setLogMode(self.ctrl.logXCheck.isChecked(), self.ctrl.logYCheck.isChecked())
+            
+        if isinstance(item, PlotDataItem):
+            ## configure curve for this plot
+            (alpha, auto) = self.alphaState()
+            item.setAlpha(alpha, auto)
+            item.setFftMode(self.ctrl.fftCheck.isChecked())
+            item.setDownsampling(*self.downsampleMode())
+            item.setClipToView(self.clipToViewMode())
+            item.setPointMode(self.pointMode())
+            
+            ## Hide older plots if needed
+            self.updateDecimation()
+            
+            ## Add to average if needed
+            self.updateParamList()
+            if self.ctrl.averageGroup.isChecked() and 'skipAverage' not in kargs:
+                self.addAvgCurve(item)
+                
+            #c.connect(c, QtCore.SIGNAL('plotChanged'), self.plotChanged)
+            #item.sigPlotChanged.connect(self.plotChanged)
+            #self.plotChanged()
+        #name = kargs.get('name', getattr(item, 'opts', {}).get('name', None))
+        if name is not None and hasattr(self, 'legend') and self.legend is not None:
+            self.legend.addItem(item, name=name)
+            
+
+    def addDataItem(self, item, *args):
+        print("PlotItem.addDataItem is deprecated. Use addItem instead.")
+        self.addItem(item, *args)
+        
+    def listDataItems(self):
+        """Return a list of all data items (PlotDataItem, PlotCurveItem, ScatterPlotItem, etc)
+        contained in this PlotItem."""
+        return self.dataItems[:]
+        
+    def addCurve(self, c, params=None):
+        print("PlotItem.addCurve is deprecated. Use addItem instead.")
+        self.addItem(c, params)
+
+    def addLine(self, x=None, y=None, z=None, **kwds):
+        """
+        Create an InfiniteLine and add to the plot. 
+        
+        If *x* is specified,
+        the line will be vertical. If *y* is specified, the line will be
+        horizontal. All extra keyword arguments are passed to
+        :func:`InfiniteLine.__init__() <pyqtgraph.InfiniteLine.__init__>`.
+        Returns the item created.
+        """
+        pos = kwds.get('pos', x if x is not None else y)
+        angle = kwds.get('angle', 0 if x is None else 90)
+        line = InfiniteLine(pos, angle, **kwds)
+        self.addItem(line)
+        if z is not None:
+            line.setZValue(z)
+        return line
+        
+        
+
+    def removeItem(self, item):
+        """
+        Remove an item from the internal ViewBox.
+        """
+        if not item in self.items:
+            return
+        self.items.remove(item)
+        if item in self.dataItems:
+            self.dataItems.remove(item)
+            
+        if item.scene() is not None:
+            self.vb.removeItem(item)
+        if item in self.curves:
+            self.curves.remove(item)
+            self.updateDecimation()
+            self.updateParamList()
+            #item.connect(item, QtCore.SIGNAL('plotChanged'), self.plotChanged)
+            #item.sigPlotChanged.connect(self.plotChanged)
+
+    def clear(self):
+        """
+        Remove all items from the ViewBox.
+        """
+        for i in self.items[:]:
+            self.removeItem(i)
+        self.avgCurves = {}
+    
+    def clearPlots(self):
+        for i in self.curves[:]:
+            self.removeItem(i)
+        self.avgCurves = {}
+        
+    
+    def plot(self, *args, **kargs):
+        """
+        Add and return a new plot.
+        See :func:`PlotDataItem.__init__ <pyqtgraph.PlotDataItem.__init__>` for data arguments
+        
+        Extra allowed arguments are:
+            clear    - clear all plots before displaying new data
+            params   - meta-parameters to associate with this data
+        """
+        
+        
+        clear = kargs.get('clear', False)
+        params = kargs.get('params', None)
+          
+        if clear:
+            self.clear()
+            
+        item = PlotDataItem(*args, **kargs)
+            
+        if params is None:
+            params = {}
+        self.addItem(item, params=params)
+        
+        return item
+
+    def addLegend(self, size=None, offset=(30, 30)):
+        """
+        Create a new LegendItem and anchor it over the internal ViewBox.
+        Plots will be automatically displayed in the legend if they
+        are created with the 'name' argument.
+        """
+        self.legend = LegendItem(size, offset)
+        self.legend.setParentItem(self.vb)
+        return self.legend
+        
+    def scatterPlot(self, *args, **kargs):
+        if 'pen' in kargs:
+            kargs['symbolPen'] = kargs['pen']
+        kargs['pen'] = None
+            
+        if 'brush' in kargs:
+            kargs['symbolBrush'] = kargs['brush']
+            del kargs['brush']
+            
+        if 'size' in kargs:
+            kargs['symbolSize'] = kargs['size']
+            del kargs['size']
+
+        return self.plot(*args, **kargs)
+                
+    def replot(self):
+        self.update()
+
+    def updateParamList(self):
+        self.ctrl.avgParamList.clear()
+        ## Check to see that each parameter for each curve is present in the list
+        for c in self.curves:
+            for p in list(self.itemMeta.get(c, {}).keys()):
+                if type(p) is tuple:
+                    p = '.'.join(p)
+                    
+                ## If the parameter is not in the list, add it.
+                matches = self.ctrl.avgParamList.findItems(p, QtCore.Qt.MatchExactly)
+                if len(matches) == 0:
+                    i = QtGui.QListWidgetItem(p)
+                    if p in self.paramList and self.paramList[p] is True:
+                        i.setCheckState(QtCore.Qt.Checked)
+                    else:
+                        i.setCheckState(QtCore.Qt.Unchecked)
+                    self.ctrl.avgParamList.addItem(i)
+                else:
+                    i = matches[0]
+                    
+                self.paramList[p] = (i.checkState() == QtCore.Qt.Checked)
+
+
+    ## Qt's SVG-writing capabilities are pretty terrible. 
+    def writeSvgCurves(self, fileName=None):
+        if fileName is None:
+            self.fileDialog = FileDialog()
+            if PlotItem.lastFileDir is not None:
+                self.fileDialog.setDirectory(PlotItem.lastFileDir)
+            self.fileDialog.setFileMode(QtGui.QFileDialog.AnyFile)
+            self.fileDialog.setAcceptMode(QtGui.QFileDialog.AcceptSave) 
+            self.fileDialog.show()
+            self.fileDialog.fileSelected.connect(self.writeSvg)
+            return
+        #if fileName is None:
+            #fileName = QtGui.QFileDialog.getSaveFileName()
+        if isinstance(fileName, tuple):
+            raise Exception("Not implemented yet..")
+        fileName = str(fileName)
+        PlotItem.lastFileDir = os.path.dirname(fileName)
+        
+        rect = self.vb.viewRect()
+        xRange = rect.left(), rect.right() 
+        
+        svg = ""
+        fh = open(fileName, 'w')
+
+        dx = max(rect.right(),0) - min(rect.left(),0)
+        ymn = min(rect.top(), rect.bottom())
+        ymx = max(rect.top(), rect.bottom())
+        dy = max(ymx,0) - min(ymn,0)
+        sx = 1.
+        sy = 1.
+        while dx*sx < 10:
+            sx *= 1000
+        while dy*sy < 10:
+            sy *= 1000
+        sy *= -1
+
+        #fh.write('<svg viewBox="%f %f %f %f">\n' % (rect.left()*sx, rect.top()*sx, rect.width()*sy, rect.height()*sy))
+        fh.write('<svg>\n')
+        fh.write('<path fill="none" stroke="#000000" stroke-opacity="0.5" stroke-width="1" d="M%f,0 L%f,0"/>\n' % (rect.left()*sx, rect.right()*sx))
+        fh.write('<path fill="none" stroke="#000000" stroke-opacity="0.5" stroke-width="1" d="M0,%f L0,%f"/>\n' % (rect.top()*sy, rect.bottom()*sy))
+
+
+        for item in self.curves:
+            if isinstance(item, PlotCurveItem):
+                color = fn.colorStr(item.pen.color())
+                opacity = item.pen.color().alpha() / 255.
+                color = color[:6]
+                x, y = item.getData()
+                mask = (x > xRange[0]) * (x < xRange[1])
+                mask[:-1] += mask[1:]
+                m2 = mask.copy()
+                mask[1:] += m2[:-1]
+                x = x[mask]
+                y = y[mask]
+                
+                x *= sx
+                y *= sy
+                
+                #fh.write('<g fill="none" stroke="#%s" stroke-opacity="1" stroke-width="1">\n' % color)
+                fh.write('<path fill="none" stroke="#%s" stroke-opacity="%f" stroke-width="1" d="M%f,%f ' % (color, opacity, x[0], y[0]))
+                for i in range(1, len(x)):
+                    fh.write('L%f,%f ' % (x[i], y[i]))
+                
+                fh.write('"/>')
+                #fh.write("</g>")
+        for item in self.dataItems:
+            if isinstance(item, ScatterPlotItem):
+                
+                pRect = item.boundingRect()
+                vRect = pRect.intersected(rect)
+                
+                for point in item.points():
+                    pos = point.pos()
+                    if not rect.contains(pos):
+                        continue
+                    color = fn.colorStr(point.brush.color())
+                    opacity = point.brush.color().alpha() / 255.
+                    color = color[:6]
+                    x = pos.x() * sx
+                    y = pos.y() * sy
+                    
+                    fh.write('<circle cx="%f" cy="%f" r="1" fill="#%s" stroke="none" fill-opacity="%f"/>\n' % (x, y, color, opacity))
+                    #fh.write('<path fill="none" stroke="#%s" stroke-opacity="%f" stroke-width="1" d="M%f,%f ' % (color, opacity, x[0], y[0]))
+                    #for i in xrange(1, len(x)):
+                        #fh.write('L%f,%f ' % (x[i], y[i]))
+                    
+                    #fh.write('"/>')
+            
+        ## get list of curves, scatter plots
+        
+        
+        fh.write("</svg>\n")
+        
+        
+    
+    def writeSvg(self, fileName=None):
+        if fileName is None:
+            fileName = QtGui.QFileDialog.getSaveFileName()
+        fileName = str(fileName)
+        PlotItem.lastFileDir = os.path.dirname(fileName)
+        
+        from ...exporters import SVGExporter
+        ex = SVGExporter(self)
+        ex.export(fileName)
+        
+    def writeImage(self, fileName=None):
+        if fileName is None:
+            self.fileDialog = FileDialog()
+            if PlotItem.lastFileDir is not None:
+                self.fileDialog.setDirectory(PlotItem.lastFileDir)
+            self.fileDialog.setFileMode(QtGui.QFileDialog.AnyFile)
+            self.fileDialog.setAcceptMode(QtGui.QFileDialog.AcceptSave) 
+            self.fileDialog.show()
+            self.fileDialog.fileSelected.connect(self.writeImage)
+            return
+        #if fileName is None:
+            #fileName = QtGui.QFileDialog.getSaveFileName()
+        if isinstance(fileName, tuple):
+            raise Exception("Not implemented yet..")
+        fileName = str(fileName)
+        PlotItem.lastFileDir = os.path.dirname(fileName)
+        self.png = QtGui.QImage(int(self.size().width()), int(self.size().height()), QtGui.QImage.Format_ARGB32)
+        painter = QtGui.QPainter(self.png)
+        painter.setRenderHints(painter.Antialiasing | painter.TextAntialiasing)
+        self.scene().render(painter, QtCore.QRectF(), self.mapRectToScene(self.boundingRect()))
+        painter.end()
+        self.png.save(fileName)
+        
+    def writeCsv(self, fileName=None):
+        if fileName is None:
+            self.fileDialog = FileDialog()
+            if PlotItem.lastFileDir is not None:
+                self.fileDialog.setDirectory(PlotItem.lastFileDir)
+            self.fileDialog.setFileMode(QtGui.QFileDialog.AnyFile)
+            self.fileDialog.setAcceptMode(QtGui.QFileDialog.AcceptSave) 
+            self.fileDialog.show()
+            self.fileDialog.fileSelected.connect(self.writeCsv)
+            return
+        #if fileName is None:
+            #fileName = QtGui.QFileDialog.getSaveFileName()
+        fileName = str(fileName)
+        PlotItem.lastFileDir = os.path.dirname(fileName)
+        
+        fd = open(fileName, 'w')
+        data = [c.getData() for c in self.curves]
+        i = 0
+        while True:
+            done = True
+            for d in data:
+                if i < len(d[0]):
+                    fd.write('%g,%g,'%(d[0][i], d[1][i]))
+                    done = False
+                else:
+                    fd.write(' , ,')
+            fd.write('\n')
+            if done:
+                break
+            i += 1
+        fd.close()
+
+
+    def saveState(self):
+        state = self.stateGroup.state()
+        state['paramList'] = self.paramList.copy()
+        state['view'] = self.vb.getState()
+        return state
+        
+    def restoreState(self, state):
+        if 'paramList' in state:
+            self.paramList = state['paramList'].copy()
+            
+        self.stateGroup.setState(state)
+        self.updateSpectrumMode()
+        self.updateDownsampling()
+        self.updateAlpha()
+        self.updateDecimation()
+        
+        if 'powerSpectrumGroup' in state:
+            state['fftCheck'] = state['powerSpectrumGroup']
+        if 'gridGroup' in state:
+            state['xGridCheck'] = state['gridGroup']
+            state['yGridCheck'] = state['gridGroup']
+            
+        self.stateGroup.setState(state)
+        self.updateParamList()
+        
+        if 'view' not in state:
+            r = [[float(state['xMinText']), float(state['xMaxText'])], [float(state['yMinText']), float(state['yMaxText'])]]
+            state['view'] = {
+                'autoRange': [state['xAutoRadio'], state['yAutoRadio']],
+                'linkedViews': [state['xLinkCombo'], state['yLinkCombo']],
+                'targetRange': r,
+                'viewRange': r,
+            }
+        self.vb.setState(state['view'])
+        
+
+    def widgetGroupInterface(self):
+        return (None, PlotItem.saveState, PlotItem.restoreState)
+      
+    def updateSpectrumMode(self, b=None):
+        if b is None:
+            b = self.ctrl.fftCheck.isChecked()
+        for c in self.curves:
+            c.setFftMode(b)
+        self.enableAutoRange()
+        self.recomputeAverages()
+            
+    def updateLogMode(self):
+        x = self.ctrl.logXCheck.isChecked()
+        y = self.ctrl.logYCheck.isChecked()
+        for i in self.items:
+            if hasattr(i, 'setLogMode'):
+                i.setLogMode(x,y)
+        self.getAxis('bottom').setLogMode(x)
+        self.getAxis('top').setLogMode(x)
+        self.getAxis('left').setLogMode(y)
+        self.getAxis('right').setLogMode(y)
+        self.enableAutoRange()
+        self.recomputeAverages()
+        
+    def setDownsampling(self, ds=None, auto=None, mode=None):
+        """Change the default downsampling mode for all PlotDataItems managed by this plot.
+        
+        =============== =================================================================
+        **Arguments:**
+        ds              (int) Reduce visible plot samples by this factor, or
+                        (bool) To enable/disable downsampling without changing the value.
+        auto            (bool) If True, automatically pick *ds* based on visible range
+        mode            'subsample': Downsample by taking the first of N samples.
+                        This method is fastest and least accurate.
+                        'mean': Downsample by taking the mean of N samples.
+                        'peak': Downsample by drawing a saw wave that follows the min
+                        and max of the original data. This method produces the best
+                        visual representation of the data but is slower.
+        =============== =================================================================
+        """
+        if ds is not None:
+            if ds is False:
+                self.ctrl.downsampleCheck.setChecked(False)
+            elif ds is True:
+                self.ctrl.downsampleCheck.setChecked(True)
+            else:
+                self.ctrl.downsampleCheck.setChecked(True)
+                self.ctrl.downsampleSpin.setValue(ds)
+                
+        if auto is not None:
+            if auto and ds is not False:
+                self.ctrl.downsampleCheck.setChecked(True)
+            self.ctrl.autoDownsampleCheck.setChecked(auto)
+            
+        if mode is not None:
+            if mode == 'subsample':
+                self.ctrl.subsampleRadio.setChecked(True)
+            elif mode == 'mean':
+                self.ctrl.meanRadio.setChecked(True)
+            elif mode == 'peak':
+                self.ctrl.peakRadio.setChecked(True)
+            else:
+                raise ValueError("mode argument must be 'subsample', 'mean', or 'peak'.")
+            
+    def updateDownsampling(self):
+        ds, auto, method = self.downsampleMode()
+        clip = self.ctrl.clipToViewCheck.isChecked()
+        for c in self.curves:
+            c.setDownsampling(ds, auto, method)
+            c.setClipToView(clip)
+        self.recomputeAverages()
+        
+    def downsampleMode(self):
+        if self.ctrl.downsampleCheck.isChecked():
+            ds = self.ctrl.downsampleSpin.value()
+        else:
+            ds = 1
+            
+        auto = self.ctrl.downsampleCheck.isChecked() and self.ctrl.autoDownsampleCheck.isChecked()
+            
+        if self.ctrl.subsampleRadio.isChecked():
+            method = 'subsample' 
+        elif self.ctrl.meanRadio.isChecked():
+            method = 'mean'
+        elif self.ctrl.peakRadio.isChecked():
+            method = 'peak'
+        
+        return ds, auto, method
+        
+    def setClipToView(self, clip):
+        """Set the default clip-to-view mode for all PlotDataItems managed by this plot.
+        If *clip* is True, then PlotDataItems will attempt to draw only points within the visible
+        range of the ViewBox."""
+        self.ctrl.clipToViewCheck.setChecked(clip)
+        
+    def clipToViewMode(self):
+        return self.ctrl.clipToViewCheck.isChecked()
+        
+        
+        
+    def updateDecimation(self):
+        if self.ctrl.maxTracesCheck.isChecked():
+            numCurves = self.ctrl.maxTracesSpin.value()
+        else:
+            numCurves = -1
+            
+        curves = self.curves[:]
+        split = len(curves) - numCurves
+        for i in range(len(curves)):
+            if numCurves == -1 or i >= split:
+                curves[i].show()
+            else:
+                if self.ctrl.forgetTracesCheck.isChecked():
+                    curves[i].clear()
+                    self.removeItem(curves[i])
+                else:
+                    curves[i].hide()
+        
+      
+    def updateAlpha(self, *args):
+        (alpha, auto) = self.alphaState()
+        for c in self.curves:
+            c.setAlpha(alpha**2, auto)
+     
+    def alphaState(self):
+        enabled = self.ctrl.alphaGroup.isChecked()
+        auto = self.ctrl.autoAlphaCheck.isChecked()
+        alpha = float(self.ctrl.alphaSlider.value()) / self.ctrl.alphaSlider.maximum()
+        if auto:
+            alpha = 1.0  ## should be 1/number of overlapping plots
+        if not enabled:
+            auto = False
+            alpha = 1.0
+        return (alpha, auto)
+
+    def pointMode(self):
+        if self.ctrl.pointsGroup.isChecked():
+            if self.ctrl.autoPointsCheck.isChecked():
+                mode = None
+            else:
+                mode = True
+        else:
+            mode = False
+        return mode
+        
+
+    def resizeEvent(self, ev):
+        if self.autoBtn is None:  ## already closed down
+            return
+        btnRect = self.mapRectFromItem(self.autoBtn, self.autoBtn.boundingRect())
+        y = self.size().height() - btnRect.height()
+        self.autoBtn.setPos(0, y)
+    
+    
+    def getMenu(self):
+        return self.ctrlMenu
+    
+    def getContextMenus(self, event):
+        ## called when another item is displaying its context menu; we get to add extras to the end of the menu.
+        if self.menuEnabled():
+            return self.ctrlMenu
+        else:
+            return None
+    
+    def setMenuEnabled(self, enableMenu=True, enableViewBoxMenu='same'):
+        """
+        Enable or disable the context menu for this PlotItem.
+        By default, the ViewBox's context menu will also be affected.
+        (use enableViewBoxMenu=None to leave the ViewBox unchanged)
+        """
+        self._menuEnabled = enableMenu
+        if enableViewBoxMenu is None:
+            return
+        if enableViewBoxMenu is 'same':
+            enableViewBoxMenu = enableMenu 
+        self.vb.setMenuEnabled(enableViewBoxMenu)
+    
+    def menuEnabled(self):
+        return self._menuEnabled
+    
+    def hoverEvent(self, ev):
+        if ev.enter:
+            self.mouseHovering = True
+        if ev.exit:
+            self.mouseHovering = False
+            
+        self.updateButtons()
+    
+
+    def getLabel(self, key):
+        pass
+        
+    def _checkScaleKey(self, key):
+        if key not in self.axes:
+            raise Exception("Scale '%s' not found. Scales are: %s" % (key, str(list(self.axes.keys()))))
+        
+    def getScale(self, key):
+        return self.getAxis(key)
+        
+    def getAxis(self, name):
+        """Return the specified AxisItem. 
+        *name* should be 'left', 'bottom', 'top', or 'right'."""
+        self._checkScaleKey(name)
+        return self.axes[name]['item']
+        
+    def setLabel(self, axis, text=None, units=None, unitPrefix=None, **args):
+        """
+        Set the label for an axis. Basic HTML formatting is allowed.
+        
+        ==============  =================================================================
+        **Arguments:**
+        axis            must be one of 'left', 'bottom', 'right', or 'top'
+        text            text to display along the axis. HTML allowed.
+        units           units to display after the title. If units are given,
+                        then an SI prefix will be automatically appended
+                        and the axis values will be scaled accordingly.
+                        (ie, use 'V' instead of 'mV'; 'm' will be added automatically)
+        ==============  =================================================================
+        """
+        self.getAxis(axis).setLabel(text=text, units=units, **args)
+        self.showAxis(axis)
+        
+    def setLabels(self, **kwds):
+        """
+        Convenience function allowing multiple labels and/or title to be set in one call.
+        Keyword arguments can be 'title', 'left', 'bottom', 'right', or 'top'.
+        Values may be strings or a tuple of arguments to pass to setLabel.
+        """
+        for k,v in kwds.items():
+            if k == 'title':
+                self.setTitle(v)
+            else:
+                if isinstance(v, basestring):
+                    v = (v,)
+                self.setLabel(k, *v)
+        
+        
+    def showLabel(self, axis, show=True):
+        """
+        Show or hide one of the plot's axis labels (the axis itself will be unaffected).
+        axis must be one of 'left', 'bottom', 'right', or 'top'
+        """
+        self.getScale(axis).showLabel(show)
+
+    def setTitle(self, title=None, **args):
+        """
+        Set the title of the plot. Basic HTML formatting is allowed.
+        If title is None, then the title will be hidden.
+        """
+        if title is None:
+            self.titleLabel.setVisible(False)
+            self.layout.setRowFixedHeight(0, 0)
+            self.titleLabel.setMaximumHeight(0)
+        else:
+            self.titleLabel.setMaximumHeight(30)
+            self.layout.setRowFixedHeight(0, 30)
+            self.titleLabel.setVisible(True)
+            self.titleLabel.setText(title, **args)
+
+    def showAxis(self, axis, show=True):
+        """
+        Show or hide one of the plot's axes.
+        axis must be one of 'left', 'bottom', 'right', or 'top'
+        """
+        s = self.getScale(axis)
+        p = self.axes[axis]['pos']
+        if show:
+            s.show()
+        else:
+            s.hide()
+            
+    def hideAxis(self, axis):
+        """Hide one of the PlotItem's axes. ('left', 'bottom', 'right', or 'top')"""
+        self.showAxis(axis, False)
+            
+    def showScale(self, *args, **kargs):
+        print("Deprecated. use showAxis() instead")
+        return self.showAxis(*args, **kargs)
+            
+    def hideButtons(self):
+        """Causes auto-scale button ('A' in lower-left corner) to be hidden for this PlotItem"""
+        #self.ctrlBtn.hide()
+        self.buttonsHidden = True
+        self.updateButtons()
+        
+    def showButtons(self):
+        """Causes auto-scale button ('A' in lower-left corner) to be visible for this PlotItem"""
+        #self.ctrlBtn.hide()
+        self.buttonsHidden = False
+        self.updateButtons()
+        
+    def updateButtons(self):
+        try:
+            if self._exportOpts is False and self.mouseHovering and not self.buttonsHidden and not all(self.vb.autoRangeEnabled()):
+                self.autoBtn.show()
+            else:
+                self.autoBtn.hide()
+        except RuntimeError:
+            pass  # this can happen if the plot has been deleted.
+            
+    def _plotArray(self, arr, x=None, **kargs):
+        if arr.ndim != 1:
+            raise Exception("Array must be 1D to plot (shape is %s)" % arr.shape)
+        if x is None:
+            x = np.arange(arr.shape[0])
+        if x.ndim != 1:
+            raise Exception("X array must be 1D to plot (shape is %s)" % x.shape)
+        c = PlotCurveItem(arr, x=x, **kargs)
+        return c
+            
+        
+        
+    def _plotMetaArray(self, arr, x=None, autoLabel=True, **kargs):
+        inf = arr.infoCopy()
+        if arr.ndim != 1:
+            raise Exception('can only automatically plot 1 dimensional arrays.')
+        ## create curve
+        try:
+            xv = arr.xvals(0)
+        except:
+            if x is None:
+                xv = np.arange(arr.shape[0])
+            else:
+                xv = x
+        c = PlotCurveItem(**kargs)
+        c.setData(x=xv, y=arr.view(np.ndarray))
+        
+        if autoLabel:
+            name = arr._info[0].get('name', None)
+            units = arr._info[0].get('units', None)
+            self.setLabel('bottom', text=name, units=units)
+            
+            name = arr._info[1].get('name', None)
+            units = arr._info[1].get('units', None)
+            self.setLabel('left', text=name, units=units)
+            
+        return c
+
+      
+    def setExportMode(self, export, opts=None):
+        GraphicsWidget.setExportMode(self, export, opts)
+        self.updateButtons()
+        #if export:
+            #self.autoBtn.hide()
+        #else:
+            #self.autoBtn.show()
+    
diff --git a/libs/pyqtgraph/graphicsItems/PlotItem/__init__.py b/libs/pyqtgraph/graphicsItems/PlotItem/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..d797978c7924832cdbd10cabccbc23425dd51029
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/PlotItem/__init__.py
@@ -0,0 +1 @@
+from .PlotItem import PlotItem
diff --git a/libs/pyqtgraph/graphicsItems/PlotItem/plotConfigTemplate.ui b/libs/pyqtgraph/graphicsItems/PlotItem/plotConfigTemplate.ui
new file mode 100644
index 0000000000000000000000000000000000000000..dffc62d04f9c993a5b6b2393833c4dd18153ab24
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/PlotItem/plotConfigTemplate.ui
@@ -0,0 +1,343 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>481</width>
+    <height>840</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <widget class="QGroupBox" name="averageGroup">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>640</y>
+     <width>242</width>
+     <height>182</height>
+    </rect>
+   </property>
+   <property name="toolTip">
+    <string>Display averages of the curves displayed in this plot. The parameter list allows you to choose parameters to average over (if any are available).</string>
+   </property>
+   <property name="title">
+    <string>Average</string>
+   </property>
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>false</bool>
+   </property>
+   <layout class="QGridLayout" name="gridLayout_5">
+    <property name="margin">
+     <number>0</number>
+    </property>
+    <property name="spacing">
+     <number>0</number>
+    </property>
+    <item row="0" column="0">
+     <widget class="QListWidget" name="avgParamList"/>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QFrame" name="decimateGroup">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>140</y>
+     <width>191</width>
+     <height>171</height>
+    </rect>
+   </property>
+   <layout class="QGridLayout" name="gridLayout_4">
+    <property name="margin">
+     <number>0</number>
+    </property>
+    <property name="spacing">
+     <number>0</number>
+    </property>
+    <item row="7" column="0" colspan="3">
+     <widget class="QCheckBox" name="clipToViewCheck">
+      <property name="toolTip">
+       <string>Plot only the portion of each curve that is visible. This assumes X values are uniformly spaced.</string>
+      </property>
+      <property name="text">
+       <string>Clip to View</string>
+      </property>
+     </widget>
+    </item>
+    <item row="8" column="0" colspan="2">
+     <widget class="QCheckBox" name="maxTracesCheck">
+      <property name="toolTip">
+       <string>If multiple curves are displayed in this plot, check this box to limit the number of traces that are displayed.</string>
+      </property>
+      <property name="text">
+       <string>Max Traces:</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="0" colspan="3">
+     <widget class="QCheckBox" name="downsampleCheck">
+      <property name="text">
+       <string>Downsample</string>
+      </property>
+     </widget>
+    </item>
+    <item row="6" column="1" colspan="2">
+     <widget class="QRadioButton" name="peakRadio">
+      <property name="toolTip">
+       <string>Downsample by drawing a saw wave that follows the min and max of the original data. This method produces the best visual representation of the data but is slower.</string>
+      </property>
+      <property name="text">
+       <string>Peak</string>
+      </property>
+      <property name="checked">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+    <item row="8" column="2">
+     <widget class="QSpinBox" name="maxTracesSpin">
+      <property name="toolTip">
+       <string>If multiple curves are displayed in this plot, check &quot;Max Traces&quot; and set this value to limit the number of traces that are displayed.</string>
+      </property>
+     </widget>
+    </item>
+    <item row="9" column="0" colspan="3">
+     <widget class="QCheckBox" name="forgetTracesCheck">
+      <property name="toolTip">
+       <string>If MaxTraces is checked, remove curves from memory after they are hidden (saves memory, but traces can not be un-hidden).</string>
+      </property>
+      <property name="text">
+       <string>Forget hidden traces</string>
+      </property>
+     </widget>
+    </item>
+    <item row="3" column="1" colspan="2">
+     <widget class="QRadioButton" name="meanRadio">
+      <property name="toolTip">
+       <string>Downsample by taking the mean of N samples.</string>
+      </property>
+      <property name="text">
+       <string>Mean</string>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="1" colspan="2">
+     <widget class="QRadioButton" name="subsampleRadio">
+      <property name="toolTip">
+       <string>Downsample by taking the first of N samples. This method is fastest and least accurate.</string>
+      </property>
+      <property name="text">
+       <string>Subsample</string>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="2">
+     <widget class="QCheckBox" name="autoDownsampleCheck">
+      <property name="toolTip">
+       <string>Automatically downsample data based on the visible range. This assumes X values are uniformly spaced.</string>
+      </property>
+      <property name="text">
+       <string>Auto</string>
+      </property>
+      <property name="checked">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="0">
+     <spacer name="horizontalSpacer">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="sizeType">
+       <enum>QSizePolicy::Maximum</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>30</width>
+        <height>20</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+    <item row="1" column="1">
+     <widget class="QSpinBox" name="downsampleSpin">
+      <property name="toolTip">
+       <string>Downsample data before plotting. (plot every Nth sample)</string>
+      </property>
+      <property name="suffix">
+       <string>x</string>
+      </property>
+      <property name="minimum">
+       <number>1</number>
+      </property>
+      <property name="maximum">
+       <number>100000</number>
+      </property>
+      <property name="value">
+       <number>1</number>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QFrame" name="transformGroup">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>154</width>
+     <height>79</height>
+    </rect>
+   </property>
+   <layout class="QGridLayout" name="gridLayout">
+    <item row="0" column="0">
+     <widget class="QCheckBox" name="fftCheck">
+      <property name="text">
+       <string>Power Spectrum (FFT)</string>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="0">
+     <widget class="QCheckBox" name="logXCheck">
+      <property name="text">
+       <string>Log X</string>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="0">
+     <widget class="QCheckBox" name="logYCheck">
+      <property name="text">
+       <string>Log Y</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QGroupBox" name="pointsGroup">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>550</y>
+     <width>234</width>
+     <height>58</height>
+    </rect>
+   </property>
+   <property name="title">
+    <string>Points</string>
+   </property>
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <layout class="QVBoxLayout" name="verticalLayout_5">
+    <item>
+     <widget class="QCheckBox" name="autoPointsCheck">
+      <property name="text">
+       <string>Auto</string>
+      </property>
+      <property name="checked">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QFrame" name="gridGroup">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>460</y>
+     <width>221</width>
+     <height>81</height>
+    </rect>
+   </property>
+   <layout class="QGridLayout" name="gridLayout_2">
+    <item row="0" column="0" colspan="2">
+     <widget class="QCheckBox" name="xGridCheck">
+      <property name="text">
+       <string>Show X Grid</string>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="0" colspan="2">
+     <widget class="QCheckBox" name="yGridCheck">
+      <property name="text">
+       <string>Show Y Grid</string>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="1">
+     <widget class="QSlider" name="gridAlphaSlider">
+      <property name="maximum">
+       <number>255</number>
+      </property>
+      <property name="value">
+       <number>128</number>
+      </property>
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="0">
+     <widget class="QLabel" name="label">
+      <property name="text">
+       <string>Opacity</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QGroupBox" name="alphaGroup">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>390</y>
+     <width>234</width>
+     <height>60</height>
+    </rect>
+   </property>
+   <property name="title">
+    <string>Alpha</string>
+   </property>
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <layout class="QHBoxLayout" name="horizontalLayout">
+    <item>
+     <widget class="QCheckBox" name="autoAlphaCheck">
+      <property name="text">
+       <string>Auto</string>
+      </property>
+      <property name="checked">
+       <bool>false</bool>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QSlider" name="alphaSlider">
+      <property name="maximum">
+       <number>1000</number>
+      </property>
+      <property name="value">
+       <number>1000</number>
+      </property>
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/libs/pyqtgraph/graphicsItems/PlotItem/plotConfigTemplate_pyqt.py b/libs/pyqtgraph/graphicsItems/PlotItem/plotConfigTemplate_pyqt.py
new file mode 100644
index 0000000000000000000000000000000000000000..e09c9978106d3830e85161968a7aa8198d798a02
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/PlotItem/plotConfigTemplate_pyqt.py
@@ -0,0 +1,182 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file './pyqtgraph/graphicsItems/PlotItem/plotConfigTemplate.ui'
+#
+# Created: Mon Dec 23 10:10:51 2013
+#      by: PyQt4 UI code generator 4.10
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt4 import QtCore, QtGui
+
+try:
+    _fromUtf8 = QtCore.QString.fromUtf8
+except AttributeError:
+    def _fromUtf8(s):
+        return s
+
+try:
+    _encoding = QtGui.QApplication.UnicodeUTF8
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig, _encoding)
+except AttributeError:
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig)
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName(_fromUtf8("Form"))
+        Form.resize(481, 840)
+        self.averageGroup = QtGui.QGroupBox(Form)
+        self.averageGroup.setGeometry(QtCore.QRect(0, 640, 242, 182))
+        self.averageGroup.setCheckable(True)
+        self.averageGroup.setChecked(False)
+        self.averageGroup.setObjectName(_fromUtf8("averageGroup"))
+        self.gridLayout_5 = QtGui.QGridLayout(self.averageGroup)
+        self.gridLayout_5.setMargin(0)
+        self.gridLayout_5.setSpacing(0)
+        self.gridLayout_5.setObjectName(_fromUtf8("gridLayout_5"))
+        self.avgParamList = QtGui.QListWidget(self.averageGroup)
+        self.avgParamList.setObjectName(_fromUtf8("avgParamList"))
+        self.gridLayout_5.addWidget(self.avgParamList, 0, 0, 1, 1)
+        self.decimateGroup = QtGui.QFrame(Form)
+        self.decimateGroup.setGeometry(QtCore.QRect(10, 140, 191, 171))
+        self.decimateGroup.setObjectName(_fromUtf8("decimateGroup"))
+        self.gridLayout_4 = QtGui.QGridLayout(self.decimateGroup)
+        self.gridLayout_4.setMargin(0)
+        self.gridLayout_4.setSpacing(0)
+        self.gridLayout_4.setObjectName(_fromUtf8("gridLayout_4"))
+        self.clipToViewCheck = QtGui.QCheckBox(self.decimateGroup)
+        self.clipToViewCheck.setObjectName(_fromUtf8("clipToViewCheck"))
+        self.gridLayout_4.addWidget(self.clipToViewCheck, 7, 0, 1, 3)
+        self.maxTracesCheck = QtGui.QCheckBox(self.decimateGroup)
+        self.maxTracesCheck.setObjectName(_fromUtf8("maxTracesCheck"))
+        self.gridLayout_4.addWidget(self.maxTracesCheck, 8, 0, 1, 2)
+        self.downsampleCheck = QtGui.QCheckBox(self.decimateGroup)
+        self.downsampleCheck.setObjectName(_fromUtf8("downsampleCheck"))
+        self.gridLayout_4.addWidget(self.downsampleCheck, 0, 0, 1, 3)
+        self.peakRadio = QtGui.QRadioButton(self.decimateGroup)
+        self.peakRadio.setChecked(True)
+        self.peakRadio.setObjectName(_fromUtf8("peakRadio"))
+        self.gridLayout_4.addWidget(self.peakRadio, 6, 1, 1, 2)
+        self.maxTracesSpin = QtGui.QSpinBox(self.decimateGroup)
+        self.maxTracesSpin.setObjectName(_fromUtf8("maxTracesSpin"))
+        self.gridLayout_4.addWidget(self.maxTracesSpin, 8, 2, 1, 1)
+        self.forgetTracesCheck = QtGui.QCheckBox(self.decimateGroup)
+        self.forgetTracesCheck.setObjectName(_fromUtf8("forgetTracesCheck"))
+        self.gridLayout_4.addWidget(self.forgetTracesCheck, 9, 0, 1, 3)
+        self.meanRadio = QtGui.QRadioButton(self.decimateGroup)
+        self.meanRadio.setObjectName(_fromUtf8("meanRadio"))
+        self.gridLayout_4.addWidget(self.meanRadio, 3, 1, 1, 2)
+        self.subsampleRadio = QtGui.QRadioButton(self.decimateGroup)
+        self.subsampleRadio.setObjectName(_fromUtf8("subsampleRadio"))
+        self.gridLayout_4.addWidget(self.subsampleRadio, 2, 1, 1, 2)
+        self.autoDownsampleCheck = QtGui.QCheckBox(self.decimateGroup)
+        self.autoDownsampleCheck.setChecked(True)
+        self.autoDownsampleCheck.setObjectName(_fromUtf8("autoDownsampleCheck"))
+        self.gridLayout_4.addWidget(self.autoDownsampleCheck, 1, 2, 1, 1)
+        spacerItem = QtGui.QSpacerItem(30, 20, QtGui.QSizePolicy.Maximum, QtGui.QSizePolicy.Minimum)
+        self.gridLayout_4.addItem(spacerItem, 2, 0, 1, 1)
+        self.downsampleSpin = QtGui.QSpinBox(self.decimateGroup)
+        self.downsampleSpin.setMinimum(1)
+        self.downsampleSpin.setMaximum(100000)
+        self.downsampleSpin.setProperty("value", 1)
+        self.downsampleSpin.setObjectName(_fromUtf8("downsampleSpin"))
+        self.gridLayout_4.addWidget(self.downsampleSpin, 1, 1, 1, 1)
+        self.transformGroup = QtGui.QFrame(Form)
+        self.transformGroup.setGeometry(QtCore.QRect(0, 0, 154, 79))
+        self.transformGroup.setObjectName(_fromUtf8("transformGroup"))
+        self.gridLayout = QtGui.QGridLayout(self.transformGroup)
+        self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
+        self.fftCheck = QtGui.QCheckBox(self.transformGroup)
+        self.fftCheck.setObjectName(_fromUtf8("fftCheck"))
+        self.gridLayout.addWidget(self.fftCheck, 0, 0, 1, 1)
+        self.logXCheck = QtGui.QCheckBox(self.transformGroup)
+        self.logXCheck.setObjectName(_fromUtf8("logXCheck"))
+        self.gridLayout.addWidget(self.logXCheck, 1, 0, 1, 1)
+        self.logYCheck = QtGui.QCheckBox(self.transformGroup)
+        self.logYCheck.setObjectName(_fromUtf8("logYCheck"))
+        self.gridLayout.addWidget(self.logYCheck, 2, 0, 1, 1)
+        self.pointsGroup = QtGui.QGroupBox(Form)
+        self.pointsGroup.setGeometry(QtCore.QRect(10, 550, 234, 58))
+        self.pointsGroup.setCheckable(True)
+        self.pointsGroup.setObjectName(_fromUtf8("pointsGroup"))
+        self.verticalLayout_5 = QtGui.QVBoxLayout(self.pointsGroup)
+        self.verticalLayout_5.setObjectName(_fromUtf8("verticalLayout_5"))
+        self.autoPointsCheck = QtGui.QCheckBox(self.pointsGroup)
+        self.autoPointsCheck.setChecked(True)
+        self.autoPointsCheck.setObjectName(_fromUtf8("autoPointsCheck"))
+        self.verticalLayout_5.addWidget(self.autoPointsCheck)
+        self.gridGroup = QtGui.QFrame(Form)
+        self.gridGroup.setGeometry(QtCore.QRect(10, 460, 221, 81))
+        self.gridGroup.setObjectName(_fromUtf8("gridGroup"))
+        self.gridLayout_2 = QtGui.QGridLayout(self.gridGroup)
+        self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2"))
+        self.xGridCheck = QtGui.QCheckBox(self.gridGroup)
+        self.xGridCheck.setObjectName(_fromUtf8("xGridCheck"))
+        self.gridLayout_2.addWidget(self.xGridCheck, 0, 0, 1, 2)
+        self.yGridCheck = QtGui.QCheckBox(self.gridGroup)
+        self.yGridCheck.setObjectName(_fromUtf8("yGridCheck"))
+        self.gridLayout_2.addWidget(self.yGridCheck, 1, 0, 1, 2)
+        self.gridAlphaSlider = QtGui.QSlider(self.gridGroup)
+        self.gridAlphaSlider.setMaximum(255)
+        self.gridAlphaSlider.setProperty("value", 128)
+        self.gridAlphaSlider.setOrientation(QtCore.Qt.Horizontal)
+        self.gridAlphaSlider.setObjectName(_fromUtf8("gridAlphaSlider"))
+        self.gridLayout_2.addWidget(self.gridAlphaSlider, 2, 1, 1, 1)
+        self.label = QtGui.QLabel(self.gridGroup)
+        self.label.setObjectName(_fromUtf8("label"))
+        self.gridLayout_2.addWidget(self.label, 2, 0, 1, 1)
+        self.alphaGroup = QtGui.QGroupBox(Form)
+        self.alphaGroup.setGeometry(QtCore.QRect(10, 390, 234, 60))
+        self.alphaGroup.setCheckable(True)
+        self.alphaGroup.setObjectName(_fromUtf8("alphaGroup"))
+        self.horizontalLayout = QtGui.QHBoxLayout(self.alphaGroup)
+        self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
+        self.autoAlphaCheck = QtGui.QCheckBox(self.alphaGroup)
+        self.autoAlphaCheck.setChecked(False)
+        self.autoAlphaCheck.setObjectName(_fromUtf8("autoAlphaCheck"))
+        self.horizontalLayout.addWidget(self.autoAlphaCheck)
+        self.alphaSlider = QtGui.QSlider(self.alphaGroup)
+        self.alphaSlider.setMaximum(1000)
+        self.alphaSlider.setProperty("value", 1000)
+        self.alphaSlider.setOrientation(QtCore.Qt.Horizontal)
+        self.alphaSlider.setObjectName(_fromUtf8("alphaSlider"))
+        self.horizontalLayout.addWidget(self.alphaSlider)
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        Form.setWindowTitle(_translate("Form", "Form", None))
+        self.averageGroup.setToolTip(_translate("Form", "Display averages of the curves displayed in this plot. The parameter list allows you to choose parameters to average over (if any are available).", None))
+        self.averageGroup.setTitle(_translate("Form", "Average", None))
+        self.clipToViewCheck.setToolTip(_translate("Form", "Plot only the portion of each curve that is visible. This assumes X values are uniformly spaced.", None))
+        self.clipToViewCheck.setText(_translate("Form", "Clip to View", None))
+        self.maxTracesCheck.setToolTip(_translate("Form", "If multiple curves are displayed in this plot, check this box to limit the number of traces that are displayed.", None))
+        self.maxTracesCheck.setText(_translate("Form", "Max Traces:", None))
+        self.downsampleCheck.setText(_translate("Form", "Downsample", None))
+        self.peakRadio.setToolTip(_translate("Form", "Downsample by drawing a saw wave that follows the min and max of the original data. This method produces the best visual representation of the data but is slower.", None))
+        self.peakRadio.setText(_translate("Form", "Peak", None))
+        self.maxTracesSpin.setToolTip(_translate("Form", "If multiple curves are displayed in this plot, check \"Max Traces\" and set this value to limit the number of traces that are displayed.", None))
+        self.forgetTracesCheck.setToolTip(_translate("Form", "If MaxTraces is checked, remove curves from memory after they are hidden (saves memory, but traces can not be un-hidden).", None))
+        self.forgetTracesCheck.setText(_translate("Form", "Forget hidden traces", None))
+        self.meanRadio.setToolTip(_translate("Form", "Downsample by taking the mean of N samples.", None))
+        self.meanRadio.setText(_translate("Form", "Mean", None))
+        self.subsampleRadio.setToolTip(_translate("Form", "Downsample by taking the first of N samples. This method is fastest and least accurate.", None))
+        self.subsampleRadio.setText(_translate("Form", "Subsample", None))
+        self.autoDownsampleCheck.setToolTip(_translate("Form", "Automatically downsample data based on the visible range. This assumes X values are uniformly spaced.", None))
+        self.autoDownsampleCheck.setText(_translate("Form", "Auto", None))
+        self.downsampleSpin.setToolTip(_translate("Form", "Downsample data before plotting. (plot every Nth sample)", None))
+        self.downsampleSpin.setSuffix(_translate("Form", "x", None))
+        self.fftCheck.setText(_translate("Form", "Power Spectrum (FFT)", None))
+        self.logXCheck.setText(_translate("Form", "Log X", None))
+        self.logYCheck.setText(_translate("Form", "Log Y", None))
+        self.pointsGroup.setTitle(_translate("Form", "Points", None))
+        self.autoPointsCheck.setText(_translate("Form", "Auto", None))
+        self.xGridCheck.setText(_translate("Form", "Show X Grid", None))
+        self.yGridCheck.setText(_translate("Form", "Show Y Grid", None))
+        self.label.setText(_translate("Form", "Opacity", None))
+        self.alphaGroup.setTitle(_translate("Form", "Alpha", None))
+        self.autoAlphaCheck.setText(_translate("Form", "Auto", None))
+
diff --git a/libs/pyqtgraph/graphicsItems/PlotItem/plotConfigTemplate_pyqt5.py b/libs/pyqtgraph/graphicsItems/PlotItem/plotConfigTemplate_pyqt5.py
new file mode 100644
index 0000000000000000000000000000000000000000..e9fdff248397e8fa75d518aca298271cd2504b48
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/PlotItem/plotConfigTemplate_pyqt5.py
@@ -0,0 +1,169 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file './pyqtgraph/graphicsItems/PlotItem/plotConfigTemplate.ui'
+#
+# Created: Wed Mar 26 15:09:28 2014
+#      by: PyQt5 UI code generator 5.0.1
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt5 import QtCore, QtGui, QtWidgets
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName("Form")
+        Form.resize(481, 840)
+        self.averageGroup = QtWidgets.QGroupBox(Form)
+        self.averageGroup.setGeometry(QtCore.QRect(0, 640, 242, 182))
+        self.averageGroup.setCheckable(True)
+        self.averageGroup.setChecked(False)
+        self.averageGroup.setObjectName("averageGroup")
+        self.gridLayout_5 = QtWidgets.QGridLayout(self.averageGroup)
+        self.gridLayout_5.setContentsMargins(0, 0, 0, 0)
+        self.gridLayout_5.setSpacing(0)
+        self.gridLayout_5.setObjectName("gridLayout_5")
+        self.avgParamList = QtWidgets.QListWidget(self.averageGroup)
+        self.avgParamList.setObjectName("avgParamList")
+        self.gridLayout_5.addWidget(self.avgParamList, 0, 0, 1, 1)
+        self.decimateGroup = QtWidgets.QFrame(Form)
+        self.decimateGroup.setGeometry(QtCore.QRect(10, 140, 191, 171))
+        self.decimateGroup.setObjectName("decimateGroup")
+        self.gridLayout_4 = QtWidgets.QGridLayout(self.decimateGroup)
+        self.gridLayout_4.setContentsMargins(0, 0, 0, 0)
+        self.gridLayout_4.setSpacing(0)
+        self.gridLayout_4.setObjectName("gridLayout_4")
+        self.clipToViewCheck = QtWidgets.QCheckBox(self.decimateGroup)
+        self.clipToViewCheck.setObjectName("clipToViewCheck")
+        self.gridLayout_4.addWidget(self.clipToViewCheck, 7, 0, 1, 3)
+        self.maxTracesCheck = QtWidgets.QCheckBox(self.decimateGroup)
+        self.maxTracesCheck.setObjectName("maxTracesCheck")
+        self.gridLayout_4.addWidget(self.maxTracesCheck, 8, 0, 1, 2)
+        self.downsampleCheck = QtWidgets.QCheckBox(self.decimateGroup)
+        self.downsampleCheck.setObjectName("downsampleCheck")
+        self.gridLayout_4.addWidget(self.downsampleCheck, 0, 0, 1, 3)
+        self.peakRadio = QtWidgets.QRadioButton(self.decimateGroup)
+        self.peakRadio.setChecked(True)
+        self.peakRadio.setObjectName("peakRadio")
+        self.gridLayout_4.addWidget(self.peakRadio, 6, 1, 1, 2)
+        self.maxTracesSpin = QtWidgets.QSpinBox(self.decimateGroup)
+        self.maxTracesSpin.setObjectName("maxTracesSpin")
+        self.gridLayout_4.addWidget(self.maxTracesSpin, 8, 2, 1, 1)
+        self.forgetTracesCheck = QtWidgets.QCheckBox(self.decimateGroup)
+        self.forgetTracesCheck.setObjectName("forgetTracesCheck")
+        self.gridLayout_4.addWidget(self.forgetTracesCheck, 9, 0, 1, 3)
+        self.meanRadio = QtWidgets.QRadioButton(self.decimateGroup)
+        self.meanRadio.setObjectName("meanRadio")
+        self.gridLayout_4.addWidget(self.meanRadio, 3, 1, 1, 2)
+        self.subsampleRadio = QtWidgets.QRadioButton(self.decimateGroup)
+        self.subsampleRadio.setObjectName("subsampleRadio")
+        self.gridLayout_4.addWidget(self.subsampleRadio, 2, 1, 1, 2)
+        self.autoDownsampleCheck = QtWidgets.QCheckBox(self.decimateGroup)
+        self.autoDownsampleCheck.setChecked(True)
+        self.autoDownsampleCheck.setObjectName("autoDownsampleCheck")
+        self.gridLayout_4.addWidget(self.autoDownsampleCheck, 1, 2, 1, 1)
+        spacerItem = QtWidgets.QSpacerItem(30, 20, QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Minimum)
+        self.gridLayout_4.addItem(spacerItem, 2, 0, 1, 1)
+        self.downsampleSpin = QtWidgets.QSpinBox(self.decimateGroup)
+        self.downsampleSpin.setMinimum(1)
+        self.downsampleSpin.setMaximum(100000)
+        self.downsampleSpin.setProperty("value", 1)
+        self.downsampleSpin.setObjectName("downsampleSpin")
+        self.gridLayout_4.addWidget(self.downsampleSpin, 1, 1, 1, 1)
+        self.transformGroup = QtWidgets.QFrame(Form)
+        self.transformGroup.setGeometry(QtCore.QRect(0, 0, 154, 79))
+        self.transformGroup.setObjectName("transformGroup")
+        self.gridLayout = QtWidgets.QGridLayout(self.transformGroup)
+        self.gridLayout.setObjectName("gridLayout")
+        self.fftCheck = QtWidgets.QCheckBox(self.transformGroup)
+        self.fftCheck.setObjectName("fftCheck")
+        self.gridLayout.addWidget(self.fftCheck, 0, 0, 1, 1)
+        self.logXCheck = QtWidgets.QCheckBox(self.transformGroup)
+        self.logXCheck.setObjectName("logXCheck")
+        self.gridLayout.addWidget(self.logXCheck, 1, 0, 1, 1)
+        self.logYCheck = QtWidgets.QCheckBox(self.transformGroup)
+        self.logYCheck.setObjectName("logYCheck")
+        self.gridLayout.addWidget(self.logYCheck, 2, 0, 1, 1)
+        self.pointsGroup = QtWidgets.QGroupBox(Form)
+        self.pointsGroup.setGeometry(QtCore.QRect(10, 550, 234, 58))
+        self.pointsGroup.setCheckable(True)
+        self.pointsGroup.setObjectName("pointsGroup")
+        self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.pointsGroup)
+        self.verticalLayout_5.setObjectName("verticalLayout_5")
+        self.autoPointsCheck = QtWidgets.QCheckBox(self.pointsGroup)
+        self.autoPointsCheck.setChecked(True)
+        self.autoPointsCheck.setObjectName("autoPointsCheck")
+        self.verticalLayout_5.addWidget(self.autoPointsCheck)
+        self.gridGroup = QtWidgets.QFrame(Form)
+        self.gridGroup.setGeometry(QtCore.QRect(10, 460, 221, 81))
+        self.gridGroup.setObjectName("gridGroup")
+        self.gridLayout_2 = QtWidgets.QGridLayout(self.gridGroup)
+        self.gridLayout_2.setObjectName("gridLayout_2")
+        self.xGridCheck = QtWidgets.QCheckBox(self.gridGroup)
+        self.xGridCheck.setObjectName("xGridCheck")
+        self.gridLayout_2.addWidget(self.xGridCheck, 0, 0, 1, 2)
+        self.yGridCheck = QtWidgets.QCheckBox(self.gridGroup)
+        self.yGridCheck.setObjectName("yGridCheck")
+        self.gridLayout_2.addWidget(self.yGridCheck, 1, 0, 1, 2)
+        self.gridAlphaSlider = QtWidgets.QSlider(self.gridGroup)
+        self.gridAlphaSlider.setMaximum(255)
+        self.gridAlphaSlider.setProperty("value", 128)
+        self.gridAlphaSlider.setOrientation(QtCore.Qt.Horizontal)
+        self.gridAlphaSlider.setObjectName("gridAlphaSlider")
+        self.gridLayout_2.addWidget(self.gridAlphaSlider, 2, 1, 1, 1)
+        self.label = QtWidgets.QLabel(self.gridGroup)
+        self.label.setObjectName("label")
+        self.gridLayout_2.addWidget(self.label, 2, 0, 1, 1)
+        self.alphaGroup = QtWidgets.QGroupBox(Form)
+        self.alphaGroup.setGeometry(QtCore.QRect(10, 390, 234, 60))
+        self.alphaGroup.setCheckable(True)
+        self.alphaGroup.setObjectName("alphaGroup")
+        self.horizontalLayout = QtWidgets.QHBoxLayout(self.alphaGroup)
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.autoAlphaCheck = QtWidgets.QCheckBox(self.alphaGroup)
+        self.autoAlphaCheck.setChecked(False)
+        self.autoAlphaCheck.setObjectName("autoAlphaCheck")
+        self.horizontalLayout.addWidget(self.autoAlphaCheck)
+        self.alphaSlider = QtWidgets.QSlider(self.alphaGroup)
+        self.alphaSlider.setMaximum(1000)
+        self.alphaSlider.setProperty("value", 1000)
+        self.alphaSlider.setOrientation(QtCore.Qt.Horizontal)
+        self.alphaSlider.setObjectName("alphaSlider")
+        self.horizontalLayout.addWidget(self.alphaSlider)
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        _translate = QtCore.QCoreApplication.translate
+        Form.setWindowTitle(_translate("Form", "Form"))
+        self.averageGroup.setToolTip(_translate("Form", "Display averages of the curves displayed in this plot. The parameter list allows you to choose parameters to average over (if any are available)."))
+        self.averageGroup.setTitle(_translate("Form", "Average"))
+        self.clipToViewCheck.setToolTip(_translate("Form", "Plot only the portion of each curve that is visible. This assumes X values are uniformly spaced."))
+        self.clipToViewCheck.setText(_translate("Form", "Clip to View"))
+        self.maxTracesCheck.setToolTip(_translate("Form", "If multiple curves are displayed in this plot, check this box to limit the number of traces that are displayed."))
+        self.maxTracesCheck.setText(_translate("Form", "Max Traces:"))
+        self.downsampleCheck.setText(_translate("Form", "Downsample"))
+        self.peakRadio.setToolTip(_translate("Form", "Downsample by drawing a saw wave that follows the min and max of the original data. This method produces the best visual representation of the data but is slower."))
+        self.peakRadio.setText(_translate("Form", "Peak"))
+        self.maxTracesSpin.setToolTip(_translate("Form", "If multiple curves are displayed in this plot, check \"Max Traces\" and set this value to limit the number of traces that are displayed."))
+        self.forgetTracesCheck.setToolTip(_translate("Form", "If MaxTraces is checked, remove curves from memory after they are hidden (saves memory, but traces can not be un-hidden)."))
+        self.forgetTracesCheck.setText(_translate("Form", "Forget hidden traces"))
+        self.meanRadio.setToolTip(_translate("Form", "Downsample by taking the mean of N samples."))
+        self.meanRadio.setText(_translate("Form", "Mean"))
+        self.subsampleRadio.setToolTip(_translate("Form", "Downsample by taking the first of N samples. This method is fastest and least accurate."))
+        self.subsampleRadio.setText(_translate("Form", "Subsample"))
+        self.autoDownsampleCheck.setToolTip(_translate("Form", "Automatically downsample data based on the visible range. This assumes X values are uniformly spaced."))
+        self.autoDownsampleCheck.setText(_translate("Form", "Auto"))
+        self.downsampleSpin.setToolTip(_translate("Form", "Downsample data before plotting. (plot every Nth sample)"))
+        self.downsampleSpin.setSuffix(_translate("Form", "x"))
+        self.fftCheck.setText(_translate("Form", "Power Spectrum (FFT)"))
+        self.logXCheck.setText(_translate("Form", "Log X"))
+        self.logYCheck.setText(_translate("Form", "Log Y"))
+        self.pointsGroup.setTitle(_translate("Form", "Points"))
+        self.autoPointsCheck.setText(_translate("Form", "Auto"))
+        self.xGridCheck.setText(_translate("Form", "Show X Grid"))
+        self.yGridCheck.setText(_translate("Form", "Show Y Grid"))
+        self.label.setText(_translate("Form", "Opacity"))
+        self.alphaGroup.setTitle(_translate("Form", "Alpha"))
+        self.autoAlphaCheck.setText(_translate("Form", "Auto"))
+
diff --git a/libs/pyqtgraph/graphicsItems/PlotItem/plotConfigTemplate_pyside.py b/libs/pyqtgraph/graphicsItems/PlotItem/plotConfigTemplate_pyside.py
new file mode 100644
index 0000000000000000000000000000000000000000..aff3121179c391fcb3b9917ae7e0d324ebf5f78e
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/PlotItem/plotConfigTemplate_pyside.py
@@ -0,0 +1,168 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file './pyqtgraph/graphicsItems/PlotItem/plotConfigTemplate.ui'
+#
+# Created: Mon Dec 23 10:10:52 2013
+#      by: pyside-uic 0.2.14 running on PySide 1.1.2
+#
+# WARNING! All changes made in this file will be lost!
+
+from PySide import QtCore, QtGui
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName("Form")
+        Form.resize(481, 840)
+        self.averageGroup = QtGui.QGroupBox(Form)
+        self.averageGroup.setGeometry(QtCore.QRect(0, 640, 242, 182))
+        self.averageGroup.setCheckable(True)
+        self.averageGroup.setChecked(False)
+        self.averageGroup.setObjectName("averageGroup")
+        self.gridLayout_5 = QtGui.QGridLayout(self.averageGroup)
+        self.gridLayout_5.setContentsMargins(0, 0, 0, 0)
+        self.gridLayout_5.setSpacing(0)
+        self.gridLayout_5.setObjectName("gridLayout_5")
+        self.avgParamList = QtGui.QListWidget(self.averageGroup)
+        self.avgParamList.setObjectName("avgParamList")
+        self.gridLayout_5.addWidget(self.avgParamList, 0, 0, 1, 1)
+        self.decimateGroup = QtGui.QFrame(Form)
+        self.decimateGroup.setGeometry(QtCore.QRect(10, 140, 191, 171))
+        self.decimateGroup.setObjectName("decimateGroup")
+        self.gridLayout_4 = QtGui.QGridLayout(self.decimateGroup)
+        self.gridLayout_4.setContentsMargins(0, 0, 0, 0)
+        self.gridLayout_4.setSpacing(0)
+        self.gridLayout_4.setObjectName("gridLayout_4")
+        self.clipToViewCheck = QtGui.QCheckBox(self.decimateGroup)
+        self.clipToViewCheck.setObjectName("clipToViewCheck")
+        self.gridLayout_4.addWidget(self.clipToViewCheck, 7, 0, 1, 3)
+        self.maxTracesCheck = QtGui.QCheckBox(self.decimateGroup)
+        self.maxTracesCheck.setObjectName("maxTracesCheck")
+        self.gridLayout_4.addWidget(self.maxTracesCheck, 8, 0, 1, 2)
+        self.downsampleCheck = QtGui.QCheckBox(self.decimateGroup)
+        self.downsampleCheck.setObjectName("downsampleCheck")
+        self.gridLayout_4.addWidget(self.downsampleCheck, 0, 0, 1, 3)
+        self.peakRadio = QtGui.QRadioButton(self.decimateGroup)
+        self.peakRadio.setChecked(True)
+        self.peakRadio.setObjectName("peakRadio")
+        self.gridLayout_4.addWidget(self.peakRadio, 6, 1, 1, 2)
+        self.maxTracesSpin = QtGui.QSpinBox(self.decimateGroup)
+        self.maxTracesSpin.setObjectName("maxTracesSpin")
+        self.gridLayout_4.addWidget(self.maxTracesSpin, 8, 2, 1, 1)
+        self.forgetTracesCheck = QtGui.QCheckBox(self.decimateGroup)
+        self.forgetTracesCheck.setObjectName("forgetTracesCheck")
+        self.gridLayout_4.addWidget(self.forgetTracesCheck, 9, 0, 1, 3)
+        self.meanRadio = QtGui.QRadioButton(self.decimateGroup)
+        self.meanRadio.setObjectName("meanRadio")
+        self.gridLayout_4.addWidget(self.meanRadio, 3, 1, 1, 2)
+        self.subsampleRadio = QtGui.QRadioButton(self.decimateGroup)
+        self.subsampleRadio.setObjectName("subsampleRadio")
+        self.gridLayout_4.addWidget(self.subsampleRadio, 2, 1, 1, 2)
+        self.autoDownsampleCheck = QtGui.QCheckBox(self.decimateGroup)
+        self.autoDownsampleCheck.setChecked(True)
+        self.autoDownsampleCheck.setObjectName("autoDownsampleCheck")
+        self.gridLayout_4.addWidget(self.autoDownsampleCheck, 1, 2, 1, 1)
+        spacerItem = QtGui.QSpacerItem(30, 20, QtGui.QSizePolicy.Maximum, QtGui.QSizePolicy.Minimum)
+        self.gridLayout_4.addItem(spacerItem, 2, 0, 1, 1)
+        self.downsampleSpin = QtGui.QSpinBox(self.decimateGroup)
+        self.downsampleSpin.setMinimum(1)
+        self.downsampleSpin.setMaximum(100000)
+        self.downsampleSpin.setProperty("value", 1)
+        self.downsampleSpin.setObjectName("downsampleSpin")
+        self.gridLayout_4.addWidget(self.downsampleSpin, 1, 1, 1, 1)
+        self.transformGroup = QtGui.QFrame(Form)
+        self.transformGroup.setGeometry(QtCore.QRect(0, 0, 154, 79))
+        self.transformGroup.setObjectName("transformGroup")
+        self.gridLayout = QtGui.QGridLayout(self.transformGroup)
+        self.gridLayout.setObjectName("gridLayout")
+        self.fftCheck = QtGui.QCheckBox(self.transformGroup)
+        self.fftCheck.setObjectName("fftCheck")
+        self.gridLayout.addWidget(self.fftCheck, 0, 0, 1, 1)
+        self.logXCheck = QtGui.QCheckBox(self.transformGroup)
+        self.logXCheck.setObjectName("logXCheck")
+        self.gridLayout.addWidget(self.logXCheck, 1, 0, 1, 1)
+        self.logYCheck = QtGui.QCheckBox(self.transformGroup)
+        self.logYCheck.setObjectName("logYCheck")
+        self.gridLayout.addWidget(self.logYCheck, 2, 0, 1, 1)
+        self.pointsGroup = QtGui.QGroupBox(Form)
+        self.pointsGroup.setGeometry(QtCore.QRect(10, 550, 234, 58))
+        self.pointsGroup.setCheckable(True)
+        self.pointsGroup.setObjectName("pointsGroup")
+        self.verticalLayout_5 = QtGui.QVBoxLayout(self.pointsGroup)
+        self.verticalLayout_5.setObjectName("verticalLayout_5")
+        self.autoPointsCheck = QtGui.QCheckBox(self.pointsGroup)
+        self.autoPointsCheck.setChecked(True)
+        self.autoPointsCheck.setObjectName("autoPointsCheck")
+        self.verticalLayout_5.addWidget(self.autoPointsCheck)
+        self.gridGroup = QtGui.QFrame(Form)
+        self.gridGroup.setGeometry(QtCore.QRect(10, 460, 221, 81))
+        self.gridGroup.setObjectName("gridGroup")
+        self.gridLayout_2 = QtGui.QGridLayout(self.gridGroup)
+        self.gridLayout_2.setObjectName("gridLayout_2")
+        self.xGridCheck = QtGui.QCheckBox(self.gridGroup)
+        self.xGridCheck.setObjectName("xGridCheck")
+        self.gridLayout_2.addWidget(self.xGridCheck, 0, 0, 1, 2)
+        self.yGridCheck = QtGui.QCheckBox(self.gridGroup)
+        self.yGridCheck.setObjectName("yGridCheck")
+        self.gridLayout_2.addWidget(self.yGridCheck, 1, 0, 1, 2)
+        self.gridAlphaSlider = QtGui.QSlider(self.gridGroup)
+        self.gridAlphaSlider.setMaximum(255)
+        self.gridAlphaSlider.setProperty("value", 128)
+        self.gridAlphaSlider.setOrientation(QtCore.Qt.Horizontal)
+        self.gridAlphaSlider.setObjectName("gridAlphaSlider")
+        self.gridLayout_2.addWidget(self.gridAlphaSlider, 2, 1, 1, 1)
+        self.label = QtGui.QLabel(self.gridGroup)
+        self.label.setObjectName("label")
+        self.gridLayout_2.addWidget(self.label, 2, 0, 1, 1)
+        self.alphaGroup = QtGui.QGroupBox(Form)
+        self.alphaGroup.setGeometry(QtCore.QRect(10, 390, 234, 60))
+        self.alphaGroup.setCheckable(True)
+        self.alphaGroup.setObjectName("alphaGroup")
+        self.horizontalLayout = QtGui.QHBoxLayout(self.alphaGroup)
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.autoAlphaCheck = QtGui.QCheckBox(self.alphaGroup)
+        self.autoAlphaCheck.setChecked(False)
+        self.autoAlphaCheck.setObjectName("autoAlphaCheck")
+        self.horizontalLayout.addWidget(self.autoAlphaCheck)
+        self.alphaSlider = QtGui.QSlider(self.alphaGroup)
+        self.alphaSlider.setMaximum(1000)
+        self.alphaSlider.setProperty("value", 1000)
+        self.alphaSlider.setOrientation(QtCore.Qt.Horizontal)
+        self.alphaSlider.setObjectName("alphaSlider")
+        self.horizontalLayout.addWidget(self.alphaSlider)
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        Form.setWindowTitle(QtGui.QApplication.translate("Form", "Form", None, QtGui.QApplication.UnicodeUTF8))
+        self.averageGroup.setToolTip(QtGui.QApplication.translate("Form", "Display averages of the curves displayed in this plot. The parameter list allows you to choose parameters to average over (if any are available).", None, QtGui.QApplication.UnicodeUTF8))
+        self.averageGroup.setTitle(QtGui.QApplication.translate("Form", "Average", None, QtGui.QApplication.UnicodeUTF8))
+        self.clipToViewCheck.setToolTip(QtGui.QApplication.translate("Form", "Plot only the portion of each curve that is visible. This assumes X values are uniformly spaced.", None, QtGui.QApplication.UnicodeUTF8))
+        self.clipToViewCheck.setText(QtGui.QApplication.translate("Form", "Clip to View", None, QtGui.QApplication.UnicodeUTF8))
+        self.maxTracesCheck.setToolTip(QtGui.QApplication.translate("Form", "If multiple curves are displayed in this plot, check this box to limit the number of traces that are displayed.", None, QtGui.QApplication.UnicodeUTF8))
+        self.maxTracesCheck.setText(QtGui.QApplication.translate("Form", "Max Traces:", None, QtGui.QApplication.UnicodeUTF8))
+        self.downsampleCheck.setText(QtGui.QApplication.translate("Form", "Downsample", None, QtGui.QApplication.UnicodeUTF8))
+        self.peakRadio.setToolTip(QtGui.QApplication.translate("Form", "Downsample by drawing a saw wave that follows the min and max of the original data. This method produces the best visual representation of the data but is slower.", None, QtGui.QApplication.UnicodeUTF8))
+        self.peakRadio.setText(QtGui.QApplication.translate("Form", "Peak", None, QtGui.QApplication.UnicodeUTF8))
+        self.maxTracesSpin.setToolTip(QtGui.QApplication.translate("Form", "If multiple curves are displayed in this plot, check \"Max Traces\" and set this value to limit the number of traces that are displayed.", None, QtGui.QApplication.UnicodeUTF8))
+        self.forgetTracesCheck.setToolTip(QtGui.QApplication.translate("Form", "If MaxTraces is checked, remove curves from memory after they are hidden (saves memory, but traces can not be un-hidden).", None, QtGui.QApplication.UnicodeUTF8))
+        self.forgetTracesCheck.setText(QtGui.QApplication.translate("Form", "Forget hidden traces", None, QtGui.QApplication.UnicodeUTF8))
+        self.meanRadio.setToolTip(QtGui.QApplication.translate("Form", "Downsample by taking the mean of N samples.", None, QtGui.QApplication.UnicodeUTF8))
+        self.meanRadio.setText(QtGui.QApplication.translate("Form", "Mean", None, QtGui.QApplication.UnicodeUTF8))
+        self.subsampleRadio.setToolTip(QtGui.QApplication.translate("Form", "Downsample by taking the first of N samples. This method is fastest and least accurate.", None, QtGui.QApplication.UnicodeUTF8))
+        self.subsampleRadio.setText(QtGui.QApplication.translate("Form", "Subsample", None, QtGui.QApplication.UnicodeUTF8))
+        self.autoDownsampleCheck.setToolTip(QtGui.QApplication.translate("Form", "Automatically downsample data based on the visible range. This assumes X values are uniformly spaced.", None, QtGui.QApplication.UnicodeUTF8))
+        self.autoDownsampleCheck.setText(QtGui.QApplication.translate("Form", "Auto", None, QtGui.QApplication.UnicodeUTF8))
+        self.downsampleSpin.setToolTip(QtGui.QApplication.translate("Form", "Downsample data before plotting. (plot every Nth sample)", None, QtGui.QApplication.UnicodeUTF8))
+        self.downsampleSpin.setSuffix(QtGui.QApplication.translate("Form", "x", None, QtGui.QApplication.UnicodeUTF8))
+        self.fftCheck.setText(QtGui.QApplication.translate("Form", "Power Spectrum (FFT)", None, QtGui.QApplication.UnicodeUTF8))
+        self.logXCheck.setText(QtGui.QApplication.translate("Form", "Log X", None, QtGui.QApplication.UnicodeUTF8))
+        self.logYCheck.setText(QtGui.QApplication.translate("Form", "Log Y", None, QtGui.QApplication.UnicodeUTF8))
+        self.pointsGroup.setTitle(QtGui.QApplication.translate("Form", "Points", None, QtGui.QApplication.UnicodeUTF8))
+        self.autoPointsCheck.setText(QtGui.QApplication.translate("Form", "Auto", None, QtGui.QApplication.UnicodeUTF8))
+        self.xGridCheck.setText(QtGui.QApplication.translate("Form", "Show X Grid", None, QtGui.QApplication.UnicodeUTF8))
+        self.yGridCheck.setText(QtGui.QApplication.translate("Form", "Show Y Grid", None, QtGui.QApplication.UnicodeUTF8))
+        self.label.setText(QtGui.QApplication.translate("Form", "Opacity", None, QtGui.QApplication.UnicodeUTF8))
+        self.alphaGroup.setTitle(QtGui.QApplication.translate("Form", "Alpha", None, QtGui.QApplication.UnicodeUTF8))
+        self.autoAlphaCheck.setText(QtGui.QApplication.translate("Form", "Auto", None, QtGui.QApplication.UnicodeUTF8))
+
diff --git a/libs/pyqtgraph/graphicsItems/ROI.py b/libs/pyqtgraph/graphicsItems/ROI.py
new file mode 100644
index 0000000000000000000000000000000000000000..3aa19daaffa582c5d2c7f9e96e04999a8df97cc4
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/ROI.py
@@ -0,0 +1,2236 @@
+# -*- coding: utf-8 -*-
+"""
+ROI.py -  Interactive graphics items for GraphicsView (ROI widgets)
+Copyright 2010  Luke Campagnola
+Distributed under MIT/X11 license. See license.txt for more infomation.
+
+Implements a series of graphics items which display movable/scalable/rotatable shapes
+for use as region-of-interest markers. ROI class automatically handles extraction 
+of array data from ImageItems.
+
+The ROI class is meant to serve as the base for more specific types; see several examples
+of how to build an ROI at the bottom of the file.
+"""
+
+from ..Qt import QtCore, QtGui
+import numpy as np
+#from numpy.linalg import norm
+from ..Point import *
+from ..SRTTransform import SRTTransform
+from math import cos, sin
+from .. import functions as fn
+from .GraphicsObject import GraphicsObject
+from .UIGraphicsItem import UIGraphicsItem
+
+__all__ = [
+    'ROI', 
+    'TestROI', 'RectROI', 'EllipseROI', 'CircleROI', 'PolygonROI', 
+    'LineROI', 'MultiLineROI', 'MultiRectROI', 'LineSegmentROI', 'PolyLineROI', 'SpiralROI', 'CrosshairROI',
+]
+
+
+def rectStr(r):
+    return "[%f, %f] + [%f, %f]" % (r.x(), r.y(), r.width(), r.height())
+
+class ROI(GraphicsObject):
+    """
+    Generic region-of-interest widget.
+    
+    Can be used for implementing many types of selection box with 
+    rotate/translate/scale handles.
+    ROIs can be customized to have a variety of shapes (by subclassing or using
+    any of the built-in subclasses) and any combination of draggable handles
+    that allow the user to manipulate the ROI.
+    
+    
+    
+    ================ ===========================================================
+    **Arguments**
+    pos              (length-2 sequence) Indicates the position of the ROI's 
+                     origin. For most ROIs, this is the lower-left corner of
+                     its bounding rectangle.
+    size             (length-2 sequence) Indicates the width and height of the 
+                     ROI.
+    angle            (float) The rotation of the ROI in degrees. Default is 0.
+    invertible       (bool) If True, the user may resize the ROI to have 
+                     negative width or height (assuming the ROI has scale
+                     handles). Default is False.
+    maxBounds        (QRect, QRectF, or None) Specifies boundaries that the ROI 
+                     cannot be dragged outside of by the user. Default is None.
+    snapSize         (float) The spacing of snap positions used when *scaleSnap*
+                     or *translateSnap* are enabled. Default is 1.0.
+    scaleSnap        (bool) If True, the width and height of the ROI are forced
+                     to be integer multiples of *snapSize* when being resized
+                     by the user. Default is False.
+    translateSnap    (bool) If True, the x and y positions of the ROI are forced
+                     to be integer multiples of *snapSize* when being resized
+                     by the user. Default is False.
+    rotateSnap       (bool) If True, the ROI angle is forced to a multiple of 
+                     15 degrees when rotated by the user. Default is False.
+    parent           (QGraphicsItem) The graphics item parent of this ROI. It
+                     is generally not necessary to specify the parent.
+    pen              (QPen or argument to pg.mkPen) The pen to use when drawing
+                     the shape of the ROI.
+    movable          (bool) If True, the ROI can be moved by dragging anywhere 
+                     inside the ROI. Default is True.
+    removable        (bool) If True, the ROI will be given a context menu with
+                     an option to remove the ROI. The ROI emits
+                     sigRemoveRequested when this menu action is selected.
+                     Default is False.
+    ================ ===========================================================
+    
+    
+    
+    ======================= ====================================================
+    **Signals**
+    sigRegionChangeFinished Emitted when the user stops dragging the ROI (or
+                            one of its handles) or if the ROI is changed
+                            programatically.
+    sigRegionChangeStarted  Emitted when the user starts dragging the ROI (or
+                            one of its handles).
+    sigRegionChanged        Emitted any time the position of the ROI changes,
+                            including while it is being dragged by the user.
+    sigHoverEvent           Emitted when the mouse hovers over the ROI.
+    sigClicked              Emitted when the user clicks on the ROI.
+                            Note that clicking is disabled by default to prevent
+                            stealing clicks from objects behind the ROI. To 
+                            enable clicking, call 
+                            roi.setAcceptedMouseButtons(QtCore.Qt.LeftButton). 
+                            See QtGui.QGraphicsItem documentation for more 
+                            details.
+    sigRemoveRequested      Emitted when the user selects 'remove' from the 
+                            ROI's context menu (if available).
+    ======================= ====================================================
+    """
+    
+    sigRegionChangeFinished = QtCore.Signal(object)
+    sigRegionChangeStarted = QtCore.Signal(object)
+    sigRegionChanged = QtCore.Signal(object)
+    sigHoverEvent = QtCore.Signal(object)
+    sigClicked = QtCore.Signal(object, object)
+    sigRemoveRequested = QtCore.Signal(object)
+    
+    def __init__(self, pos, size=Point(1, 1), angle=0.0, invertible=False, maxBounds=None, snapSize=1.0, scaleSnap=False, translateSnap=False, rotateSnap=False, parent=None, pen=None, movable=True, removable=False):
+        #QObjectWorkaround.__init__(self)
+        GraphicsObject.__init__(self, parent)
+        self.setAcceptedMouseButtons(QtCore.Qt.NoButton)
+        pos = Point(pos)
+        size = Point(size)
+        self.aspectLocked = False
+        self.translatable = movable
+        self.rotateAllowed = True
+        self.removable = removable
+        self.menu = None
+        
+        self.freeHandleMoved = False ## keep track of whether free handles have moved since last change signal was emitted.
+        self.mouseHovering = False
+        if pen is None:
+            pen = (255, 255, 255)
+        self.setPen(pen)
+        
+        self.handlePen = QtGui.QPen(QtGui.QColor(150, 255, 255))
+        self.handles = []
+        self.state = {'pos': Point(0,0), 'size': Point(1,1), 'angle': 0}  ## angle is in degrees for ease of Qt integration
+        self.lastState = None
+        self.setPos(pos)
+        self.setAngle(angle)
+        self.setSize(size)
+        self.setZValue(10)
+        self.isMoving = False
+        
+        self.handleSize = 5
+        self.invertible = invertible
+        self.maxBounds = maxBounds
+        
+        self.snapSize = snapSize
+        self.translateSnap = translateSnap
+        self.rotateSnap = rotateSnap
+        self.scaleSnap = scaleSnap
+        #self.setFlag(self.ItemIsSelectable, True)
+    
+    def getState(self):
+        return self.stateCopy()
+
+    def stateCopy(self):
+        sc = {}
+        sc['pos'] = Point(self.state['pos'])
+        sc['size'] = Point(self.state['size'])
+        sc['angle'] = self.state['angle']
+        return sc
+        
+    def saveState(self):
+        """Return the state of the widget in a format suitable for storing to 
+        disk. (Points are converted to tuple)
+        
+        Combined with setState(), this allows ROIs to be easily saved and 
+        restored."""
+        state = {}
+        state['pos'] = tuple(self.state['pos'])
+        state['size'] = tuple(self.state['size'])
+        state['angle'] = self.state['angle']
+        return state
+    
+    def setState(self, state, update=True):
+        """
+        Set the state of the ROI from a structure generated by saveState() or
+        getState().
+        """
+        self.setPos(state['pos'], update=False)
+        self.setSize(state['size'], update=False)
+        self.setAngle(state['angle'], update=update)
+    
+    def setZValue(self, z):
+        QtGui.QGraphicsItem.setZValue(self, z)
+        for h in self.handles:
+            h['item'].setZValue(z+1)
+        
+    def parentBounds(self):
+        """
+        Return the bounding rectangle of this ROI in the coordinate system
+        of its parent.        
+        """
+        return self.mapToParent(self.boundingRect()).boundingRect()
+
+    def setPen(self, *args, **kwargs):
+        """
+        Set the pen to use when drawing the ROI shape.
+        For arguments, see :func:`mkPen <pyqtgraph.mkPen>`.
+        """
+        self.pen = fn.mkPen(*args, **kwargs)
+        self.currentPen = self.pen
+        self.update()
+        
+    def size(self):
+        """Return the size (w,h) of the ROI."""
+        return self.getState()['size']
+        
+    def pos(self):
+        """Return the position (x,y) of the ROI's origin. 
+        For most ROIs, this will be the lower-left corner."""
+        return self.getState()['pos']
+        
+    def angle(self):
+        """Return the angle of the ROI in degrees."""
+        return self.getState()['angle']
+        
+    def setPos(self, pos, update=True, finish=True):
+        """Set the position of the ROI (in the parent's coordinate system).
+        By default, this will cause both sigRegionChanged and sigRegionChangeFinished to be emitted.
+        
+        If finish is False, then sigRegionChangeFinished will not be emitted. You can then use 
+        stateChangeFinished() to cause the signal to be emitted after a series of state changes.
+        
+        If update is False, the state change will be remembered but not processed and no signals 
+        will be emitted. You can then use stateChanged() to complete the state change. This allows
+        multiple change functions to be called sequentially while minimizing processing overhead
+        and repeated signals. Setting update=False also forces finish=False.
+        """
+        
+        pos = Point(pos)
+        self.state['pos'] = pos
+        QtGui.QGraphicsItem.setPos(self, pos)
+        if update:
+            self.stateChanged(finish=finish)
+        
+    def setSize(self, size, update=True, finish=True):
+        """Set the size of the ROI. May be specified as a QPoint, Point, or list of two values.
+        See setPos() for an explanation of the update and finish arguments.
+        """
+        size = Point(size)
+        self.prepareGeometryChange()
+        self.state['size'] = size
+        if update:
+            self.stateChanged(finish=finish)
+        
+    def setAngle(self, angle, update=True, finish=True):
+        """Set the angle of rotation (in degrees) for this ROI.
+        See setPos() for an explanation of the update and finish arguments.
+        """
+        self.state['angle'] = angle
+        tr = QtGui.QTransform()
+        #tr.rotate(-angle * 180 / np.pi)
+        tr.rotate(angle)
+        self.setTransform(tr)
+        if update:
+            self.stateChanged(finish=finish)
+        
+    def scale(self, s, center=[0,0], update=True, finish=True):
+        """
+        Resize the ROI by scaling relative to *center*.
+        See setPos() for an explanation of the *update* and *finish* arguments.
+        """
+        c = self.mapToParent(Point(center) * self.state['size'])
+        self.prepareGeometryChange()
+        newSize = self.state['size'] * s
+        c1 = self.mapToParent(Point(center) * newSize)
+        newPos = self.state['pos'] + c - c1
+        
+        self.setSize(newSize, update=False)
+        self.setPos(newPos, update=update, finish=finish)
+        
+   
+    def translate(self, *args, **kargs):
+        """
+        Move the ROI to a new position.
+        Accepts either (x, y, snap) or ([x,y], snap) as arguments
+        If the ROI is bounded and the move would exceed boundaries, then the ROI
+        is moved to the nearest acceptable position instead.
+        
+        *snap* can be:
+        
+        =============== ==========================================================================
+        None (default)  use self.translateSnap and self.snapSize to determine whether/how to snap
+        False           do not snap
+        Point(w,h)      snap to rectangular grid with spacing (w,h)
+        True            snap using self.snapSize (and ignoring self.translateSnap)
+        =============== ==========================================================================
+           
+        Also accepts *update* and *finish* arguments (see setPos() for a description of these).
+        """
+
+        if len(args) == 1:
+            pt = args[0]
+        else:
+            pt = args
+            
+        newState = self.stateCopy()
+        newState['pos'] = newState['pos'] + pt
+        
+        ## snap position
+        #snap = kargs.get('snap', None)
+        #if (snap is not False)   and   not (snap is None and self.translateSnap is False):
+        
+        snap = kargs.get('snap', None)
+        if snap is None:
+            snap = self.translateSnap
+        if snap is not False:
+            newState['pos'] = self.getSnapPosition(newState['pos'], snap=snap)
+        
+        #d = ev.scenePos() - self.mapToScene(self.pressPos)
+        if self.maxBounds is not None:
+            r = self.stateRect(newState)
+            #r0 = self.sceneTransform().mapRect(self.boundingRect())
+            d = Point(0,0)
+            if self.maxBounds.left() > r.left():
+                d[0] = self.maxBounds.left() - r.left()
+            elif self.maxBounds.right() < r.right():
+                d[0] = self.maxBounds.right() - r.right()
+            if self.maxBounds.top() > r.top():
+                d[1] = self.maxBounds.top() - r.top()
+            elif self.maxBounds.bottom() < r.bottom():
+                d[1] = self.maxBounds.bottom() - r.bottom()
+            newState['pos'] += d
+        
+        #self.state['pos'] = newState['pos']
+        update = kargs.get('update', True)
+        finish = kargs.get('finish', True)
+        self.setPos(newState['pos'], update=update, finish=finish)
+        #if 'update' not in kargs or kargs['update'] is True:
+        #self.stateChanged()
+
+    def rotate(self, angle, update=True, finish=True):
+        """
+        Rotate the ROI by *angle* degrees. 
+        
+        Also accepts *update* and *finish* arguments (see setPos() for a 
+        description of these).
+        """
+        self.setAngle(self.angle()+angle, update=update, finish=finish)
+
+    def handleMoveStarted(self):
+        self.preMoveState = self.getState()
+    
+    def addTranslateHandle(self, pos, axes=None, item=None, name=None, index=None):
+        """
+        Add a new translation handle to the ROI. Dragging the handle will move 
+        the entire ROI without changing its angle or shape. 
+        
+        Note that, by default, ROIs may be moved by dragging anywhere inside the
+        ROI. However, for larger ROIs it may be desirable to disable this and
+        instead provide one or more translation handles.
+        
+        =================== ====================================================
+        **Arguments**
+        pos                 (length-2 sequence) The position of the handle 
+                            relative to the shape of the ROI. A value of (0,0)
+                            indicates the origin, whereas (1, 1) indicates the
+                            upper-right corner, regardless of the ROI's size.
+        item                The Handle instance to add. If None, a new handle
+                            will be created.
+        name                The name of this handle (optional). Handles are 
+                            identified by name when calling 
+                            getLocalHandlePositions and getSceneHandlePositions.
+        =================== ====================================================
+        """
+        pos = Point(pos)
+        return self.addHandle({'name': name, 'type': 't', 'pos': pos, 'item': item}, index=index)
+    
+    def addFreeHandle(self, pos=None, axes=None, item=None, name=None, index=None):
+        """
+        Add a new free handle to the ROI. Dragging free handles has no effect
+        on the position or shape of the ROI. 
+        
+        =================== ====================================================
+        **Arguments**
+        pos                 (length-2 sequence) The position of the handle 
+                            relative to the shape of the ROI. A value of (0,0)
+                            indicates the origin, whereas (1, 1) indicates the
+                            upper-right corner, regardless of the ROI's size.
+        item                The Handle instance to add. If None, a new handle
+                            will be created.
+        name                The name of this handle (optional). Handles are 
+                            identified by name when calling 
+                            getLocalHandlePositions and getSceneHandlePositions.
+        =================== ====================================================
+        """
+        if pos is not None:
+            pos = Point(pos)
+        return self.addHandle({'name': name, 'type': 'f', 'pos': pos, 'item': item}, index=index)
+    
+    def addScaleHandle(self, pos, center, axes=None, item=None, name=None, lockAspect=False, index=None):
+        """
+        Add a new scale handle to the ROI. Dragging a scale handle allows the
+        user to change the height and/or width of the ROI.
+        
+        =================== ====================================================
+        **Arguments**
+        pos                 (length-2 sequence) The position of the handle 
+                            relative to the shape of the ROI. A value of (0,0)
+                            indicates the origin, whereas (1, 1) indicates the
+                            upper-right corner, regardless of the ROI's size.
+        center              (length-2 sequence) The center point around which 
+                            scaling takes place. If the center point has the
+                            same x or y value as the handle position, then 
+                            scaling will be disabled for that axis.
+        item                The Handle instance to add. If None, a new handle
+                            will be created.
+        name                The name of this handle (optional). Handles are 
+                            identified by name when calling 
+                            getLocalHandlePositions and getSceneHandlePositions.
+        =================== ====================================================
+        """
+        pos = Point(pos)
+        center = Point(center)
+        info = {'name': name, 'type': 's', 'center': center, 'pos': pos, 'item': item, 'lockAspect': lockAspect}
+        if pos.x() == center.x():
+            info['xoff'] = True
+        if pos.y() == center.y():
+            info['yoff'] = True
+        return self.addHandle(info, index=index)
+    
+    def addRotateHandle(self, pos, center, item=None, name=None, index=None):
+        """
+        Add a new rotation handle to the ROI. Dragging a rotation handle allows 
+        the user to change the angle of the ROI.
+        
+        =================== ====================================================
+        **Arguments**
+        pos                 (length-2 sequence) The position of the handle 
+                            relative to the shape of the ROI. A value of (0,0)
+                            indicates the origin, whereas (1, 1) indicates the
+                            upper-right corner, regardless of the ROI's size.
+        center              (length-2 sequence) The center point around which 
+                            rotation takes place.
+        item                The Handle instance to add. If None, a new handle
+                            will be created.
+        name                The name of this handle (optional). Handles are 
+                            identified by name when calling 
+                            getLocalHandlePositions and getSceneHandlePositions.
+        =================== ====================================================
+        """
+        pos = Point(pos)
+        center = Point(center)
+        return self.addHandle({'name': name, 'type': 'r', 'center': center, 'pos': pos, 'item': item}, index=index)
+    
+    def addScaleRotateHandle(self, pos, center, item=None, name=None, index=None):
+        """
+        Add a new scale+rotation handle to the ROI. When dragging a handle of 
+        this type, the user can simultaneously rotate the ROI around an 
+        arbitrary center point as well as scale the ROI by dragging the handle
+        toward or away from the center point.
+        
+        =================== ====================================================
+        **Arguments**
+        pos                 (length-2 sequence) The position of the handle 
+                            relative to the shape of the ROI. A value of (0,0)
+                            indicates the origin, whereas (1, 1) indicates the
+                            upper-right corner, regardless of the ROI's size.
+        center              (length-2 sequence) The center point around which 
+                            scaling and rotation take place.
+        item                The Handle instance to add. If None, a new handle
+                            will be created.
+        name                The name of this handle (optional). Handles are 
+                            identified by name when calling 
+                            getLocalHandlePositions and getSceneHandlePositions.
+        =================== ====================================================
+        """
+        pos = Point(pos)
+        center = Point(center)
+        if pos[0] != center[0] and pos[1] != center[1]:
+            raise Exception("Scale/rotate handles must have either the same x or y coordinate as their center point.")
+        return self.addHandle({'name': name, 'type': 'sr', 'center': center, 'pos': pos, 'item': item}, index=index)
+    
+    def addRotateFreeHandle(self, pos, center, axes=None, item=None, name=None, index=None):
+        """
+        Add a new rotation+free handle to the ROI. When dragging a handle of 
+        this type, the user can rotate the ROI around an 
+        arbitrary center point, while moving toward or away from the center 
+        point has no effect on the shape of the ROI.
+        
+        =================== ====================================================
+        **Arguments**
+        pos                 (length-2 sequence) The position of the handle 
+                            relative to the shape of the ROI. A value of (0,0)
+                            indicates the origin, whereas (1, 1) indicates the
+                            upper-right corner, regardless of the ROI's size.
+        center              (length-2 sequence) The center point around which 
+                            rotation takes place.
+        item                The Handle instance to add. If None, a new handle
+                            will be created.
+        name                The name of this handle (optional). Handles are 
+                            identified by name when calling 
+                            getLocalHandlePositions and getSceneHandlePositions.
+        =================== ====================================================
+        """
+        pos = Point(pos)
+        center = Point(center)
+        return self.addHandle({'name': name, 'type': 'rf', 'center': center, 'pos': pos, 'item': item}, index=index)
+    
+    def addHandle(self, info, index=None):
+        ## If a Handle was not supplied, create it now
+        if 'item' not in info or info['item'] is None:
+            h = Handle(self.handleSize, typ=info['type'], pen=self.handlePen, parent=self)
+            h.setPos(info['pos'] * self.state['size'])
+            info['item'] = h
+        else:
+            h = info['item']
+            if info['pos'] is None:
+                info['pos'] = h.pos()
+            
+        ## connect the handle to this ROI
+        #iid = len(self.handles)
+        h.connectROI(self)
+        if index is None:
+            self.handles.append(info)
+        else:
+            self.handles.insert(index, info)
+        
+        h.setZValue(self.zValue()+1)
+        self.stateChanged()
+        return h
+    
+    def indexOfHandle(self, handle):
+        """
+        Return the index of *handle* in the list of this ROI's handles.
+        """
+        if isinstance(handle, Handle):
+            index = [i for i, info in enumerate(self.handles) if info['item'] is handle]    
+            if len(index) == 0:
+                raise Exception("Cannot remove handle; it is not attached to this ROI")
+            return index[0]
+        else:
+            return handle
+        
+    def removeHandle(self, handle):
+        """Remove a handle from this ROI. Argument may be either a Handle 
+        instance or the integer index of the handle."""
+        index = self.indexOfHandle(handle)
+            
+        handle = self.handles[index]['item']
+        self.handles.pop(index)
+        handle.disconnectROI(self)
+        if len(handle.rois) == 0:
+            self.scene().removeItem(handle)
+        self.stateChanged()
+    
+    def replaceHandle(self, oldHandle, newHandle):
+        """Replace one handle in the ROI for another. This is useful when 
+        connecting multiple ROIs together.
+        
+        *oldHandle* may be a Handle instance or the index of a handle to be
+        replaced."""
+        index = self.indexOfHandle(oldHandle)
+        info = self.handles[index]
+        self.removeHandle(index)
+        info['item'] = newHandle
+        info['pos'] = newHandle.pos()
+        self.addHandle(info, index=index)
+        
+    def checkRemoveHandle(self, handle):
+        ## This is used when displaying a Handle's context menu to determine
+        ## whether removing is allowed. 
+        ## Subclasses may wish to override this to disable the menu entry.
+        ## Note: by default, handles are not user-removable even if this method returns True.
+        return True
+        
+        
+    def getLocalHandlePositions(self, index=None):
+        """Returns the position of handles in the ROI's coordinate system.
+        
+        The format returned is a list of (name, pos) tuples.
+        """
+        if index == None:
+            positions = []
+            for h in self.handles:
+                positions.append((h['name'], h['pos']))
+            return positions
+        else:
+            return (self.handles[index]['name'], self.handles[index]['pos'])
+            
+    def getSceneHandlePositions(self, index=None):
+        """Returns the position of handles in the scene coordinate system.
+        
+        The format returned is a list of (name, pos) tuples.
+        """
+        if index == None:
+            positions = []
+            for h in self.handles:
+                positions.append((h['name'], h['item'].scenePos()))
+            return positions
+        else:
+            return (self.handles[index]['name'], self.handles[index]['item'].scenePos())
+        
+    def getHandles(self):
+        """
+        Return a list of this ROI's Handles.
+        """
+        return [h['item'] for h in self.handles]
+    
+    def mapSceneToParent(self, pt):
+        return self.mapToParent(self.mapFromScene(pt))
+
+    def setSelected(self, s):
+        QtGui.QGraphicsItem.setSelected(self, s)
+        #print "select", self, s
+        if s:
+            for h in self.handles:
+                h['item'].show()
+        else:
+            for h in self.handles:
+                h['item'].hide()
+
+
+    def hoverEvent(self, ev):
+        hover = False
+        if not ev.isExit():
+            if self.translatable and ev.acceptDrags(QtCore.Qt.LeftButton):
+                hover=True
+                
+            for btn in [QtCore.Qt.LeftButton, QtCore.Qt.RightButton, QtCore.Qt.MidButton]:
+                if int(self.acceptedMouseButtons() & btn) > 0 and ev.acceptClicks(btn):
+                    hover=True
+            if self.contextMenuEnabled():
+                ev.acceptClicks(QtCore.Qt.RightButton)
+                
+        if hover:
+            self.setMouseHover(True)
+            self.sigHoverEvent.emit(self)
+            ev.acceptClicks(QtCore.Qt.LeftButton)  ## If the ROI is hilighted, we should accept all clicks to avoid confusion.
+            ev.acceptClicks(QtCore.Qt.RightButton)
+            ev.acceptClicks(QtCore.Qt.MidButton)
+        else:
+            self.setMouseHover(False)
+
+    def setMouseHover(self, hover):
+        ## Inform the ROI that the mouse is(not) hovering over it
+        if self.mouseHovering == hover:
+            return
+        self.mouseHovering = hover
+        if hover:
+            self.currentPen = fn.mkPen(255, 255, 0)
+        else:
+            self.currentPen = self.pen
+        self.update()
+
+    def contextMenuEnabled(self):
+        return self.removable
+    
+    def raiseContextMenu(self, ev):
+        if not self.contextMenuEnabled():
+            return
+        menu = self.getMenu()
+        menu = self.scene().addParentContextMenus(self, menu, ev)
+        pos = ev.screenPos()
+        menu.popup(QtCore.QPoint(pos.x(), pos.y()))
+
+    def getMenu(self):
+        if self.menu is None:
+            self.menu = QtGui.QMenu()
+            self.menu.setTitle("ROI")
+            remAct = QtGui.QAction("Remove ROI", self.menu)
+            remAct.triggered.connect(self.removeClicked)
+            self.menu.addAction(remAct)
+            self.menu.remAct = remAct
+        return self.menu
+
+    def removeClicked(self):
+        ## Send remove event only after we have exited the menu event handler
+        QtCore.QTimer.singleShot(0, lambda: self.sigRemoveRequested.emit(self))
+        
+    def mouseDragEvent(self, ev):
+        if ev.isStart():
+            #p = ev.pos()
+            #if not self.isMoving and not self.shape().contains(p):
+                #ev.ignore()
+                #return        
+            if ev.button() == QtCore.Qt.LeftButton:
+                self.setSelected(True)
+                if self.translatable:
+                    self.isMoving = True
+                    self.preMoveState = self.getState()
+                    self.cursorOffset = self.pos() - self.mapToParent(ev.buttonDownPos())
+                    self.sigRegionChangeStarted.emit(self)
+                    ev.accept()
+                else:
+                    ev.ignore()
+
+        elif ev.isFinish():
+            if self.translatable:
+                if self.isMoving:
+                    self.stateChangeFinished()
+                self.isMoving = False
+            return
+
+        if self.translatable and self.isMoving and ev.buttons() == QtCore.Qt.LeftButton:
+            snap = True if (ev.modifiers() & QtCore.Qt.ControlModifier) else None
+            newPos = self.mapToParent(ev.pos()) + self.cursorOffset
+            self.translate(newPos - self.pos(), snap=snap, finish=False)
+        
+    def mouseClickEvent(self, ev):
+        if ev.button() == QtCore.Qt.RightButton and self.isMoving:
+            ev.accept()
+            self.cancelMove()
+        if ev.button() == QtCore.Qt.RightButton and self.contextMenuEnabled():
+            self.raiseContextMenu(ev)
+            ev.accept()
+        elif int(ev.button() & self.acceptedMouseButtons()) > 0:
+            ev.accept()
+            self.sigClicked.emit(self, ev)
+        else:
+            ev.ignore()
+
+    def cancelMove(self):
+        self.isMoving = False
+        self.setState(self.preMoveState)
+
+    def checkPointMove(self, handle, pos, modifiers):
+        """When handles move, they must ask the ROI if the move is acceptable.
+        By default, this always returns True. Subclasses may wish override.
+        """
+        return True
+
+    def movePoint(self, handle, pos, modifiers=QtCore.Qt.KeyboardModifier(), finish=True, coords='parent'):
+        ## called by Handles when they are moved. 
+        ## pos is the new position of the handle in scene coords, as requested by the handle.
+        
+        newState = self.stateCopy()
+        index = self.indexOfHandle(handle)
+        h = self.handles[index]
+        p0 = self.mapToParent(h['pos'] * self.state['size'])
+        p1 = Point(pos)
+        
+        if coords == 'parent':
+            pass
+        elif coords == 'scene':
+            p1 = self.mapSceneToParent(p1)
+        else:
+            raise Exception("New point location must be given in either 'parent' or 'scene' coordinates.")
+
+        
+        ## transform p0 and p1 into parent's coordinates (same as scene coords if there is no parent). I forget why.
+        #p0 = self.mapSceneToParent(p0)
+        #p1 = self.mapSceneToParent(p1)
+
+        ## Handles with a 'center' need to know their local position relative to the center point (lp0, lp1)
+        if 'center' in h:
+            c = h['center']
+            cs = c * self.state['size']
+            lp0 = self.mapFromParent(p0) - cs
+            lp1 = self.mapFromParent(p1) - cs
+        
+        if h['type'] == 't':
+            snap = True if (modifiers & QtCore.Qt.ControlModifier) else None
+            #if self.translateSnap or ():
+                #snap = Point(self.snapSize, self.snapSize)
+            self.translate(p1-p0, snap=snap, update=False)
+        
+        elif h['type'] == 'f':
+            newPos = self.mapFromParent(p1)
+            h['item'].setPos(newPos)
+            h['pos'] = newPos
+            self.freeHandleMoved = True
+            #self.sigRegionChanged.emit(self)  ## should be taken care of by call to stateChanged()
+            
+        elif h['type'] == 's':
+            ## If a handle and its center have the same x or y value, we can't scale across that axis.
+            if h['center'][0] == h['pos'][0]:
+                lp1[0] = 0
+            if h['center'][1] == h['pos'][1]:
+                lp1[1] = 0
+            
+            ## snap 
+            if self.scaleSnap or (modifiers & QtCore.Qt.ControlModifier):
+                lp1[0] = round(lp1[0] / self.snapSize) * self.snapSize
+                lp1[1] = round(lp1[1] / self.snapSize) * self.snapSize
+                
+            ## preserve aspect ratio (this can override snapping)
+            if h['lockAspect'] or (modifiers & QtCore.Qt.AltModifier):
+                #arv = Point(self.preMoveState['size']) - 
+                lp1 = lp1.proj(lp0)
+            
+            ## determine scale factors and new size of ROI
+            hs = h['pos'] - c
+            if hs[0] == 0:
+                hs[0] = 1
+            if hs[1] == 0:
+                hs[1] = 1
+            newSize = lp1 / hs
+            
+            ## Perform some corrections and limit checks
+            if newSize[0] == 0:
+                newSize[0] = newState['size'][0]
+            if newSize[1] == 0:
+                newSize[1] = newState['size'][1]
+            if not self.invertible:
+                if newSize[0] < 0:
+                    newSize[0] = newState['size'][0]
+                if newSize[1] < 0:
+                    newSize[1] = newState['size'][1]
+            if self.aspectLocked:
+                newSize[0] = newSize[1]
+            
+            ## Move ROI so the center point occupies the same scene location after the scale
+            s0 = c * self.state['size']
+            s1 = c * newSize
+            cc = self.mapToParent(s0 - s1) - self.mapToParent(Point(0, 0))
+            
+            ## update state, do more boundary checks
+            newState['size'] = newSize
+            newState['pos'] = newState['pos'] + cc
+            if self.maxBounds is not None:
+                r = self.stateRect(newState)
+                if not self.maxBounds.contains(r):
+                    return
+            
+            self.setPos(newState['pos'], update=False)
+            self.setSize(newState['size'], update=False)
+        
+        elif h['type'] in ['r', 'rf']:
+            if h['type'] == 'rf':
+                self.freeHandleMoved = True
+            
+            if not self.rotateAllowed:
+                return
+            ## If the handle is directly over its center point, we can't compute an angle.
+            try:
+                if lp1.length() == 0 or lp0.length() == 0:
+                    return
+            except OverflowError:
+                return
+            
+            ## determine new rotation angle, constrained if necessary
+            ang = newState['angle'] - lp0.angle(lp1)
+            if ang is None:  ## this should never happen..
+                return
+            if self.rotateSnap or (modifiers & QtCore.Qt.ControlModifier):
+                ang = round(ang / 15.) * 15.  ## 180/12 = 15
+            
+            ## create rotation transform
+            tr = QtGui.QTransform()
+            tr.rotate(ang)
+            
+            ## move ROI so that center point remains stationary after rotate
+            cc = self.mapToParent(cs) - (tr.map(cs) + self.state['pos'])
+            newState['angle'] = ang
+            newState['pos'] = newState['pos'] + cc
+            
+            ## check boundaries, update
+            if self.maxBounds is not None:
+                r = self.stateRect(newState)
+                if not self.maxBounds.contains(r):
+                    return
+            #self.setTransform(tr)
+            self.setPos(newState['pos'], update=False)
+            self.setAngle(ang, update=False)
+            #self.state = newState
+            
+            ## If this is a free-rotate handle, its distance from the center may change.
+            
+            if h['type'] == 'rf':
+                h['item'].setPos(self.mapFromScene(p1))  ## changes ROI coordinates of handle
+                
+        elif h['type'] == 'sr':
+            if h['center'][0] == h['pos'][0]:
+                scaleAxis = 1
+                nonScaleAxis=0
+            else:
+                scaleAxis = 0
+                nonScaleAxis=1
+            
+            try:
+                if lp1.length() == 0 or lp0.length() == 0:
+                    return
+            except OverflowError:
+                return
+            
+            ang = newState['angle'] - lp0.angle(lp1)
+            if ang is None:
+                return
+            if self.rotateSnap or (modifiers & QtCore.Qt.ControlModifier):
+                #ang = round(ang / (np.pi/12.)) * (np.pi/12.)
+                ang = round(ang / 15.) * 15.
+            
+            hs = abs(h['pos'][scaleAxis] - c[scaleAxis])
+            newState['size'][scaleAxis] = lp1.length() / hs
+            #if self.scaleSnap or (modifiers & QtCore.Qt.ControlModifier):
+            if self.scaleSnap:  ## use CTRL only for angular snap here.
+                newState['size'][scaleAxis] = round(newState['size'][scaleAxis] / self.snapSize) * self.snapSize
+            if newState['size'][scaleAxis] == 0:
+                newState['size'][scaleAxis] = 1
+            if self.aspectLocked:
+                newState['size'][nonScaleAxis] = newState['size'][scaleAxis]
+                
+            c1 = c * newState['size']
+            tr = QtGui.QTransform()
+            tr.rotate(ang)
+            
+            cc = self.mapToParent(cs) - (tr.map(c1) + self.state['pos'])
+            newState['angle'] = ang
+            newState['pos'] = newState['pos'] + cc
+            if self.maxBounds is not None:
+                r = self.stateRect(newState)
+                if not self.maxBounds.contains(r):
+                    return
+            #self.setTransform(tr)
+            #self.setPos(newState['pos'], update=False)
+            #self.prepareGeometryChange()
+            #self.state = newState
+            self.setState(newState, update=False)
+        
+        self.stateChanged(finish=finish)
+    
+    def stateChanged(self, finish=True):
+        """Process changes to the state of the ROI.
+        If there are any changes, then the positions of handles are updated accordingly
+        and sigRegionChanged is emitted. If finish is True, then 
+        sigRegionChangeFinished will also be emitted."""
+        
+        changed = False
+        if self.lastState is None:
+            changed = True
+        else:
+            for k in list(self.state.keys()):
+                if self.state[k] != self.lastState[k]:
+                    changed = True
+        
+        self.prepareGeometryChange()
+        if changed:
+            ## Move all handles to match the current configuration of the ROI
+            for h in self.handles:
+                if h['item'] in self.childItems():
+                    p = h['pos']
+                    h['item'].setPos(h['pos'] * self.state['size'])
+                #else:
+                #    trans = self.state['pos']-self.lastState['pos']
+                #    h['item'].setPos(h['pos'] + h['item'].parentItem().mapFromParent(trans))
+                    
+            self.update()
+            self.sigRegionChanged.emit(self)
+        elif self.freeHandleMoved:
+            self.sigRegionChanged.emit(self)
+            
+        self.freeHandleMoved = False
+        self.lastState = self.stateCopy()
+            
+        if finish:
+            self.stateChangeFinished()
+    
+    def stateChangeFinished(self):
+        self.sigRegionChangeFinished.emit(self)
+    
+    def stateRect(self, state):
+        r = QtCore.QRectF(0, 0, state['size'][0], state['size'][1])
+        tr = QtGui.QTransform()
+        #tr.rotate(-state['angle'] * 180 / np.pi)
+        tr.rotate(-state['angle'])
+        r = tr.mapRect(r)
+        return r.adjusted(state['pos'][0], state['pos'][1], state['pos'][0], state['pos'][1])
+    
+    
+    def getSnapPosition(self, pos, snap=None):
+        ## Given that pos has been requested, return the nearest snap-to position
+        ## optionally, snap may be passed in to specify a rectangular snap grid.
+        ## override this function for more interesting snap functionality..
+        
+        if snap is None or snap is True:
+            if self.snapSize is None:
+                return pos
+            snap = Point(self.snapSize, self.snapSize)
+        
+        return Point(
+            round(pos[0] / snap[0]) * snap[0],
+            round(pos[1] / snap[1]) * snap[1]
+        )
+    
+    def boundingRect(self):
+        return QtCore.QRectF(0, 0, self.state['size'][0], self.state['size'][1]).normalized()
+
+    def paint(self, p, opt, widget):
+        # p.save()
+        # Note: don't use self.boundingRect here, because subclasses may need to redefine it.
+        r = QtCore.QRectF(0, 0, self.state['size'][0], self.state['size'][1]).normalized()
+        
+        p.setRenderHint(QtGui.QPainter.Antialiasing)
+        p.setPen(self.currentPen)
+        p.translate(r.left(), r.top())
+        p.scale(r.width(), r.height())
+        p.drawRect(0, 0, 1, 1)
+        # p.restore()
+
+    def getArraySlice(self, data, img, axes=(0,1), returnSlice=True):
+        """Return a tuple of slice objects that can be used to slice the region from data covered by this ROI.
+        Also returns the transform which maps the ROI into data coordinates.
+        
+        If returnSlice is set to False, the function returns a pair of tuples with the values that would have 
+        been used to generate the slice objects. ((ax0Start, ax0Stop), (ax1Start, ax1Stop))
+        
+        If the slice can not be computed (usually because the scene/transforms are not properly
+        constructed yet), then the method returns None.
+        """
+        #print "getArraySlice"
+        
+        ## Determine shape of array along ROI axes
+        dShape = (data.shape[axes[0]], data.shape[axes[1]])
+        #print "  dshape", dShape
+        
+        ## Determine transform that maps ROI bounding box to image coordinates
+        try:
+            tr = self.sceneTransform() * fn.invertQTransform(img.sceneTransform())
+        except np.linalg.linalg.LinAlgError:
+            return None
+            
+        ## Modify transform to scale from image coords to data coords
+        #m = QtGui.QTransform()
+        tr.scale(float(dShape[0]) / img.width(), float(dShape[1]) / img.height())
+        #tr = tr * m
+        
+        ## Transform ROI bounds into data bounds
+        dataBounds = tr.mapRect(self.boundingRect())
+        #print "  boundingRect:", self.boundingRect()
+        #print "  dataBounds:", dataBounds
+        
+        ## Intersect transformed ROI bounds with data bounds
+        intBounds = dataBounds.intersected(QtCore.QRectF(0, 0, dShape[0], dShape[1]))
+        #print "  intBounds:", intBounds
+        
+        ## Determine index values to use when referencing the array. 
+        bounds = (
+            (int(min(intBounds.left(), intBounds.right())), int(1+max(intBounds.left(), intBounds.right()))),
+            (int(min(intBounds.bottom(), intBounds.top())), int(1+max(intBounds.bottom(), intBounds.top())))
+        )
+        #print "  bounds:", bounds
+        
+        if returnSlice:
+            ## Create slice objects
+            sl = [slice(None)] * data.ndim
+            sl[axes[0]] = slice(*bounds[0])
+            sl[axes[1]] = slice(*bounds[1])
+            return tuple(sl), tr
+        else:
+            return bounds, tr
+
+    def getArrayRegion(self, data, img, axes=(0,1), returnMappedCoords=False, **kwds):
+        """Use the position and orientation of this ROI relative to an imageItem 
+        to pull a slice from an array.
+        
+        =================== ====================================================
+        **Arguments**
+        data                The array to slice from. Note that this array does
+                            *not* have to be the same data that is represented
+                            in *img*.
+        img                 (ImageItem or other suitable QGraphicsItem)
+                            Used to determine the relationship between the 
+                            ROI and the boundaries of *data*.
+        axes                (length-2 tuple) Specifies the axes in *data* that
+                            correspond to the x and y axes of *img*.
+        returnMappedCoords  (bool) If True, the array slice is returned along
+                            with a corresponding array of coordinates that were
+                            used to extract data from the original array.
+        \**kwds             All keyword arguments are passed to 
+                            :func:`affineSlice <pyqtgraph.affineSlice>`.
+        =================== ====================================================
+        
+        This method uses :func:`affineSlice <pyqtgraph.affineSlice>` to generate
+        the slice from *data* and uses :func:`getAffineSliceParams <pyqtgraph.ROI.getAffineSliceParams>`
+        to determine the parameters to pass to :func:`affineSlice <pyqtgraph.affineSlice>`.
+        
+        If *returnMappedCoords* is True, then the method returns a tuple (result, coords) 
+        such that coords is the set of coordinates used to interpolate values from the original
+        data, mapped into the parent coordinate system of the image. This is useful, when slicing
+        data from images that have been transformed, for determining the location of each value
+        in the sliced data.
+        
+        All extra keyword arguments are passed to :func:`affineSlice <pyqtgraph.affineSlice>`.
+        """
+        
+        shape, vectors, origin = self.getAffineSliceParams(data, img, axes)
+        if not returnMappedCoords:
+            return fn.affineSlice(data, shape=shape, vectors=vectors, origin=origin, axes=axes, **kwds)
+        else:
+            kwds['returnCoords'] = True
+            result, coords = fn.affineSlice(data, shape=shape, vectors=vectors, origin=origin, axes=axes, **kwds)
+            
+            ### map coordinates and return
+            mapped = fn.transformCoordinates(img.transform(), coords)
+            return result, mapped
+
+    def getAffineSliceParams(self, data, img, axes=(0,1)):
+        """
+        Returns the parameters needed to use :func:`affineSlice <pyqtgraph.affineSlice>`
+        (shape, vectors, origin) to extract a subset of *data* using this ROI 
+        and *img* to specify the subset.
+        
+        See :func:`getArrayRegion <pyqtgraph.ROI.getArrayRegion>` for more information.
+        """
+        if self.scene() is not img.scene():
+            raise Exception("ROI and target item must be members of the same scene.")
+        
+        shape = self.state['size']
+        
+        origin = self.mapToItem(img, QtCore.QPointF(0, 0))
+        
+        ## vx and vy point in the directions of the slice axes, but must be scaled properly
+        vx = self.mapToItem(img, QtCore.QPointF(1, 0)) - origin
+        vy = self.mapToItem(img, QtCore.QPointF(0, 1)) - origin
+        
+        lvx = np.sqrt(vx.x()**2 + vx.y()**2)
+        lvy = np.sqrt(vy.x()**2 + vy.y()**2)
+        pxLen = img.width() / float(data.shape[axes[0]])
+        #img.width is number of pixels or width of item?
+        #need pxWidth and pxHeight instead of pxLen ?
+        sx =  pxLen / lvx
+        sy =  pxLen / lvy
+        
+        vectors = ((vx.x()*sx, vx.y()*sx), (vy.x()*sy, vy.y()*sy))
+        shape = self.state['size']
+        shape = [abs(shape[0]/sx), abs(shape[1]/sy)]
+        
+        origin = (origin.x(), origin.y())
+        return shape, vectors, origin
+        
+    def getGlobalTransform(self, relativeTo=None):
+        """Return global transformation (rotation angle+translation) required to move 
+        from relative state to current state. If relative state isn't specified,
+        then we use the state of the ROI when mouse is pressed."""
+        if relativeTo == None:
+            relativeTo = self.preMoveState
+        st = self.getState()
+        
+        ## this is only allowed because we will be comparing the two 
+        relativeTo['scale'] = relativeTo['size']
+        st['scale'] = st['size']
+        
+        t1 = SRTTransform(relativeTo)
+        t2 = SRTTransform(st)
+        return t2/t1
+        
+        
+        #st = self.getState()
+        
+        ### rotation
+        #ang = (st['angle']-relativeTo['angle']) * 180. / 3.14159265358
+        #rot = QtGui.QTransform()
+        #rot.rotate(-ang)
+
+        ### We need to come up with a universal transformation--one that can be applied to other objects 
+        ### such that all maintain alignment. 
+        ### More specifically, we need to turn the ROI's position and angle into
+        ### a rotation _around the origin_ and a translation.
+        
+        #p0 = Point(relativeTo['pos'])
+
+        ### base position, rotated
+        #p1 = rot.map(p0)
+        
+        #trans = Point(st['pos']) - p1
+        #return trans, ang
+
+    def applyGlobalTransform(self, tr):
+        st = self.getState()
+        
+        st['scale'] = st['size']
+        st = SRTTransform(st)
+        st = (st * tr).saveState()
+        st['size'] = st['scale']
+        self.setState(st)
+
+
+class Handle(UIGraphicsItem):
+    """
+    Handle represents a single user-interactable point attached to an ROI. They
+    are usually created by a call to one of the ROI.add___Handle() methods.
+    
+    Handles are represented as a square, diamond, or circle, and are drawn with 
+    fixed pixel size regardless of the scaling of the view they are displayed in.
+    
+    Handles may be dragged to change the position, size, orientation, or other
+    properties of the ROI they are attached to.
+    
+    
+    """
+    types = {   ## defines number of sides, start angle for each handle type
+        't': (4, np.pi/4),
+        'f': (4, np.pi/4), 
+        's': (4, 0),
+        'r': (12, 0),
+        'sr': (12, 0),
+        'rf': (12, 0),
+    }
+
+    sigClicked = QtCore.Signal(object, object)   # self, event
+    sigRemoveRequested = QtCore.Signal(object)   # self
+    
+    def __init__(self, radius, typ=None, pen=(200, 200, 220), parent=None, deletable=False):
+        #print "   create item with parent", parent
+        #self.bounds = QtCore.QRectF(-1e-10, -1e-10, 2e-10, 2e-10)
+        #self.setFlags(self.ItemIgnoresTransformations | self.ItemSendsScenePositionChanges)
+        self.rois = []
+        self.radius = radius
+        self.typ = typ
+        self.pen = fn.mkPen(pen)
+        self.currentPen = self.pen
+        self.pen.setWidth(0)
+        self.pen.setCosmetic(True)
+        self.isMoving = False
+        self.sides, self.startAng = self.types[typ]
+        self.buildPath()
+        self._shape = None
+        self.menu = self.buildMenu()
+        
+        UIGraphicsItem.__init__(self, parent=parent)
+        self.setAcceptedMouseButtons(QtCore.Qt.NoButton)
+        self.deletable = deletable
+        if deletable:
+            self.setAcceptedMouseButtons(QtCore.Qt.RightButton)        
+        #self.updateShape()
+        self.setZValue(11)
+            
+    def connectROI(self, roi):
+        ### roi is the "parent" roi, i is the index of the handle in roi.handles
+        self.rois.append(roi)
+        
+    def disconnectROI(self, roi):
+        self.rois.remove(roi)
+        #for i, r in enumerate(self.roi):
+            #if r[0] == roi:
+                #self.roi.pop(i)
+                
+    #def close(self):
+        #for r in self.roi:
+            #r.removeHandle(self)
+            
+    def setDeletable(self, b):
+        self.deletable = b
+        if b:
+            self.setAcceptedMouseButtons(self.acceptedMouseButtons() | QtCore.Qt.RightButton)
+        else:
+            self.setAcceptedMouseButtons(self.acceptedMouseButtons() & ~QtCore.Qt.RightButton)
+            
+    def removeClicked(self):
+        self.sigRemoveRequested.emit(self)
+
+    def hoverEvent(self, ev):
+        hover = False
+        if not ev.isExit():
+            if ev.acceptDrags(QtCore.Qt.LeftButton):
+                hover=True
+            for btn in [QtCore.Qt.LeftButton, QtCore.Qt.RightButton, QtCore.Qt.MidButton]:
+                if int(self.acceptedMouseButtons() & btn) > 0 and ev.acceptClicks(btn):
+                    hover=True
+                    
+        if hover:
+            self.currentPen = fn.mkPen(255, 255,0)
+        else:
+            self.currentPen = self.pen
+        self.update()
+        #if (not ev.isExit()) and ev.acceptDrags(QtCore.Qt.LeftButton):
+            #self.currentPen = fn.mkPen(255, 255,0)
+        #else:
+            #self.currentPen = self.pen
+        #self.update()
+            
+
+
+    def mouseClickEvent(self, ev):
+        ## right-click cancels drag
+        if ev.button() == QtCore.Qt.RightButton and self.isMoving:
+            self.isMoving = False  ## prevents any further motion
+            self.movePoint(self.startPos, finish=True)
+            #for r in self.roi:
+                #r[0].cancelMove()
+            ev.accept()
+        elif int(ev.button() & self.acceptedMouseButtons()) > 0:
+            ev.accept()
+            if ev.button() == QtCore.Qt.RightButton and self.deletable:
+                self.raiseContextMenu(ev)
+            self.sigClicked.emit(self, ev)
+        else:
+            ev.ignore()        
+            
+            #elif self.deletable:
+                #ev.accept()
+                #self.raiseContextMenu(ev)
+            #else:
+                #ev.ignore()
+                
+    def buildMenu(self):
+        menu = QtGui.QMenu()
+        menu.setTitle("Handle")
+        self.removeAction = menu.addAction("Remove handle", self.removeClicked) 
+        return menu
+        
+    def getMenu(self):
+        return self.menu
+
+    def raiseContextMenu(self, ev):
+        menu = self.scene().addParentContextMenus(self, self.getMenu(), ev)
+        
+        ## Make sure it is still ok to remove this handle
+        removeAllowed = all([r.checkRemoveHandle(self) for r in self.rois])
+        self.removeAction.setEnabled(removeAllowed)
+        pos = ev.screenPos()
+        menu.popup(QtCore.QPoint(pos.x(), pos.y()))    
+
+    def mouseDragEvent(self, ev):
+        if ev.button() != QtCore.Qt.LeftButton:
+            return
+        ev.accept()
+        
+        ## Inform ROIs that a drag is happening 
+        ##  note: the ROI is informed that the handle has moved using ROI.movePoint
+        ##  this is for other (more nefarious) purposes.
+        #for r in self.roi:
+            #r[0].pointDragEvent(r[1], ev)
+            
+        if ev.isFinish():
+            if self.isMoving:
+                for r in self.rois:
+                    r.stateChangeFinished()
+            self.isMoving = False
+        elif ev.isStart():
+            for r in self.rois:
+                r.handleMoveStarted()
+            self.isMoving = True
+            self.startPos = self.scenePos()
+            self.cursorOffset = self.scenePos() - ev.buttonDownScenePos()
+            
+        if self.isMoving:  ## note: isMoving may become False in mid-drag due to right-click.
+            pos = ev.scenePos() + self.cursorOffset
+            self.movePoint(pos, ev.modifiers(), finish=False)
+
+    def movePoint(self, pos, modifiers=QtCore.Qt.KeyboardModifier(), finish=True):
+        for r in self.rois:
+            if not r.checkPointMove(self, pos, modifiers):
+                return
+        #print "point moved; inform %d ROIs" % len(self.roi)
+        # A handle can be used by multiple ROIs; tell each to update its handle position
+        for r in self.rois:
+            r.movePoint(self, pos, modifiers, finish=finish, coords='scene')
+        
+    def buildPath(self):
+        size = self.radius
+        self.path = QtGui.QPainterPath()
+        ang = self.startAng
+        dt = 2*np.pi / self.sides
+        for i in range(0, self.sides+1):
+            x = size * cos(ang)
+            y = size * sin(ang)
+            ang += dt
+            if i == 0:
+                self.path.moveTo(x, y)
+            else:
+                self.path.lineTo(x, y)            
+            
+    def paint(self, p, opt, widget):
+        ### determine rotation of transform
+        #m = self.sceneTransform()
+        ##mi = m.inverted()[0]
+        #v = m.map(QtCore.QPointF(1, 0)) - m.map(QtCore.QPointF(0, 0))
+        #va = np.arctan2(v.y(), v.x())
+        
+        ### Determine length of unit vector in painter's coords
+        ##size = mi.map(Point(self.radius, self.radius)) - mi.map(Point(0, 0))
+        ##size = (size.x()*size.x() + size.y() * size.y()) ** 0.5
+        #size = self.radius
+        
+        #bounds = QtCore.QRectF(-size, -size, size*2, size*2)
+        #if bounds != self.bounds:
+            #self.bounds = bounds
+            #self.prepareGeometryChange()
+        p.setRenderHints(p.Antialiasing, True)
+        p.setPen(self.currentPen)
+        
+        #p.rotate(va * 180. / 3.1415926)
+        #p.drawPath(self.path)        
+        p.drawPath(self.shape())
+        #ang = self.startAng + va
+        #dt = 2*np.pi / self.sides
+        #for i in range(0, self.sides):
+            #x1 = size * cos(ang)
+            #y1 = size * sin(ang)
+            #x2 = size * cos(ang+dt)
+            #y2 = size * sin(ang+dt)
+            #ang += dt
+            #p.drawLine(Point(x1, y1), Point(x2, y2))
+            
+    def shape(self):
+        if self._shape is None:
+            s = self.generateShape()
+            if s is None:
+                return self.path
+            self._shape = s
+            self.prepareGeometryChange()  ## beware--this can cause the view to adjust, which would immediately invalidate the shape.
+        return self._shape
+    
+    def boundingRect(self):
+        #print 'roi:', self.roi
+        s1 = self.shape()
+        #print "   s1:", s1
+        #s2 = self.shape()
+        #print "   s2:", s2
+        
+        return self.shape().boundingRect()
+            
+    def generateShape(self):
+        ## determine rotation of transform
+        #m = self.sceneTransform()  ## Qt bug: do not access sceneTransform() until we know this object has a scene.
+        #mi = m.inverted()[0]
+        dt = self.deviceTransform()
+        
+        if dt is None:
+            self._shape = self.path
+            return None
+        
+        v = dt.map(QtCore.QPointF(1, 0)) - dt.map(QtCore.QPointF(0, 0))
+        va = np.arctan2(v.y(), v.x())
+        
+        dti = fn.invertQTransform(dt)
+        devPos = dt.map(QtCore.QPointF(0,0))
+        tr = QtGui.QTransform()
+        tr.translate(devPos.x(), devPos.y())
+        tr.rotate(va * 180. / 3.1415926)
+        
+        return dti.map(tr.map(self.path))
+        
+        
+    def viewTransformChanged(self):
+        GraphicsObject.viewTransformChanged(self)
+        self._shape = None  ## invalidate shape, recompute later if requested.
+        self.update()
+        
+    #def itemChange(self, change, value):
+        #if change == self.ItemScenePositionHasChanged:
+            #self.updateShape()
+
+
+class TestROI(ROI):
+    def __init__(self, pos, size, **args):
+        #QtGui.QGraphicsRectItem.__init__(self, pos[0], pos[1], size[0], size[1])
+        ROI.__init__(self, pos, size, **args)
+        #self.addTranslateHandle([0, 0])
+        self.addTranslateHandle([0.5, 0.5])
+        self.addScaleHandle([1, 1], [0, 0])
+        self.addScaleHandle([0, 0], [1, 1])
+        self.addScaleRotateHandle([1, 0.5], [0.5, 0.5])
+        self.addScaleHandle([0.5, 1], [0.5, 0.5])
+        self.addRotateHandle([1, 0], [0, 0])
+        self.addRotateHandle([0, 1], [1, 1])
+
+
+
+class RectROI(ROI):
+    """
+    Rectangular ROI subclass with a single scale handle at the top-right corner.
+    
+    ============== =============================================================
+    **Arguments**
+    pos            (length-2 sequence) The position of the ROI origin.
+                   See ROI().
+    size           (length-2 sequence) The size of the ROI. See ROI().
+    centered       (bool) If True, scale handles affect the ROI relative to its
+                   center, rather than its origin.
+    sideScalers    (bool) If True, extra scale handles are added at the top and 
+                   right edges.
+    \**args        All extra keyword arguments are passed to ROI()
+    ============== =============================================================
+    
+    """
+    def __init__(self, pos, size, centered=False, sideScalers=False, **args):
+        #QtGui.QGraphicsRectItem.__init__(self, 0, 0, size[0], size[1])
+        ROI.__init__(self, pos, size, **args)
+        if centered:
+            center = [0.5, 0.5]
+        else:
+            center = [0, 0]
+            
+        #self.addTranslateHandle(center)
+        self.addScaleHandle([1, 1], center)
+        if sideScalers:
+            self.addScaleHandle([1, 0.5], [center[0], 0.5])
+            self.addScaleHandle([0.5, 1], [0.5, center[1]])
+
+class LineROI(ROI):
+    """
+    Rectangular ROI subclass with scale-rotate handles on either side. This
+    allows the ROI to be positioned as if moving the ends of a line segment.
+    A third handle controls the width of the ROI orthogonal to its "line" axis.
+    
+    ============== =============================================================
+    **Arguments**
+    pos1           (length-2 sequence) The position of the center of the ROI's
+                   left edge.
+    pos2           (length-2 sequence) The position of the center of the ROI's
+                   right edge.
+    width          (float) The width of the ROI.
+    \**args        All extra keyword arguments are passed to ROI()
+    ============== =============================================================
+    
+    """
+    def __init__(self, pos1, pos2, width, **args):
+        pos1 = Point(pos1)
+        pos2 = Point(pos2)
+        d = pos2-pos1
+        l = d.length()
+        ang = Point(1, 0).angle(d)
+        ra = ang * np.pi / 180.
+        c = Point(-width/2. * sin(ra), -width/2. * cos(ra))
+        pos1 = pos1 + c
+        
+        ROI.__init__(self, pos1, size=Point(l, width), angle=ang, **args)
+        self.addScaleRotateHandle([0, 0.5], [1, 0.5])
+        self.addScaleRotateHandle([1, 0.5], [0, 0.5])
+        self.addScaleHandle([0.5, 1], [0.5, 0.5])
+        
+
+        
+class MultiRectROI(QtGui.QGraphicsObject):
+    """
+    Chain of rectangular ROIs connected by handles. 
+    
+    This is generally used to mark a curved path through 
+    an image similarly to PolyLineROI. It differs in that each segment
+    of the chain is rectangular instead of linear and thus has width.
+    
+    ============== =============================================================
+    **Arguments**
+    points         (list of length-2 sequences) The list of points in the path.
+    width          (float) The width of the ROIs orthogonal to the path.
+    \**args        All extra keyword arguments are passed to ROI()
+    ============== =============================================================
+    """
+    sigRegionChangeFinished = QtCore.Signal(object)
+    sigRegionChangeStarted = QtCore.Signal(object)
+    sigRegionChanged = QtCore.Signal(object)
+    
+    def __init__(self, points, width, pen=None, **args):
+        QtGui.QGraphicsObject.__init__(self)
+        self.pen = pen
+        self.roiArgs = args
+        self.lines = []
+        if len(points) < 2:
+            raise Exception("Must start with at least 2 points")
+        
+        ## create first segment
+        self.addSegment(points[1], connectTo=points[0], scaleHandle=True)
+        
+        ## create remaining segments
+        for p in points[2:]:
+            self.addSegment(p)
+        
+        
+    def paint(self, *args):
+        pass
+    
+    def boundingRect(self):
+        return QtCore.QRectF()
+        
+    def roiChangedEvent(self):
+        w = self.lines[0].state['size'][1]
+        for l in self.lines[1:]:
+            w0 = l.state['size'][1]
+            if w == w0:
+                continue
+            l.scale([1.0, w/w0], center=[0.5,0.5])
+        self.sigRegionChanged.emit(self)
+            
+    def roiChangeStartedEvent(self):
+        self.sigRegionChangeStarted.emit(self)
+        
+    def roiChangeFinishedEvent(self):
+        self.sigRegionChangeFinished.emit(self)
+        
+    def getHandlePositions(self):
+        """Return the positions of all handles in local coordinates."""
+        pos = [self.mapFromScene(self.lines[0].getHandles()[0].scenePos())]
+        for l in self.lines:
+            pos.append(self.mapFromScene(l.getHandles()[1].scenePos()))
+        return pos
+        
+    def getArrayRegion(self, arr, img=None, axes=(0,1)):
+        rgns = []
+        for l in self.lines:
+            rgn = l.getArrayRegion(arr, img, axes=axes)
+            if rgn is None:
+                continue
+                #return None
+            rgns.append(rgn)
+            #print l.state['size']
+            
+        ## make sure orthogonal axis is the same size
+        ## (sometimes fp errors cause differences)
+        ms = min([r.shape[axes[1]] for r in rgns])
+        sl = [slice(None)] * rgns[0].ndim
+        sl[axes[1]] = slice(0,ms)
+        rgns = [r[sl] for r in rgns]
+        #print [r.shape for r in rgns], axes
+        
+        return np.concatenate(rgns, axis=axes[0])
+        
+    def addSegment(self, pos=(0,0), scaleHandle=False, connectTo=None):
+        """
+        Add a new segment to the ROI connecting from the previous endpoint to *pos*.
+        (pos is specified in the parent coordinate system of the MultiRectROI)
+        """
+        
+        ## by default, connect to the previous endpoint
+        if connectTo is None:
+            connectTo = self.lines[-1].getHandles()[1]
+            
+        ## create new ROI
+        newRoi = ROI((0,0), [1, 5], parent=self, pen=self.pen, **self.roiArgs)
+        self.lines.append(newRoi)
+        
+        ## Add first SR handle
+        if isinstance(connectTo, Handle):
+            self.lines[-1].addScaleRotateHandle([0, 0.5], [1, 0.5], item=connectTo)
+            newRoi.movePoint(connectTo, connectTo.scenePos(), coords='scene')
+        else:
+            h = self.lines[-1].addScaleRotateHandle([0, 0.5], [1, 0.5])
+            newRoi.movePoint(h, connectTo, coords='scene')
+            
+        ## add second SR handle
+        h = self.lines[-1].addScaleRotateHandle([1, 0.5], [0, 0.5]) 
+        newRoi.movePoint(h, pos)
+        
+        ## optionally add scale handle (this MUST come after the two SR handles)
+        if scaleHandle:
+            newRoi.addScaleHandle([0.5, 1], [0.5, 0.5])
+            
+        newRoi.translatable = False 
+        newRoi.sigRegionChanged.connect(self.roiChangedEvent) 
+        newRoi.sigRegionChangeStarted.connect(self.roiChangeStartedEvent) 
+        newRoi.sigRegionChangeFinished.connect(self.roiChangeFinishedEvent)
+        self.sigRegionChanged.emit(self) 
+    
+
+    def removeSegment(self, index=-1): 
+        """Remove a segment from the ROI."""
+        roi = self.lines[index]
+        self.lines.pop(index)
+        self.scene().removeItem(roi)
+        roi.sigRegionChanged.disconnect(self.roiChangedEvent) 
+        roi.sigRegionChangeStarted.disconnect(self.roiChangeStartedEvent) 
+        roi.sigRegionChangeFinished.disconnect(self.roiChangeFinishedEvent)
+        
+        self.sigRegionChanged.emit(self)
+        
+        
+class MultiLineROI(MultiRectROI):
+    def __init__(self, *args, **kwds):
+        MultiRectROI.__init__(self, *args, **kwds)
+        print("Warning: MultiLineROI has been renamed to MultiRectROI. (and MultiLineROI may be redefined in the future)")
+        
+class EllipseROI(ROI):
+    """
+    Elliptical ROI subclass with one scale handle and one rotation handle.
+    
+    
+    ============== =============================================================
+    **Arguments**
+    pos            (length-2 sequence) The position of the ROI's origin.
+    size           (length-2 sequence) The size of the ROI's bounding rectangle.
+    \**args        All extra keyword arguments are passed to ROI()
+    ============== =============================================================
+    
+    """
+    def __init__(self, pos, size, **args):
+        #QtGui.QGraphicsRectItem.__init__(self, 0, 0, size[0], size[1])
+        ROI.__init__(self, pos, size, **args)
+        self.addRotateHandle([1.0, 0.5], [0.5, 0.5])
+        self.addScaleHandle([0.5*2.**-0.5 + 0.5, 0.5*2.**-0.5 + 0.5], [0.5, 0.5])
+            
+    def paint(self, p, opt, widget):
+        r = self.boundingRect()
+        p.setRenderHint(QtGui.QPainter.Antialiasing)
+        p.setPen(self.currentPen)
+        
+        p.scale(r.width(), r.height())## workaround for GL bug
+        r = QtCore.QRectF(r.x()/r.width(), r.y()/r.height(), 1,1)
+        
+        p.drawEllipse(r)
+        
+    def getArrayRegion(self, arr, img=None):
+        """
+        Return the result of ROI.getArrayRegion() masked by the elliptical shape
+        of the ROI. Regions outside the ellipse are set to 0.
+        """
+        arr = ROI.getArrayRegion(self, arr, img)
+        if arr is None or arr.shape[0] == 0 or arr.shape[1] == 0:
+            return None
+        w = arr.shape[0]
+        h = arr.shape[1]
+        ## generate an ellipsoidal mask
+        mask = np.fromfunction(lambda x,y: (((x+0.5)/(w/2.)-1)**2+ ((y+0.5)/(h/2.)-1)**2)**0.5 < 1, (w, h))
+    
+        return arr * mask
+    
+    def shape(self):
+        self.path = QtGui.QPainterPath()
+        self.path.addEllipse(self.boundingRect())
+        return self.path
+        
+        
+class CircleROI(EllipseROI):
+    """
+    Circular ROI subclass. Behaves exactly as EllipseROI, but may only be scaled
+    proportionally to maintain its aspect ratio.
+    
+    ============== =============================================================
+    **Arguments**
+    pos            (length-2 sequence) The position of the ROI's origin.
+    size           (length-2 sequence) The size of the ROI's bounding rectangle.
+    \**args        All extra keyword arguments are passed to ROI()
+    ============== =============================================================
+    
+    """
+    def __init__(self, pos, size, **args):
+        ROI.__init__(self, pos, size, **args)
+        self.aspectLocked = True
+        #self.addTranslateHandle([0.5, 0.5])
+        self.addScaleHandle([0.5*2.**-0.5 + 0.5, 0.5*2.**-0.5 + 0.5], [0.5, 0.5])
+
+
+class PolygonROI(ROI):
+    ## deprecated. Use PloyLineROI instead.
+    
+    def __init__(self, positions, pos=None, **args):
+        if pos is None:
+            pos = [0,0]
+        ROI.__init__(self, pos, [1,1], **args)
+        #ROI.__init__(self, positions[0])
+        for p in positions:
+            self.addFreeHandle(p)
+        self.setZValue(1000)
+        print("Warning: PolygonROI is deprecated. Use PolyLineROI instead.")
+        
+            
+    def listPoints(self):
+        return [p['item'].pos() for p in self.handles]
+            
+    #def movePoint(self, *args, **kargs):
+        #ROI.movePoint(self, *args, **kargs)
+        #self.prepareGeometryChange()
+        #for h in self.handles:
+            #h['pos'] = h['item'].pos()
+            
+    def paint(self, p, *args):
+        p.setRenderHint(QtGui.QPainter.Antialiasing)
+        p.setPen(self.currentPen)
+        for i in range(len(self.handles)):
+            h1 = self.handles[i]['item'].pos()
+            h2 = self.handles[i-1]['item'].pos()
+            p.drawLine(h1, h2)
+        
+    def boundingRect(self):
+        r = QtCore.QRectF()
+        for h in self.handles:
+            r |= self.mapFromItem(h['item'], h['item'].boundingRect()).boundingRect()   ## |= gives the union of the two QRectFs
+        return r
+    
+    def shape(self):
+        p = QtGui.QPainterPath()
+        p.moveTo(self.handles[0]['item'].pos())
+        for i in range(len(self.handles)):
+            p.lineTo(self.handles[i]['item'].pos())
+        return p
+    
+    def stateCopy(self):
+        sc = {}
+        sc['pos'] = Point(self.state['pos'])
+        sc['size'] = Point(self.state['size'])
+        sc['angle'] = self.state['angle']
+        #sc['handles'] = self.handles
+        return sc
+
+class PolyLineROI(ROI):
+    """
+    Container class for multiple connected LineSegmentROIs.
+    
+    This class allows the user to draw paths of multiple line segments.
+    
+    ============== =============================================================
+    **Arguments**
+    positions      (list of length-2 sequences) The list of points in the path.
+                   Note that, unlike the handle positions specified in other
+                   ROIs, these positions must be expressed in the normal
+                   coordinate system of the ROI, rather than (0 to 1) relative
+                   to the size of the ROI.
+    closed         (bool) if True, an extra LineSegmentROI is added connecting 
+                   the beginning and end points.
+    \**args        All extra keyword arguments are passed to ROI()
+    ============== =============================================================
+    
+    """
+    def __init__(self, positions, closed=False, pos=None, **args):
+        
+        if pos is None:
+            pos = [0,0]
+            
+        self.closed = closed
+        self.segments = []
+        ROI.__init__(self, pos, size=[1,1], **args)
+        
+        self.setPoints(positions)
+        #for p in positions:
+            #self.addFreeHandle(p)
+         
+        #start = -1 if self.closed else 0
+        #for i in range(start, len(self.handles)-1):
+            #self.addSegment(self.handles[i]['item'], self.handles[i+1]['item'])
+
+    def setPoints(self, points, closed=None):
+        """
+        Set the complete sequence of points displayed by this ROI.
+        
+        ============= =========================================================
+        **Arguments**
+        points        List of (x,y) tuples specifying handle locations to set.
+        closed        If bool, then this will set whether the ROI is closed 
+                      (the last point is connected to the first point). If
+                      None, then the closed mode is left unchanged.
+        ============= =========================================================
+        
+        """
+        if closed is not None:
+            self.closed = closed
+        
+        for p in points:
+            self.addFreeHandle(p)
+        
+        start = -1 if self.closed else 0
+        for i in range(start, len(self.handles)-1):
+            self.addSegment(self.handles[i]['item'], self.handles[i+1]['item'])
+        
+        
+    def clearPoints(self):
+        """
+        Remove all handles and segments.
+        """
+        while len(self.handles) > 0:
+            self.removeHandle(self.handles[0]['item'])
+
+    def saveState(self):
+        state = ROI.saveState(self)
+        state['closed'] = self.closed
+        state['points'] = [tuple(h.pos()) for h in self.getHandles()]
+        return state
+
+    def setState(self, state):
+        ROI.setState(self, state)
+        self.clearPoints()
+        self.setPoints(state['points'], closed=state['closed'])
+        
+    def addSegment(self, h1, h2, index=None):
+        seg = LineSegmentROI(handles=(h1, h2), pen=self.pen, parent=self, movable=False)
+        if index is None:
+            self.segments.append(seg)
+        else:
+            self.segments.insert(index, seg)
+        seg.sigClicked.connect(self.segmentClicked)
+        seg.setAcceptedMouseButtons(QtCore.Qt.LeftButton)
+        seg.setZValue(self.zValue()+1)
+        for h in seg.handles:
+            h['item'].setDeletable(True)
+            h['item'].setAcceptedMouseButtons(h['item'].acceptedMouseButtons() | QtCore.Qt.LeftButton) ## have these handles take left clicks too, so that handles cannot be added on top of other handles
+        
+    def setMouseHover(self, hover):
+        ## Inform all the ROI's segments that the mouse is(not) hovering over it
+        ROI.setMouseHover(self, hover)
+        for s in self.segments:
+            s.setMouseHover(hover)
+          
+    def addHandle(self, info, index=None):
+        h = ROI.addHandle(self, info, index=index)
+        h.sigRemoveRequested.connect(self.removeHandle)
+        return h
+        
+    def segmentClicked(self, segment, ev=None, pos=None): ## pos should be in this item's coordinate system
+        if ev != None:
+            pos = segment.mapToParent(ev.pos())
+        elif pos != None:
+            pos = pos
+        else:
+            raise Exception("Either an event or a position must be given.")
+        h1 = segment.handles[0]['item']
+        h2 = segment.handles[1]['item']
+        
+        i = self.segments.index(segment)
+        h3 = self.addFreeHandle(pos, index=self.indexOfHandle(h2))
+        self.addSegment(h3, h2, index=i+1)
+        segment.replaceHandle(h2, h3)
+        
+    def removeHandle(self, handle, updateSegments=True):
+        ROI.removeHandle(self, handle)
+        handle.sigRemoveRequested.disconnect(self.removeHandle)
+        
+        if not updateSegments:
+            return
+        segments = handle.rois[:]
+        
+        if len(segments) == 1:
+            self.removeSegment(segments[0])
+        else:
+            handles = [h['item'] for h in segments[1].handles]
+            handles.remove(handle)
+            segments[0].replaceHandle(handle, handles[0])
+            self.removeSegment(segments[1])
+        
+    def removeSegment(self, seg):
+        for handle in seg.handles[:]:
+            seg.removeHandle(handle['item'])
+        self.segments.remove(seg)
+        seg.sigClicked.disconnect(self.segmentClicked)
+        self.scene().removeItem(seg)
+        
+    def checkRemoveHandle(self, h):
+        ## called when a handle is about to display its context menu
+        if self.closed:
+            return len(self.handles) > 3
+        else:
+            return len(self.handles) > 2
+        
+    def paint(self, p, *args):
+        #for s in self.segments:
+            #s.update()
+        #p.setPen(self.currentPen)
+        #p.setPen(fn.mkPen('w'))
+        #p.drawRect(self.boundingRect())
+        #p.drawPath(self.shape())
+        pass
+    
+    def boundingRect(self):
+        return self.shape().boundingRect()
+        #r = QtCore.QRectF()
+        #for h in self.handles:
+            #r |= self.mapFromItem(h['item'], h['item'].boundingRect()).boundingRect()   ## |= gives the union of the two QRectFs
+        #return r 
+
+    def shape(self):
+        p = QtGui.QPainterPath()
+        if len(self.handles) == 0:
+            return p
+        p.moveTo(self.handles[0]['item'].pos())
+        for i in range(len(self.handles)):
+            p.lineTo(self.handles[i]['item'].pos())
+        p.lineTo(self.handles[0]['item'].pos())
+        return p        
+
+    def getArrayRegion(self, data, img, axes=(0,1), returnMappedCoords=False, **kwds):
+        """
+        Return the result of ROI.getArrayRegion(), masked by the shape of the 
+        ROI. Values outside the ROI shape are set to 0.
+        """
+        sl = self.getArraySlice(data, img, axes=(0,1))
+        if sl is None:
+            return None
+        sliced = data[sl[0]]
+        im = QtGui.QImage(sliced.shape[axes[0]], sliced.shape[axes[1]], QtGui.QImage.Format_ARGB32)
+        im.fill(0x0)
+        p = QtGui.QPainter(im)
+        p.setPen(fn.mkPen(None))
+        p.setBrush(fn.mkBrush('w'))
+        p.setTransform(self.itemTransform(img)[0])
+        bounds = self.mapRectToItem(img, self.boundingRect())
+        p.translate(-bounds.left(), -bounds.top()) 
+        p.drawPath(self.shape())
+        p.end()
+        mask = fn.imageToArray(im)[:,:,0].astype(float) / 255.
+        shape = [1] * data.ndim
+        shape[axes[0]] = sliced.shape[axes[0]]
+        shape[axes[1]] = sliced.shape[axes[1]]
+        return sliced * mask.reshape(shape)
+
+    def setPen(self, *args, **kwds):
+        ROI.setPen(self, *args, **kwds)
+        for seg in self.segments:
+            seg.setPen(*args, **kwds)
+
+
+
+class LineSegmentROI(ROI):
+    """
+    ROI subclass with two freely-moving handles defining a line.
+    
+    ============== =============================================================
+    **Arguments**
+    positions      (list of two length-2 sequences) The endpoints of the line 
+                   segment. Note that, unlike the handle positions specified in 
+                   other ROIs, these positions must be expressed in the normal
+                   coordinate system of the ROI, rather than (0 to 1) relative
+                   to the size of the ROI.
+    \**args        All extra keyword arguments are passed to ROI()
+    ============== =============================================================
+    """
+    
+    def __init__(self, positions=(None, None), pos=None, handles=(None,None), **args):
+        if pos is None:
+            pos = [0,0]
+            
+        ROI.__init__(self, pos, [1,1], **args)
+        #ROI.__init__(self, positions[0])
+        if len(positions) > 2:
+            raise Exception("LineSegmentROI must be defined by exactly 2 positions. For more points, use PolyLineROI.")
+        
+        for i, p in enumerate(positions):
+            self.addFreeHandle(p, item=handles[i])
+                
+        
+    def listPoints(self):
+        return [p['item'].pos() for p in self.handles]
+            
+    def paint(self, p, *args):
+        p.setRenderHint(QtGui.QPainter.Antialiasing)
+        p.setPen(self.currentPen)
+        h1 = self.handles[0]['item'].pos()
+        h2 = self.handles[1]['item'].pos()
+        p.drawLine(h1, h2)
+        
+    def boundingRect(self):
+        return self.shape().boundingRect()
+    
+    def shape(self):
+        p = QtGui.QPainterPath()
+    
+        h1 = self.handles[0]['item'].pos()
+        h2 = self.handles[1]['item'].pos()
+        dh = h2-h1
+        if dh.length() == 0:
+            return p
+        pxv = self.pixelVectors(dh)[1]
+        if pxv is None:
+            return p
+            
+        pxv *= 4
+        
+        p.moveTo(h1+pxv)
+        p.lineTo(h2+pxv)
+        p.lineTo(h2-pxv)
+        p.lineTo(h1-pxv)
+        p.lineTo(h1+pxv)
+      
+        return p
+    
+    def getArrayRegion(self, data, img, axes=(0,1)):
+        """
+        Use the position of this ROI relative to an imageItem to pull a slice 
+        from an array.
+        
+        Since this pulls 1D data from a 2D coordinate system, the return value 
+        will have ndim = data.ndim-1
+        
+        See ROI.getArrayRegion() for a description of the arguments.
+        """
+        
+        imgPts = [self.mapToItem(img, h['item'].pos()) for h in self.handles]
+        rgns = []
+        for i in range(len(imgPts)-1):
+            d = Point(imgPts[i+1] - imgPts[i])
+            o = Point(imgPts[i])
+            r = fn.affineSlice(data, shape=(int(d.length()),), vectors=[Point(d.norm())], origin=o, axes=axes, order=1)
+            rgns.append(r)
+            
+        return np.concatenate(rgns, axis=axes[0])
+        
+
+class SpiralROI(ROI):
+    def __init__(self, pos=None, size=None, **args):
+        if size == None:
+            size = [100e-6,100e-6]
+        if pos == None:
+            pos = [0,0]
+        ROI.__init__(self, pos, size, **args)
+        self.translateSnap = False
+        self.addFreeHandle([0.25,0], name='a')
+        self.addRotateFreeHandle([1,0], [0,0], name='r')
+        #self.getRadius()
+        #QtCore.connect(self, QtCore.SIGNAL('regionChanged'), self.
+        
+        
+    def getRadius(self):
+        radius = Point(self.handles[1]['item'].pos()).length()
+        #r2 = radius[1]
+        #r3 = r2[0]
+        return radius
+    
+    def boundingRect(self):
+        r = self.getRadius()
+        return QtCore.QRectF(-r*1.1, -r*1.1, 2.2*r, 2.2*r)
+        #return self.bounds
+    
+    #def movePoint(self, *args, **kargs):
+        #ROI.movePoint(self, *args, **kargs)
+        #self.prepareGeometryChange()
+        #for h in self.handles:
+            #h['pos'] = h['item'].pos()/self.state['size'][0]
+            
+    def stateChanged(self, finish=True):
+        ROI.stateChanged(self, finish=finish)
+        if len(self.handles) > 1:
+            self.path = QtGui.QPainterPath()
+            h0 = Point(self.handles[0]['item'].pos()).length()
+            a = h0/(2.0*np.pi)
+            theta = 30.0*(2.0*np.pi)/360.0
+            self.path.moveTo(QtCore.QPointF(a*theta*cos(theta), a*theta*sin(theta)))
+            x0 = a*theta*cos(theta)
+            y0 = a*theta*sin(theta)
+            radius = self.getRadius()
+            theta += 20.0*(2.0*np.pi)/360.0
+            i = 0
+            while Point(x0, y0).length() < radius and i < 1000:
+                x1 = a*theta*cos(theta)
+                y1 = a*theta*sin(theta)
+                self.path.lineTo(QtCore.QPointF(x1,y1))
+                theta += 20.0*(2.0*np.pi)/360.0
+                x0 = x1
+                y0 = y1
+                i += 1
+           
+                
+            return self.path
+    
+        
+    def shape(self):
+        p = QtGui.QPainterPath()
+        p.addEllipse(self.boundingRect())
+        return p
+    
+    def paint(self, p, *args):
+        p.setRenderHint(QtGui.QPainter.Antialiasing)
+        #path = self.shape()
+        p.setPen(self.currentPen)
+        p.drawPath(self.path)
+        p.setPen(QtGui.QPen(QtGui.QColor(255,0,0)))
+        p.drawPath(self.shape())
+        p.setPen(QtGui.QPen(QtGui.QColor(0,0,255)))
+        p.drawRect(self.boundingRect())
+        
+    
+class CrosshairROI(ROI):
+    """A crosshair ROI whose position is at the center of the crosshairs. By default, it is scalable, rotatable and translatable."""
+    
+    def __init__(self, pos=None, size=None, **kargs):
+        if size == None:
+            #size = [100e-6,100e-6]
+            size=[1,1]
+        if pos == None:
+            pos = [0,0]
+        self._shape = None
+        ROI.__init__(self, pos, size, **kargs)
+        
+        self.sigRegionChanged.connect(self.invalidate)
+        self.addScaleRotateHandle(Point(1, 0), Point(0, 0))
+        self.aspectLocked = True
+
+    def invalidate(self):
+        self._shape = None
+        self.prepareGeometryChange()
+        
+    def boundingRect(self):
+        #size = self.size()
+        #return QtCore.QRectF(-size[0]/2., -size[1]/2., size[0], size[1]).normalized()
+        return self.shape().boundingRect()
+    
+    #def getRect(self):
+        ### same as boundingRect -- for internal use so that boundingRect can be re-implemented in subclasses
+        #size = self.size()
+        #return QtCore.QRectF(-size[0]/2., -size[1]/2., size[0], size[1]).normalized()
+        
+    
+    def shape(self):
+        if self._shape is None:
+            radius = self.getState()['size'][1]
+            p = QtGui.QPainterPath()
+            p.moveTo(Point(0, -radius))
+            p.lineTo(Point(0, radius))
+            p.moveTo(Point(-radius, 0))
+            p.lineTo(Point(radius, 0))
+            p = self.mapToDevice(p)
+            stroker = QtGui.QPainterPathStroker()
+            stroker.setWidth(10)
+            outline = stroker.createStroke(p)
+            self._shape = self.mapFromDevice(outline)
+            
+        
+            ##h1 = self.handles[0]['item'].pos()
+            ##h2 = self.handles[1]['item'].pos()
+            #w1 = Point(-0.5, 0)*self.size()
+            #w2 = Point(0.5, 0)*self.size()
+            #h1 = Point(0, -0.5)*self.size()
+            #h2 = Point(0, 0.5)*self.size()
+            
+            #dh = h2-h1
+            #dw = w2-w1
+            #if dh.length() == 0 or dw.length() == 0:
+                #return p
+            #pxv = self.pixelVectors(dh)[1]
+            #if pxv is None:
+                #return p
+                
+            #pxv *= 4
+            
+            #p.moveTo(h1+pxv)
+            #p.lineTo(h2+pxv)
+            #p.lineTo(h2-pxv)
+            #p.lineTo(h1-pxv)
+            #p.lineTo(h1+pxv)
+            
+            #pxv = self.pixelVectors(dw)[1]
+            #if pxv is None:
+                #return p
+                
+            #pxv *= 4
+            
+            #p.moveTo(w1+pxv)
+            #p.lineTo(w2+pxv)
+            #p.lineTo(w2-pxv)
+            #p.lineTo(w1-pxv)
+            #p.lineTo(w1+pxv)
+        
+        return self._shape
+    
+    def paint(self, p, *args):
+        #p.save()
+        #r = self.getRect()
+        radius = self.getState()['size'][1]
+        p.setRenderHint(QtGui.QPainter.Antialiasing)
+        p.setPen(self.currentPen)
+        #p.translate(r.left(), r.top())
+        #p.scale(r.width()/10., r.height()/10.) ## need to scale up a little because drawLine has trouble dealing with 0.5
+        #p.drawLine(0,5, 10,5)
+        #p.drawLine(5,0, 5,10)
+        #p.restore()
+        
+        p.drawLine(Point(0, -radius), Point(0, radius))
+        p.drawLine(Point(-radius, 0), Point(radius, 0))
+        
+        
diff --git a/libs/pyqtgraph/graphicsItems/ScaleBar.py b/libs/pyqtgraph/graphicsItems/ScaleBar.py
new file mode 100644
index 0000000000000000000000000000000000000000..8ba546f7b4601695463a5d1a98b469c270829c4b
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/ScaleBar.py
@@ -0,0 +1,71 @@
+from ..Qt import QtGui, QtCore
+from .GraphicsObject import *
+from .GraphicsWidgetAnchor import *
+from .TextItem import TextItem
+import numpy as np
+from .. import functions as fn
+from .. import getConfigOption
+from ..Point import Point
+
+__all__ = ['ScaleBar']
+
+class ScaleBar(GraphicsObject, GraphicsWidgetAnchor):
+    """
+    Displays a rectangular bar to indicate the relative scale of objects on the view.
+    """
+    def __init__(self, size, width=5, brush=None, pen=None, suffix='m', offset=None):
+        GraphicsObject.__init__(self)
+        GraphicsWidgetAnchor.__init__(self)
+        self.setFlag(self.ItemHasNoContents)
+        self.setAcceptedMouseButtons(QtCore.Qt.NoButton)
+        
+        if brush is None:
+            brush = getConfigOption('foreground')
+        self.brush = fn.mkBrush(brush)
+        self.pen = fn.mkPen(pen)
+        self._width = width
+        self.size = size
+        if offset == None:
+            offset = (0,0)
+        self.offset = offset
+        
+        self.bar = QtGui.QGraphicsRectItem()
+        self.bar.setPen(self.pen)
+        self.bar.setBrush(self.brush)
+        self.bar.setParentItem(self)
+        
+        self.text = TextItem(text=fn.siFormat(size, suffix=suffix), anchor=(0.5,1))
+        self.text.setParentItem(self)
+
+    def parentChanged(self):
+        view = self.parentItem()
+        if view is None:
+            return
+        view.sigRangeChanged.connect(self.updateBar)
+        self.updateBar()
+        
+        
+    def updateBar(self):
+        view = self.parentItem()
+        if view is None:
+            return
+        p1 = view.mapFromViewToItem(self, QtCore.QPointF(0,0))
+        p2 = view.mapFromViewToItem(self, QtCore.QPointF(self.size,0))
+        w = (p2-p1).x()
+        self.bar.setRect(QtCore.QRectF(-w, 0, w, self._width))
+        self.text.setPos(-w/2., 0)
+
+    def boundingRect(self):
+        return QtCore.QRectF()
+
+    def setParentItem(self, p):
+        ret = GraphicsObject.setParentItem(self, p)
+        if self.offset is not None:
+            offset = Point(self.offset)
+            anchorx = 1 if offset[0] <= 0 else 0
+            anchory = 1 if offset[1] <= 0 else 0
+            anchor = (anchorx, anchory)
+            self.anchor(itemPos=anchor, parentPos=anchor, offset=offset)
+        return ret
+
+
diff --git a/libs/pyqtgraph/graphicsItems/ScatterPlotItem.py b/libs/pyqtgraph/graphicsItems/ScatterPlotItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..649449cd72d12c503fc2c8a0406dc2645ef0d4c5
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/ScatterPlotItem.py
@@ -0,0 +1,971 @@
+from ..Qt import QtGui, QtCore, USE_PYSIDE, USE_PYQT5
+from ..Point import Point
+from .. import functions as fn
+from .GraphicsItem import GraphicsItem
+from .GraphicsObject import GraphicsObject
+from itertools import starmap, repeat
+try:
+    from itertools import imap
+except ImportError:
+    imap = map
+import numpy as np
+import weakref
+from .. import getConfigOption
+from .. import debug as debug
+from ..pgcollections import OrderedDict
+from .. import debug
+
+__all__ = ['ScatterPlotItem', 'SpotItem']
+
+
+## Build all symbol paths
+Symbols = OrderedDict([(name, QtGui.QPainterPath()) for name in ['o', 's', 't', 'd', '+', 'x']])
+Symbols['o'].addEllipse(QtCore.QRectF(-0.5, -0.5, 1, 1))
+Symbols['s'].addRect(QtCore.QRectF(-0.5, -0.5, 1, 1))
+coords = {
+    't': [(-0.5, -0.5), (0, 0.5), (0.5, -0.5)],
+    'd': [(0., -0.5), (-0.4, 0.), (0, 0.5), (0.4, 0)],
+    '+': [
+        (-0.5, -0.05), (-0.5, 0.05), (-0.05, 0.05), (-0.05, 0.5),
+        (0.05, 0.5), (0.05, 0.05), (0.5, 0.05), (0.5, -0.05), 
+        (0.05, -0.05), (0.05, -0.5), (-0.05, -0.5), (-0.05, -0.05)
+    ],
+}
+for k, c in coords.items():
+    Symbols[k].moveTo(*c[0])
+    for x,y in c[1:]:
+        Symbols[k].lineTo(x, y)
+    Symbols[k].closeSubpath()
+tr = QtGui.QTransform()
+tr.rotate(45)
+Symbols['x'] = tr.map(Symbols['+'])
+
+    
+def drawSymbol(painter, symbol, size, pen, brush):
+    if symbol is None:
+        return
+    painter.scale(size, size)
+    painter.setPen(pen)
+    painter.setBrush(brush)
+    if isinstance(symbol, basestring):
+        symbol = Symbols[symbol]
+    if np.isscalar(symbol):
+        symbol = list(Symbols.values())[symbol % len(Symbols)]
+    painter.drawPath(symbol)
+
+    
+def renderSymbol(symbol, size, pen, brush, device=None):
+    """
+    Render a symbol specification to QImage.
+    Symbol may be either a QPainterPath or one of the keys in the Symbols dict.
+    If *device* is None, a new QPixmap will be returned. Otherwise,
+    the symbol will be rendered into the device specified (See QPainter documentation 
+    for more information).
+    """
+    ## Render a spot with the given parameters to a pixmap
+    penPxWidth = max(np.ceil(pen.widthF()), 1)
+    if device is None:
+        device = QtGui.QImage(int(size+penPxWidth), int(size+penPxWidth), QtGui.QImage.Format_ARGB32)
+        device.fill(0)
+    p = QtGui.QPainter(device)
+    try:
+        p.setRenderHint(p.Antialiasing)
+        p.translate(device.width()*0.5, device.height()*0.5)
+        drawSymbol(p, symbol, size, pen, brush)
+    finally:
+        p.end()
+    return device
+
+def makeSymbolPixmap(size, pen, brush, symbol):
+    ## deprecated
+    img = renderSymbol(symbol, size, pen, brush)
+    return QtGui.QPixmap(img)
+    
+class SymbolAtlas(object):
+    """
+    Used to efficiently construct a single QPixmap containing all rendered symbols
+    for a ScatterPlotItem. This is required for fragment rendering.
+    
+    Use example:
+        atlas = SymbolAtlas()
+        sc1 = atlas.getSymbolCoords('o', 5, QPen(..), QBrush(..))
+        sc2 = atlas.getSymbolCoords('t', 10, QPen(..), QBrush(..))
+        pm = atlas.getAtlas()
+        
+    """
+    def __init__(self):
+        # symbol key : QRect(...) coordinates where symbol can be found in atlas.
+        # note that the coordinate list will always be the same list object as 
+        # long as the symbol is in the atlas, but the coordinates may
+        # change if the atlas is rebuilt.
+        # weak value; if all external refs to this list disappear, 
+        # the symbol will be forgotten.
+        self.symbolMap = weakref.WeakValueDictionary()
+        
+        self.atlasData = None # numpy array of atlas image
+        self.atlas = None     # atlas as QPixmap
+        self.atlasValid = False
+        self.max_width=0
+        
+    def getSymbolCoords(self, opts):
+        """
+        Given a list of spot records, return an object representing the coordinates of that symbol within the atlas
+        """
+        sourceRect = np.empty(len(opts), dtype=object)
+        keyi = None
+        sourceRecti = None
+        for i, rec in enumerate(opts):
+            key = (rec[3], rec[2], id(rec[4]), id(rec[5]))   # TODO: use string indexes?
+            if key == keyi:
+                sourceRect[i] = sourceRecti
+            else:
+                try:
+                    sourceRect[i] = self.symbolMap[key]
+                except KeyError:
+                    newRectSrc = QtCore.QRectF()
+                    newRectSrc.pen = rec['pen']
+                    newRectSrc.brush = rec['brush']
+                    self.symbolMap[key] = newRectSrc
+                    self.atlasValid = False
+                    sourceRect[i] = newRectSrc
+                    keyi = key
+                    sourceRecti = newRectSrc
+        return sourceRect
+        
+    def buildAtlas(self):
+        # get rendered array for all symbols, keep track of avg/max width
+        rendered = {}
+        avgWidth = 0.0
+        maxWidth = 0
+        images = []
+        for key, sourceRect in self.symbolMap.items():
+            if sourceRect.width() == 0:
+                img = renderSymbol(key[0], key[1], sourceRect.pen, sourceRect.brush)
+                images.append(img)  ## we only need this to prevent the images being garbage collected immediately
+                arr = fn.imageToArray(img, copy=False, transpose=False)
+            else:
+                (y,x,h,w) = sourceRect.getRect()
+                arr = self.atlasData[x:x+w, y:y+w]
+            rendered[key] = arr
+            w = arr.shape[0]
+            avgWidth += w
+            maxWidth = max(maxWidth, w)
+            
+        nSymbols = len(rendered)
+        if nSymbols > 0:
+            avgWidth /= nSymbols
+            width = max(maxWidth, avgWidth * (nSymbols**0.5))
+        else:
+            avgWidth = 0
+            width = 0
+        
+        # sort symbols by height
+        symbols = sorted(rendered.keys(), key=lambda x: rendered[x].shape[1], reverse=True)
+        
+        self.atlasRows = []
+
+        x = width
+        y = 0
+        rowheight = 0
+        for key in symbols:
+            arr = rendered[key]
+            w,h = arr.shape[:2]
+            if x+w > width:
+                y += rowheight
+                x = 0
+                rowheight = h
+                self.atlasRows.append([y, rowheight, 0])
+            self.symbolMap[key].setRect(y, x, h, w)
+            x += w
+            self.atlasRows[-1][2] = x
+        height = y + rowheight
+
+        self.atlasData = np.zeros((width, height, 4), dtype=np.ubyte)
+        for key in symbols:
+            y, x, h, w = self.symbolMap[key].getRect()
+            self.atlasData[x:x+w, y:y+h] = rendered[key]
+        self.atlas = None
+        self.atlasValid = True
+        self.max_width = maxWidth
+    
+    def getAtlas(self):
+        if not self.atlasValid:
+            self.buildAtlas()
+        if self.atlas is None:
+            if len(self.atlasData) == 0:
+                return QtGui.QPixmap(0,0)
+            img = fn.makeQImage(self.atlasData, copy=False, transpose=False)
+            self.atlas = QtGui.QPixmap(img)
+        return self.atlas
+        
+    
+    
+    
+class ScatterPlotItem(GraphicsObject):
+    """
+    Displays a set of x/y points. Instances of this class are created
+    automatically as part of PlotDataItem; these rarely need to be instantiated
+    directly.
+    
+    The size, shape, pen, and fill brush may be set for each point individually 
+    or for all points. 
+    
+    
+    ========================  ===============================================
+    **Signals:**
+    sigPlotChanged(self)      Emitted when the data being plotted has changed
+    sigClicked(self, points)  Emitted when the curve is clicked. Sends a list
+                              of all the points under the mouse pointer.
+    ========================  ===============================================
+    
+    """
+    #sigPointClicked = QtCore.Signal(object, object)
+    sigClicked = QtCore.Signal(object, object)  ## self, points
+    sigPlotChanged = QtCore.Signal(object)
+    def __init__(self, *args, **kargs):
+        """
+        Accepts the same arguments as setData()
+        """
+        profiler = debug.Profiler()
+        GraphicsObject.__init__(self)
+        
+        self.picture = None   # QPicture used for rendering when pxmode==False
+        self.fragmentAtlas = SymbolAtlas()
+        
+        self.data = np.empty(0, dtype=[('x', float), ('y', float), ('size', float), ('symbol', object), ('pen', object), ('brush', object), ('data', object), ('item', object), ('sourceRect', object), ('targetRect', object), ('width', float)])
+        self.bounds = [None, None]  ## caches data bounds
+        self._maxSpotWidth = 0      ## maximum size of the scale-variant portion of all spots
+        self._maxSpotPxWidth = 0    ## maximum size of the scale-invariant portion of all spots
+        self.opts = {
+            'pxMode': True, 
+            'useCache': True,  ## If useCache is False, symbols are re-drawn on every paint. 
+            'antialias': getConfigOption('antialias'),
+            'name': None,
+        }
+
+        self.setPen(fn.mkPen(getConfigOption('foreground')), update=False)
+        self.setBrush(fn.mkBrush(100,100,150), update=False)
+        self.setSymbol('o', update=False)
+        self.setSize(7, update=False)
+        profiler()
+        self.setData(*args, **kargs)
+        profiler('setData')
+
+        #self.setCacheMode(self.DeviceCoordinateCache)
+        
+    def setData(self, *args, **kargs):
+        """
+        **Ordered Arguments:**
+        
+        * If there is only one unnamed argument, it will be interpreted like the 'spots' argument.
+        * If there are two unnamed arguments, they will be interpreted as sequences of x and y values.
+        
+        ====================== ===============================================================================================
+        **Keyword Arguments:**
+        *spots*                Optional list of dicts. Each dict specifies parameters for a single spot:
+                               {'pos': (x,y), 'size', 'pen', 'brush', 'symbol'}. This is just an alternate method
+                               of passing in data for the corresponding arguments.
+        *x*,*y*                1D arrays of x,y values.
+        *pos*                  2D structure of x,y pairs (such as Nx2 array or list of tuples)
+        *pxMode*               If True, spots are always the same size regardless of scaling, and size is given in px.
+                               Otherwise, size is in scene coordinates and the spots scale with the view.
+                               Default is True
+        *symbol*               can be one (or a list) of:
+                               * 'o'  circle (default)
+                               * 's'  square
+                               * 't'  triangle
+                               * 'd'  diamond
+                               * '+'  plus
+                               * any QPainterPath to specify custom symbol shapes. To properly obey the position and size,
+                               custom symbols should be centered at (0,0) and width and height of 1.0. Note that it is also
+                               possible to 'install' custom shapes by setting ScatterPlotItem.Symbols[key] = shape.
+        *pen*                  The pen (or list of pens) to use for drawing spot outlines.
+        *brush*                The brush (or list of brushes) to use for filling spots.
+        *size*                 The size (or list of sizes) of spots. If *pxMode* is True, this value is in pixels. Otherwise,
+                               it is in the item's local coordinate system.
+        *data*                 a list of python objects used to uniquely identify each spot.
+        *identical*            *Deprecated*. This functionality is handled automatically now.
+        *antialias*            Whether to draw symbols with antialiasing. Note that if pxMode is True, symbols are 
+                               always rendered with antialiasing (since the rendered symbols can be cached, this 
+                               incurs very little performance cost)
+        *name*                 The name of this item. Names are used for automatically
+                               generating LegendItem entries and by some exporters.
+        ====================== ===============================================================================================
+        """
+        oldData = self.data  ## this causes cached pixmaps to be preserved while new data is registered.
+        self.clear()  ## clear out all old data
+        self.addPoints(*args, **kargs)
+
+    def addPoints(self, *args, **kargs):
+        """
+        Add new points to the scatter plot. 
+        Arguments are the same as setData()
+        """
+        
+        ## deal with non-keyword arguments
+        if len(args) == 1:
+            kargs['spots'] = args[0]
+        elif len(args) == 2:
+            kargs['x'] = args[0]
+            kargs['y'] = args[1]
+        elif len(args) > 2:
+            raise Exception('Only accepts up to two non-keyword arguments.')
+        
+        ## convert 'pos' argument to 'x' and 'y'
+        if 'pos' in kargs:
+            pos = kargs['pos']
+            if isinstance(pos, np.ndarray):
+                kargs['x'] = pos[:,0]
+                kargs['y'] = pos[:,1]
+            else:
+                x = []
+                y = []
+                for p in pos:
+                    if isinstance(p, QtCore.QPointF):
+                        x.append(p.x())
+                        y.append(p.y())
+                    else:
+                        x.append(p[0])
+                        y.append(p[1])
+                kargs['x'] = x
+                kargs['y'] = y
+        
+        ## determine how many spots we have
+        if 'spots' in kargs:
+            numPts = len(kargs['spots'])
+        elif 'y' in kargs and kargs['y'] is not None:
+            numPts = len(kargs['y'])
+        else:
+            kargs['x'] = []
+            kargs['y'] = []
+            numPts = 0
+        
+        ## Extend record array
+        oldData = self.data
+        self.data = np.empty(len(oldData)+numPts, dtype=self.data.dtype)
+        ## note that np.empty initializes object fields to None and string fields to ''
+        
+        self.data[:len(oldData)] = oldData
+        #for i in range(len(oldData)):
+            #oldData[i]['item']._data = self.data[i]  ## Make sure items have proper reference to new array
+            
+        newData = self.data[len(oldData):]
+        newData['size'] = -1  ## indicates to use default size
+
+        if 'spots' in kargs:
+            spots = kargs['spots']
+            for i in range(len(spots)):
+                spot = spots[i]
+                for k in spot:
+                    if k == 'pos':
+                        pos = spot[k]
+                        if isinstance(pos, QtCore.QPointF):
+                            x,y = pos.x(), pos.y()
+                        else:
+                            x,y = pos[0], pos[1]
+                        newData[i]['x'] = x
+                        newData[i]['y'] = y
+                    elif k == 'pen':
+                        newData[i][k] = fn.mkPen(spot[k])
+                    elif k == 'brush':
+                        newData[i][k] = fn.mkBrush(spot[k])
+                    elif k in ['x', 'y', 'size', 'symbol', 'brush', 'data']:
+                        newData[i][k] = spot[k]
+                    else:
+                        raise Exception("Unknown spot parameter: %s" % k)
+        elif 'y' in kargs:
+            newData['x'] = kargs['x']
+            newData['y'] = kargs['y']
+        
+        if 'pxMode' in kargs:
+            self.setPxMode(kargs['pxMode'])
+        if 'antialias' in kargs:
+            self.opts['antialias'] = kargs['antialias']
+            
+        ## Set any extra parameters provided in keyword arguments
+        for k in ['pen', 'brush', 'symbol', 'size']:
+            if k in kargs:
+                setMethod = getattr(self, 'set' + k[0].upper() + k[1:])
+                setMethod(kargs[k], update=False, dataSet=newData, mask=kargs.get('mask', None))
+
+        if 'data' in kargs:
+            self.setPointData(kargs['data'], dataSet=newData)
+
+        self.prepareGeometryChange()
+        self.informViewBoundsChanged()
+        self.bounds = [None, None]
+        self.invalidate()
+        self.updateSpots(newData)
+        self.sigPlotChanged.emit(self)
+        
+    def invalidate(self):
+        ## clear any cached drawing state
+        self.picture = None
+        self.update()
+        
+    def getData(self):
+        return self.data['x'], self.data['y']    
+        
+    def setPoints(self, *args, **kargs):
+        ##Deprecated; use setData
+        return self.setData(*args, **kargs)
+        
+    def implements(self, interface=None):
+        ints = ['plotData']
+        if interface is None:
+            return ints
+        return interface in ints
+    
+    def name(self):
+        return self.opts.get('name', None)
+    
+    def setPen(self, *args, **kargs):
+        """Set the pen(s) used to draw the outline around each spot. 
+        If a list or array is provided, then the pen for each spot will be set separately.
+        Otherwise, the arguments are passed to pg.mkPen and used as the default pen for 
+        all spots which do not have a pen explicitly set."""
+        update = kargs.pop('update', True)
+        dataSet = kargs.pop('dataSet', self.data)
+
+        if len(args) == 1 and (isinstance(args[0], np.ndarray) or isinstance(args[0], list)):
+            pens = args[0]
+            if 'mask' in kargs and kargs['mask'] is not None:
+                pens = pens[kargs['mask']]
+            if len(pens) != len(dataSet):
+                raise Exception("Number of pens does not match number of points (%d != %d)" % (len(pens), len(dataSet)))
+            dataSet['pen'] = pens
+        else:
+            self.opts['pen'] = fn.mkPen(*args, **kargs)
+        
+        dataSet['sourceRect'] = None
+        if update:
+            self.updateSpots(dataSet)
+        
+    def setBrush(self, *args, **kargs):
+        """Set the brush(es) used to fill the interior of each spot. 
+        If a list or array is provided, then the brush for each spot will be set separately.
+        Otherwise, the arguments are passed to pg.mkBrush and used as the default brush for 
+        all spots which do not have a brush explicitly set."""
+        update = kargs.pop('update', True)
+        dataSet = kargs.pop('dataSet', self.data)
+            
+        if len(args) == 1 and (isinstance(args[0], np.ndarray) or isinstance(args[0], list)):
+            brushes = args[0]
+            if 'mask' in kargs and kargs['mask'] is not None:
+                brushes = brushes[kargs['mask']]
+            if len(brushes) != len(dataSet):
+                raise Exception("Number of brushes does not match number of points (%d != %d)" % (len(brushes), len(dataSet)))
+            #for i in xrange(len(brushes)):
+                #self.data[i]['brush'] = fn.mkBrush(brushes[i], **kargs)
+            dataSet['brush'] = brushes
+        else:
+            self.opts['brush'] = fn.mkBrush(*args, **kargs)
+            #self._spotPixmap = None
+        
+        dataSet['sourceRect'] = None
+        if update:
+            self.updateSpots(dataSet)
+
+    def setSymbol(self, symbol, update=True, dataSet=None, mask=None):
+        """Set the symbol(s) used to draw each spot. 
+        If a list or array is provided, then the symbol for each spot will be set separately.
+        Otherwise, the argument will be used as the default symbol for 
+        all spots which do not have a symbol explicitly set."""
+        if dataSet is None:
+            dataSet = self.data
+            
+        if isinstance(symbol, np.ndarray) or isinstance(symbol, list):
+            symbols = symbol
+            if mask is not None:
+                symbols = symbols[mask]
+            if len(symbols) != len(dataSet):
+                raise Exception("Number of symbols does not match number of points (%d != %d)" % (len(symbols), len(dataSet)))
+            dataSet['symbol'] = symbols
+        else:
+            self.opts['symbol'] = symbol
+            self._spotPixmap = None
+        
+        dataSet['sourceRect'] = None
+        if update:
+            self.updateSpots(dataSet)
+    
+    def setSize(self, size, update=True, dataSet=None, mask=None):
+        """Set the size(s) used to draw each spot. 
+        If a list or array is provided, then the size for each spot will be set separately.
+        Otherwise, the argument will be used as the default size for 
+        all spots which do not have a size explicitly set."""
+        if dataSet is None:
+            dataSet = self.data
+            
+        if isinstance(size, np.ndarray) or isinstance(size, list):
+            sizes = size
+            if mask is not None:
+                sizes = sizes[mask]
+            if len(sizes) != len(dataSet):
+                raise Exception("Number of sizes does not match number of points (%d != %d)" % (len(sizes), len(dataSet)))
+            dataSet['size'] = sizes
+        else:
+            self.opts['size'] = size
+            self._spotPixmap = None
+            
+        dataSet['sourceRect'] = None
+        if update:
+            self.updateSpots(dataSet)
+        
+    def setPointData(self, data, dataSet=None, mask=None):
+        if dataSet is None:
+            dataSet = self.data
+            
+        if isinstance(data, np.ndarray) or isinstance(data, list):
+            if mask is not None:
+                data = data[mask]
+            if len(data) != len(dataSet):
+                raise Exception("Length of meta data does not match number of points (%d != %d)" % (len(data), len(dataSet)))
+        
+        ## Bug: If data is a numpy record array, then items from that array must be copied to dataSet one at a time.
+        ## (otherwise they are converted to tuples and thus lose their field names.
+        if isinstance(data, np.ndarray) and (data.dtype.fields is not None)and len(data.dtype.fields) > 1:
+            for i, rec in enumerate(data):
+                dataSet['data'][i] = rec
+        else:
+            dataSet['data'] = data
+        
+    def setPxMode(self, mode):
+        if self.opts['pxMode'] == mode:
+            return
+            
+        self.opts['pxMode'] = mode
+        self.invalidate()
+        
+    def updateSpots(self, dataSet=None):
+        if dataSet is None:
+            dataSet = self.data
+
+        invalidate = False
+        if self.opts['pxMode']:
+            mask = np.equal(dataSet['sourceRect'], None)
+            if np.any(mask):
+                invalidate = True
+                opts = self.getSpotOpts(dataSet[mask])
+                sourceRect = self.fragmentAtlas.getSymbolCoords(opts)
+                dataSet['sourceRect'][mask] = sourceRect
+                
+            self.fragmentAtlas.getAtlas() # generate atlas so source widths are available.
+            
+            dataSet['width'] = np.array(list(imap(QtCore.QRectF.width, dataSet['sourceRect'])))/2
+            dataSet['targetRect'] = None
+            self._maxSpotPxWidth = self.fragmentAtlas.max_width
+        else:
+            self._maxSpotWidth = 0
+            self._maxSpotPxWidth = 0
+            self.measureSpotSizes(dataSet)
+
+        if invalidate:
+            self.invalidate()
+
+    def getSpotOpts(self, recs, scale=1.0):
+        if recs.ndim == 0:
+            rec = recs
+            symbol = rec['symbol']
+            if symbol is None:
+                symbol = self.opts['symbol']
+            size = rec['size']
+            if size < 0:
+                size = self.opts['size']
+            pen = rec['pen']
+            if pen is None:
+                pen = self.opts['pen']
+            brush = rec['brush']
+            if brush is None:
+                brush = self.opts['brush']
+            return (symbol, size*scale, fn.mkPen(pen), fn.mkBrush(brush))
+        else:
+            recs = recs.copy()
+            recs['symbol'][np.equal(recs['symbol'], None)] = self.opts['symbol']
+            recs['size'][np.equal(recs['size'], -1)] = self.opts['size']
+            recs['size'] *= scale
+            recs['pen'][np.equal(recs['pen'], None)] = fn.mkPen(self.opts['pen'])
+            recs['brush'][np.equal(recs['brush'], None)] = fn.mkBrush(self.opts['brush'])
+            return recs
+            
+            
+        
+    def measureSpotSizes(self, dataSet):
+        for rec in dataSet:
+            ## keep track of the maximum spot size and pixel size
+            symbol, size, pen, brush = self.getSpotOpts(rec)
+            width = 0
+            pxWidth = 0
+            if self.opts['pxMode']:
+                pxWidth = size + pen.widthF()
+            else:
+                width = size
+                if pen.isCosmetic():
+                    pxWidth += pen.widthF()
+                else:
+                    width += pen.widthF()
+            self._maxSpotWidth = max(self._maxSpotWidth, width)
+            self._maxSpotPxWidth = max(self._maxSpotPxWidth, pxWidth)
+        self.bounds = [None, None]
+    
+    
+    def clear(self):
+        """Remove all spots from the scatter plot"""
+        #self.clearItems()
+        self.data = np.empty(0, dtype=self.data.dtype)
+        self.bounds = [None, None]
+        self.invalidate()
+
+    def dataBounds(self, ax, frac=1.0, orthoRange=None):
+        if frac >= 1.0 and orthoRange is None and self.bounds[ax] is not None:
+            return self.bounds[ax]
+        
+        #self.prepareGeometryChange()
+        if self.data is None or len(self.data) == 0:
+            return (None, None)
+        
+        if ax == 0:
+            d = self.data['x']
+            d2 = self.data['y']
+        elif ax == 1:
+            d = self.data['y']
+            d2 = self.data['x']
+        
+        if orthoRange is not None:
+            mask = (d2 >= orthoRange[0]) * (d2 <= orthoRange[1])
+            d = d[mask]
+            d2 = d2[mask]
+            
+        if frac >= 1.0:
+            self.bounds[ax] = (np.nanmin(d) - self._maxSpotWidth*0.7072, np.nanmax(d) + self._maxSpotWidth*0.7072)
+            return self.bounds[ax]
+        elif frac <= 0.0:
+            raise Exception("Value for parameter 'frac' must be > 0. (got %s)" % str(frac))
+        else:
+            mask = np.isfinite(d)
+            d = d[mask]
+            return np.percentile(d, [50 * (1 - frac), 50 * (1 + frac)])
+
+    def pixelPadding(self):
+        return self._maxSpotPxWidth*0.7072
+
+    def boundingRect(self):
+        (xmn, xmx) = self.dataBounds(ax=0)
+        (ymn, ymx) = self.dataBounds(ax=1)
+        if xmn is None or xmx is None:
+            xmn = 0
+            xmx = 0
+        if ymn is None or ymx is None:
+            ymn = 0
+            ymx = 0
+        
+        px = py = 0.0
+        pxPad = self.pixelPadding()
+        if pxPad > 0:
+            # determine length of pixel in local x, y directions    
+            px, py = self.pixelVectors()
+            try:
+                px = 0 if px is None else px.length()
+            except OverflowError:
+                px = 0
+            try:
+                py = 0 if py is None else py.length()
+            except OverflowError:
+                py = 0
+            
+            # return bounds expanded by pixel size
+            px *= pxPad
+            py *= pxPad
+        return QtCore.QRectF(xmn-px, ymn-py, (2*px)+xmx-xmn, (2*py)+ymx-ymn)
+
+    def viewTransformChanged(self):
+        self.prepareGeometryChange()
+        GraphicsObject.viewTransformChanged(self)
+        self.bounds = [None, None]
+        self.data['targetRect'] = None
+
+    def setExportMode(self, *args, **kwds):
+        GraphicsObject.setExportMode(self, *args, **kwds)
+        self.invalidate()
+
+
+    def mapPointsToDevice(self, pts):
+        # Map point locations to device        
+        tr = self.deviceTransform()
+        if tr is None:
+            return None
+
+        #pts = np.empty((2,len(self.data['x'])))
+        #pts[0] = self.data['x']
+        #pts[1] = self.data['y']
+        pts = fn.transformCoordinates(tr, pts)
+        pts -= self.data['width']
+        pts = np.clip(pts, -2**30, 2**30) ## prevent Qt segmentation fault.
+        
+        return pts
+
+    def getViewMask(self, pts):
+        # Return bool mask indicating all points that are within viewbox
+        # pts is expressed in *device coordiantes*
+        vb = self.getViewBox()
+        if vb is None:
+            return None
+        viewBounds = vb.mapRectToDevice(vb.boundingRect())
+        w = self.data['width']
+        mask = ((pts[0] + w > viewBounds.left()) &
+                (pts[0] - w < viewBounds.right()) &
+                (pts[1] + w > viewBounds.top()) &
+                (pts[1] - w < viewBounds.bottom())) ## remove out of view points 
+        return mask
+        
+        
+    @debug.warnOnException  ## raising an exception here causes crash
+    def paint(self, p, *args):
+
+        #p.setPen(fn.mkPen('r'))
+        #p.drawRect(self.boundingRect())
+        
+        if self._exportOpts is not False:
+            aa = self._exportOpts.get('antialias', True)
+            scale = self._exportOpts.get('resolutionScale', 1.0)  ## exporting to image; pixel resolution may have changed
+        else:
+            aa = self.opts['antialias']
+            scale = 1.0
+            
+        if self.opts['pxMode'] is True:
+            p.resetTransform()
+            
+            # Map point coordinates to device
+            pts = np.vstack([self.data['x'], self.data['y']])
+            pts = self.mapPointsToDevice(pts)
+            if pts is None:
+                return
+            
+            # Cull points that are outside view
+            viewMask = self.getViewMask(pts)
+            #pts = pts[:,mask]
+            #data = self.data[mask]
+            
+            if self.opts['useCache'] and self._exportOpts is False:
+                # Draw symbols from pre-rendered atlas
+                atlas = self.fragmentAtlas.getAtlas()
+                
+                # Update targetRects if necessary
+                updateMask = viewMask & np.equal(self.data['targetRect'], None)
+                if np.any(updateMask):
+                    updatePts = pts[:,updateMask]
+                    width = self.data[updateMask]['width']*2
+                    self.data['targetRect'][updateMask] = list(imap(QtCore.QRectF, updatePts[0,:], updatePts[1,:], width, width))
+                
+                data = self.data[viewMask]
+                if USE_PYSIDE or USE_PYQT5:
+                    list(imap(p.drawPixmap, data['targetRect'], repeat(atlas), data['sourceRect']))
+                else:
+                    p.drawPixmapFragments(data['targetRect'].tolist(), data['sourceRect'].tolist(), atlas)
+            else:
+                # render each symbol individually
+                p.setRenderHint(p.Antialiasing, aa)
+
+                data = self.data[viewMask]
+                pts = pts[:,viewMask]
+                for i, rec in enumerate(data):
+                    p.resetTransform()
+                    p.translate(pts[0,i] + rec['width'], pts[1,i] + rec['width'])
+                    drawSymbol(p, *self.getSpotOpts(rec, scale))
+        else:
+            if self.picture is None:
+                self.picture = QtGui.QPicture()
+                p2 = QtGui.QPainter(self.picture)
+                for rec in self.data:
+                    if scale != 1.0:
+                        rec = rec.copy()
+                        rec['size'] *= scale
+                    p2.resetTransform()
+                    p2.translate(rec['x'], rec['y'])
+                    drawSymbol(p2, *self.getSpotOpts(rec, scale))
+                p2.end()
+                
+            p.setRenderHint(p.Antialiasing, aa)
+            self.picture.play(p)
+        
+    def points(self):
+        for rec in self.data:
+            if rec['item'] is None:
+                rec['item'] = SpotItem(rec, self)
+        return self.data['item']
+        
+    def pointsAt(self, pos):
+        x = pos.x()
+        y = pos.y()
+        pw = self.pixelWidth()
+        ph = self.pixelHeight()
+        pts = []
+        for s in self.points():
+            sp = s.pos()
+            ss = s.size()
+            sx = sp.x()
+            sy = sp.y()
+            s2x = s2y = ss * 0.5
+            if self.opts['pxMode']:
+                s2x *= pw
+                s2y *= ph
+            if x > sx-s2x and x < sx+s2x and y > sy-s2y and y < sy+s2y:
+                pts.append(s)
+                #print "HIT:", x, y, sx, sy, s2x, s2y
+            #else:
+                #print "No hit:", (x, y), (sx, sy)
+                #print "       ", (sx-s2x, sy-s2y), (sx+s2x, sy+s2y)
+        #pts.sort(lambda a,b: cmp(b.zValue(), a.zValue()))
+        return pts[::-1]
+            
+
+    def mouseClickEvent(self, ev):
+        if ev.button() == QtCore.Qt.LeftButton:
+            pts = self.pointsAt(ev.pos())
+            if len(pts) > 0:
+                self.ptsClicked = pts
+                self.sigClicked.emit(self, self.ptsClicked)
+                ev.accept()
+            else:
+                #print "no spots"
+                ev.ignore()
+        else:
+            ev.ignore()
+
+
+class SpotItem(object):
+    """
+    Class referring to individual spots in a scatter plot.
+    These can be retrieved by calling ScatterPlotItem.points() or 
+    by connecting to the ScatterPlotItem's click signals.
+    """
+
+    def __init__(self, data, plot):
+        #GraphicsItem.__init__(self, register=False)
+        self._data = data
+        self._plot = plot
+        #self.setParentItem(plot)
+        #self.setPos(QtCore.QPointF(data['x'], data['y']))
+        #self.updateItem()
+    
+    def data(self):
+        """Return the user data associated with this spot."""
+        return self._data['data']
+    
+    def size(self):
+        """Return the size of this spot. 
+        If the spot has no explicit size set, then return the ScatterPlotItem's default size instead."""
+        if self._data['size'] == -1:
+            return self._plot.opts['size']
+        else:
+            return self._data['size']
+    
+    def pos(self):
+        return Point(self._data['x'], self._data['y'])
+        
+    def viewPos(self):
+        return self._plot.mapToView(self.pos())
+    
+    def setSize(self, size):
+        """Set the size of this spot. 
+        If the size is set to -1, then the ScatterPlotItem's default size 
+        will be used instead."""
+        self._data['size'] = size
+        self.updateItem()
+    
+    def symbol(self):
+        """Return the symbol of this spot. 
+        If the spot has no explicit symbol set, then return the ScatterPlotItem's default symbol instead.
+        """
+        symbol = self._data['symbol']
+        if symbol is None:
+            symbol = self._plot.opts['symbol']
+        try:
+            n = int(symbol)
+            symbol = list(Symbols.keys())[n % len(Symbols)]
+        except:
+            pass
+        return symbol
+    
+    def setSymbol(self, symbol):
+        """Set the symbol for this spot.
+        If the symbol is set to '', then the ScatterPlotItem's default symbol will be used instead."""
+        self._data['symbol'] = symbol
+        self.updateItem()
+
+    def pen(self):
+        pen = self._data['pen']
+        if pen is None:
+            pen = self._plot.opts['pen']
+        return fn.mkPen(pen)
+    
+    def setPen(self, *args, **kargs):
+        """Set the outline pen for this spot"""
+        pen = fn.mkPen(*args, **kargs)
+        self._data['pen'] = pen
+        self.updateItem()
+    
+    def resetPen(self):
+        """Remove the pen set for this spot; the scatter plot's default pen will be used instead."""
+        self._data['pen'] = None  ## Note this is NOT the same as calling setPen(None)
+        self.updateItem()
+    
+    def brush(self):
+        brush = self._data['brush']
+        if brush is None:
+            brush = self._plot.opts['brush']
+        return fn.mkBrush(brush)
+    
+    def setBrush(self, *args, **kargs):
+        """Set the fill brush for this spot"""
+        brush = fn.mkBrush(*args, **kargs)
+        self._data['brush'] = brush
+        self.updateItem()
+    
+    def resetBrush(self):
+        """Remove the brush set for this spot; the scatter plot's default brush will be used instead."""
+        self._data['brush'] = None  ## Note this is NOT the same as calling setBrush(None)
+        self.updateItem()
+    
+    def setData(self, data):
+        """Set the user-data associated with this spot"""
+        self._data['data'] = data
+
+    def updateItem(self):
+        self._data['sourceRect'] = None
+        self._plot.updateSpots(self._data.reshape(1))
+        self._plot.invalidate()
+
+#class PixmapSpotItem(SpotItem, QtGui.QGraphicsPixmapItem):
+    #def __init__(self, data, plot):
+        #QtGui.QGraphicsPixmapItem.__init__(self)
+        #self.setFlags(self.flags() | self.ItemIgnoresTransformations)
+        #SpotItem.__init__(self, data, plot)
+    
+    #def setPixmap(self, pixmap):
+        #QtGui.QGraphicsPixmapItem.setPixmap(self, pixmap)
+        #self.setOffset(-pixmap.width()/2.+0.5, -pixmap.height()/2.)
+    
+    #def updateItem(self):
+        #symbolOpts = (self._data['pen'], self._data['brush'], self._data['size'], self._data['symbol'])
+        
+        ### If all symbol options are default, use default pixmap
+        #if symbolOpts == (None, None, -1, ''):
+            #pixmap = self._plot.defaultSpotPixmap()
+        #else:
+            #pixmap = makeSymbolPixmap(size=self.size(), pen=self.pen(), brush=self.brush(), symbol=self.symbol())
+        #self.setPixmap(pixmap)
+
+
+#class PathSpotItem(SpotItem, QtGui.QGraphicsPathItem):
+    #def __init__(self, data, plot):
+        #QtGui.QGraphicsPathItem.__init__(self)
+        #SpotItem.__init__(self, data, plot)
+
+    #def updateItem(self):
+        #QtGui.QGraphicsPathItem.setPath(self, Symbols[self.symbol()])
+        #QtGui.QGraphicsPathItem.setPen(self, self.pen())
+        #QtGui.QGraphicsPathItem.setBrush(self, self.brush())
+        #size = self.size()
+        #self.resetTransform()
+        #self.scale(size, size)
diff --git a/libs/pyqtgraph/graphicsItems/TextItem.py b/libs/pyqtgraph/graphicsItems/TextItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..d3c98006867875b46fc6db4d40427406bfa08beb
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/TextItem.py
@@ -0,0 +1,152 @@
+from ..Qt import QtCore, QtGui
+from ..Point import Point
+from .UIGraphicsItem import *
+from .. import functions as fn
+
+class TextItem(UIGraphicsItem):
+    """
+    GraphicsItem displaying unscaled text (the text will always appear normal even inside a scaled ViewBox). 
+    """
+    def __init__(self, text='', color=(200,200,200), html=None, anchor=(0,0), border=None, fill=None, angle=0):
+        """
+        ==============  =================================================================================
+        **Arguments:**
+        *text*          The text to display
+        *color*         The color of the text (any format accepted by pg.mkColor)
+        *html*          If specified, this overrides both *text* and *color*
+        *anchor*        A QPointF or (x,y) sequence indicating what region of the text box will
+                        be anchored to the item's position. A value of (0,0) sets the upper-left corner
+                        of the text box to be at the position specified by setPos(), while a value of (1,1)
+                        sets the lower-right corner.
+        *border*        A pen to use when drawing the border
+        *fill*          A brush to use when filling within the border
+        ==============  =================================================================================
+        """
+        
+        ## not working yet
+        #*angle*      Angle in degrees to rotate text (note that the rotation assigned in this item's 
+                     #transformation will be ignored)
+                     
+        self.anchor = Point(anchor)
+        #self.angle = 0
+        UIGraphicsItem.__init__(self)
+        self.textItem = QtGui.QGraphicsTextItem()
+        self.textItem.setParentItem(self)
+        self.lastTransform = None
+        self._bounds = QtCore.QRectF()
+        if html is None:
+            self.setText(text, color)
+        else:
+            self.setHtml(html)
+        self.fill = fn.mkBrush(fill)
+        self.border = fn.mkPen(border)
+        self.rotate(angle)
+        self.setFlag(self.ItemIgnoresTransformations)  ## This is required to keep the text unscaled inside the viewport
+
+    def setText(self, text, color=(200,200,200)):
+        """
+        Set the text and color of this item. 
+        
+        This method sets the plain text of the item; see also setHtml().
+        """
+        color = fn.mkColor(color)
+        self.textItem.setDefaultTextColor(color)
+        self.textItem.setPlainText(text)
+        self.updateText()
+        #html = '<span style="color: #%s; text-align: center;">%s</span>' % (color, text)
+        #self.setHtml(html)
+        
+    def updateAnchor(self):
+        pass
+        #self.resetTransform()
+        #self.translate(0, 20)
+        
+    def setPlainText(self, *args):
+        """
+        Set the plain text to be rendered by this item. 
+        
+        See QtGui.QGraphicsTextItem.setPlainText().
+        """
+        self.textItem.setPlainText(*args)
+        self.updateText()
+        
+    def setHtml(self, *args):
+        """
+        Set the HTML code to be rendered by this item. 
+        
+        See QtGui.QGraphicsTextItem.setHtml().
+        """
+        self.textItem.setHtml(*args)
+        self.updateText()
+        
+    def setTextWidth(self, *args):
+        """
+        Set the width of the text.
+        
+        If the text requires more space than the width limit, then it will be
+        wrapped into multiple lines.
+        
+        See QtGui.QGraphicsTextItem.setTextWidth().
+        """
+        self.textItem.setTextWidth(*args)
+        self.updateText()
+        
+    def setFont(self, *args):
+        """
+        Set the font for this text. 
+        
+        See QtGui.QGraphicsTextItem.setFont().
+        """
+        self.textItem.setFont(*args)
+        self.updateText()
+        
+    #def setAngle(self, angle):
+        #self.angle = angle
+        #self.updateText()
+        
+        
+    def updateText(self):
+        
+        ## Needed to maintain font size when rendering to image with increased resolution
+        self.textItem.resetTransform()
+        #self.textItem.rotate(self.angle)
+        if self._exportOpts is not False and 'resolutionScale' in self._exportOpts:
+            s = self._exportOpts['resolutionScale']
+            self.textItem.scale(s, s)
+        
+        #br = self.textItem.mapRectToParent(self.textItem.boundingRect())
+        self.textItem.setPos(0,0)
+        br = self.textItem.boundingRect()
+        apos = self.textItem.mapToParent(Point(br.width()*self.anchor.x(), br.height()*self.anchor.y()))
+        #print br, apos
+        self.textItem.setPos(-apos.x(), -apos.y())
+        
+    #def textBoundingRect(self):
+        ### return the bounds of the text box in device coordinates
+        #pos = self.mapToDevice(QtCore.QPointF(0,0))
+        #if pos is None:
+            #return None
+        #tbr = self.textItem.boundingRect()
+        #return QtCore.QRectF(pos.x() - tbr.width()*self.anchor.x(), pos.y() - tbr.height()*self.anchor.y(), tbr.width(), tbr.height())
+
+
+    def viewRangeChanged(self):
+        self.updateText()
+
+    def boundingRect(self):
+        return self.textItem.mapToParent(self.textItem.boundingRect()).boundingRect()
+        
+    def paint(self, p, *args):
+        tr = p.transform()
+        if self.lastTransform is not None:
+            if tr != self.lastTransform:
+                self.viewRangeChanged()
+        self.lastTransform = tr
+        
+        if self.border.style() != QtCore.Qt.NoPen or self.fill.style() != QtCore.Qt.NoBrush:
+            p.setPen(self.border)
+            p.setBrush(self.fill)
+            p.setRenderHint(p.Antialiasing, True)
+            p.drawPolygon(self.textItem.mapToParent(self.textItem.boundingRect()))
+        
+        
\ No newline at end of file
diff --git a/libs/pyqtgraph/graphicsItems/UIGraphicsItem.py b/libs/pyqtgraph/graphicsItems/UIGraphicsItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..6f756334a197aa253785b977b142a0183af363ea
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/UIGraphicsItem.py
@@ -0,0 +1,124 @@
+from ..Qt import QtGui, QtCore, USE_PYSIDE
+import weakref
+from .GraphicsObject import GraphicsObject
+if not USE_PYSIDE:
+    import sip
+
+__all__ = ['UIGraphicsItem']
+class UIGraphicsItem(GraphicsObject):
+    """
+    Base class for graphics items with boundaries relative to a GraphicsView or ViewBox.
+    The purpose of this class is to allow the creation of GraphicsItems which live inside 
+    a scalable view, but whose boundaries will always stay fixed relative to the view's boundaries.
+    For example: GridItem, InfiniteLine
+    
+    The view can be specified on initialization or it can be automatically detected when the item is painted.
+    
+    NOTE: Only the item's boundingRect is affected; the item is not transformed in any way. Use viewRangeChanged
+    to respond to changes in the view.
+    """
+    
+    #sigViewChanged = QtCore.Signal(object)  ## emitted whenever the viewport coords have changed
+    
+    def __init__(self, bounds=None, parent=None):
+        """
+        ============== =============================================================================
+        **Arguments:**
+        bounds         QRectF with coordinates relative to view box. The default is QRectF(0,0,1,1),
+                       which means the item will have the same bounds as the view.
+        ============== =============================================================================
+        """
+        GraphicsObject.__init__(self, parent)
+        self.setFlag(self.ItemSendsScenePositionChanges)
+            
+        if bounds is None:
+            self._bounds = QtCore.QRectF(0, 0, 1, 1)
+        else:
+            self._bounds = bounds
+            
+        self._boundingRect = None
+        self._updateView()
+        
+    def paint(self, *args):
+        ## check for a new view object every time we paint.
+        #self.updateView()
+        pass
+    
+    def itemChange(self, change, value):
+        ret = GraphicsObject.itemChange(self, change, value)
+            
+        ## workaround for pyqt bug:
+        ## http://www.riverbankcomputing.com/pipermail/pyqt/2012-August/031818.html
+        if not USE_PYSIDE and change == self.ItemParentChange and isinstance(ret, QtGui.QGraphicsItem):
+            ret = sip.cast(ret, QtGui.QGraphicsItem)
+        
+        if change == self.ItemScenePositionHasChanged:
+            self.setNewBounds()
+        return ret
+    
+    #def updateView(self):
+        ### called to see whether this item has a new view to connect to
+        
+        ### check for this item's current viewbox or view widget
+        #view = self.getViewBox()
+        #if view is None:
+            ##print "  no view"
+            #return
+            
+        #if self._connectedView is not None and view is self._connectedView():
+            ##print "  already have view", view
+            #return
+            
+        ### disconnect from previous view
+        #if self._connectedView is not None:
+            #cv = self._connectedView()
+            #if cv is not None:
+                ##print "disconnect:", self
+                #cv.sigRangeChanged.disconnect(self.viewRangeChanged)
+            
+        ### connect to new view
+        ##print "connect:", self
+        #view.sigRangeChanged.connect(self.viewRangeChanged)
+        #self._connectedView = weakref.ref(view)
+        #self.setNewBounds()
+
+    def boundingRect(self):
+        if self._boundingRect is None:
+            br = self.viewRect()
+            if br is None:
+                return QtCore.QRectF()
+            else:
+                self._boundingRect = br
+        return QtCore.QRectF(self._boundingRect)
+    
+    def dataBounds(self, axis, frac=1.0, orthoRange=None):
+        """Called by ViewBox for determining the auto-range bounds.
+        By default, UIGraphicsItems are excluded from autoRange."""
+        return None
+
+    def viewRangeChanged(self):
+        """Called when the view widget/viewbox is resized/rescaled"""
+        self.setNewBounds()
+        self.update()
+        
+    def setNewBounds(self):
+        """Update the item's bounding rect to match the viewport"""
+        self._boundingRect = None  ## invalidate bounding rect, regenerate later if needed.
+        self.prepareGeometryChange()
+
+
+    def setPos(self, *args):
+        GraphicsObject.setPos(self, *args)
+        self.setNewBounds()
+        
+    def mouseShape(self):
+        """Return the shape of this item after expanding by 2 pixels"""
+        shape = self.shape()
+        ds = self.mapToDevice(shape)
+        stroker = QtGui.QPainterPathStroker()
+        stroker.setWidh(2)
+        ds2 = stroker.createStroke(ds).united(ds)
+        return self.mapFromDevice(ds2)
+        
+        
+        
diff --git a/libs/pyqtgraph/graphicsItems/VTickGroup.py b/libs/pyqtgraph/graphicsItems/VTickGroup.py
new file mode 100644
index 0000000000000000000000000000000000000000..1db4a4a26ad4c4b738bb8b6647a70b960374b7e5
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/VTickGroup.py
@@ -0,0 +1,99 @@
+if __name__ == '__main__':
+    import os, sys
+    path = os.path.abspath(os.path.dirname(__file__))
+    sys.path.insert(0, os.path.join(path, '..', '..'))
+
+from ..Qt import QtGui, QtCore
+from .. import functions as fn
+import weakref
+from .UIGraphicsItem import UIGraphicsItem
+
+__all__ = ['VTickGroup']
+class VTickGroup(UIGraphicsItem):
+    """
+    **Bases:** :class:`UIGraphicsItem <pyqtgraph.UIGraphicsItem>`
+    
+    Draws a set of tick marks which always occupy the same vertical range of the view,
+    but have x coordinates relative to the data within the view.
+    
+    """
+    def __init__(self, xvals=None, yrange=None, pen=None):
+        """
+        ==============  ===================================================================
+        **Arguments:**
+        xvals           A list of x values (in data coordinates) at which to draw ticks.
+        yrange          A list of [low, high] limits for the tick. 0 is the bottom of
+                        the view, 1 is the top. [0.8, 1] would draw ticks in the top
+                        fifth of the view.
+        pen             The pen to use for drawing ticks. Default is grey. Can be specified
+                        as any argument valid for :func:`mkPen<pyqtgraph.mkPen>`
+        ==============  ===================================================================
+        """
+        if yrange is None:
+            yrange = [0, 1]
+        if xvals is None:
+            xvals = []
+            
+        UIGraphicsItem.__init__(self)
+            
+        if pen is None:
+            pen = (200, 200, 200)
+            
+        self.path = QtGui.QGraphicsPathItem()
+        
+        self.ticks = []
+        self.xvals = []
+        self.yrange = [0,1]
+        self.setPen(pen)
+        self.setYRange(yrange)
+        self.setXVals(xvals)
+        
+    def setPen(self, *args, **kwargs):
+        """Set the pen to use for drawing ticks. Can be specified as any arguments valid
+        for :func:`mkPen<pyqtgraph.mkPen>`"""        
+        self.pen = fn.mkPen(*args, **kwargs)
+
+    def setXVals(self, vals):
+        """Set the x values for the ticks. 
+        
+        ==============   =====================================================================
+        **Arguments:**
+        vals             A list of x values (in data/plot coordinates) at which to draw ticks.
+        ==============   =====================================================================
+        """
+        self.xvals = vals
+        self.rebuildTicks()
+        #self.valid = False
+        
+    def setYRange(self, vals):
+        """Set the y range [low, high] that the ticks are drawn on. 0 is the bottom of 
+        the view, 1 is the top."""
+        self.yrange = vals
+        self.rebuildTicks()
+        
+    def dataBounds(self, *args, **kargs):
+        return None  ## item should never affect view autoscaling
+            
+    def yRange(self):
+        return self.yrange
+            
+    def rebuildTicks(self):
+        self.path = QtGui.QPainterPath()
+        yrange = self.yRange()
+        for x in self.xvals:
+            self.path.moveTo(x, 0.)
+            self.path.lineTo(x, 1.)
+        
+    def paint(self, p, *args):
+        UIGraphicsItem.paint(self, p, *args)
+        
+        br = self.boundingRect()
+        h = br.height()
+        br.setY(br.y() + self.yrange[0] * h)
+        br.setHeight(h - (1.0-self.yrange[1]) * h)
+        p.translate(0, br.y())
+        p.scale(1.0, br.height())
+        p.setPen(self.pen)
+        p.drawPath(self.path)
+
+    
\ No newline at end of file
diff --git a/libs/pyqtgraph/graphicsItems/ViewBox/ViewBox.py b/libs/pyqtgraph/graphicsItems/ViewBox/ViewBox.py
new file mode 100644
index 0000000000000000000000000000000000000000..900c20386ba39e13c5f8609563b18c68517a4229
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/ViewBox/ViewBox.py
@@ -0,0 +1,1774 @@
+from ...Qt import QtGui, QtCore
+from ...python2_3 import sortList
+import numpy as np
+from ...Point import Point
+from ... import functions as fn
+from .. ItemGroup import ItemGroup
+from .. GraphicsWidget import GraphicsWidget
+import weakref
+from copy import deepcopy
+from ... import debug as debug
+from ... import getConfigOption
+import sys
+from ...Qt import isQObjectAlive
+
+__all__ = ['ViewBox']
+
+class WeakList(object):
+
+    def __init__(self):
+        self._items = []
+
+    def append(self, obj):
+        #Add backwards to iterate backwards (to make iterating more efficient on removal).
+        self._items.insert(0, weakref.ref(obj))
+
+    def __iter__(self):
+        i = len(self._items)-1
+        while i >= 0:
+            ref = self._items[i]
+            d = ref()
+            if d is None:
+                del self._items[i]
+            else:
+                yield d
+            i -= 1
+
+class ChildGroup(ItemGroup):
+    
+    def __init__(self, parent):
+        ItemGroup.__init__(self, parent)
+        
+        # Used as callback to inform ViewBox when items are added/removed from 
+        # the group. 
+        # Note 1: We would prefer to override itemChange directly on the 
+        #         ViewBox, but this causes crashes on PySide.
+        # Note 2: We might also like to use a signal rather than this callback
+        #         mechanism, but this causes a different PySide crash.        
+        self.itemsChangedListeners = WeakList()
+ 
+        # excempt from telling view when transform changes
+        self._GraphicsObject__inform_view_on_change = False
+    
+    def itemChange(self, change, value):
+        ret = ItemGroup.itemChange(self, change, value)
+        if change == self.ItemChildAddedChange or change == self.ItemChildRemovedChange:
+            try:
+                itemsChangedListeners = self.itemsChangedListeners
+            except AttributeError:
+                # It's possible that the attribute was already collected when the itemChange happened
+                # (if it was triggered during the gc of the object).
+                pass
+            else:
+                for listener in itemsChangedListeners:
+                    listener.itemsChanged()
+        return ret
+
+
+class ViewBox(GraphicsWidget):
+    """
+    **Bases:** :class:`GraphicsWidget <pyqtgraph.GraphicsWidget>`
+    
+    Box that allows internal scaling/panning of children by mouse drag. 
+    This class is usually created automatically as part of a :class:`PlotItem <pyqtgraph.PlotItem>` or :class:`Canvas <pyqtgraph.canvas.Canvas>` or with :func:`GraphicsLayout.addViewBox() <pyqtgraph.GraphicsLayout.addViewBox>`.
+    
+    Features:
+    
+    * Scaling contents by mouse or auto-scale when contents change
+    * View linking--multiple views display the same data ranges
+    * Configurable by context menu
+    * Item coordinate mapping methods
+    
+    """
+    
+    sigYRangeChanged = QtCore.Signal(object, object)
+    sigXRangeChanged = QtCore.Signal(object, object)
+    sigRangeChangedManually = QtCore.Signal(object)
+    sigRangeChanged = QtCore.Signal(object, object)
+    #sigActionPositionChanged = QtCore.Signal(object)
+    sigStateChanged = QtCore.Signal(object)
+    sigTransformChanged = QtCore.Signal(object)
+    sigResized = QtCore.Signal(object)
+    
+    ## mouse modes
+    PanMode = 3
+    RectMode = 1
+    
+    ## axes
+    XAxis = 0
+    YAxis = 1
+    XYAxes = 2
+    
+    ## for linking views together
+    NamedViews = weakref.WeakValueDictionary()   # name: ViewBox
+    AllViews = weakref.WeakKeyDictionary()       # ViewBox: None
+    
+    def __init__(self, parent=None, border=None, lockAspect=False, enableMouse=True, invertY=False, enableMenu=True, name=None, invertX=False):
+        """
+        ==============  =============================================================
+        **Arguments:**
+        *parent*        (QGraphicsWidget) Optional parent widget
+        *border*        (QPen) Do draw a border around the view, give any
+                        single argument accepted by :func:`mkPen <pyqtgraph.mkPen>`
+        *lockAspect*    (False or float) The aspect ratio to lock the view
+                        coorinates to. (or False to allow the ratio to change)
+        *enableMouse*   (bool) Whether mouse can be used to scale/pan the view
+        *invertY*       (bool) See :func:`invertY <pyqtgraph.ViewBox.invertY>`
+        *invertX*       (bool) See :func:`invertX <pyqtgraph.ViewBox.invertX>`
+        *enableMenu*    (bool) Whether to display a context menu when 
+                        right-clicking on the ViewBox background.
+        *name*          (str) Used to register this ViewBox so that it appears
+                        in the "Link axis" dropdown inside other ViewBox
+                        context menus. This allows the user to manually link
+                        the axes of any other view to this one. 
+        ==============  =============================================================
+        """
+        
+        GraphicsWidget.__init__(self, parent)
+        self.name = None
+        self.linksBlocked = False
+        self.addedItems = []
+        #self.gView = view
+        #self.showGrid = showGrid
+        self._matrixNeedsUpdate = True  ## indicates that range has changed, but matrix update was deferred
+        self._autoRangeNeedsUpdate = True ## indicates auto-range needs to be recomputed.
+
+        self._lastScene = None  ## stores reference to the last known scene this view was a part of.
+        
+        self.state = {
+            
+            ## separating targetRange and viewRange allows the view to be resized
+            ## while keeping all previously viewed contents visible
+            'targetRange': [[0,1], [0,1]],   ## child coord. range visible [[xmin, xmax], [ymin, ymax]]
+            'viewRange': [[0,1], [0,1]],     ## actual range viewed
+        
+            'yInverted': invertY,
+            'xInverted': invertX,
+            'aspectLocked': False,    ## False if aspect is unlocked, otherwise float specifies the locked ratio.
+            'autoRange': [True, True],  ## False if auto range is disabled, 
+                                          ## otherwise float gives the fraction of data that is visible
+            'autoPan': [False, False],         ## whether to only pan (do not change scaling) when auto-range is enabled
+            'autoVisibleOnly': [False, False], ## whether to auto-range only to the visible portion of a plot 
+            'linkedViews': [None, None],  ## may be None, "viewName", or weakref.ref(view)
+                                          ## a name string indicates that the view *should* link to another, but no view with that name exists yet.
+            
+            'mouseEnabled': [enableMouse, enableMouse],
+            'mouseMode': ViewBox.PanMode if getConfigOption('leftButtonPan') else ViewBox.RectMode,  
+            'enableMenu': enableMenu,
+            'wheelScaleFactor': -1.0 / 8.0,
+
+            'background': None,
+            
+            # Limits
+            'limits': {
+                'xLimits': [None, None],   # Maximum and minimum visible X values 
+                'yLimits': [None, None],   # Maximum and minimum visible Y values  
+                'xRange': [None, None],   # Maximum and minimum X range
+                'yRange': [None, None],   # Maximum and minimum Y range 
+                }
+            
+        }
+        self._updatingRange = False  ## Used to break recursive loops. See updateAutoRange.
+        self._itemBoundsCache = weakref.WeakKeyDictionary()
+        
+        self.locateGroup = None  ## items displayed when using ViewBox.locate(item)
+        
+        self.setFlag(self.ItemClipsChildrenToShape)
+        self.setFlag(self.ItemIsFocusable, True)  ## so we can receive key presses
+        
+        ## childGroup is required so that ViewBox has local coordinates similar to device coordinates.
+        ## this is a workaround for a Qt + OpenGL bug that causes improper clipping
+        ## https://bugreports.qt.nokia.com/browse/QTBUG-23723
+        self.childGroup = ChildGroup(self)
+        self.childGroup.itemsChangedListeners.append(self)
+        
+        self.background = QtGui.QGraphicsRectItem(self.rect())
+        self.background.setParentItem(self)
+        self.background.setZValue(-1e6)
+        self.background.setPen(fn.mkPen(None))
+        self.updateBackground()
+        
+        #self.useLeftButtonPan = pyqtgraph.getConfigOption('leftButtonPan') # normally use left button to pan
+        # this also enables capture of keyPressEvents.
+        
+        ## Make scale box that is shown when dragging on the view
+        self.rbScaleBox = QtGui.QGraphicsRectItem(0, 0, 1, 1)
+        self.rbScaleBox.setPen(fn.mkPen((255,255,100), width=1))
+        self.rbScaleBox.setBrush(fn.mkBrush(255,255,0,100))
+        self.rbScaleBox.setZValue(1e9)
+        self.rbScaleBox.hide()
+        self.addItem(self.rbScaleBox, ignoreBounds=True)
+        
+        ## show target rect for debugging
+        self.target = QtGui.QGraphicsRectItem(0, 0, 1, 1)
+        self.target.setPen(fn.mkPen('r'))
+        self.target.setParentItem(self)
+        self.target.hide()
+        
+        self.axHistory = [] # maintain a history of zoom locations
+        self.axHistoryPointer = -1 # pointer into the history. Allows forward/backward movement, not just "undo"
+        
+        self.setZValue(-100)
+        self.setSizePolicy(QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding))
+        
+        self.setAspectLocked(lockAspect)
+        
+        self.border = fn.mkPen(border)
+        self.menu = ViewBoxMenu(self)
+        
+        self.register(name)
+        if name is None:
+            self.updateViewLists()
+        
+    def register(self, name):
+        """
+        Add this ViewBox to the registered list of views. 
+        
+        This allows users to manually link the axes of any other ViewBox to
+        this one. The specified *name* will appear in the drop-down lists for 
+        axis linking in the context menus of all other views.
+        
+        The same can be accomplished by initializing the ViewBox with the *name* attribute.
+        """
+        ViewBox.AllViews[self] = None
+        if self.name is not None:
+            del ViewBox.NamedViews[self.name]
+        self.name = name
+        if name is not None:
+            ViewBox.NamedViews[name] = self
+            ViewBox.updateAllViewLists()
+            sid = id(self)
+            self.destroyed.connect(lambda: ViewBox.forgetView(sid, name) if (ViewBox is not None and 'sid' in locals() and 'name' in locals()) else None)
+            #self.destroyed.connect(self.unregister)
+
+    def unregister(self):
+        """
+        Remove this ViewBox from the list of linkable views. (see :func:`register() <pyqtgraph.ViewBox.register>`)
+        """
+        del ViewBox.AllViews[self]
+        if self.name is not None:
+            del ViewBox.NamedViews[self.name]
+
+    def close(self):
+        self.clear()
+        self.unregister()
+
+    def implements(self, interface):
+        return interface == 'ViewBox'
+        
+    # removed due to https://bugreports.qt-project.org/browse/PYSIDE-86
+    #def itemChange(self, change, value):
+        ## Note: Calling QWidget.itemChange causes segv in python 3 + PyQt
+        ##ret = QtGui.QGraphicsItem.itemChange(self, change, value)
+        #ret = GraphicsWidget.itemChange(self, change, value)
+        #if change == self.ItemSceneChange:
+            #scene = self.scene()
+            #if scene is not None and hasattr(scene, 'sigPrepareForPaint'):
+                #scene.sigPrepareForPaint.disconnect(self.prepareForPaint)
+        #elif change == self.ItemSceneHasChanged:
+            #scene = self.scene()
+            #if scene is not None and hasattr(scene, 'sigPrepareForPaint'):
+                #scene.sigPrepareForPaint.connect(self.prepareForPaint)
+        #return ret
+        
+    def checkSceneChange(self):
+        # ViewBox needs to receive sigPrepareForPaint from its scene before 
+        # being painted. However, we have no way of being informed when the
+        # scene has changed in order to make this connection. The usual way
+        # to do this is via itemChange(), but bugs prevent this approach
+        # (see above). Instead, we simply check at every paint to see whether
+        # (the scene has changed.
+        scene = self.scene()
+        if scene == self._lastScene:
+            return
+        if self._lastScene is not None and hasattr(self.lastScene, 'sigPrepareForPaint'):
+            self._lastScene.sigPrepareForPaint.disconnect(self.prepareForPaint)
+        if scene is not None and hasattr(scene, 'sigPrepareForPaint'):
+            scene.sigPrepareForPaint.connect(self.prepareForPaint)
+        self.prepareForPaint()
+        self._lastScene = scene
+            
+            
+        
+
+    def prepareForPaint(self):
+        #autoRangeEnabled = (self.state['autoRange'][0] is not False) or (self.state['autoRange'][1] is not False)
+        # don't check whether auto range is enabled here--only check when setting dirty flag.
+        if self._autoRangeNeedsUpdate: # and autoRangeEnabled: 
+            self.updateAutoRange()
+        if self._matrixNeedsUpdate:
+            self.updateMatrix()
+        
+    def getState(self, copy=True):
+        """Return the current state of the ViewBox. 
+        Linked views are always converted to view names in the returned state."""
+        state = self.state.copy()
+        views = []
+        for v in state['linkedViews']:
+            if isinstance(v, weakref.ref):
+                v = v()
+            if v is None or isinstance(v, basestring):
+                views.append(v)
+            else:
+                views.append(v.name)
+        state['linkedViews'] = views
+        if copy:
+            return deepcopy(state)
+        else:
+            return state
+        
+    def setState(self, state):
+        """Restore the state of this ViewBox.
+        (see also getState)"""
+        state = state.copy()
+        self.setXLink(state['linkedViews'][0])
+        self.setYLink(state['linkedViews'][1])
+        del state['linkedViews']
+        
+        self.state.update(state)
+        #self.updateMatrix()
+        self.updateViewRange()
+        self.sigStateChanged.emit(self)
+
+    def setBackgroundColor(self, color):
+        """
+        Set the background color of the ViewBox.
+        
+        If color is None, then no background will be drawn.
+        
+        Added in version 0.9.9
+        """
+        self.background.setVisible(color is not None)
+        self.state['background'] = color
+        self.updateBackground()
+
+    def setMouseMode(self, mode):
+        """
+        Set the mouse interaction mode. *mode* must be either ViewBox.PanMode or ViewBox.RectMode.
+        In PanMode, the left mouse button pans the view and the right button scales.
+        In RectMode, the left button draws a rectangle which updates the visible region (this mode is more suitable for single-button mice)
+        """
+        if mode not in [ViewBox.PanMode, ViewBox.RectMode]:
+            raise Exception("Mode must be ViewBox.PanMode or ViewBox.RectMode")
+        self.state['mouseMode'] = mode
+        self.sigStateChanged.emit(self)
+
+    #def toggleLeftAction(self, act):  ## for backward compatibility
+        #if act.text() is 'pan':
+            #self.setLeftButtonAction('pan')
+        #elif act.text() is 'zoom':
+            #self.setLeftButtonAction('rect')
+
+    def setLeftButtonAction(self, mode='rect'):  ## for backward compatibility
+        if mode.lower() == 'rect':
+            self.setMouseMode(ViewBox.RectMode)
+        elif mode.lower() == 'pan':
+            self.setMouseMode(ViewBox.PanMode)
+        else:
+            raise Exception('graphicsItems:ViewBox:setLeftButtonAction: unknown mode = %s (Options are "pan" and "rect")' % mode)
+            
+    def innerSceneItem(self):
+        return self.childGroup
+    
+    def setMouseEnabled(self, x=None, y=None):
+        """
+        Set whether each axis is enabled for mouse interaction. *x*, *y* arguments must be True or False.
+        This allows the user to pan/scale one axis of the view while leaving the other axis unchanged.
+        """
+        if x is not None:
+            self.state['mouseEnabled'][0] = x
+        if y is not None:
+            self.state['mouseEnabled'][1] = y
+        self.sigStateChanged.emit(self)
+            
+    def mouseEnabled(self):
+        return self.state['mouseEnabled'][:]
+        
+    def setMenuEnabled(self, enableMenu=True):
+        self.state['enableMenu'] = enableMenu
+        self.sigStateChanged.emit(self)
+
+    def menuEnabled(self):
+        return self.state.get('enableMenu', True)       
+    
+    def addItem(self, item, ignoreBounds=False):
+        """
+        Add a QGraphicsItem to this view. The view will include this item when determining how to set its range
+        automatically unless *ignoreBounds* is True.
+        """
+        if item.zValue() < self.zValue():
+            item.setZValue(self.zValue()+1)
+        scene = self.scene()
+        if scene is not None and scene is not item.scene():
+            scene.addItem(item)  ## Necessary due to Qt bug: https://bugreports.qt-project.org/browse/QTBUG-18616
+        item.setParentItem(self.childGroup)
+        if not ignoreBounds:
+            self.addedItems.append(item)
+        self.updateAutoRange()
+        #print "addItem:", item, item.boundingRect()
+        
+    def removeItem(self, item):
+        """Remove an item from this view."""
+        try:
+            self.addedItems.remove(item)
+        except:
+            pass
+        self.scene().removeItem(item)
+        self.updateAutoRange()
+
+    def clear(self):
+        for i in self.addedItems[:]:
+            self.removeItem(i)
+        for ch in self.childGroup.childItems():
+            ch.setParentItem(None)
+        
+    def resizeEvent(self, ev):
+        self.linkedXChanged()
+        self.linkedYChanged()
+        self.updateAutoRange()
+        self.updateViewRange()
+        self._matrixNeedsUpdate = True
+        self.sigStateChanged.emit(self)
+        self.background.setRect(self.rect())
+        self.sigResized.emit(self)
+        
+    def viewRange(self):
+        """Return a the view's visible range as a list: [[xmin, xmax], [ymin, ymax]]"""
+        return [x[:] for x in self.state['viewRange']]  ## return copy
+
+    def viewRect(self):
+        """Return a QRectF bounding the region visible within the ViewBox"""
+        try:
+            vr0 = self.state['viewRange'][0]
+            vr1 = self.state['viewRange'][1]
+            return QtCore.QRectF(vr0[0], vr1[0], vr0[1]-vr0[0], vr1[1] - vr1[0])
+        except:
+            print("make qrectf failed:", self.state['viewRange'])
+            raise
+    
+    def targetRange(self):
+        return [x[:] for x in self.state['targetRange']]  ## return copy
+    
+    def targetRect(self):  
+        """
+        Return the region which has been requested to be visible. 
+        (this is not necessarily the same as the region that is *actually* visible--
+        resizing and aspect ratio constraints can cause targetRect() and viewRect() to differ)
+        """
+        try:
+            tr0 = self.state['targetRange'][0]
+            tr1 = self.state['targetRange'][1]
+            return QtCore.QRectF(tr0[0], tr1[0], tr0[1]-tr0[0], tr1[1] - tr1[0])
+        except:
+            print("make qrectf failed:", self.state['targetRange'])
+            raise
+
+    def _resetTarget(self):
+        # Reset target range to exactly match current view range.
+        # This is used during mouse interaction to prevent unpredictable
+        # behavior (because the user is unaware of targetRange).
+        if self.state['aspectLocked'] is False: # (interferes with aspect locking)
+            self.state['targetRange'] = [self.state['viewRange'][0][:], self.state['viewRange'][1][:]]
+
+    def setRange(self, rect=None, xRange=None, yRange=None, padding=None, update=True, disableAutoRange=True):
+        """
+        Set the visible range of the ViewBox.
+        Must specify at least one of *rect*, *xRange*, or *yRange*. 
+        
+        ================== =====================================================================
+        **Arguments:**
+        *rect*             (QRectF) The full range that should be visible in the view box.
+        *xRange*           (min,max) The range that should be visible along the x-axis.
+        *yRange*           (min,max) The range that should be visible along the y-axis.
+        *padding*          (float) Expand the view by a fraction of the requested range. 
+                           By default, this value is set between 0.02 and 0.1 depending on
+                           the size of the ViewBox.
+        *update*           (bool) If True, update the range of the ViewBox immediately. 
+                           Otherwise, the update is deferred until before the next render.
+        *disableAutoRange* (bool) If True, auto-ranging is diabled. Otherwise, it is left
+                           unchanged.
+        ================== =====================================================================
+        
+        """
+        #print self.name, "ViewBox.setRange", rect, xRange, yRange, padding
+        #import traceback
+        #traceback.print_stack()
+        
+        changes = {}   # axes
+        setRequested = [False, False]
+        
+        if rect is not None:
+            changes = {0: [rect.left(), rect.right()], 1: [rect.top(), rect.bottom()]}
+            setRequested = [True, True]
+        if xRange is not None:
+            changes[0] = xRange
+            setRequested[0] = True
+        if yRange is not None:
+            changes[1] = yRange
+            setRequested[1] = True
+
+        if len(changes) == 0:
+            print(rect)
+            raise Exception("Must specify at least one of rect, xRange, or yRange. (gave rect=%s)" % str(type(rect)))
+        
+        # Update axes one at a time
+        changed = [False, False]
+        for ax, range in changes.items():
+            mn = min(range)
+            mx = max(range)
+            
+            # If we requested 0 range, try to preserve previous scale. 
+            # Otherwise just pick an arbitrary scale.
+            if mn == mx:   
+                dy = self.state['viewRange'][ax][1] - self.state['viewRange'][ax][0]
+                if dy == 0:
+                    dy = 1
+                mn -= dy*0.5
+                mx += dy*0.5
+                xpad = 0.0
+                
+            # Make sure no nan/inf get through
+            if not all(np.isfinite([mn, mx])):
+                raise Exception("Cannot set range [%s, %s]" % (str(mn), str(mx)))
+            
+            # Apply padding
+            if padding is None:
+                xpad = self.suggestPadding(ax)
+            else:
+                xpad = padding
+            p = (mx-mn) * xpad
+            mn -= p
+            mx += p
+            
+            # Set target range
+            if self.state['targetRange'][ax] != [mn, mx]:
+                self.state['targetRange'][ax] = [mn, mx]
+                changed[ax] = True
+                
+        # Update viewRange to match targetRange as closely as possible while 
+        # accounting for aspect ratio constraint
+        lockX, lockY = setRequested
+        if lockX and lockY:
+            lockX = False
+            lockY = False
+        self.updateViewRange(lockX, lockY)
+            
+        # Disable auto-range for each axis that was requested to be set
+        if disableAutoRange:
+            xOff = False if setRequested[0] else None
+            yOff = False if setRequested[1] else None
+            self.enableAutoRange(x=xOff, y=yOff)
+            changed.append(True)
+
+        # If nothing has changed, we are done.
+        if any(changed):
+            #if update and self.matrixNeedsUpdate:
+                #self.updateMatrix(changed)
+            #return 
+        
+            self.sigStateChanged.emit(self)
+            
+            # Update target rect for debugging
+            if self.target.isVisible():
+                self.target.setRect(self.mapRectFromItem(self.childGroup, self.targetRect()))
+                
+        # If ortho axes have auto-visible-only, update them now
+        # Note that aspect ratio constraints and auto-visible probably do not work together..
+        if changed[0] and self.state['autoVisibleOnly'][1] and (self.state['autoRange'][0] is not False):
+            self._autoRangeNeedsUpdate = True
+            #self.updateAutoRange()  ## Maybe just indicate that auto range needs to be updated?
+        elif changed[1] and self.state['autoVisibleOnly'][0] and (self.state['autoRange'][1] is not False):
+            self._autoRangeNeedsUpdate = True
+            #self.updateAutoRange()
+            
+        ## Update view matrix only if requested
+        #if update:
+            #self.updateMatrix(changed)
+        ## Otherwise, indicate that the matrix needs to be updated
+        #else:
+            #self.matrixNeedsUpdate = True
+            
+        ## Inform linked views that the range has changed <<This should be moved>>
+        #for ax, range in changes.items():
+            #link = self.linkedView(ax)
+            #if link is not None:
+                #link.linkedViewChanged(self, ax)
+
+
+            
+    def setYRange(self, min, max, padding=None, update=True):
+        """
+        Set the visible Y range of the view to [*min*, *max*]. 
+        The *padding* argument causes the range to be set larger by the fraction specified.
+        (by default, this value is between 0.02 and 0.1 depending on the size of the ViewBox)
+        """
+        self.setRange(yRange=[min, max], update=update, padding=padding)
+        
+    def setXRange(self, min, max, padding=None, update=True):
+        """
+        Set the visible X range of the view to [*min*, *max*]. 
+        The *padding* argument causes the range to be set larger by the fraction specified.
+        (by default, this value is between 0.02 and 0.1 depending on the size of the ViewBox)
+        """
+        self.setRange(xRange=[min, max], update=update, padding=padding)
+
+    def autoRange(self, padding=None, items=None, item=None):
+        """
+        Set the range of the view box to make all children visible.
+        Note that this is not the same as enableAutoRange, which causes the view to 
+        automatically auto-range whenever its contents are changed.
+        
+        ==============  ============================================================
+        **Arguments:**
+        padding         The fraction of the total data range to add on to the final
+                        visible range. By default, this value is set between 0.02
+                        and 0.1 depending on the size of the ViewBox.
+        items           If specified, this is a list of items to consider when
+                        determining the visible range.
+        ==============  ============================================================
+        """
+        if item is None:
+            bounds = self.childrenBoundingRect(items=items)
+        else:
+            print("Warning: ViewBox.autoRange(item=__) is deprecated. Use 'items' argument instead.")
+            bounds = self.mapFromItemToView(item, item.boundingRect()).boundingRect()
+            
+        if bounds is not None:
+            self.setRange(bounds, padding=padding)
+            
+    def suggestPadding(self, axis):
+        l = self.width() if axis==0 else self.height()
+        if l > 0:
+            padding = np.clip(1./(l**0.5), 0.02, 0.1)
+        else:
+            padding = 0.02
+        return padding
+    
+    def setLimits(self, **kwds):
+        """
+        Set limits that constrain the possible view ranges.
+        
+        **Panning limits**. The following arguments define the region within the 
+        viewbox coordinate system that may be accessed by panning the view.
+        
+        =========== ============================================================
+        xMin        Minimum allowed x-axis value
+        xMax        Maximum allowed x-axis value
+        yMin        Minimum allowed y-axis value
+        yMax        Maximum allowed y-axis value
+        =========== ============================================================        
+        
+        **Scaling limits**. These arguments prevent the view being zoomed in or
+        out too far.
+        
+        =========== ============================================================
+        minXRange   Minimum allowed left-to-right span across the view.
+        maxXRange   Maximum allowed left-to-right span across the view.
+        minYRange   Minimum allowed top-to-bottom span across the view.
+        maxYRange   Maximum allowed top-to-bottom span across the view.
+        =========== ============================================================
+        
+        Added in version 0.9.9
+        """
+        update = False
+        allowed = ['xMin', 'xMax', 'yMin', 'yMax', 'minXRange', 'maxXRange', 'minYRange', 'maxYRange']
+        for kwd in kwds:
+            if kwd not in allowed:
+                raise ValueError("Invalid keyword argument '%s'." % kwd)
+        #for kwd in ['xLimits', 'yLimits', 'minRange', 'maxRange']:
+            #if kwd in kwds and self.state['limits'][kwd] != kwds[kwd]:
+                #self.state['limits'][kwd] = kwds[kwd]
+                #update = True
+        for axis in [0,1]:
+            for mnmx in [0,1]:
+                kwd = [['xMin', 'xMax'], ['yMin', 'yMax']][axis][mnmx]
+                lname = ['xLimits', 'yLimits'][axis]
+                if kwd in kwds and self.state['limits'][lname][mnmx] != kwds[kwd]:
+                    self.state['limits'][lname][mnmx] = kwds[kwd]
+                    update = True
+                kwd = [['minXRange', 'maxXRange'], ['minYRange', 'maxYRange']][axis][mnmx]
+                lname = ['xRange', 'yRange'][axis]
+                if kwd in kwds and self.state['limits'][lname][mnmx] != kwds[kwd]:
+                    self.state['limits'][lname][mnmx] = kwds[kwd]
+                    update = True
+                    
+        if update:
+            self.updateViewRange()
+                    
+            
+            
+            
+    def scaleBy(self, s=None, center=None, x=None, y=None):
+        """
+        Scale by *s* around given center point (or center of view).
+        *s* may be a Point or tuple (x, y).
+        
+        Optionally, x or y may be specified individually. This allows the other 
+        axis to be left unaffected (note that using a scale factor of 1.0 may
+        cause slight changes due to floating-point error).
+        """
+        if s is not None:
+            scale = Point(s)
+        else:
+            scale = [x, y]
+        
+        affect = [True, True]
+        if scale[0] is None and scale[1] is None:
+            return
+        elif scale[0] is None:
+            affect[0] = False
+            scale[0] = 1.0
+        elif scale[1] is None:
+            affect[1] = False
+            scale[1] = 1.0
+            
+        scale = Point(scale)
+            
+        if self.state['aspectLocked'] is not False:
+            scale[0] = scale[1]
+
+        vr = self.targetRect()
+        if center is None:
+            center = Point(vr.center())
+        else:
+            center = Point(center)
+        
+        tl = center + (vr.topLeft()-center) * scale
+        br = center + (vr.bottomRight()-center) * scale
+        
+        if not affect[0]:
+            self.setYRange(tl.y(), br.y(), padding=0)
+        elif not affect[1]:
+            self.setXRange(tl.x(), br.x(), padding=0)
+        else:
+            self.setRange(QtCore.QRectF(tl, br), padding=0)
+        
+    def translateBy(self, t=None, x=None, y=None):
+        """
+        Translate the view by *t*, which may be a Point or tuple (x, y).
+        
+        Alternately, x or y may be specified independently, leaving the other
+        axis unchanged (note that using a translation of 0 may still cause
+        small changes due to floating-point error).
+        """
+        vr = self.targetRect()
+        if t is not None:
+            t = Point(t)
+            self.setRange(vr.translated(t), padding=0)
+        else:
+            if x is not None:
+                x = vr.left()+x, vr.right()+x
+            if y is not None:
+                y = vr.top()+y, vr.bottom()+y
+            if x is not None or y is not None:
+                self.setRange(xRange=x, yRange=y, padding=0)
+            
+        
+        
+    def enableAutoRange(self, axis=None, enable=True, x=None, y=None):
+        """
+        Enable (or disable) auto-range for *axis*, which may be ViewBox.XAxis, ViewBox.YAxis, or ViewBox.XYAxes for both
+        (if *axis* is omitted, both axes will be changed).
+        When enabled, the axis will automatically rescale when items are added/removed or change their shape.
+        The argument *enable* may optionally be a float (0.0-1.0) which indicates the fraction of the data that should
+        be visible (this only works with items implementing a dataRange method, such as PlotDataItem).
+        """
+        #print "autorange:", axis, enable
+        #if not enable:
+            #import traceback
+            #traceback.print_stack()
+        
+        # support simpler interface:
+        if x is not None or y is not None:
+            if x is not None:
+                self.enableAutoRange(ViewBox.XAxis, x)
+            if y is not None:
+                self.enableAutoRange(ViewBox.YAxis, y)
+            return
+        
+        if enable is True:
+            enable = 1.0
+        
+        if axis is None:
+            axis = ViewBox.XYAxes
+        
+        needAutoRangeUpdate = False
+        
+        if axis == ViewBox.XYAxes or axis == 'xy':
+            axes = [0, 1]
+        elif axis == ViewBox.XAxis or axis == 'x':
+            axes = [0]
+        elif axis == ViewBox.YAxis or axis == 'y':
+            axes = [1]
+        else:
+            raise Exception('axis argument must be ViewBox.XAxis, ViewBox.YAxis, or ViewBox.XYAxes.')
+        
+        for ax in axes:
+            if self.state['autoRange'][ax] != enable:
+                # If we are disabling, do one last auto-range to make sure that
+                # previously scheduled auto-range changes are enacted
+                if enable is False and self._autoRangeNeedsUpdate:
+                    self.updateAutoRange()
+                
+                self.state['autoRange'][ax] = enable
+                self._autoRangeNeedsUpdate |= (enable is not False)
+                self.update()
+
+
+        #if needAutoRangeUpdate:
+        #    self.updateAutoRange()
+        
+        self.sigStateChanged.emit(self)
+
+    def disableAutoRange(self, axis=None):
+        """Disables auto-range. (See enableAutoRange)"""
+        self.enableAutoRange(axis, enable=False)
+
+    def autoRangeEnabled(self):
+        return self.state['autoRange'][:]
+
+    def setAutoPan(self, x=None, y=None):
+        if x is not None:
+            self.state['autoPan'][0] = x
+        if y is not None:
+            self.state['autoPan'][1] = y
+        if None not in [x,y]:
+            self.updateAutoRange()
+
+    def setAutoVisible(self, x=None, y=None):
+        if x is not None:
+            self.state['autoVisibleOnly'][0] = x
+            if x is True:
+                self.state['autoVisibleOnly'][1] = False
+        if y is not None:
+            self.state['autoVisibleOnly'][1] = y
+            if y is True:
+                self.state['autoVisibleOnly'][0] = False
+        
+        if x is not None or y is not None:
+            self.updateAutoRange()
+
+    def updateAutoRange(self):
+        ## Break recursive loops when auto-ranging.
+        ## This is needed because some items change their size in response 
+        ## to a view change.
+        if self._updatingRange:
+            return
+        
+        self._updatingRange = True
+        try:
+            targetRect = self.viewRange()
+            if not any(self.state['autoRange']):
+                return
+                
+            fractionVisible = self.state['autoRange'][:]
+            for i in [0,1]:
+                if type(fractionVisible[i]) is bool:
+                    fractionVisible[i] = 1.0
+
+            childRange = None
+            
+            order = [0,1]
+            if self.state['autoVisibleOnly'][0] is True:
+                order = [1,0]
+
+            args = {}
+            for ax in order:
+                if self.state['autoRange'][ax] is False:
+                    continue
+                if self.state['autoVisibleOnly'][ax]:
+                    oRange = [None, None]
+                    oRange[ax] = targetRect[1-ax]
+                    childRange = self.childrenBounds(frac=fractionVisible, orthoRange=oRange)
+                    
+                else:
+                    if childRange is None:
+                        childRange = self.childrenBounds(frac=fractionVisible)
+                
+                ## Make corrections to range
+                xr = childRange[ax]
+                if xr is not None:
+                    if self.state['autoPan'][ax]:
+                        x = sum(xr) * 0.5
+                        w2 = (targetRect[ax][1]-targetRect[ax][0]) / 2.
+                        childRange[ax] = [x-w2, x+w2]
+                    else:
+                        padding = self.suggestPadding(ax)
+                        wp = (xr[1] - xr[0]) * padding
+                        childRange[ax][0] -= wp
+                        childRange[ax][1] += wp
+                    targetRect[ax] = childRange[ax]
+                    args['xRange' if ax == 0 else 'yRange'] = targetRect[ax]
+            if len(args) == 0:
+                return
+            args['padding'] = 0
+            args['disableAutoRange'] = False
+            
+             # check for and ignore bad ranges
+            for k in ['xRange', 'yRange']:
+                if k in args:
+                    if not np.all(np.isfinite(args[k])):
+                        r = args.pop(k)
+                        #print("Warning: %s is invalid: %s" % (k, str(r))
+                        
+            self.setRange(**args)
+        finally:
+            self._autoRangeNeedsUpdate = False
+            self._updatingRange = False
+        
+    def setXLink(self, view):
+        """Link this view's X axis to another view. (see LinkView)"""
+        self.linkView(self.XAxis, view)
+        
+    def setYLink(self, view):
+        """Link this view's Y axis to another view. (see LinkView)"""
+        self.linkView(self.YAxis, view)
+        
+        
+    def linkView(self, axis, view):
+        """
+        Link X or Y axes of two views and unlink any previously connected axes. *axis* must be ViewBox.XAxis or ViewBox.YAxis.
+        If view is None, the axis is left unlinked.
+        """
+        if isinstance(view, basestring):
+            if view == '':
+                view = None
+            else:
+                view = ViewBox.NamedViews.get(view, view)  ## convert view name to ViewBox if possible
+
+        if hasattr(view, 'implements') and view.implements('ViewBoxWrapper'):
+            view = view.getViewBox()
+
+        ## used to connect/disconnect signals between a pair of views
+        if axis == ViewBox.XAxis:
+            signal = 'sigXRangeChanged'
+            slot = self.linkedXChanged
+        else:
+            signal = 'sigYRangeChanged'
+            slot = self.linkedYChanged
+
+
+        oldLink = self.linkedView(axis)
+        if oldLink is not None:
+            try:
+                getattr(oldLink, signal).disconnect(slot)
+                oldLink.sigResized.disconnect(slot)
+            except (TypeError, RuntimeError):
+                ## This can occur if the view has been deleted already
+                pass
+            
+        
+        if view is None or isinstance(view, basestring):
+            self.state['linkedViews'][axis] = view
+        else:
+            self.state['linkedViews'][axis] = weakref.ref(view)
+            getattr(view, signal).connect(slot)
+            view.sigResized.connect(slot)
+            if view.autoRangeEnabled()[axis] is not False:
+                self.enableAutoRange(axis, False)
+                slot()
+            else:
+                if self.autoRangeEnabled()[axis] is False:
+                    slot()
+        
+            
+        self.sigStateChanged.emit(self)
+        
+    def blockLink(self, b):
+        self.linksBlocked = b  ## prevents recursive plot-change propagation
+
+    def linkedXChanged(self):
+        ## called when x range of linked view has changed
+        view = self.linkedView(0)
+        self.linkedViewChanged(view, ViewBox.XAxis)
+
+    def linkedYChanged(self):
+        ## called when y range of linked view has changed
+        view = self.linkedView(1)
+        self.linkedViewChanged(view, ViewBox.YAxis)
+        
+    def linkedView(self, ax):
+        ## Return the linked view for axis *ax*.
+        ## this method _always_ returns either a ViewBox or None.
+        v = self.state['linkedViews'][ax]
+        if v is None or isinstance(v, basestring):
+            return None
+        else:
+            return v()  ## dereference weakref pointer. If the reference is dead, this returns None
+
+    def linkedViewChanged(self, view, axis):
+        if self.linksBlocked or view is None:
+            return
+        
+        #print self.name, "ViewBox.linkedViewChanged", axis, view.viewRange()[axis]
+        vr = view.viewRect()
+        vg = view.screenGeometry()
+        sg = self.screenGeometry()
+        if vg is None or sg is None:
+            return
+        
+        view.blockLink(True)
+        try:
+            if axis == ViewBox.XAxis:
+                overlap = min(sg.right(), vg.right()) - max(sg.left(), vg.left())
+                if overlap < min(vg.width()/3, sg.width()/3):  ## if less than 1/3 of views overlap, 
+                                                               ## then just replicate the view
+                    x1 = vr.left()
+                    x2 = vr.right()
+                else:  ## views overlap; line them up
+                    upp = float(vr.width()) / vg.width()
+                    if self.xInverted():
+                        x1 = vr.left()   + (sg.right()-vg.right()) * upp
+                    else:
+                        x1 = vr.left()   + (sg.x()-vg.x()) * upp
+                    x2 = x1 + sg.width() * upp
+                self.enableAutoRange(ViewBox.XAxis, False)
+                self.setXRange(x1, x2, padding=0)
+            else:
+                overlap = min(sg.bottom(), vg.bottom()) - max(sg.top(), vg.top())
+                if overlap < min(vg.height()/3, sg.height()/3):  ## if less than 1/3 of views overlap, 
+                                                                 ## then just replicate the view
+                    y1 = vr.top()
+                    y2 = vr.bottom()
+                else:  ## views overlap; line them up
+                    upp = float(vr.height()) / vg.height()
+                    if self.yInverted():
+                        y2 = vr.bottom() + (sg.bottom()-vg.bottom()) * upp
+                    else:
+                        y2 = vr.bottom() + (sg.top()-vg.top()) * upp
+                    y1 = y2 - sg.height() * upp
+                self.enableAutoRange(ViewBox.YAxis, False)
+                self.setYRange(y1, y2, padding=0)
+        finally:
+            view.blockLink(False)
+        
+        
+    def screenGeometry(self):
+        """return the screen geometry of the viewbox"""
+        v = self.getViewWidget()
+        if v is None:
+            return None
+        b = self.sceneBoundingRect()
+        wr = v.mapFromScene(b).boundingRect()
+        pos = v.mapToGlobal(v.pos())
+        wr.adjust(pos.x(), pos.y(), pos.x(), pos.y())
+        return wr
+        
+    
+
+    def itemsChanged(self):
+        ## called when items are added/removed from self.childGroup
+        self.updateAutoRange()
+        
+    def itemBoundsChanged(self, item):
+        self._itemBoundsCache.pop(item, None)
+        if (self.state['autoRange'][0] is not False) or (self.state['autoRange'][1] is not False):
+            self._autoRangeNeedsUpdate = True
+            self.update()
+        #self.updateAutoRange()
+
+    def invertY(self, b=True):
+        """
+        By default, the positive y-axis points upward on the screen. Use invertY(True) to reverse the y-axis.
+        """
+        if self.state['yInverted'] == b:
+            return
+        
+        self.state['yInverted'] = b
+        self._matrixNeedsUpdate = True # updateViewRange won't detect this for us
+        self.updateViewRange()
+        self.sigStateChanged.emit(self)
+        self.sigYRangeChanged.emit(self, tuple(self.state['viewRange'][1]))
+
+    def yInverted(self):
+        return self.state['yInverted']
+        
+    def invertX(self, b=True):
+        """
+        By default, the positive x-axis points rightward on the screen. Use invertX(True) to reverse the x-axis.
+        """
+        if self.state['xInverted'] == b:
+            return
+        
+        self.state['xInverted'] = b
+        #self.updateMatrix(changed=(False, True))
+        self.updateViewRange()
+        self.sigStateChanged.emit(self)
+        self.sigXRangeChanged.emit(self, tuple(self.state['viewRange'][0]))
+
+    def xInverted(self):
+        return self.state['xInverted']
+        
+    def setAspectLocked(self, lock=True, ratio=1):
+        """
+        If the aspect ratio is locked, view scaling must always preserve the aspect ratio.
+        By default, the ratio is set to 1; x and y both have the same scaling.
+        This ratio can be overridden (xScale/yScale), or use None to lock in the current ratio.
+        """
+        
+        if not lock:
+            if self.state['aspectLocked'] == False:
+                return
+            self.state['aspectLocked'] = False
+        else:
+            rect = self.rect()
+            vr = self.viewRect()
+            if rect.height() == 0 or vr.width() == 0 or vr.height() == 0:
+                currentRatio = 1.0
+            else:
+                currentRatio = (rect.width()/float(rect.height())) / (vr.width()/vr.height())
+            if ratio is None:
+                ratio = currentRatio
+            if self.state['aspectLocked'] == ratio: # nothing to change
+                return
+            self.state['aspectLocked'] = ratio
+            if ratio != currentRatio:  ## If this would change the current range, do that now
+                #self.setRange(0, self.state['viewRange'][0][0], self.state['viewRange'][0][1])
+                self.updateViewRange()
+        
+        self.updateAutoRange()
+        self.updateViewRange()
+        self.sigStateChanged.emit(self)
+        
+    def childTransform(self):
+        """
+        Return the transform that maps from child(item in the childGroup) coordinates to local coordinates.
+        (This maps from inside the viewbox to outside)
+        """ 
+        if self._matrixNeedsUpdate:
+            self.updateMatrix()
+        m = self.childGroup.transform()
+        #m1 = QtGui.QTransform()
+        #m1.translate(self.childGroup.pos().x(), self.childGroup.pos().y())
+        return m #*m1
+
+    def mapToView(self, obj):
+        """Maps from the local coordinates of the ViewBox to the coordinate system displayed inside the ViewBox"""
+        m = fn.invertQTransform(self.childTransform())
+        return m.map(obj)
+
+    def mapFromView(self, obj):
+        """Maps from the coordinate system displayed inside the ViewBox to the local coordinates of the ViewBox"""
+        m = self.childTransform()
+        return m.map(obj)
+
+    def mapSceneToView(self, obj):
+        """Maps from scene coordinates to the coordinate system displayed inside the ViewBox"""
+        return self.mapToView(self.mapFromScene(obj))
+
+    def mapViewToScene(self, obj):
+        """Maps from the coordinate system displayed inside the ViewBox to scene coordinates"""
+        return self.mapToScene(self.mapFromView(obj))
+    
+    def mapFromItemToView(self, item, obj):
+        """Maps *obj* from the local coordinate system of *item* to the view coordinates"""
+        return self.childGroup.mapFromItem(item, obj)
+        #return self.mapSceneToView(item.mapToScene(obj))
+
+    def mapFromViewToItem(self, item, obj):
+        """Maps *obj* from view coordinates to the local coordinate system of *item*."""
+        return self.childGroup.mapToItem(item, obj)
+        #return item.mapFromScene(self.mapViewToScene(obj))
+
+    def mapViewToDevice(self, obj):
+        return self.mapToDevice(self.mapFromView(obj))
+        
+    def mapDeviceToView(self, obj):
+        return self.mapToView(self.mapFromDevice(obj))
+        
+    def viewPixelSize(self):
+        """Return the (width, height) of a screen pixel in view coordinates."""
+        o = self.mapToView(Point(0,0))
+        px, py = [Point(self.mapToView(v) - o) for v in self.pixelVectors()]
+        return (px.length(), py.length())
+        
+        
+    def itemBoundingRect(self, item):
+        """Return the bounding rect of the item in view coordinates"""
+        return self.mapSceneToView(item.sceneBoundingRect()).boundingRect()
+    
+    #def viewScale(self):
+        #vr = self.viewRect()
+        ##print "viewScale:", self.range
+        #xd = vr.width()
+        #yd = vr.height()
+        #if xd == 0 or yd == 0:
+            #print "Warning: 0 range in view:", xd, yd
+            #return np.array([1,1])
+        
+        ##cs = self.canvas().size()
+        #cs = self.boundingRect()
+        #scale = np.array([cs.width() / xd, cs.height() / yd])
+        ##print "view scale:", scale
+        #return scale
+
+    def wheelEvent(self, ev, axis=None):
+        mask = np.array(self.state['mouseEnabled'], dtype=np.float)
+        if axis is not None and axis >= 0 and axis < len(mask):
+            mv = mask[axis]
+            mask[:] = 0
+            mask[axis] = mv
+        s = ((mask * 0.02) + 1) ** (ev.delta() * self.state['wheelScaleFactor']) # actual scaling factor
+        
+        center = Point(fn.invertQTransform(self.childGroup.transform()).map(ev.pos()))
+        #center = ev.pos()
+        
+        self._resetTarget()
+        self.scaleBy(s, center)
+        self.sigRangeChangedManually.emit(self.state['mouseEnabled'])
+        ev.accept()
+
+        
+    def mouseClickEvent(self, ev):
+        if ev.button() == QtCore.Qt.RightButton and self.menuEnabled():
+            ev.accept()
+            self.raiseContextMenu(ev)
+
+    def raiseContextMenu(self, ev):
+        menu = self.getMenu(ev)
+        self.scene().addParentContextMenus(self, menu, ev)
+        menu.popup(ev.screenPos().toPoint())
+
+    def getMenu(self, ev):
+        return self.menu
+
+    def getContextMenus(self, event):
+        return self.menu.actions() if self.menuEnabled() else []
+
+    def mouseDragEvent(self, ev, axis=None):
+        ## if axis is specified, event will only affect that axis.
+        ev.accept()  ## we accept all buttons
+        
+        pos = ev.pos()
+        lastPos = ev.lastPos()
+        dif = pos - lastPos
+        dif = dif * -1
+
+        ## Ignore axes if mouse is disabled
+        mouseEnabled = np.array(self.state['mouseEnabled'], dtype=np.float)
+        mask = mouseEnabled.copy()
+        if axis is not None:
+            mask[1-axis] = 0.0
+
+        ## Scale or translate based on mouse button
+        if ev.button() & (QtCore.Qt.LeftButton | QtCore.Qt.MidButton):
+            if self.state['mouseMode'] == ViewBox.RectMode:
+                if ev.isFinish():  ## This is the final move in the drag; change the view scale now
+                    #print "finish"
+                    self.rbScaleBox.hide()
+                    #ax = QtCore.QRectF(Point(self.pressPos), Point(self.mousePos))
+                    ax = QtCore.QRectF(Point(ev.buttonDownPos(ev.button())), Point(pos))
+                    ax = self.childGroup.mapRectFromParent(ax)
+                    self.showAxRect(ax)
+                    self.axHistoryPointer += 1
+                    self.axHistory = self.axHistory[:self.axHistoryPointer] + [ax]
+                else:
+                    ## update shape of scale box
+                    self.updateScaleBox(ev.buttonDownPos(), ev.pos())
+            else:
+                tr = dif*mask
+                tr = self.mapToView(tr) - self.mapToView(Point(0,0))
+                x = tr.x() if mask[0] == 1 else None
+                y = tr.y() if mask[1] == 1 else None
+                
+                self._resetTarget()
+                if x is not None or y is not None:
+                    self.translateBy(x=x, y=y)
+                self.sigRangeChangedManually.emit(self.state['mouseEnabled'])
+        elif ev.button() & QtCore.Qt.RightButton:
+            #print "vb.rightDrag"
+            if self.state['aspectLocked'] is not False:
+                mask[0] = 0
+            
+            dif = ev.screenPos() - ev.lastScreenPos()
+            dif = np.array([dif.x(), dif.y()])
+            dif[0] *= -1
+            s = ((mask * 0.02) + 1) ** dif
+            
+            tr = self.childGroup.transform()
+            tr = fn.invertQTransform(tr)
+            
+            x = s[0] if mouseEnabled[0] == 1 else None
+            y = s[1] if mouseEnabled[1] == 1 else None
+            
+            center = Point(tr.map(ev.buttonDownPos(QtCore.Qt.RightButton)))
+            self._resetTarget()
+            self.scaleBy(x=x, y=y, center=center)
+            self.sigRangeChangedManually.emit(self.state['mouseEnabled'])
+
+    def keyPressEvent(self, ev):
+        """
+        This routine should capture key presses in the current view box.
+        Key presses are used only when mouse mode is RectMode
+        The following events are implemented:
+        ctrl-A : zooms out to the default "full" view of the plot
+        ctrl-+ : moves forward in the zooming stack (if it exists)
+        ctrl-- : moves backward in the zooming stack (if it exists)
+         
+        """
+        #print ev.key()
+        #print 'I intercepted a key press, but did not accept it'
+        
+        ## not implemented yet ?
+        #self.keypress.sigkeyPressEvent.emit()
+        
+        ev.accept()
+        if ev.text() == '-':
+            self.scaleHistory(-1)
+        elif ev.text() in ['+', '=']:
+            self.scaleHistory(1)
+        elif ev.key() == QtCore.Qt.Key_Backspace:
+            self.scaleHistory(len(self.axHistory))
+        else:
+            ev.ignore()
+
+    def scaleHistory(self, d):
+        if len(self.axHistory) == 0:
+            return
+        ptr = max(0, min(len(self.axHistory)-1, self.axHistoryPointer+d))
+        if ptr != self.axHistoryPointer:
+            self.axHistoryPointer = ptr
+            self.showAxRect(self.axHistory[ptr])
+            
+
+    def updateScaleBox(self, p1, p2):
+        r = QtCore.QRectF(p1, p2)
+        r = self.childGroup.mapRectFromParent(r)
+        self.rbScaleBox.setPos(r.topLeft())
+        self.rbScaleBox.resetTransform()
+        self.rbScaleBox.scale(r.width(), r.height())
+        self.rbScaleBox.show()
+
+    def showAxRect(self, ax):
+        self.setRange(ax.normalized()) # be sure w, h are correct coordinates
+        self.sigRangeChangedManually.emit(self.state['mouseEnabled'])
+
+    #def mouseRect(self):
+        #vs = self.viewScale()
+        #vr = self.state['viewRange']
+        ## Convert positions from screen (view) pixel coordinates to axis coordinates 
+        #ax = QtCore.QRectF(self.pressPos[0]/vs[0]+vr[0][0], -(self.pressPos[1]/vs[1]-vr[1][1]),
+            #(self.mousePos[0]-self.pressPos[0])/vs[0], -(self.mousePos[1]-self.pressPos[1])/vs[1])
+        #return(ax)
+
+    def allChildren(self, item=None):
+        """Return a list of all children and grandchildren of this ViewBox"""
+        if item is None:
+            item = self.childGroup
+        
+        children = [item]
+        for ch in item.childItems():
+            children.extend(self.allChildren(ch))
+        return children
+        
+        
+    
+    def childrenBounds(self, frac=None, orthoRange=(None,None), items=None):
+        """Return the bounding range of all children.
+        [[xmin, xmax], [ymin, ymax]]
+        Values may be None if there are no specific bounds for an axis.
+        """
+        profiler = debug.Profiler()
+        if items is None:
+            items = self.addedItems
+        
+        ## measure pixel dimensions in view box
+        px, py = [v.length() if v is not None else 0 for v in self.childGroup.pixelVectors()]
+        
+        ## First collect all boundary information
+        itemBounds = []
+        for item in items:
+            if not item.isVisible():
+                continue
+        
+            useX = True
+            useY = True
+            
+            if hasattr(item, 'dataBounds'):
+                #bounds = self._itemBoundsCache.get(item, None)
+                #if bounds is None:
+                if frac is None:
+                    frac = (1.0, 1.0)
+                xr = item.dataBounds(0, frac=frac[0], orthoRange=orthoRange[0])
+                yr = item.dataBounds(1, frac=frac[1], orthoRange=orthoRange[1])
+                pxPad = 0 if not hasattr(item, 'pixelPadding') else item.pixelPadding()
+                if xr is None or (xr[0] is None and xr[1] is None) or np.isnan(xr).any() or np.isinf(xr).any():
+                    useX = False
+                    xr = (0,0)
+                if yr is None or (yr[0] is None and yr[1] is None) or np.isnan(yr).any() or np.isinf(yr).any():
+                    useY = False
+                    yr = (0,0)
+
+                bounds = QtCore.QRectF(xr[0], yr[0], xr[1]-xr[0], yr[1]-yr[0])
+                bounds = self.mapFromItemToView(item, bounds).boundingRect()
+                
+                if not any([useX, useY]):
+                    continue
+                
+                ## If we are ignoring only one axis, we need to check for rotations
+                if useX != useY:  ##   !=  means  xor
+                    ang = round(item.transformAngle())
+                    if ang == 0 or ang == 180:
+                        pass
+                    elif ang == 90 or ang == 270:
+                        useX, useY = useY, useX 
+                    else:
+                        ## Item is rotated at non-orthogonal angle, ignore bounds entirely.
+                        ## Not really sure what is the expected behavior in this case.
+                        continue  ## need to check for item rotations and decide how best to apply this boundary. 
+                
+                
+                itemBounds.append((bounds, useX, useY, pxPad))
+                    #self._itemBoundsCache[item] = (bounds, useX, useY)
+                #else:
+                    #bounds, useX, useY = bounds
+            else:
+                if int(item.flags() & item.ItemHasNoContents) > 0:
+                    continue
+                else:
+                    bounds = item.boundingRect()
+                bounds = self.mapFromItemToView(item, bounds).boundingRect()
+                itemBounds.append((bounds, True, True, 0))
+        
+        #print itemBounds
+        
+        ## determine tentative new range
+        range = [None, None]
+        for bounds, useX, useY, px in itemBounds:
+            if useY:
+                if range[1] is not None:
+                    range[1] = [min(bounds.top(), range[1][0]), max(bounds.bottom(), range[1][1])]
+                else:
+                    range[1] = [bounds.top(), bounds.bottom()]
+            if useX:
+                if range[0] is not None:
+                    range[0] = [min(bounds.left(), range[0][0]), max(bounds.right(), range[0][1])]
+                else:
+                    range[0] = [bounds.left(), bounds.right()]
+            profiler()
+        
+        #print "range", range
+        
+        ## Now expand any bounds that have a pixel margin
+        ## This must be done _after_ we have a good estimate of the new range
+        ## to ensure that the pixel size is roughly accurate.
+        w = self.width()
+        h = self.height()
+        #print "w:", w, "h:", h
+        if w > 0 and range[0] is not None:
+            pxSize = (range[0][1] - range[0][0]) / w
+            for bounds, useX, useY, px in itemBounds:
+                if px == 0 or not useX:
+                    continue
+                range[0][0] = min(range[0][0], bounds.left() - px*pxSize)
+                range[0][1] = max(range[0][1], bounds.right() + px*pxSize)
+        if h > 0 and range[1] is not None:
+            pxSize = (range[1][1] - range[1][0]) / h
+            for bounds, useX, useY, px in itemBounds:
+                if px == 0 or not useY:
+                    continue
+                range[1][0] = min(range[1][0], bounds.top() - px*pxSize)
+                range[1][1] = max(range[1][1], bounds.bottom() + px*pxSize)
+
+        return range
+        
+    def childrenBoundingRect(self, *args, **kwds):
+        range = self.childrenBounds(*args, **kwds)
+        tr = self.targetRange()
+        if range[0] is None:
+            range[0] = tr[0]
+        if range[1] is None:
+            range[1] = tr[1]
+            
+        bounds = QtCore.QRectF(range[0][0], range[1][0], range[0][1]-range[0][0], range[1][1]-range[1][0])
+        return bounds
+            
+    def updateViewRange(self, forceX=False, forceY=False):
+        ## Update viewRange to match targetRange as closely as possible, given 
+        ## aspect ratio constraints. The *force* arguments are used to indicate 
+        ## which axis (if any) should be unchanged when applying constraints.
+        viewRange = [self.state['targetRange'][0][:], self.state['targetRange'][1][:]]
+        changed = [False, False]
+        
+        #-------- Make correction for aspect ratio constraint ----------
+        
+        # aspect is (widget w/h) / (view range w/h)
+        aspect = self.state['aspectLocked']  # size ratio / view ratio
+        tr = self.targetRect()
+        bounds = self.rect()
+        if aspect is not False and 0 not in [aspect, tr.height(), bounds.height(), bounds.width()]:
+            
+            ## This is the view range aspect ratio we have requested
+            targetRatio = tr.width() / tr.height() if tr.height() != 0 else 1
+            ## This is the view range aspect ratio we need to obey aspect constraint
+            viewRatio = (bounds.width() / bounds.height() if bounds.height() != 0 else 1) / aspect
+            viewRatio = 1 if viewRatio == 0 else viewRatio
+            
+            # Decide which range to keep unchanged
+            #print self.name, "aspect:", aspect, "changed:", changed, "auto:", self.state['autoRange']
+            if forceX:
+                ax = 0
+            elif forceY:
+                ax = 1
+            else:
+                # if we are not required to keep a particular axis unchanged, 
+                # then make the entire target range visible
+                ax = 0 if targetRatio > viewRatio else 1
+            
+            if ax == 0:  
+                ## view range needs to be taller than target
+                dy = 0.5 * (tr.width() / viewRatio - tr.height())
+                if dy != 0:
+                    changed[1] = True
+                viewRange[1] = [self.state['targetRange'][1][0] - dy, self.state['targetRange'][1][1] + dy]
+            else:
+                ## view range needs to be wider than target
+                dx = 0.5 * (tr.height() * viewRatio - tr.width())
+                if dx != 0:
+                    changed[0] = True
+                viewRange[0] = [self.state['targetRange'][0][0] - dx, self.state['targetRange'][0][1] + dx]
+
+            
+        # ----------- Make corrections for view limits -----------
+        
+        limits = (self.state['limits']['xLimits'], self.state['limits']['yLimits'])
+        minRng = [self.state['limits']['xRange'][0], self.state['limits']['yRange'][0]]
+        maxRng = [self.state['limits']['xRange'][1], self.state['limits']['yRange'][1]]
+        
+        for axis in [0, 1]:
+            if limits[axis][0] is None and limits[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 limits[axis][0] is not None and limits[axis][1] is not None:
+                if maxRng[axis] is not None:
+                    maxRng[axis] = min(maxRng[axis], limits[axis][1]-limits[axis][0])
+                else:
+                    maxRng[axis] = limits[axis][1]-limits[axis][0]
+            
+            #print "\nLimits for axis %d: range=%s min=%s max=%s" % (axis, limits[axis], minRng[axis], maxRng[axis])
+            #print "Starting range:", viewRange[axis]
+            
+            # Apply xRange, yRange
+            diff = viewRange[axis][1] - viewRange[axis][0]
+            if maxRng[axis] is not None and diff > maxRng[axis]:
+                delta = maxRng[axis] - diff
+                changed[axis] = True
+            elif minRng[axis] is not None and diff < minRng[axis]:
+                delta = minRng[axis] - diff
+                changed[axis] = True
+            else:
+                delta = 0
+            
+            viewRange[axis][0] -= delta/2.
+            viewRange[axis][1] += delta/2.
+            
+            #print "after applying min/max:", viewRange[axis]
+               
+            # Apply xLimits, yLimits
+            mn, mx = limits[axis]
+            if mn is not None and viewRange[axis][0] < mn:
+                delta = mn - viewRange[axis][0]
+                viewRange[axis][0] += delta
+                viewRange[axis][1] += delta
+                changed[axis] = True
+            elif mx is not None and viewRange[axis][1] > mx:
+                delta = mx - viewRange[axis][1]
+                viewRange[axis][0] += delta
+                viewRange[axis][1] += delta
+                changed[axis] = True
+            
+            #print "after applying edge limits:", viewRange[axis]
+
+        changed = [(viewRange[i][0] != self.state['viewRange'][i][0]) or (viewRange[i][1] != self.state['viewRange'][i][1]) for i in (0,1)]
+        self.state['viewRange'] = viewRange
+        
+        # emit range change signals
+        if changed[0]:
+            self.sigXRangeChanged.emit(self, tuple(self.state['viewRange'][0]))
+        if changed[1]:
+            self.sigYRangeChanged.emit(self, tuple(self.state['viewRange'][1]))
+        
+        if any(changed):
+            self.sigRangeChanged.emit(self, self.state['viewRange'])
+            self.update()
+            self._matrixNeedsUpdate = True
+        
+            # Inform linked views that the range has changed
+            for ax in [0, 1]:
+                if not changed[ax]:
+                    continue
+                link = self.linkedView(ax)
+                if link is not None:
+                    link.linkedViewChanged(self, ax)
+        
+    def updateMatrix(self, changed=None):
+        ## Make the childGroup's transform match the requested viewRange.
+        bounds = self.rect()
+        
+        vr = self.viewRect()
+        if vr.height() == 0 or vr.width() == 0:
+            return
+        scale = Point(bounds.width()/vr.width(), bounds.height()/vr.height())
+        if not self.state['yInverted']:
+            scale = scale * Point(1, -1)
+        if self.state['xInverted']:
+            scale = scale * Point(-1, 1)
+        m = QtGui.QTransform()
+        
+        ## First center the viewport at 0
+        center = bounds.center()
+        m.translate(center.x(), center.y())
+            
+        ## Now scale and translate properly
+        m.scale(scale[0], scale[1])
+        st = Point(vr.center())
+        m.translate(-st[0], -st[1])
+        
+        self.childGroup.setTransform(m)
+        
+        self.sigTransformChanged.emit(self)  ## segfaults here: 1
+        self._matrixNeedsUpdate = False
+
+    def paint(self, p, opt, widget):
+        self.checkSceneChange()
+        
+        if self.border is not None:
+            bounds = self.shape()
+            p.setPen(self.border)
+            #p.fillRect(bounds, QtGui.QColor(0, 0, 0))
+            p.drawPath(bounds)
+            
+        #p.setPen(fn.mkPen('r'))
+        #path = QtGui.QPainterPath()
+        #path.addRect(self.targetRect())
+        #tr = self.mapFromView(path)
+        #p.drawPath(tr)
+
+    def updateBackground(self):
+        bg = self.state['background']
+        if bg is None:
+            self.background.hide()
+        else:
+            self.background.show()
+            self.background.setBrush(fn.mkBrush(bg))
+            
+            
+    def updateViewLists(self):
+        try:
+            self.window()
+        except RuntimeError:  ## this view has already been deleted; it will probably be collected shortly.
+            return
+            
+        def cmpViews(a, b):
+            wins = 100 * cmp(a.window() is self.window(), b.window() is self.window())
+            alpha = cmp(a.name, b.name)
+            return wins + alpha
+            
+        ## make a sorted list of all named views
+        nv = list(ViewBox.NamedViews.values())
+        #print "new view list:", nv
+        sortList(nv, cmpViews) ## see pyqtgraph.python2_3.sortList
+        
+        if self in nv:
+            nv.remove(self)
+            
+        self.menu.setViewList(nv)
+        
+        for ax in [0,1]:
+            link = self.state['linkedViews'][ax]
+            if isinstance(link, basestring):     ## axis has not been linked yet; see if it's possible now
+                for v in nv:
+                    if link == v.name:
+                        self.linkView(ax, v)
+        #print "New view list:", nv
+        #print "linked views:", self.state['linkedViews']
+
+    @staticmethod
+    def updateAllViewLists():
+        #print "Update:", ViewBox.AllViews.keys()
+        #print "Update:", ViewBox.NamedViews.keys()
+        for v in ViewBox.AllViews:
+            v.updateViewLists()
+            
+
+    @staticmethod
+    def forgetView(vid, name):
+        if ViewBox is None:     ## can happen as python is shutting down
+            return
+        if QtGui.QApplication.instance() is None:
+            return
+        ## Called with ID and name of view (the view itself is no longer available)
+        for v in list(ViewBox.AllViews.keys()):
+            if id(v) == vid:
+                ViewBox.AllViews.pop(v)
+                break
+        ViewBox.NamedViews.pop(name, None)
+        ViewBox.updateAllViewLists()
+
+    @staticmethod
+    def quit():
+        ## called when the application is about to exit.
+        ## this disables all callbacks, which might otherwise generate errors if invoked during exit.
+        for k in ViewBox.AllViews:
+            if isQObjectAlive(k) and getConfigOption('crashWarning'):
+                sys.stderr.write('Warning: ViewBox should be closed before application exit.\n')
+                
+            try:
+                k.destroyed.disconnect()
+            except RuntimeError:  ## signal is already disconnected.
+                pass
+            except TypeError:  ## view has already been deleted (?)
+                pass
+            except AttributeError:  # PySide has deleted signal
+                pass
+            
+    def locate(self, item, timeout=3.0, children=False):
+        """
+        Temporarily display the bounding rect of an item and lines connecting to the center of the view.
+        This is useful for determining the location of items that may be out of the range of the ViewBox.
+        if allChildren is True, then the bounding rect of all item's children will be shown instead.
+        """
+        self.clearLocate()
+        
+        if item.scene() is not self.scene():
+            raise Exception("Item does not share a scene with this ViewBox.")
+        
+        c = self.viewRect().center()
+        if children:
+            br = self.mapFromItemToView(item, item.childrenBoundingRect()).boundingRect()
+        else:
+            br = self.mapFromItemToView(item, item.boundingRect()).boundingRect()
+        
+        g = ItemGroup()
+        g.setParentItem(self.childGroup)
+        self.locateGroup = g
+        g.box = QtGui.QGraphicsRectItem(br)
+        g.box.setParentItem(g)
+        g.lines = []
+        for p in (br.topLeft(), br.bottomLeft(), br.bottomRight(), br.topRight()):
+            line = QtGui.QGraphicsLineItem(c.x(), c.y(), p.x(), p.y())
+            line.setParentItem(g)
+            g.lines.append(line)
+            
+        for item in g.childItems():
+            item.setPen(fn.mkPen(color='y', width=3))
+        g.setZValue(1000000)
+        
+        if children:
+            g.path = QtGui.QGraphicsPathItem(g.childrenShape())
+        else:
+            g.path = QtGui.QGraphicsPathItem(g.shape())
+        g.path.setParentItem(g)
+        g.path.setPen(fn.mkPen('g'))
+        g.path.setZValue(100)
+        
+        QtCore.QTimer.singleShot(timeout*1000, self.clearLocate)
+    
+    def clearLocate(self):
+        if self.locateGroup is None:
+            return
+        self.scene().removeItem(self.locateGroup)
+        self.locateGroup = None
+
+from .ViewBoxMenu import ViewBoxMenu
diff --git a/libs/pyqtgraph/graphicsItems/ViewBox/ViewBoxMenu.py b/libs/pyqtgraph/graphicsItems/ViewBox/ViewBoxMenu.py
new file mode 100644
index 0000000000000000000000000000000000000000..10392d7e003160ceea0e9c29beb2442cea600de4
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/ViewBox/ViewBoxMenu.py
@@ -0,0 +1,269 @@
+from ...Qt import QtCore, QtGui, QT_LIB
+from ...python2_3 import asUnicode
+from ...WidgetGroup import WidgetGroup
+
+if QT_LIB == 'PyQt4':
+    from .axisCtrlTemplate_pyqt import Ui_Form as AxisCtrlTemplate
+elif QT_LIB == 'PySide':
+    from .axisCtrlTemplate_pyside import Ui_Form as AxisCtrlTemplate
+elif QT_LIB == 'PyQt5':
+    from .axisCtrlTemplate_pyqt5 import Ui_Form as AxisCtrlTemplate
+    
+import weakref 
+
+class ViewBoxMenu(QtGui.QMenu):
+    def __init__(self, view):
+        QtGui.QMenu.__init__(self)
+        
+        self.view = weakref.ref(view)  ## keep weakref to view to avoid circular reference (don't know why, but this prevents the ViewBox from being collected)
+        self.valid = False  ## tells us whether the ui needs to be updated
+        self.viewMap = weakref.WeakValueDictionary()  ## weakrefs to all views listed in the link combos
+
+        self.setTitle("ViewBox options")
+        self.viewAll = QtGui.QAction("View All", self)
+        self.viewAll.triggered.connect(self.autoRange)
+        self.addAction(self.viewAll)
+        
+        self.axes = []
+        self.ctrl = []
+        self.widgetGroups = []
+        self.dv = QtGui.QDoubleValidator(self)
+        for axis in 'XY':
+            m = QtGui.QMenu()
+            m.setTitle("%s Axis" % axis)
+            w = QtGui.QWidget()
+            ui = AxisCtrlTemplate()
+            ui.setupUi(w)
+            a = QtGui.QWidgetAction(self)
+            a.setDefaultWidget(w)
+            m.addAction(a)
+            self.addMenu(m)
+            self.axes.append(m)
+            self.ctrl.append(ui)
+            wg = WidgetGroup(w)
+            self.widgetGroups.append(w)
+            
+            connects = [
+                (ui.mouseCheck.toggled, 'MouseToggled'),
+                (ui.manualRadio.clicked, 'ManualClicked'),
+                (ui.minText.editingFinished, 'MinTextChanged'),
+                (ui.maxText.editingFinished, 'MaxTextChanged'),
+                (ui.autoRadio.clicked, 'AutoClicked'),
+                (ui.autoPercentSpin.valueChanged, 'AutoSpinChanged'),
+                (ui.linkCombo.currentIndexChanged, 'LinkComboChanged'),
+                (ui.autoPanCheck.toggled, 'AutoPanToggled'),
+                (ui.visibleOnlyCheck.toggled, 'VisibleOnlyToggled')
+            ]
+            
+            for sig, fn in connects:
+                sig.connect(getattr(self, axis.lower()+fn))
+
+        self.ctrl[0].invertCheck.toggled.connect(self.xInvertToggled)
+        self.ctrl[1].invertCheck.toggled.connect(self.yInvertToggled)
+        ## exporting is handled by GraphicsScene now
+        #self.export = QtGui.QMenu("Export")
+        #self.setExportMethods(view.exportMethods)
+        #self.addMenu(self.export)
+        
+        self.leftMenu = QtGui.QMenu("Mouse Mode")
+        group = QtGui.QActionGroup(self)
+        
+        # This does not work! QAction _must_ be initialized with a permanent 
+        # object as the parent or else it may be collected prematurely.
+        #pan = self.leftMenu.addAction("3 button", self.set3ButtonMode)
+        #zoom = self.leftMenu.addAction("1 button", self.set1ButtonMode)
+        pan = QtGui.QAction("3 button", self.leftMenu)
+        zoom = QtGui.QAction("1 button", self.leftMenu)
+        self.leftMenu.addAction(pan)
+        self.leftMenu.addAction(zoom)
+        pan.triggered.connect(self.set3ButtonMode)
+        zoom.triggered.connect(self.set1ButtonMode)
+        
+        pan.setCheckable(True)
+        zoom.setCheckable(True)
+        pan.setActionGroup(group)
+        zoom.setActionGroup(group)
+        self.mouseModes = [pan, zoom]
+        self.addMenu(self.leftMenu)
+        
+        self.view().sigStateChanged.connect(self.viewStateChanged)
+        
+        self.updateState()
+
+    def setExportMethods(self, methods):
+        self.exportMethods = methods
+        self.export.clear()
+        for opt, fn in methods.items():
+            self.export.addAction(opt, self.exportMethod)
+        
+
+    def viewStateChanged(self):
+        self.valid = False
+        if self.ctrl[0].minText.isVisible() or self.ctrl[1].minText.isVisible():
+            self.updateState()
+        
+    def updateState(self):
+        ## Something about the viewbox has changed; update the menu GUI
+        
+        state = self.view().getState(copy=False)
+        if state['mouseMode'] == ViewBox.PanMode:
+            self.mouseModes[0].setChecked(True)
+        else:
+            self.mouseModes[1].setChecked(True)
+            
+        for i in [0,1]:  # x, y
+            tr = state['targetRange'][i]
+            self.ctrl[i].minText.setText("%0.5g" % tr[0])
+            self.ctrl[i].maxText.setText("%0.5g" % tr[1])
+            if state['autoRange'][i] is not False:
+                self.ctrl[i].autoRadio.setChecked(True)
+                if state['autoRange'][i] is not True:
+                    self.ctrl[i].autoPercentSpin.setValue(state['autoRange'][i]*100)
+            else:
+                self.ctrl[i].manualRadio.setChecked(True)
+            self.ctrl[i].mouseCheck.setChecked(state['mouseEnabled'][i])
+            
+            ## Update combo to show currently linked view
+            c = self.ctrl[i].linkCombo
+            c.blockSignals(True)
+            try:
+                view = state['linkedViews'][i]  ## will always be string or None
+                if view is None:
+                    view = ''
+                    
+                ind = c.findText(view)
+                    
+                if ind == -1:
+                    ind = 0
+                c.setCurrentIndex(ind)
+            finally:
+                c.blockSignals(False)
+            
+            self.ctrl[i].autoPanCheck.setChecked(state['autoPan'][i])
+            self.ctrl[i].visibleOnlyCheck.setChecked(state['autoVisibleOnly'][i])
+            xy = ['x', 'y'][i]
+            self.ctrl[i].invertCheck.setChecked(state.get(xy+'Inverted', False))
+        
+        self.valid = True
+        
+    def popup(self, *args):
+        if not self.valid:
+            self.updateState()
+        QtGui.QMenu.popup(self, *args)
+        
+    def autoRange(self):
+        self.view().autoRange()  ## don't let signal call this directly--it'll add an unwanted argument
+
+    def xMouseToggled(self, b):
+        self.view().setMouseEnabled(x=b)
+
+    def xManualClicked(self):
+        self.view().enableAutoRange(ViewBox.XAxis, False)
+        
+    def xMinTextChanged(self):
+        self.ctrl[0].manualRadio.setChecked(True)
+        self.view().setXRange(float(self.ctrl[0].minText.text()), float(self.ctrl[0].maxText.text()), padding=0)
+
+    def xMaxTextChanged(self):
+        self.ctrl[0].manualRadio.setChecked(True)
+        self.view().setXRange(float(self.ctrl[0].minText.text()), float(self.ctrl[0].maxText.text()), padding=0)
+        
+    def xAutoClicked(self):
+        val = self.ctrl[0].autoPercentSpin.value() * 0.01
+        self.view().enableAutoRange(ViewBox.XAxis, val)
+        
+    def xAutoSpinChanged(self, val):
+        self.ctrl[0].autoRadio.setChecked(True)
+        self.view().enableAutoRange(ViewBox.XAxis, val*0.01)
+
+    def xLinkComboChanged(self, ind):
+        self.view().setXLink(str(self.ctrl[0].linkCombo.currentText()))
+
+    def xAutoPanToggled(self, b):
+        self.view().setAutoPan(x=b)
+    
+    def xVisibleOnlyToggled(self, b):
+        self.view().setAutoVisible(x=b)
+
+
+    def yMouseToggled(self, b):
+        self.view().setMouseEnabled(y=b)
+
+    def yManualClicked(self):
+        self.view().enableAutoRange(ViewBox.YAxis, False)
+        
+    def yMinTextChanged(self):
+        self.ctrl[1].manualRadio.setChecked(True)
+        self.view().setYRange(float(self.ctrl[1].minText.text()), float(self.ctrl[1].maxText.text()), padding=0)
+        
+    def yMaxTextChanged(self):
+        self.ctrl[1].manualRadio.setChecked(True)
+        self.view().setYRange(float(self.ctrl[1].minText.text()), float(self.ctrl[1].maxText.text()), padding=0)
+        
+    def yAutoClicked(self):
+        val = self.ctrl[1].autoPercentSpin.value() * 0.01
+        self.view().enableAutoRange(ViewBox.YAxis, val)
+        
+    def yAutoSpinChanged(self, val):
+        self.ctrl[1].autoRadio.setChecked(True)
+        self.view().enableAutoRange(ViewBox.YAxis, val*0.01)
+
+    def yLinkComboChanged(self, ind):
+        self.view().setYLink(str(self.ctrl[1].linkCombo.currentText()))
+
+    def yAutoPanToggled(self, b):
+        self.view().setAutoPan(y=b)
+    
+    def yVisibleOnlyToggled(self, b):
+        self.view().setAutoVisible(y=b)
+
+    def yInvertToggled(self, b):
+        self.view().invertY(b)
+
+    def xInvertToggled(self, b):
+        self.view().invertX(b)
+
+    def exportMethod(self):
+        act = self.sender()
+        self.exportMethods[str(act.text())]()
+
+    def set3ButtonMode(self):
+        self.view().setLeftButtonAction('pan')
+        
+    def set1ButtonMode(self):
+        self.view().setLeftButtonAction('rect')
+        
+    def setViewList(self, views):
+        names = ['']
+        self.viewMap.clear()
+        
+        ## generate list of views to show in the link combo
+        for v in views:
+            name = v.name
+            if name is None:  ## unnamed views do not show up in the view list (although they are linkable)
+                continue
+            names.append(name)
+            self.viewMap[name] = v
+            
+        for i in [0,1]:
+            c = self.ctrl[i].linkCombo
+            current = asUnicode(c.currentText())
+            c.blockSignals(True)
+            changed = True
+            try:
+                c.clear()
+                for name in names:
+                    c.addItem(name)
+                    if name == current:
+                        changed = False
+                        c.setCurrentIndex(c.count()-1)
+            finally:
+                c.blockSignals(False)
+                
+            if changed:
+                c.setCurrentIndex(0)
+                c.currentIndexChanged.emit(c.currentIndex())
+        
+from .ViewBox import ViewBox
+        
+    
diff --git a/libs/pyqtgraph/graphicsItems/ViewBox/__init__.py b/libs/pyqtgraph/graphicsItems/ViewBox/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..685a314ddd3d71dac77748bc594f6823b7b9528e
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/ViewBox/__init__.py
@@ -0,0 +1 @@
+from .ViewBox import ViewBox
diff --git a/libs/pyqtgraph/graphicsItems/ViewBox/axisCtrlTemplate.ui b/libs/pyqtgraph/graphicsItems/ViewBox/axisCtrlTemplate.ui
new file mode 100644
index 0000000000000000000000000000000000000000..297fce75a131616adc0013d23fd764ddc7da47cd
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/ViewBox/axisCtrlTemplate.ui
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>186</width>
+    <height>154</height>
+   </rect>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>200</width>
+    <height>16777215</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <item row="7" column="0" colspan="2">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Link Axis:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="2" colspan="2">
+    <widget class="QComboBox" name="linkCombo">
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Links this axis with another view. When linked, both views will display the same data range.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="sizeAdjustPolicy">
+      <enum>QComboBox::AdjustToContents</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2" colspan="2">
+    <widget class="QSpinBox" name="autoPercentSpin">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Percent of data to be visible when auto-scaling. It may be useful to decrease this value for data with spiky noise.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="suffix">
+      <string>%</string>
+     </property>
+     <property name="minimum">
+      <number>1</number>
+     </property>
+     <property name="maximum">
+      <number>100</number>
+     </property>
+     <property name="singleStep">
+      <number>1</number>
+     </property>
+     <property name="value">
+      <number>100</number>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QRadioButton" name="autoRadio">
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Automatically resize this axis whenever the displayed data is changed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="text">
+      <string>Auto</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="2">
+    <widget class="QRadioButton" name="manualRadio">
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the range for this axis manually. This disables automatic scaling. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="text">
+      <string>Manual</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2">
+    <widget class="QLineEdit" name="minText">
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Minimum value to display for this axis.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="text">
+      <string>0</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="3">
+    <widget class="QLineEdit" name="maxText">
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum value to display for this axis.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="text">
+      <string>0</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0" colspan="4">
+    <widget class="QCheckBox" name="invertCheck">
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Inverts the display of this axis. (+y points downward instead of upward)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="text">
+      <string>Invert Axis</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0" colspan="4">
+    <widget class="QCheckBox" name="mouseCheck">
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enables mouse interaction (panning, scaling) for this axis.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="text">
+      <string>Mouse Enabled</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="2" colspan="2">
+    <widget class="QCheckBox" name="visibleOnlyCheck">
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When checked, the axis will only auto-scale to data that is visible along the orthogonal axis.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="text">
+      <string>Visible Data Only</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="2" colspan="2">
+    <widget class="QCheckBox" name="autoPanCheck">
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When checked, the axis will automatically pan to center on the current data, but the scale along this axis will not change.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="text">
+      <string>Auto Pan Only</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/libs/pyqtgraph/graphicsItems/ViewBox/axisCtrlTemplate_pyqt.py b/libs/pyqtgraph/graphicsItems/ViewBox/axisCtrlTemplate_pyqt.py
new file mode 100644
index 0000000000000000000000000000000000000000..5d952741c80e77833c6591a238123a98f1bdf64e
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/ViewBox/axisCtrlTemplate_pyqt.py
@@ -0,0 +1,102 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file './pyqtgraph/graphicsItems/ViewBox/axisCtrlTemplate.ui'
+#
+# Created: Mon Dec 23 10:10:51 2013
+#      by: PyQt4 UI code generator 4.10
+#
+# WARNING! All changes made in this file will be lost!
+
+from ...Qt import QtCore, QtGui
+
+try:
+    _fromUtf8 = QtCore.QString.fromUtf8
+except AttributeError:
+    def _fromUtf8(s):
+        return s
+
+try:
+    _encoding = QtGui.QApplication.UnicodeUTF8
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig, _encoding)
+except AttributeError:
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig)
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName(_fromUtf8("Form"))
+        Form.resize(186, 154)
+        Form.setMaximumSize(QtCore.QSize(200, 16777215))
+        self.gridLayout = QtGui.QGridLayout(Form)
+        self.gridLayout.setMargin(0)
+        self.gridLayout.setSpacing(0)
+        self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
+        self.label = QtGui.QLabel(Form)
+        self.label.setObjectName(_fromUtf8("label"))
+        self.gridLayout.addWidget(self.label, 7, 0, 1, 2)
+        self.linkCombo = QtGui.QComboBox(Form)
+        self.linkCombo.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToContents)
+        self.linkCombo.setObjectName(_fromUtf8("linkCombo"))
+        self.gridLayout.addWidget(self.linkCombo, 7, 2, 1, 2)
+        self.autoPercentSpin = QtGui.QSpinBox(Form)
+        self.autoPercentSpin.setEnabled(True)
+        self.autoPercentSpin.setMinimum(1)
+        self.autoPercentSpin.setMaximum(100)
+        self.autoPercentSpin.setSingleStep(1)
+        self.autoPercentSpin.setProperty("value", 100)
+        self.autoPercentSpin.setObjectName(_fromUtf8("autoPercentSpin"))
+        self.gridLayout.addWidget(self.autoPercentSpin, 2, 2, 1, 2)
+        self.autoRadio = QtGui.QRadioButton(Form)
+        self.autoRadio.setChecked(True)
+        self.autoRadio.setObjectName(_fromUtf8("autoRadio"))
+        self.gridLayout.addWidget(self.autoRadio, 2, 0, 1, 2)
+        self.manualRadio = QtGui.QRadioButton(Form)
+        self.manualRadio.setObjectName(_fromUtf8("manualRadio"))
+        self.gridLayout.addWidget(self.manualRadio, 1, 0, 1, 2)
+        self.minText = QtGui.QLineEdit(Form)
+        self.minText.setObjectName(_fromUtf8("minText"))
+        self.gridLayout.addWidget(self.minText, 1, 2, 1, 1)
+        self.maxText = QtGui.QLineEdit(Form)
+        self.maxText.setObjectName(_fromUtf8("maxText"))
+        self.gridLayout.addWidget(self.maxText, 1, 3, 1, 1)
+        self.invertCheck = QtGui.QCheckBox(Form)
+        self.invertCheck.setObjectName(_fromUtf8("invertCheck"))
+        self.gridLayout.addWidget(self.invertCheck, 5, 0, 1, 4)
+        self.mouseCheck = QtGui.QCheckBox(Form)
+        self.mouseCheck.setChecked(True)
+        self.mouseCheck.setObjectName(_fromUtf8("mouseCheck"))
+        self.gridLayout.addWidget(self.mouseCheck, 6, 0, 1, 4)
+        self.visibleOnlyCheck = QtGui.QCheckBox(Form)
+        self.visibleOnlyCheck.setObjectName(_fromUtf8("visibleOnlyCheck"))
+        self.gridLayout.addWidget(self.visibleOnlyCheck, 3, 2, 1, 2)
+        self.autoPanCheck = QtGui.QCheckBox(Form)
+        self.autoPanCheck.setObjectName(_fromUtf8("autoPanCheck"))
+        self.gridLayout.addWidget(self.autoPanCheck, 4, 2, 1, 2)
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        Form.setWindowTitle(_translate("Form", "Form", None))
+        self.label.setText(_translate("Form", "Link Axis:", None))
+        self.linkCombo.setToolTip(_translate("Form", "<html><head/><body><p>Links this axis with another view. When linked, both views will display the same data range.</p></body></html>", None))
+        self.autoPercentSpin.setToolTip(_translate("Form", "<html><head/><body><p>Percent of data to be visible when auto-scaling. It may be useful to decrease this value for data with spiky noise.</p></body></html>", None))
+        self.autoPercentSpin.setSuffix(_translate("Form", "%", None))
+        self.autoRadio.setToolTip(_translate("Form", "<html><head/><body><p>Automatically resize this axis whenever the displayed data is changed.</p></body></html>", None))
+        self.autoRadio.setText(_translate("Form", "Auto", None))
+        self.manualRadio.setToolTip(_translate("Form", "<html><head/><body><p>Set the range for this axis manually. This disables automatic scaling. </p></body></html>", None))
+        self.manualRadio.setText(_translate("Form", "Manual", None))
+        self.minText.setToolTip(_translate("Form", "<html><head/><body><p>Minimum value to display for this axis.</p></body></html>", None))
+        self.minText.setText(_translate("Form", "0", None))
+        self.maxText.setToolTip(_translate("Form", "<html><head/><body><p>Maximum value to display for this axis.</p></body></html>", None))
+        self.maxText.setText(_translate("Form", "0", None))
+        self.invertCheck.setToolTip(_translate("Form", "<html><head/><body><p>Inverts the display of this axis. (+y points downward instead of upward)</p></body></html>", None))
+        self.invertCheck.setText(_translate("Form", "Invert Axis", None))
+        self.mouseCheck.setToolTip(_translate("Form", "<html><head/><body><p>Enables mouse interaction (panning, scaling) for this axis.</p></body></html>", None))
+        self.mouseCheck.setText(_translate("Form", "Mouse Enabled", None))
+        self.visibleOnlyCheck.setToolTip(_translate("Form", "<html><head/><body><p>When checked, the axis will only auto-scale to data that is visible along the orthogonal axis.</p></body></html>", None))
+        self.visibleOnlyCheck.setText(_translate("Form", "Visible Data Only", None))
+        self.autoPanCheck.setToolTip(_translate("Form", "<html><head/><body><p>When checked, the axis will automatically pan to center on the current data, but the scale along this axis will not change.</p></body></html>", None))
+        self.autoPanCheck.setText(_translate("Form", "Auto Pan Only", None))
+
diff --git a/libs/pyqtgraph/graphicsItems/ViewBox/axisCtrlTemplate_pyqt5.py b/libs/pyqtgraph/graphicsItems/ViewBox/axisCtrlTemplate_pyqt5.py
new file mode 100644
index 0000000000000000000000000000000000000000..78da6eea58e5ac0652bed229a4893386c99cb1ab
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/ViewBox/axisCtrlTemplate_pyqt5.py
@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file './pyqtgraph/graphicsItems/ViewBox/axisCtrlTemplate.ui'
+#
+# Created: Wed Mar 26 15:09:28 2014
+#      by: PyQt5 UI code generator 5.0.1
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt5 import QtCore, QtGui, QtWidgets
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName("Form")
+        Form.resize(186, 154)
+        Form.setMaximumSize(QtCore.QSize(200, 16777215))
+        self.gridLayout = QtWidgets.QGridLayout(Form)
+        self.gridLayout.setContentsMargins(0, 0, 0, 0)
+        self.gridLayout.setSpacing(0)
+        self.gridLayout.setObjectName("gridLayout")
+        self.label = QtWidgets.QLabel(Form)
+        self.label.setObjectName("label")
+        self.gridLayout.addWidget(self.label, 7, 0, 1, 2)
+        self.linkCombo = QtWidgets.QComboBox(Form)
+        self.linkCombo.setSizeAdjustPolicy(QtWidgets.QComboBox.AdjustToContents)
+        self.linkCombo.setObjectName("linkCombo")
+        self.gridLayout.addWidget(self.linkCombo, 7, 2, 1, 2)
+        self.autoPercentSpin = QtWidgets.QSpinBox(Form)
+        self.autoPercentSpin.setEnabled(True)
+        self.autoPercentSpin.setMinimum(1)
+        self.autoPercentSpin.setMaximum(100)
+        self.autoPercentSpin.setSingleStep(1)
+        self.autoPercentSpin.setProperty("value", 100)
+        self.autoPercentSpin.setObjectName("autoPercentSpin")
+        self.gridLayout.addWidget(self.autoPercentSpin, 2, 2, 1, 2)
+        self.autoRadio = QtWidgets.QRadioButton(Form)
+        self.autoRadio.setChecked(True)
+        self.autoRadio.setObjectName("autoRadio")
+        self.gridLayout.addWidget(self.autoRadio, 2, 0, 1, 2)
+        self.manualRadio = QtWidgets.QRadioButton(Form)
+        self.manualRadio.setObjectName("manualRadio")
+        self.gridLayout.addWidget(self.manualRadio, 1, 0, 1, 2)
+        self.minText = QtWidgets.QLineEdit(Form)
+        self.minText.setObjectName("minText")
+        self.gridLayout.addWidget(self.minText, 1, 2, 1, 1)
+        self.maxText = QtWidgets.QLineEdit(Form)
+        self.maxText.setObjectName("maxText")
+        self.gridLayout.addWidget(self.maxText, 1, 3, 1, 1)
+        self.invertCheck = QtWidgets.QCheckBox(Form)
+        self.invertCheck.setObjectName("invertCheck")
+        self.gridLayout.addWidget(self.invertCheck, 5, 0, 1, 4)
+        self.mouseCheck = QtWidgets.QCheckBox(Form)
+        self.mouseCheck.setChecked(True)
+        self.mouseCheck.setObjectName("mouseCheck")
+        self.gridLayout.addWidget(self.mouseCheck, 6, 0, 1, 4)
+        self.visibleOnlyCheck = QtWidgets.QCheckBox(Form)
+        self.visibleOnlyCheck.setObjectName("visibleOnlyCheck")
+        self.gridLayout.addWidget(self.visibleOnlyCheck, 3, 2, 1, 2)
+        self.autoPanCheck = QtWidgets.QCheckBox(Form)
+        self.autoPanCheck.setObjectName("autoPanCheck")
+        self.gridLayout.addWidget(self.autoPanCheck, 4, 2, 1, 2)
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        _translate = QtCore.QCoreApplication.translate
+        Form.setWindowTitle(_translate("Form", "Form"))
+        self.label.setText(_translate("Form", "Link Axis:"))
+        self.linkCombo.setToolTip(_translate("Form", "<html><head/><body><p>Links this axis with another view. When linked, both views will display the same data range.</p></body></html>"))
+        self.autoPercentSpin.setToolTip(_translate("Form", "<html><head/><body><p>Percent of data to be visible when auto-scaling. It may be useful to decrease this value for data with spiky noise.</p></body></html>"))
+        self.autoPercentSpin.setSuffix(_translate("Form", "%"))
+        self.autoRadio.setToolTip(_translate("Form", "<html><head/><body><p>Automatically resize this axis whenever the displayed data is changed.</p></body></html>"))
+        self.autoRadio.setText(_translate("Form", "Auto"))
+        self.manualRadio.setToolTip(_translate("Form", "<html><head/><body><p>Set the range for this axis manually. This disables automatic scaling. </p></body></html>"))
+        self.manualRadio.setText(_translate("Form", "Manual"))
+        self.minText.setToolTip(_translate("Form", "<html><head/><body><p>Minimum value to display for this axis.</p></body></html>"))
+        self.minText.setText(_translate("Form", "0"))
+        self.maxText.setToolTip(_translate("Form", "<html><head/><body><p>Maximum value to display for this axis.</p></body></html>"))
+        self.maxText.setText(_translate("Form", "0"))
+        self.invertCheck.setToolTip(_translate("Form", "<html><head/><body><p>Inverts the display of this axis. (+y points downward instead of upward)</p></body></html>"))
+        self.invertCheck.setText(_translate("Form", "Invert Axis"))
+        self.mouseCheck.setToolTip(_translate("Form", "<html><head/><body><p>Enables mouse interaction (panning, scaling) for this axis.</p></body></html>"))
+        self.mouseCheck.setText(_translate("Form", "Mouse Enabled"))
+        self.visibleOnlyCheck.setToolTip(_translate("Form", "<html><head/><body><p>When checked, the axis will only auto-scale to data that is visible along the orthogonal axis.</p></body></html>"))
+        self.visibleOnlyCheck.setText(_translate("Form", "Visible Data Only"))
+        self.autoPanCheck.setToolTip(_translate("Form", "<html><head/><body><p>When checked, the axis will automatically pan to center on the current data, but the scale along this axis will not change.</p></body></html>"))
+        self.autoPanCheck.setText(_translate("Form", "Auto Pan Only"))
+
diff --git a/libs/pyqtgraph/graphicsItems/ViewBox/axisCtrlTemplate_pyside.py b/libs/pyqtgraph/graphicsItems/ViewBox/axisCtrlTemplate_pyside.py
new file mode 100644
index 0000000000000000000000000000000000000000..9ddeb5d111bacc63c1d9a400b62d81ca21dd9973
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/ViewBox/axisCtrlTemplate_pyside.py
@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file './pyqtgraph/graphicsItems/ViewBox/axisCtrlTemplate.ui'
+#
+# Created: Mon Dec 23 10:10:51 2013
+#      by: pyside-uic 0.2.14 running on PySide 1.1.2
+#
+# WARNING! All changes made in this file will be lost!
+
+from PySide import QtCore, QtGui
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName("Form")
+        Form.resize(186, 154)
+        Form.setMaximumSize(QtCore.QSize(200, 16777215))
+        self.gridLayout = QtGui.QGridLayout(Form)
+        self.gridLayout.setContentsMargins(0, 0, 0, 0)
+        self.gridLayout.setSpacing(0)
+        self.gridLayout.setObjectName("gridLayout")
+        self.label = QtGui.QLabel(Form)
+        self.label.setObjectName("label")
+        self.gridLayout.addWidget(self.label, 7, 0, 1, 2)
+        self.linkCombo = QtGui.QComboBox(Form)
+        self.linkCombo.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToContents)
+        self.linkCombo.setObjectName("linkCombo")
+        self.gridLayout.addWidget(self.linkCombo, 7, 2, 1, 2)
+        self.autoPercentSpin = QtGui.QSpinBox(Form)
+        self.autoPercentSpin.setEnabled(True)
+        self.autoPercentSpin.setMinimum(1)
+        self.autoPercentSpin.setMaximum(100)
+        self.autoPercentSpin.setSingleStep(1)
+        self.autoPercentSpin.setProperty("value", 100)
+        self.autoPercentSpin.setObjectName("autoPercentSpin")
+        self.gridLayout.addWidget(self.autoPercentSpin, 2, 2, 1, 2)
+        self.autoRadio = QtGui.QRadioButton(Form)
+        self.autoRadio.setChecked(True)
+        self.autoRadio.setObjectName("autoRadio")
+        self.gridLayout.addWidget(self.autoRadio, 2, 0, 1, 2)
+        self.manualRadio = QtGui.QRadioButton(Form)
+        self.manualRadio.setObjectName("manualRadio")
+        self.gridLayout.addWidget(self.manualRadio, 1, 0, 1, 2)
+        self.minText = QtGui.QLineEdit(Form)
+        self.minText.setObjectName("minText")
+        self.gridLayout.addWidget(self.minText, 1, 2, 1, 1)
+        self.maxText = QtGui.QLineEdit(Form)
+        self.maxText.setObjectName("maxText")
+        self.gridLayout.addWidget(self.maxText, 1, 3, 1, 1)
+        self.invertCheck = QtGui.QCheckBox(Form)
+        self.invertCheck.setObjectName("invertCheck")
+        self.gridLayout.addWidget(self.invertCheck, 5, 0, 1, 4)
+        self.mouseCheck = QtGui.QCheckBox(Form)
+        self.mouseCheck.setChecked(True)
+        self.mouseCheck.setObjectName("mouseCheck")
+        self.gridLayout.addWidget(self.mouseCheck, 6, 0, 1, 4)
+        self.visibleOnlyCheck = QtGui.QCheckBox(Form)
+        self.visibleOnlyCheck.setObjectName("visibleOnlyCheck")
+        self.gridLayout.addWidget(self.visibleOnlyCheck, 3, 2, 1, 2)
+        self.autoPanCheck = QtGui.QCheckBox(Form)
+        self.autoPanCheck.setObjectName("autoPanCheck")
+        self.gridLayout.addWidget(self.autoPanCheck, 4, 2, 1, 2)
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        Form.setWindowTitle(QtGui.QApplication.translate("Form", "Form", None, QtGui.QApplication.UnicodeUTF8))
+        self.label.setText(QtGui.QApplication.translate("Form", "Link Axis:", None, QtGui.QApplication.UnicodeUTF8))
+        self.linkCombo.setToolTip(QtGui.QApplication.translate("Form", "<html><head/><body><p>Links this axis with another view. When linked, both views will display the same data range.</p></body></html>", None, QtGui.QApplication.UnicodeUTF8))
+        self.autoPercentSpin.setToolTip(QtGui.QApplication.translate("Form", "<html><head/><body><p>Percent of data to be visible when auto-scaling. It may be useful to decrease this value for data with spiky noise.</p></body></html>", None, QtGui.QApplication.UnicodeUTF8))
+        self.autoPercentSpin.setSuffix(QtGui.QApplication.translate("Form", "%", None, QtGui.QApplication.UnicodeUTF8))
+        self.autoRadio.setToolTip(QtGui.QApplication.translate("Form", "<html><head/><body><p>Automatically resize this axis whenever the displayed data is changed.</p></body></html>", None, QtGui.QApplication.UnicodeUTF8))
+        self.autoRadio.setText(QtGui.QApplication.translate("Form", "Auto", None, QtGui.QApplication.UnicodeUTF8))
+        self.manualRadio.setToolTip(QtGui.QApplication.translate("Form", "<html><head/><body><p>Set the range for this axis manually. This disables automatic scaling. </p></body></html>", None, QtGui.QApplication.UnicodeUTF8))
+        self.manualRadio.setText(QtGui.QApplication.translate("Form", "Manual", None, QtGui.QApplication.UnicodeUTF8))
+        self.minText.setToolTip(QtGui.QApplication.translate("Form", "<html><head/><body><p>Minimum value to display for this axis.</p></body></html>", None, QtGui.QApplication.UnicodeUTF8))
+        self.minText.setText(QtGui.QApplication.translate("Form", "0", None, QtGui.QApplication.UnicodeUTF8))
+        self.maxText.setToolTip(QtGui.QApplication.translate("Form", "<html><head/><body><p>Maximum value to display for this axis.</p></body></html>", None, QtGui.QApplication.UnicodeUTF8))
+        self.maxText.setText(QtGui.QApplication.translate("Form", "0", None, QtGui.QApplication.UnicodeUTF8))
+        self.invertCheck.setToolTip(QtGui.QApplication.translate("Form", "<html><head/><body><p>Inverts the display of this axis. (+y points downward instead of upward)</p></body></html>", None, QtGui.QApplication.UnicodeUTF8))
+        self.invertCheck.setText(QtGui.QApplication.translate("Form", "Invert Axis", None, QtGui.QApplication.UnicodeUTF8))
+        self.mouseCheck.setToolTip(QtGui.QApplication.translate("Form", "<html><head/><body><p>Enables mouse interaction (panning, scaling) for this axis.</p></body></html>", None, QtGui.QApplication.UnicodeUTF8))
+        self.mouseCheck.setText(QtGui.QApplication.translate("Form", "Mouse Enabled", None, QtGui.QApplication.UnicodeUTF8))
+        self.visibleOnlyCheck.setToolTip(QtGui.QApplication.translate("Form", "<html><head/><body><p>When checked, the axis will only auto-scale to data that is visible along the orthogonal axis.</p></body></html>", None, QtGui.QApplication.UnicodeUTF8))
+        self.visibleOnlyCheck.setText(QtGui.QApplication.translate("Form", "Visible Data Only", None, QtGui.QApplication.UnicodeUTF8))
+        self.autoPanCheck.setToolTip(QtGui.QApplication.translate("Form", "<html><head/><body><p>When checked, the axis will automatically pan to center on the current data, but the scale along this axis will not change.</p></body></html>", None, QtGui.QApplication.UnicodeUTF8))
+        self.autoPanCheck.setText(QtGui.QApplication.translate("Form", "Auto Pan Only", None, QtGui.QApplication.UnicodeUTF8))
+
diff --git a/libs/pyqtgraph/graphicsItems/ViewBox/tests/test_ViewBox.py b/libs/pyqtgraph/graphicsItems/ViewBox/tests/test_ViewBox.py
new file mode 100644
index 0000000000000000000000000000000000000000..f1063e7f116f80363e028d2fc291f9eac16b828b
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/ViewBox/tests/test_ViewBox.py
@@ -0,0 +1,85 @@
+#import PySide
+import pyqtgraph as pg
+
+app = pg.mkQApp()
+qtest = pg.Qt.QtTest.QTest
+
+def assertMapping(vb, r1, r2):
+    assert vb.mapFromView(r1.topLeft()) == r2.topLeft()
+    assert vb.mapFromView(r1.bottomLeft()) == r2.bottomLeft()
+    assert vb.mapFromView(r1.topRight()) == r2.topRight()
+    assert vb.mapFromView(r1.bottomRight()) == r2.bottomRight()
+
+def test_ViewBox():
+    global app, win, vb
+    QRectF = pg.QtCore.QRectF
+    
+    win = pg.GraphicsWindow()
+    win.ci.layout.setContentsMargins(0,0,0,0)
+    win.resize(200, 200)
+    win.show()
+    vb = win.addViewBox()
+    
+    # set range before viewbox is shown
+    vb.setRange(xRange=[0, 10], yRange=[0, 10], padding=0)
+    
+    # required to make mapFromView work properly.
+    qtest.qWaitForWindowShown(win)
+    
+    g = pg.GridItem()
+    vb.addItem(g)
+    
+    app.processEvents()
+    
+    w = vb.geometry().width()
+    h = vb.geometry().height()
+    view1 = QRectF(0, 0, 10, 10)
+    size1 = QRectF(0, h, w, -h)
+    assertMapping(vb, view1, size1)
+    
+    # test resize
+    win.resize(400, 400)
+    app.processEvents()
+    w = vb.geometry().width()
+    h = vb.geometry().height()
+    size1 = QRectF(0, h, w, -h)
+    assertMapping(vb, view1, size1)
+    
+    # now lock aspect
+    vb.setAspectLocked()
+    
+    # test wide resize
+    win.resize(800, 400)
+    app.processEvents()
+    w = vb.geometry().width()
+    h = vb.geometry().height()
+    view1 = QRectF(-5, 0, 20, 10)
+    size1 = QRectF(0, h, w, -h)
+    assertMapping(vb, view1, size1)
+    
+    # test tall resize
+    win.resize(400, 800)
+    app.processEvents()
+    w = vb.geometry().width()
+    h = vb.geometry().height()
+    view1 = QRectF(0, -5, 10, 20)
+    size1 = QRectF(0, h, w, -h)
+    assertMapping(vb, view1, size1)
+    
+    # test limits + resize  (aspect ratio constraint has priority over limits
+    win.resize(400, 400)
+    app.processEvents()
+    vb.setLimits(xMin=0, xMax=10, yMin=0, yMax=10)
+    win.resize(800, 400)
+    app.processEvents()
+    w = vb.geometry().width()
+    h = vb.geometry().height()
+    view1 = QRectF(-5, 0, 20, 10)
+    size1 = QRectF(0, h, w, -h)
+    assertMapping(vb, view1, size1)
+    
+    
+if __name__ == '__main__':
+    import user,sys
+    test_ViewBox()
+        
\ No newline at end of file
diff --git a/libs/pyqtgraph/graphicsItems/__init__.py b/libs/pyqtgraph/graphicsItems/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..8e411816cc3b005c7f194ddb66cdd0540922cc7f
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/__init__.py
@@ -0,0 +1,21 @@
+### just import everything from sub-modules
+
+#import os
+
+#d = os.path.split(__file__)[0]
+#files = []
+#for f in os.listdir(d):
+    #if os.path.isdir(os.path.join(d, f)):
+        #files.append(f)
+    #elif f[-3:] == '.py' and f != '__init__.py':
+        #files.append(f[:-3])
+    
+#for modName in files:
+    #mod = __import__(modName, globals(), locals(), fromlist=['*'])
+    #if hasattr(mod, '__all__'):
+        #names = mod.__all__
+    #else:
+        #names = [n for n in dir(mod) if n[0] != '_']
+    #for k in names:
+        ##print modName, k
+        #globals()[k] = getattr(mod, k)
diff --git a/libs/pyqtgraph/graphicsItems/tests/test_GraphicsItem.py b/libs/pyqtgraph/graphicsItems/tests/test_GraphicsItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..112dd4d59888fdc5bd8ecc9f3a95c07358c7e22c
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/tests/test_GraphicsItem.py
@@ -0,0 +1,47 @@
+import gc
+import weakref
+try:
+    import faulthandler
+    faulthandler.enable()
+except ImportError:
+    pass
+
+import pyqtgraph as pg
+pg.mkQApp()
+
+def test_getViewWidget():
+    view = pg.PlotWidget()
+    vref = weakref.ref(view)
+    item = pg.InfiniteLine()
+    view.addItem(item)
+    assert item.getViewWidget() is view
+    del view
+    gc.collect()
+    assert vref() is None
+    assert item.getViewWidget() is None
+
+def test_getViewWidget_deleted():
+    view = pg.PlotWidget()
+    item = pg.InfiniteLine()
+    view.addItem(item)
+    assert item.getViewWidget() is view
+    
+    # Arrange to have Qt automatically delete the view widget
+    obj = pg.QtGui.QWidget()
+    view.setParent(obj)
+    del obj
+    gc.collect()
+
+    assert not pg.Qt.isQObjectAlive(view)
+    assert item.getViewWidget() is None
+
+
+#if __name__ == '__main__':
+    #view = pg.PlotItem()
+    #vref = weakref.ref(view)
+    #item = pg.InfiniteLine()
+    #view.addItem(item)
+    #del view
+    #gc.collect()
+    
+    
\ No newline at end of file
diff --git a/libs/pyqtgraph/graphicsItems/tests/test_ScatterPlotItem.py b/libs/pyqtgraph/graphicsItems/tests/test_ScatterPlotItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..8b0ebc8fe936d69d1d549ba6ba02c6b960210018
--- /dev/null
+++ b/libs/pyqtgraph/graphicsItems/tests/test_ScatterPlotItem.py
@@ -0,0 +1,86 @@
+import pyqtgraph as pg
+import numpy as np
+app = pg.mkQApp()
+plot = pg.plot()
+app.processEvents()
+
+# set view range equal to its bounding rect. 
+# This causes plots to look the same regardless of pxMode.
+plot.setRange(rect=plot.boundingRect())
+
+
+def test_scatterplotitem():
+    for i, pxMode in enumerate([True, False]):
+        for j, useCache in enumerate([True, False]):
+            s = pg.ScatterPlotItem()
+            s.opts['useCache'] = useCache
+            plot.addItem(s)
+            s.setData(x=np.array([10,40,20,30])+i*100, y=np.array([40,60,10,30])+j*100, pxMode=pxMode)
+            s.addPoints(x=np.array([60, 70])+i*100, y=np.array([60, 70])+j*100, size=[20, 30])
+            
+            # Test uniform spot updates
+            s.setSize(10)
+            s.setBrush('r')
+            s.setPen('g')
+            s.setSymbol('+')
+            app.processEvents()
+            
+            # Test list spot updates
+            s.setSize([10] * 6)
+            s.setBrush([pg.mkBrush('r')] * 6)
+            s.setPen([pg.mkPen('g')] * 6)
+            s.setSymbol(['+'] * 6)
+            s.setPointData([s] * 6)
+            app.processEvents()
+
+            # Test array spot updates
+            s.setSize(np.array([10] * 6))
+            s.setBrush(np.array([pg.mkBrush('r')] * 6))
+            s.setPen(np.array([pg.mkPen('g')] * 6))
+            s.setSymbol(np.array(['+'] * 6))
+            s.setPointData(np.array([s] * 6))
+            app.processEvents()
+
+            # Test per-spot updates
+            spot = s.points()[0]
+            spot.setSize(20)
+            spot.setBrush('b')
+            spot.setPen('g')
+            spot.setSymbol('o')
+            spot.setData(None)
+            app.processEvents()
+
+    plot.clear()
+
+
+def test_init_spots():
+    spots = [
+        {'x': 0, 'y': 1},
+        {'pos': (1, 2), 'pen': None, 'brush': None, 'data': 'zzz'},
+    ]
+    s = pg.ScatterPlotItem(spots=spots)
+    
+    # Check we can display without errors
+    plot.addItem(s)
+    app.processEvents()
+    plot.clear()
+    
+    # check data is correct
+    spots = s.points()
+    
+    defPen = pg.mkPen(pg.getConfigOption('foreground'))
+
+    assert spots[0].pos().x() == 0
+    assert spots[0].pos().y() == 1
+    assert spots[0].pen() == defPen
+    assert spots[0].data() is None
+    
+    assert spots[1].pos().x() == 1
+    assert spots[1].pos().y() == 2
+    assert spots[1].pen() == pg.mkPen(None)
+    assert spots[1].brush() == pg.mkBrush(None)
+    assert spots[1].data() == 'zzz'
+    
+
+if __name__ == '__main__':
+    test_scatterplotitem()
diff --git a/libs/pyqtgraph/graphicsWindows.py b/libs/pyqtgraph/graphicsWindows.py
new file mode 100644
index 0000000000000000000000000000000000000000..1aa3f3f4d6d47d3efe7e5625b76a23454b7e1417
--- /dev/null
+++ b/libs/pyqtgraph/graphicsWindows.py
@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+"""
+graphicsWindows.py -  Convenience classes which create a new window with PlotWidget or ImageView.
+Copyright 2010  Luke Campagnola
+Distributed under MIT/X11 license. See license.txt for more infomation.
+"""
+
+from .Qt import QtCore, QtGui
+from .widgets.PlotWidget import *
+from .imageview import *
+from .widgets.GraphicsLayoutWidget import GraphicsLayoutWidget
+from .widgets.GraphicsView import GraphicsView
+QAPP = None
+
+def mkQApp():
+    if QtGui.QApplication.instance() is None:
+        global QAPP
+        QAPP = QtGui.QApplication([])
+
+
+class GraphicsWindow(GraphicsLayoutWidget):
+    """
+    Convenience subclass of :class:`GraphicsLayoutWidget 
+    <pyqtgraph.GraphicsLayoutWidget>`. This class is intended for use from 
+    the interactive python prompt.
+    """
+    def __init__(self, title=None, size=(800,600), **kargs):
+        mkQApp()
+        GraphicsLayoutWidget.__init__(self, **kargs)
+        self.resize(*size)
+        if title is not None:
+            self.setWindowTitle(title)
+        self.show()
+        
+
+class TabWindow(QtGui.QMainWindow):
+    def __init__(self, title=None, size=(800,600)):
+        mkQApp()
+        QtGui.QMainWindow.__init__(self)
+        self.resize(*size)
+        self.cw = QtGui.QTabWidget()
+        self.setCentralWidget(self.cw)
+        if title is not None:
+            self.setWindowTitle(title)
+        self.show()
+        
+    def __getattr__(self, attr):
+        if hasattr(self.cw, attr):
+            return getattr(self.cw, attr)
+        else:
+            raise NameError(attr)
+    
+
+class PlotWindow(PlotWidget):
+    def __init__(self, title=None, **kargs):
+        mkQApp()
+        self.win = QtGui.QMainWindow()
+        PlotWidget.__init__(self, **kargs)
+        self.win.setCentralWidget(self)
+        for m in ['resize']:
+            setattr(self, m, getattr(self.win, m))
+        if title is not None:
+            self.win.setWindowTitle(title)
+        self.win.show()
+
+
+class ImageWindow(ImageView):
+    def __init__(self, *args, **kargs):
+        mkQApp()
+        self.win = QtGui.QMainWindow()
+        self.win.resize(800,600)
+        if 'title' in kargs:
+            self.win.setWindowTitle(kargs['title'])
+            del kargs['title']
+        ImageView.__init__(self, self.win)
+        if len(args) > 0 or len(kargs) > 0:
+            self.setImage(*args, **kargs)
+        self.win.setCentralWidget(self)
+        for m in ['resize']:
+            setattr(self, m, getattr(self.win, m))
+        #for m in ['setImage', 'autoRange', 'addItem', 'removeItem', 'blackLevel', 'whiteLevel', 'imageItem']:
+            #setattr(self, m, getattr(self.cw, m))
+        self.win.show()
diff --git a/libs/pyqtgraph/imageview/ImageView.py b/libs/pyqtgraph/imageview/ImageView.py
new file mode 100644
index 0000000000000000000000000000000000000000..61193fc45884735250236af5c980130a94ef3389
--- /dev/null
+++ b/libs/pyqtgraph/imageview/ImageView.py
@@ -0,0 +1,720 @@
+# -*- coding: utf-8 -*-
+"""
+ImageView.py -  Widget for basic image dispay and analysis
+Copyright 2010  Luke Campagnola
+Distributed under MIT/X11 license. See license.txt for more infomation.
+
+Widget used for displaying 2D or 3D data. Features:
+  - float or int (including 16-bit int) image display via ImageItem
+  - zoom/pan via GraphicsView
+  - black/white level controls
+  - time slider for 3D data sets
+  - ROI plotting
+  - Image normalization through a variety of methods
+"""
+import os
+import numpy as np
+
+from ..Qt import QtCore, QtGui, USE_PYSIDE
+if USE_PYSIDE:
+    from .ImageViewTemplate_pyside import *
+else:
+    from .ImageViewTemplate_pyqt import *
+    
+from ..graphicsItems.ImageItem import *
+from ..graphicsItems.ROI import *
+from ..graphicsItems.LinearRegionItem import *
+from ..graphicsItems.InfiniteLine import *
+from ..graphicsItems.ViewBox import *
+from .. import ptime as ptime
+from .. import debug as debug
+from ..SignalProxy import SignalProxy
+
+try:
+    from bottleneck import nanmin, nanmax
+except ImportError:
+    from numpy import nanmin, nanmax
+
+
+class PlotROI(ROI):
+    def __init__(self, size):
+        ROI.__init__(self, pos=[0,0], size=size) #, scaleSnap=True, translateSnap=True)
+        self.addScaleHandle([1, 1], [0, 0])
+        self.addRotateHandle([0, 0], [0.5, 0.5])
+
+
+class ImageView(QtGui.QWidget):
+    """
+    Widget used for display and analysis of image data.
+    Implements many features:
+    
+    * Displays 2D and 3D image data. For 3D data, a z-axis
+      slider is displayed allowing the user to select which frame is displayed.
+    * Displays histogram of image data with movable region defining the dark/light levels
+    * Editable gradient provides a color lookup table 
+    * Frame slider may also be moved using left/right arrow keys as well as pgup, pgdn, home, and end.
+    * Basic analysis features including:
+    
+        * ROI and embedded plot for measuring image values across frames
+        * Image normalization / background subtraction 
+    
+    Basic Usage::
+    
+        imv = pg.ImageView()
+        imv.show()
+        imv.setImage(data)
+        
+    **Keyboard interaction**
+    
+    * left/right arrows step forward/backward 1 frame when pressed,
+      seek at 20fps when held.
+    * up/down arrows seek at 100fps
+    * pgup/pgdn seek at 1000fps
+    * home/end seek immediately to the first/last frame
+    * space begins playing frames. If time values (in seconds) are given 
+      for each frame, then playback is in realtime.
+    """
+    sigTimeChanged = QtCore.Signal(object, object)
+    sigProcessingChanged = QtCore.Signal(object)
+    
+    def __init__(self, parent=None, name="ImageView", view=None, imageItem=None, *args):
+        """
+        By default, this class creates an :class:`ImageItem <pyqtgraph.ImageItem>` to display image data
+        and a :class:`ViewBox <pyqtgraph.ViewBox>` to contain the ImageItem. 
+        
+        ============= =========================================================
+        **Arguments** 
+        parent        (QWidget) Specifies the parent widget to which
+                      this ImageView will belong. If None, then the ImageView
+                      is created with no parent.
+        name          (str) The name used to register both the internal ViewBox
+                      and the PlotItem used to display ROI data. See the *name*
+                      argument to :func:`ViewBox.__init__() 
+                      <pyqtgraph.ViewBox.__init__>`.
+        view          (ViewBox or PlotItem) If specified, this will be used
+                      as the display area that contains the displayed image. 
+                      Any :class:`ViewBox <pyqtgraph.ViewBox>`, 
+                      :class:`PlotItem <pyqtgraph.PlotItem>`, or other 
+                      compatible object is acceptable.
+        imageItem     (ImageItem) If specified, this object will be used to
+                      display the image. Must be an instance of ImageItem
+                      or other compatible object.
+        ============= =========================================================
+        
+        Note: to display axis ticks inside the ImageView, instantiate it 
+        with a PlotItem instance as its view::
+                
+            pg.ImageView(view=pg.PlotItem())
+        """
+        QtGui.QWidget.__init__(self, parent, *args)
+        self.levelMax = 4096
+        self.levelMin = 0
+        self.name = name
+        self.image = None
+        self.axes = {}
+        self.imageDisp = None
+        self.ui = Ui_Form()
+        self.ui.setupUi(self)
+        self.scene = self.ui.graphicsView.scene()
+        
+        self.ignoreTimeLine = False
+        
+        if view is None:
+            self.view = ViewBox()
+        else:
+            self.view = view
+        self.ui.graphicsView.setCentralItem(self.view)
+        self.view.setAspectLocked(True)
+        self.view.invertY()
+        
+        if imageItem is None:
+            self.imageItem = ImageItem()
+        else:
+            self.imageItem = imageItem
+        self.view.addItem(self.imageItem)
+        self.currentIndex = 0
+        
+        self.ui.histogram.setImageItem(self.imageItem)
+        
+        self.menu = None
+        
+        self.ui.normGroup.hide()
+
+        self.roi = PlotROI(10)
+        self.roi.setZValue(20)
+        self.view.addItem(self.roi)
+        self.roi.hide()
+        self.normRoi = PlotROI(10)
+        self.normRoi.setPen('y')
+        self.normRoi.setZValue(20)
+        self.view.addItem(self.normRoi)
+        self.normRoi.hide()
+        self.roiCurve = self.ui.roiPlot.plot()
+        self.timeLine = InfiniteLine(0, movable=True)
+        self.timeLine.setPen((255, 255, 0, 200))
+        self.timeLine.setZValue(1)
+        self.ui.roiPlot.addItem(self.timeLine)
+        self.ui.splitter.setSizes([self.height()-35, 35])
+        self.ui.roiPlot.hideAxis('left')
+        
+        self.keysPressed = {}
+        self.playTimer = QtCore.QTimer()
+        self.playRate = 0
+        self.lastPlayTime = 0
+        
+        self.normRgn = LinearRegionItem()
+        self.normRgn.setZValue(0)
+        self.ui.roiPlot.addItem(self.normRgn)
+        self.normRgn.hide()
+            
+        ## wrap functions from view box
+        for fn in ['addItem', 'removeItem']:
+            setattr(self, fn, getattr(self.view, fn))
+
+        ## wrap functions from histogram
+        for fn in ['setHistogramRange', 'autoHistogramRange', 'getLookupTable', 'getLevels']:
+            setattr(self, fn, getattr(self.ui.histogram, fn))
+
+        self.timeLine.sigPositionChanged.connect(self.timeLineChanged)
+        self.ui.roiBtn.clicked.connect(self.roiClicked)
+        self.roi.sigRegionChanged.connect(self.roiChanged)
+        #self.ui.normBtn.toggled.connect(self.normToggled)
+        self.ui.menuBtn.clicked.connect(self.menuClicked)
+        self.ui.normDivideRadio.clicked.connect(self.normRadioChanged)
+        self.ui.normSubtractRadio.clicked.connect(self.normRadioChanged)
+        self.ui.normOffRadio.clicked.connect(self.normRadioChanged)
+        self.ui.normROICheck.clicked.connect(self.updateNorm)
+        self.ui.normFrameCheck.clicked.connect(self.updateNorm)
+        self.ui.normTimeRangeCheck.clicked.connect(self.updateNorm)
+        self.playTimer.timeout.connect(self.timeout)
+        
+        self.normProxy = SignalProxy(self.normRgn.sigRegionChanged, slot=self.updateNorm)
+        self.normRoi.sigRegionChangeFinished.connect(self.updateNorm)
+        
+        self.ui.roiPlot.registerPlot(self.name + '_ROI')
+        self.view.register(self.name)
+        
+        self.noRepeatKeys = [QtCore.Qt.Key_Right, QtCore.Qt.Key_Left, QtCore.Qt.Key_Up, QtCore.Qt.Key_Down, QtCore.Qt.Key_PageUp, QtCore.Qt.Key_PageDown]
+        
+        self.roiClicked() ## initialize roi plot to correct shape / visibility
+
+    def setImage(self, img, autoRange=True, autoLevels=True, levels=None, axes=None, xvals=None, pos=None, scale=None, transform=None, autoHistogramRange=True):
+        """
+        Set the image to be displayed in the widget.
+        
+        ================== =======================================================================
+        **Arguments:**
+        img                (numpy array) the image to be displayed.
+        xvals              (numpy array) 1D array of z-axis values corresponding to the third axis
+                           in a 3D image. For video, this array should contain the time of each frame.
+        autoRange          (bool) whether to scale/pan the view to fit the image.
+        autoLevels         (bool) whether to update the white/black levels to fit the image.
+        levels             (min, max); the white and black level values to use.
+        axes               Dictionary indicating the interpretation for each axis.
+                           This is only needed to override the default guess. Format is::
+                       
+                               {'t':0, 'x':1, 'y':2, 'c':3};
+        
+        pos                Change the position of the displayed image
+        scale              Change the scale of the displayed image
+        transform          Set the transform of the displayed image. This option overrides *pos*
+                           and *scale*.
+        autoHistogramRange If True, the histogram y-range is automatically scaled to fit the
+                           image data.
+        ================== =======================================================================
+        """
+        profiler = debug.Profiler()
+        
+        if hasattr(img, 'implements') and img.implements('MetaArray'):
+            img = img.asarray()
+        
+        if not isinstance(img, np.ndarray):
+            required = ['dtype', 'max', 'min', 'ndim', 'shape', 'size']
+            if not all([hasattr(img, attr) for attr in required]):
+                raise TypeError("Image must be NumPy array or any object "
+                                "that provides compatible attributes/methods:\n"
+                                "  %s" % str(required))
+        
+        self.image = img
+        self.imageDisp = None
+        
+        if xvals is not None:
+            self.tVals = xvals
+        elif hasattr(img, 'xvals'):
+            try:
+                self.tVals = img.xvals(0)
+            except:
+                self.tVals = np.arange(img.shape[0])
+        else:
+            self.tVals = np.arange(img.shape[0])
+        
+        profiler()
+        
+        if axes is None:
+            if img.ndim == 2:
+                self.axes = {'t': None, 'x': 0, 'y': 1, 'c': None}
+            elif img.ndim == 3:
+                if img.shape[2] <= 4:
+                    self.axes = {'t': None, 'x': 0, 'y': 1, 'c': 2}
+                else:
+                    self.axes = {'t': 0, 'x': 1, 'y': 2, 'c': None}
+            elif img.ndim == 4:
+                self.axes = {'t': 0, 'x': 1, 'y': 2, 'c': 3}
+            else:
+                raise Exception("Can not interpret image with dimensions %s" % (str(img.shape)))
+        elif isinstance(axes, dict):
+            self.axes = axes.copy()
+        elif isinstance(axes, list) or isinstance(axes, tuple):
+            self.axes = {}
+            for i in range(len(axes)):
+                self.axes[axes[i]] = i
+        else:
+            raise Exception("Can not interpret axis specification %s. Must be like {'t': 2, 'x': 0, 'y': 1} or ('t', 'x', 'y', 'c')" % (str(axes)))
+            
+        for x in ['t', 'x', 'y', 'c']:
+            self.axes[x] = self.axes.get(x, None)
+
+        profiler()
+
+        self.currentIndex = 0
+        self.updateImage(autoHistogramRange=autoHistogramRange)
+        if levels is None and autoLevels:
+            self.autoLevels()
+        if levels is not None:  ## this does nothing since getProcessedImage sets these values again.
+            self.setLevels(*levels)
+            
+        if self.ui.roiBtn.isChecked():
+            self.roiChanged()
+
+        profiler()
+
+        if self.axes['t'] is not None:
+            #self.ui.roiPlot.show()
+            self.ui.roiPlot.setXRange(self.tVals.min(), self.tVals.max())
+            self.timeLine.setValue(0)
+            #self.ui.roiPlot.setMouseEnabled(False, False)
+            if len(self.tVals) > 1:
+                start = self.tVals.min()
+                stop = self.tVals.max() + abs(self.tVals[-1] - self.tVals[0]) * 0.02
+            elif len(self.tVals) == 1:
+                start = self.tVals[0] - 0.5
+                stop = self.tVals[0] + 0.5
+            else:
+                start = 0
+                stop = 1
+            for s in [self.timeLine, self.normRgn]:
+                s.setBounds([start, stop])
+        #else:
+            #self.ui.roiPlot.hide()
+        profiler()
+
+        self.imageItem.resetTransform()
+        if scale is not None:
+            self.imageItem.scale(*scale)
+        if pos is not None:
+            self.imageItem.setPos(*pos)
+        if transform is not None:
+            self.imageItem.setTransform(transform)
+
+        profiler()
+
+        if autoRange:
+            self.autoRange()
+        self.roiClicked()
+
+        profiler()
+
+    def clear(self):
+        self.image = None
+        self.imageItem.clear()
+        
+    def play(self, rate):
+        """Begin automatically stepping frames forward at the given rate (in fps).
+        This can also be accessed by pressing the spacebar."""
+        #print "play:", rate
+        self.playRate = rate
+        if rate == 0:
+            self.playTimer.stop()
+            return
+            
+        self.lastPlayTime = ptime.time()
+        if not self.playTimer.isActive():
+            self.playTimer.start(16)
+            
+    def autoLevels(self):
+        """Set the min/max intensity levels automatically to match the image data."""
+        self.setLevels(self.levelMin, self.levelMax)
+
+    def setLevels(self, min, max):
+        """Set the min/max (bright and dark) levels."""
+        self.ui.histogram.setLevels(min, max)
+
+    def autoRange(self):
+        """Auto scale and pan the view around the image such that the image fills the view."""
+        image = self.getProcessedImage()
+        self.view.autoRange()
+        
+    def getProcessedImage(self):
+        """Returns the image data after it has been processed by any normalization options in use.
+        This method also sets the attributes self.levelMin and self.levelMax 
+        to indicate the range of data in the image."""
+        if self.imageDisp is None:
+            image = self.normalize(self.image)
+            self.imageDisp = image
+            self.levelMin, self.levelMax = list(map(float, self.quickMinMax(self.imageDisp)))
+            
+        return self.imageDisp
+        
+    def close(self):
+        """Closes the widget nicely, making sure to clear the graphics scene and release memory."""
+        self.ui.roiPlot.close()
+        self.ui.graphicsView.close()
+        self.scene.clear()
+        del self.image
+        del self.imageDisp
+        self.setParent(None)
+        
+    def keyPressEvent(self, ev):
+        #print ev.key()
+        if ev.key() == QtCore.Qt.Key_Space:
+            if self.playRate == 0:
+                fps = (self.getProcessedImage().shape[0]-1) / (self.tVals[-1] - self.tVals[0])
+                self.play(fps)
+                #print fps
+            else:
+                self.play(0)
+            ev.accept()
+        elif ev.key() == QtCore.Qt.Key_Home:
+            self.setCurrentIndex(0)
+            self.play(0)
+            ev.accept()
+        elif ev.key() == QtCore.Qt.Key_End:
+            self.setCurrentIndex(self.getProcessedImage().shape[0]-1)
+            self.play(0)
+            ev.accept()
+        elif ev.key() in self.noRepeatKeys:
+            ev.accept()
+            if ev.isAutoRepeat():
+                return
+            self.keysPressed[ev.key()] = 1
+            self.evalKeyState()
+        else:
+            QtGui.QWidget.keyPressEvent(self, ev)
+
+    def keyReleaseEvent(self, ev):
+        if ev.key() in [QtCore.Qt.Key_Space, QtCore.Qt.Key_Home, QtCore.Qt.Key_End]:
+            ev.accept()
+        elif ev.key() in self.noRepeatKeys:
+            ev.accept()
+            if ev.isAutoRepeat():
+                return
+            try:
+                del self.keysPressed[ev.key()]
+            except:
+                self.keysPressed = {}
+            self.evalKeyState()
+        else:
+            QtGui.QWidget.keyReleaseEvent(self, ev)
+        
+    def evalKeyState(self):
+        if len(self.keysPressed) == 1:
+            key = list(self.keysPressed.keys())[0]
+            if key == QtCore.Qt.Key_Right:
+                self.play(20)
+                self.jumpFrames(1)
+                self.lastPlayTime = ptime.time() + 0.2  ## 2ms wait before start
+                                                        ## This happens *after* jumpFrames, since it might take longer than 2ms
+            elif key == QtCore.Qt.Key_Left:
+                self.play(-20)
+                self.jumpFrames(-1)
+                self.lastPlayTime = ptime.time() + 0.2
+            elif key == QtCore.Qt.Key_Up:
+                self.play(-100)
+            elif key == QtCore.Qt.Key_Down:
+                self.play(100)
+            elif key == QtCore.Qt.Key_PageUp:
+                self.play(-1000)
+            elif key == QtCore.Qt.Key_PageDown:
+                self.play(1000)
+        else:
+            self.play(0)
+        
+    def timeout(self):
+        now = ptime.time()
+        dt = now - self.lastPlayTime
+        if dt < 0:
+            return
+        n = int(self.playRate * dt)
+        if n != 0:
+            self.lastPlayTime += (float(n)/self.playRate)
+            if self.currentIndex+n > self.image.shape[0]:
+                self.play(0)
+            self.jumpFrames(n)
+        
+    def setCurrentIndex(self, ind):
+        """Set the currently displayed frame index."""
+        self.currentIndex = np.clip(ind, 0, self.getProcessedImage().shape[0]-1)
+        self.updateImage()
+        self.ignoreTimeLine = True
+        self.timeLine.setValue(self.tVals[self.currentIndex])
+        self.ignoreTimeLine = False
+
+    def jumpFrames(self, n):
+        """Move video frame ahead n frames (may be negative)"""
+        if self.axes['t'] is not None:
+            self.setCurrentIndex(self.currentIndex + n)
+
+    def normRadioChanged(self):
+        self.imageDisp = None
+        self.updateImage()
+        self.autoLevels()
+        self.roiChanged()
+        self.sigProcessingChanged.emit(self)
+    
+    def updateNorm(self):
+        if self.ui.normTimeRangeCheck.isChecked():
+            self.normRgn.show()
+        else:
+            self.normRgn.hide()
+        
+        if self.ui.normROICheck.isChecked():
+            self.normRoi.show()
+        else:
+            self.normRoi.hide()
+        
+        if not self.ui.normOffRadio.isChecked():
+            self.imageDisp = None
+            self.updateImage()
+            self.autoLevels()
+            self.roiChanged()
+            self.sigProcessingChanged.emit(self)
+
+    def normToggled(self, b):
+        self.ui.normGroup.setVisible(b)
+        self.normRoi.setVisible(b and self.ui.normROICheck.isChecked())
+        self.normRgn.setVisible(b and self.ui.normTimeRangeCheck.isChecked())
+
+    def hasTimeAxis(self):
+        return 't' in self.axes and self.axes['t'] is not None
+
+    def roiClicked(self):
+        showRoiPlot = False
+        if self.ui.roiBtn.isChecked():
+            showRoiPlot = True
+            self.roi.show()
+            #self.ui.roiPlot.show()
+            self.ui.roiPlot.setMouseEnabled(True, True)
+            self.ui.splitter.setSizes([self.height()*0.6, self.height()*0.4])
+            self.roiCurve.show()
+            self.roiChanged()
+            self.ui.roiPlot.showAxis('left')
+        else:
+            self.roi.hide()
+            self.ui.roiPlot.setMouseEnabled(False, False)
+            self.roiCurve.hide()
+            self.ui.roiPlot.hideAxis('left')
+            
+        if self.hasTimeAxis():
+            showRoiPlot = True
+            mn = self.tVals.min()
+            mx = self.tVals.max()
+            self.ui.roiPlot.setXRange(mn, mx, padding=0.01)
+            self.timeLine.show()
+            self.timeLine.setBounds([mn, mx])
+            self.ui.roiPlot.show()
+            if not self.ui.roiBtn.isChecked():
+                self.ui.splitter.setSizes([self.height()-35, 35])
+        else:
+            self.timeLine.hide()
+            #self.ui.roiPlot.hide()
+            
+        self.ui.roiPlot.setVisible(showRoiPlot)
+
+    def roiChanged(self):
+        if self.image is None:
+            return
+            
+        image = self.getProcessedImage()
+        if image.ndim == 2:
+            axes = (0, 1)
+        elif image.ndim == 3:
+            axes = (1, 2)
+        else:
+            return
+        data, coords = self.roi.getArrayRegion(image.view(np.ndarray), self.imageItem, axes, returnMappedCoords=True)
+        if data is not None:
+            while data.ndim > 1:
+                data = data.mean(axis=1)
+            if image.ndim == 3:
+                self.roiCurve.setData(y=data, x=self.tVals)
+            else:
+                while coords.ndim > 2:
+                    coords = coords[:,:,0]
+                coords = coords - coords[:,0,np.newaxis]
+                xvals = (coords**2).sum(axis=0) ** 0.5
+                self.roiCurve.setData(y=data, x=xvals)
+
+    def quickMinMax(self, data):
+        """
+        Estimate the min/max values of *data* by subsampling.
+        """
+        while data.size > 1e6:
+            ax = np.argmax(data.shape)
+            sl = [slice(None)] * data.ndim
+            sl[ax] = slice(None, None, 2)
+            data = data[sl]
+        return nanmin(data), nanmax(data)
+
+    def normalize(self, image):
+        """
+        Process *image* using the normalization options configured in the
+        control panel.
+        
+        This can be repurposed to process any data through the same filter.
+        """
+        if self.ui.normOffRadio.isChecked():
+            return image
+            
+        div = self.ui.normDivideRadio.isChecked()
+        norm = image.view(np.ndarray).copy()
+        #if div:
+            #norm = ones(image.shape)
+        #else:
+            #norm = zeros(image.shape)
+        if div:
+            norm = norm.astype(np.float32)
+            
+        if self.ui.normTimeRangeCheck.isChecked() and image.ndim == 3:
+            (sind, start) = self.timeIndex(self.normRgn.lines[0])
+            (eind, end) = self.timeIndex(self.normRgn.lines[1])
+            #print start, end, sind, eind
+            n = image[sind:eind+1].mean(axis=0)
+            n.shape = (1,) + n.shape
+            if div:
+                norm /= n
+            else:
+                norm -= n
+                
+        if self.ui.normFrameCheck.isChecked() and image.ndim == 3:
+            n = image.mean(axis=1).mean(axis=1)
+            n.shape = n.shape + (1, 1)
+            if div:
+                norm /= n
+            else:
+                norm -= n
+            
+        if self.ui.normROICheck.isChecked() and image.ndim == 3:
+            n = self.normRoi.getArrayRegion(norm, self.imageItem, (1, 2)).mean(axis=1).mean(axis=1)
+            n = n[:,np.newaxis,np.newaxis]
+            #print start, end, sind, eind
+            if div:
+                norm /= n
+            else:
+                norm -= n
+                
+        return norm
+        
+    def timeLineChanged(self):
+        #(ind, time) = self.timeIndex(self.ui.timeSlider)
+        if self.ignoreTimeLine:
+            return
+        self.play(0)
+        (ind, time) = self.timeIndex(self.timeLine)
+        if ind != self.currentIndex:
+            self.currentIndex = ind
+            self.updateImage()
+        #self.timeLine.setPos(time)
+        #self.emit(QtCore.SIGNAL('timeChanged'), ind, time)
+        self.sigTimeChanged.emit(ind, time)
+
+    def updateImage(self, autoHistogramRange=True):
+        ## Redraw image on screen
+        if self.image is None:
+            return
+            
+        image = self.getProcessedImage()
+        
+        if autoHistogramRange:
+            self.ui.histogram.setHistogramRange(self.levelMin, self.levelMax)
+        if self.axes['t'] is None:
+            self.imageItem.updateImage(image)
+        else:
+            self.ui.roiPlot.show()
+            self.imageItem.updateImage(image[self.currentIndex])
+            
+            
+    def timeIndex(self, slider):
+        ## Return the time and frame index indicated by a slider
+        if self.image is None:
+            return (0,0)
+        
+        t = slider.value()
+        
+        xv = self.tVals
+        if xv is None:
+            ind = int(t)
+        else:
+            if len(xv) < 2:
+                return (0,0)
+            totTime = xv[-1] + (xv[-1]-xv[-2])
+            inds = np.argwhere(xv < t)
+            if len(inds) < 1:
+                return (0,t)
+            ind = inds[-1,0]
+        return ind, t
+
+    def getView(self):
+        """Return the ViewBox (or other compatible object) which displays the ImageItem"""
+        return self.view
+        
+    def getImageItem(self):
+        """Return the ImageItem for this ImageView."""
+        return self.imageItem
+        
+    def getRoiPlot(self):
+        """Return the ROI PlotWidget for this ImageView"""
+        return self.ui.roiPlot
+       
+    def getHistogramWidget(self):
+        """Return the HistogramLUTWidget for this ImageView"""
+        return self.ui.histogram
+
+    def export(self, fileName):
+        """
+        Export data from the ImageView to a file, or to a stack of files if
+        the data is 3D. Saving an image stack will result in index numbers
+        being added to the file name. Images are saved as they would appear
+        onscreen, with levels and lookup table applied.
+        """
+        img = self.getProcessedImage()
+        if self.hasTimeAxis():
+            base, ext = os.path.splitext(fileName)
+            fmt = "%%s%%0%dd%%s" % int(np.log10(img.shape[0])+1)
+            for i in range(img.shape[0]):
+                self.imageItem.setImage(img[i], autoLevels=False)
+                self.imageItem.save(fmt % (base, i, ext))
+            self.updateImage()
+        else:
+            self.imageItem.save(fileName)
+            
+    def exportClicked(self):
+        fileName = QtGui.QFileDialog.getSaveFileName()
+        if fileName == '':
+            return
+        self.export(fileName)
+        
+    def buildMenu(self):
+        self.menu = QtGui.QMenu()
+        self.normAction = QtGui.QAction("Normalization", self.menu)
+        self.normAction.setCheckable(True)
+        self.normAction.toggled.connect(self.normToggled)
+        self.menu.addAction(self.normAction)
+        self.exportAction = QtGui.QAction("Export", self.menu)
+        self.exportAction.triggered.connect(self.exportClicked)
+        self.menu.addAction(self.exportAction)
+        
+    def menuClicked(self):
+        if self.menu is None:
+            self.buildMenu()
+        self.menu.popup(QtGui.QCursor.pos())
+        
diff --git a/libs/pyqtgraph/imageview/ImageViewTemplate.ui b/libs/pyqtgraph/imageview/ImageViewTemplate.ui
new file mode 100644
index 0000000000000000000000000000000000000000..927bda30aaf1f880575fb118d2648458875b4d79
--- /dev/null
+++ b/libs/pyqtgraph/imageview/ImageViewTemplate.ui
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>726</width>
+    <height>588</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_3">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <item row="0" column="0">
+    <widget class="QSplitter" name="splitter">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <widget class="QWidget" name="layoutWidget">
+      <layout class="QGridLayout" name="gridLayout">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <item row="0" column="0" rowspan="2">
+        <widget class="GraphicsView" name="graphicsView"/>
+       </item>
+       <item row="0" column="1" colspan="2">
+        <widget class="HistogramLUTWidget" name="histogram"/>
+       </item>
+       <item row="1" column="1">
+        <widget class="QPushButton" name="roiBtn">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>1</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>ROI</string>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="2">
+        <widget class="QPushButton" name="menuBtn">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>1</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Menu</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="PlotWidget" name="roiPlot" native="true">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="minimumSize">
+       <size>
+        <width>0</width>
+        <height>40</height>
+       </size>
+      </property>
+     </widget>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="normGroup">
+     <property name="title">
+      <string>Normalization</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <property name="margin">
+       <number>0</number>
+      </property>
+      <property name="spacing">
+       <number>0</number>
+      </property>
+      <item row="0" column="2">
+       <widget class="QRadioButton" name="normSubtractRadio">
+        <property name="text">
+         <string>Subtract</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QRadioButton" name="normDivideRadio">
+        <property name="text">
+         <string>Divide</string>
+        </property>
+        <property name="checked">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_5">
+        <property name="font">
+         <font>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>Operation:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="font">
+         <font>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>Mean:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="font">
+         <font>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>Blur:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QCheckBox" name="normROICheck">
+        <property name="text">
+         <string>ROI</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2">
+       <widget class="QDoubleSpinBox" name="normXBlurSpin"/>
+      </item>
+      <item row="2" column="1">
+       <widget class="QLabel" name="label_8">
+        <property name="text">
+         <string>X</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="3">
+       <widget class="QLabel" name="label_9">
+        <property name="text">
+         <string>Y</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="4">
+       <widget class="QDoubleSpinBox" name="normYBlurSpin"/>
+      </item>
+      <item row="2" column="5">
+       <widget class="QLabel" name="label_10">
+        <property name="text">
+         <string>T</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
+       <widget class="QRadioButton" name="normOffRadio">
+        <property name="text">
+         <string>Off</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <widget class="QCheckBox" name="normTimeRangeCheck">
+        <property name="text">
+         <string>Time range</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QCheckBox" name="normFrameCheck">
+        <property name="text">
+         <string>Frame</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="6">
+       <widget class="QDoubleSpinBox" name="normTBlurSpin"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>PlotWidget</class>
+   <extends>QWidget</extends>
+   <header>..widgets.PlotWidget</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>GraphicsView</class>
+   <extends>QGraphicsView</extends>
+   <header>..widgets.GraphicsView</header>
+  </customwidget>
+  <customwidget>
+   <class>HistogramLUTWidget</class>
+   <extends>QGraphicsView</extends>
+   <header>..widgets.HistogramLUTWidget</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/libs/pyqtgraph/imageview/ImageViewTemplate_pyqt.py b/libs/pyqtgraph/imageview/ImageViewTemplate_pyqt.py
new file mode 100644
index 0000000000000000000000000000000000000000..8c9d5633984f67163d55604c13641cdd89603a2d
--- /dev/null
+++ b/libs/pyqtgraph/imageview/ImageViewTemplate_pyqt.py
@@ -0,0 +1,168 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'ImageViewTemplate.ui'
+#
+# Created: Thu May  1 15:20:40 2014
+#      by: PyQt4 UI code generator 4.10.4
+#
+# WARNING! All changes made in this file will be lost!
+
+from ..Qt import QtCore, QtGui
+
+try:
+    _fromUtf8 = QtCore.QString.fromUtf8
+except AttributeError:
+    def _fromUtf8(s):
+        return s
+
+try:
+    _encoding = QtGui.QApplication.UnicodeUTF8
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig, _encoding)
+except AttributeError:
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig)
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName(_fromUtf8("Form"))
+        Form.resize(726, 588)
+        self.gridLayout_3 = QtGui.QGridLayout(Form)
+        self.gridLayout_3.setMargin(0)
+        self.gridLayout_3.setSpacing(0)
+        self.gridLayout_3.setObjectName(_fromUtf8("gridLayout_3"))
+        self.splitter = QtGui.QSplitter(Form)
+        self.splitter.setOrientation(QtCore.Qt.Vertical)
+        self.splitter.setObjectName(_fromUtf8("splitter"))
+        self.layoutWidget = QtGui.QWidget(self.splitter)
+        self.layoutWidget.setObjectName(_fromUtf8("layoutWidget"))
+        self.gridLayout = QtGui.QGridLayout(self.layoutWidget)
+        self.gridLayout.setSpacing(0)
+        self.gridLayout.setMargin(0)
+        self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
+        self.graphicsView = GraphicsView(self.layoutWidget)
+        self.graphicsView.setObjectName(_fromUtf8("graphicsView"))
+        self.gridLayout.addWidget(self.graphicsView, 0, 0, 2, 1)
+        self.histogram = HistogramLUTWidget(self.layoutWidget)
+        self.histogram.setObjectName(_fromUtf8("histogram"))
+        self.gridLayout.addWidget(self.histogram, 0, 1, 1, 2)
+        self.roiBtn = QtGui.QPushButton(self.layoutWidget)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(1)
+        sizePolicy.setHeightForWidth(self.roiBtn.sizePolicy().hasHeightForWidth())
+        self.roiBtn.setSizePolicy(sizePolicy)
+        self.roiBtn.setCheckable(True)
+        self.roiBtn.setObjectName(_fromUtf8("roiBtn"))
+        self.gridLayout.addWidget(self.roiBtn, 1, 1, 1, 1)
+        self.menuBtn = QtGui.QPushButton(self.layoutWidget)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(1)
+        sizePolicy.setHeightForWidth(self.menuBtn.sizePolicy().hasHeightForWidth())
+        self.menuBtn.setSizePolicy(sizePolicy)
+        self.menuBtn.setObjectName(_fromUtf8("menuBtn"))
+        self.gridLayout.addWidget(self.menuBtn, 1, 2, 1, 1)
+        self.roiPlot = PlotWidget(self.splitter)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.roiPlot.sizePolicy().hasHeightForWidth())
+        self.roiPlot.setSizePolicy(sizePolicy)
+        self.roiPlot.setMinimumSize(QtCore.QSize(0, 40))
+        self.roiPlot.setObjectName(_fromUtf8("roiPlot"))
+        self.gridLayout_3.addWidget(self.splitter, 0, 0, 1, 1)
+        self.normGroup = QtGui.QGroupBox(Form)
+        self.normGroup.setObjectName(_fromUtf8("normGroup"))
+        self.gridLayout_2 = QtGui.QGridLayout(self.normGroup)
+        self.gridLayout_2.setMargin(0)
+        self.gridLayout_2.setSpacing(0)
+        self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2"))
+        self.normSubtractRadio = QtGui.QRadioButton(self.normGroup)
+        self.normSubtractRadio.setObjectName(_fromUtf8("normSubtractRadio"))
+        self.gridLayout_2.addWidget(self.normSubtractRadio, 0, 2, 1, 1)
+        self.normDivideRadio = QtGui.QRadioButton(self.normGroup)
+        self.normDivideRadio.setChecked(False)
+        self.normDivideRadio.setObjectName(_fromUtf8("normDivideRadio"))
+        self.gridLayout_2.addWidget(self.normDivideRadio, 0, 1, 1, 1)
+        self.label_5 = QtGui.QLabel(self.normGroup)
+        font = QtGui.QFont()
+        font.setBold(True)
+        font.setWeight(75)
+        self.label_5.setFont(font)
+        self.label_5.setObjectName(_fromUtf8("label_5"))
+        self.gridLayout_2.addWidget(self.label_5, 0, 0, 1, 1)
+        self.label_3 = QtGui.QLabel(self.normGroup)
+        font = QtGui.QFont()
+        font.setBold(True)
+        font.setWeight(75)
+        self.label_3.setFont(font)
+        self.label_3.setObjectName(_fromUtf8("label_3"))
+        self.gridLayout_2.addWidget(self.label_3, 1, 0, 1, 1)
+        self.label_4 = QtGui.QLabel(self.normGroup)
+        font = QtGui.QFont()
+        font.setBold(True)
+        font.setWeight(75)
+        self.label_4.setFont(font)
+        self.label_4.setObjectName(_fromUtf8("label_4"))
+        self.gridLayout_2.addWidget(self.label_4, 2, 0, 1, 1)
+        self.normROICheck = QtGui.QCheckBox(self.normGroup)
+        self.normROICheck.setObjectName(_fromUtf8("normROICheck"))
+        self.gridLayout_2.addWidget(self.normROICheck, 1, 1, 1, 1)
+        self.normXBlurSpin = QtGui.QDoubleSpinBox(self.normGroup)
+        self.normXBlurSpin.setObjectName(_fromUtf8("normXBlurSpin"))
+        self.gridLayout_2.addWidget(self.normXBlurSpin, 2, 2, 1, 1)
+        self.label_8 = QtGui.QLabel(self.normGroup)
+        self.label_8.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_8.setObjectName(_fromUtf8("label_8"))
+        self.gridLayout_2.addWidget(self.label_8, 2, 1, 1, 1)
+        self.label_9 = QtGui.QLabel(self.normGroup)
+        self.label_9.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_9.setObjectName(_fromUtf8("label_9"))
+        self.gridLayout_2.addWidget(self.label_9, 2, 3, 1, 1)
+        self.normYBlurSpin = QtGui.QDoubleSpinBox(self.normGroup)
+        self.normYBlurSpin.setObjectName(_fromUtf8("normYBlurSpin"))
+        self.gridLayout_2.addWidget(self.normYBlurSpin, 2, 4, 1, 1)
+        self.label_10 = QtGui.QLabel(self.normGroup)
+        self.label_10.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_10.setObjectName(_fromUtf8("label_10"))
+        self.gridLayout_2.addWidget(self.label_10, 2, 5, 1, 1)
+        self.normOffRadio = QtGui.QRadioButton(self.normGroup)
+        self.normOffRadio.setChecked(True)
+        self.normOffRadio.setObjectName(_fromUtf8("normOffRadio"))
+        self.gridLayout_2.addWidget(self.normOffRadio, 0, 3, 1, 1)
+        self.normTimeRangeCheck = QtGui.QCheckBox(self.normGroup)
+        self.normTimeRangeCheck.setObjectName(_fromUtf8("normTimeRangeCheck"))
+        self.gridLayout_2.addWidget(self.normTimeRangeCheck, 1, 3, 1, 1)
+        self.normFrameCheck = QtGui.QCheckBox(self.normGroup)
+        self.normFrameCheck.setObjectName(_fromUtf8("normFrameCheck"))
+        self.gridLayout_2.addWidget(self.normFrameCheck, 1, 2, 1, 1)
+        self.normTBlurSpin = QtGui.QDoubleSpinBox(self.normGroup)
+        self.normTBlurSpin.setObjectName(_fromUtf8("normTBlurSpin"))
+        self.gridLayout_2.addWidget(self.normTBlurSpin, 2, 6, 1, 1)
+        self.gridLayout_3.addWidget(self.normGroup, 1, 0, 1, 1)
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        Form.setWindowTitle(_translate("Form", "Form", None))
+        self.roiBtn.setText(_translate("Form", "ROI", None))
+        self.menuBtn.setText(_translate("Form", "Menu", None))
+        self.normGroup.setTitle(_translate("Form", "Normalization", None))
+        self.normSubtractRadio.setText(_translate("Form", "Subtract", None))
+        self.normDivideRadio.setText(_translate("Form", "Divide", None))
+        self.label_5.setText(_translate("Form", "Operation:", None))
+        self.label_3.setText(_translate("Form", "Mean:", None))
+        self.label_4.setText(_translate("Form", "Blur:", None))
+        self.normROICheck.setText(_translate("Form", "ROI", None))
+        self.label_8.setText(_translate("Form", "X", None))
+        self.label_9.setText(_translate("Form", "Y", None))
+        self.label_10.setText(_translate("Form", "T", None))
+        self.normOffRadio.setText(_translate("Form", "Off", None))
+        self.normTimeRangeCheck.setText(_translate("Form", "Time range", None))
+        self.normFrameCheck.setText(_translate("Form", "Frame", None))
+
+from ..widgets.HistogramLUTWidget import HistogramLUTWidget
+from ..widgets.GraphicsView import GraphicsView
+from ..widgets.PlotWidget import PlotWidget
diff --git a/libs/pyqtgraph/imageview/ImageViewTemplate_pyqt5.py b/libs/pyqtgraph/imageview/ImageViewTemplate_pyqt5.py
new file mode 100644
index 0000000000000000000000000000000000000000..4b4009b6f0118943464d2c74e0fcf4992b083ad5
--- /dev/null
+++ b/libs/pyqtgraph/imageview/ImageViewTemplate_pyqt5.py
@@ -0,0 +1,156 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file './pyqtgraph/imageview/ImageViewTemplate.ui'
+#
+# Created: Wed Mar 26 15:09:28 2014
+#      by: PyQt5 UI code generator 5.0.1
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt5 import QtCore, QtGui, QtWidgets
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName("Form")
+        Form.resize(726, 588)
+        self.gridLayout_3 = QtWidgets.QGridLayout(Form)
+        self.gridLayout_3.setContentsMargins(0, 0, 0, 0)
+        self.gridLayout_3.setSpacing(0)
+        self.gridLayout_3.setObjectName("gridLayout_3")
+        self.splitter = QtWidgets.QSplitter(Form)
+        self.splitter.setOrientation(QtCore.Qt.Vertical)
+        self.splitter.setObjectName("splitter")
+        self.layoutWidget = QtWidgets.QWidget(self.splitter)
+        self.layoutWidget.setObjectName("layoutWidget")
+        self.gridLayout = QtWidgets.QGridLayout(self.layoutWidget)
+        self.gridLayout.setSpacing(0)
+        self.gridLayout.setContentsMargins(0, 0, 0, 0)
+        self.gridLayout.setObjectName("gridLayout")
+        self.graphicsView = GraphicsView(self.layoutWidget)
+        self.graphicsView.setObjectName("graphicsView")
+        self.gridLayout.addWidget(self.graphicsView, 0, 0, 2, 1)
+        self.histogram = HistogramLUTWidget(self.layoutWidget)
+        self.histogram.setObjectName("histogram")
+        self.gridLayout.addWidget(self.histogram, 0, 1, 1, 2)
+        self.roiBtn = QtWidgets.QPushButton(self.layoutWidget)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(1)
+        sizePolicy.setHeightForWidth(self.roiBtn.sizePolicy().hasHeightForWidth())
+        self.roiBtn.setSizePolicy(sizePolicy)
+        self.roiBtn.setCheckable(True)
+        self.roiBtn.setObjectName("roiBtn")
+        self.gridLayout.addWidget(self.roiBtn, 1, 1, 1, 1)
+        self.normBtn = QtWidgets.QPushButton(self.layoutWidget)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(1)
+        sizePolicy.setHeightForWidth(self.normBtn.sizePolicy().hasHeightForWidth())
+        self.normBtn.setSizePolicy(sizePolicy)
+        self.normBtn.setCheckable(True)
+        self.normBtn.setObjectName("normBtn")
+        self.gridLayout.addWidget(self.normBtn, 1, 2, 1, 1)
+        self.roiPlot = PlotWidget(self.splitter)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.roiPlot.sizePolicy().hasHeightForWidth())
+        self.roiPlot.setSizePolicy(sizePolicy)
+        self.roiPlot.setMinimumSize(QtCore.QSize(0, 40))
+        self.roiPlot.setObjectName("roiPlot")
+        self.gridLayout_3.addWidget(self.splitter, 0, 0, 1, 1)
+        self.normGroup = QtWidgets.QGroupBox(Form)
+        self.normGroup.setObjectName("normGroup")
+        self.gridLayout_2 = QtWidgets.QGridLayout(self.normGroup)
+        self.gridLayout_2.setContentsMargins(0, 0, 0, 0)
+        self.gridLayout_2.setSpacing(0)
+        self.gridLayout_2.setObjectName("gridLayout_2")
+        self.normSubtractRadio = QtWidgets.QRadioButton(self.normGroup)
+        self.normSubtractRadio.setObjectName("normSubtractRadio")
+        self.gridLayout_2.addWidget(self.normSubtractRadio, 0, 2, 1, 1)
+        self.normDivideRadio = QtWidgets.QRadioButton(self.normGroup)
+        self.normDivideRadio.setChecked(False)
+        self.normDivideRadio.setObjectName("normDivideRadio")
+        self.gridLayout_2.addWidget(self.normDivideRadio, 0, 1, 1, 1)
+        self.label_5 = QtWidgets.QLabel(self.normGroup)
+        font = QtGui.QFont()
+        font.setBold(True)
+        font.setWeight(75)
+        self.label_5.setFont(font)
+        self.label_5.setObjectName("label_5")
+        self.gridLayout_2.addWidget(self.label_5, 0, 0, 1, 1)
+        self.label_3 = QtWidgets.QLabel(self.normGroup)
+        font = QtGui.QFont()
+        font.setBold(True)
+        font.setWeight(75)
+        self.label_3.setFont(font)
+        self.label_3.setObjectName("label_3")
+        self.gridLayout_2.addWidget(self.label_3, 1, 0, 1, 1)
+        self.label_4 = QtWidgets.QLabel(self.normGroup)
+        font = QtGui.QFont()
+        font.setBold(True)
+        font.setWeight(75)
+        self.label_4.setFont(font)
+        self.label_4.setObjectName("label_4")
+        self.gridLayout_2.addWidget(self.label_4, 2, 0, 1, 1)
+        self.normROICheck = QtWidgets.QCheckBox(self.normGroup)
+        self.normROICheck.setObjectName("normROICheck")
+        self.gridLayout_2.addWidget(self.normROICheck, 1, 1, 1, 1)
+        self.normXBlurSpin = QtWidgets.QDoubleSpinBox(self.normGroup)
+        self.normXBlurSpin.setObjectName("normXBlurSpin")
+        self.gridLayout_2.addWidget(self.normXBlurSpin, 2, 2, 1, 1)
+        self.label_8 = QtWidgets.QLabel(self.normGroup)
+        self.label_8.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_8.setObjectName("label_8")
+        self.gridLayout_2.addWidget(self.label_8, 2, 1, 1, 1)
+        self.label_9 = QtWidgets.QLabel(self.normGroup)
+        self.label_9.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_9.setObjectName("label_9")
+        self.gridLayout_2.addWidget(self.label_9, 2, 3, 1, 1)
+        self.normYBlurSpin = QtWidgets.QDoubleSpinBox(self.normGroup)
+        self.normYBlurSpin.setObjectName("normYBlurSpin")
+        self.gridLayout_2.addWidget(self.normYBlurSpin, 2, 4, 1, 1)
+        self.label_10 = QtWidgets.QLabel(self.normGroup)
+        self.label_10.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_10.setObjectName("label_10")
+        self.gridLayout_2.addWidget(self.label_10, 2, 5, 1, 1)
+        self.normOffRadio = QtWidgets.QRadioButton(self.normGroup)
+        self.normOffRadio.setChecked(True)
+        self.normOffRadio.setObjectName("normOffRadio")
+        self.gridLayout_2.addWidget(self.normOffRadio, 0, 3, 1, 1)
+        self.normTimeRangeCheck = QtWidgets.QCheckBox(self.normGroup)
+        self.normTimeRangeCheck.setObjectName("normTimeRangeCheck")
+        self.gridLayout_2.addWidget(self.normTimeRangeCheck, 1, 3, 1, 1)
+        self.normFrameCheck = QtWidgets.QCheckBox(self.normGroup)
+        self.normFrameCheck.setObjectName("normFrameCheck")
+        self.gridLayout_2.addWidget(self.normFrameCheck, 1, 2, 1, 1)
+        self.normTBlurSpin = QtWidgets.QDoubleSpinBox(self.normGroup)
+        self.normTBlurSpin.setObjectName("normTBlurSpin")
+        self.gridLayout_2.addWidget(self.normTBlurSpin, 2, 6, 1, 1)
+        self.gridLayout_3.addWidget(self.normGroup, 1, 0, 1, 1)
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        _translate = QtCore.QCoreApplication.translate
+        Form.setWindowTitle(_translate("Form", "Form"))
+        self.roiBtn.setText(_translate("Form", "ROI"))
+        self.normBtn.setText(_translate("Form", "Norm"))
+        self.normGroup.setTitle(_translate("Form", "Normalization"))
+        self.normSubtractRadio.setText(_translate("Form", "Subtract"))
+        self.normDivideRadio.setText(_translate("Form", "Divide"))
+        self.label_5.setText(_translate("Form", "Operation:"))
+        self.label_3.setText(_translate("Form", "Mean:"))
+        self.label_4.setText(_translate("Form", "Blur:"))
+        self.normROICheck.setText(_translate("Form", "ROI"))
+        self.label_8.setText(_translate("Form", "X"))
+        self.label_9.setText(_translate("Form", "Y"))
+        self.label_10.setText(_translate("Form", "T"))
+        self.normOffRadio.setText(_translate("Form", "Off"))
+        self.normTimeRangeCheck.setText(_translate("Form", "Time range"))
+        self.normFrameCheck.setText(_translate("Form", "Frame"))
+
+from ..widgets.HistogramLUTWidget import HistogramLUTWidget
+from ..widgets.PlotWidget import PlotWidget
+from ..widgets.GraphicsView import GraphicsView
diff --git a/libs/pyqtgraph/imageview/ImageViewTemplate_pyside.py b/libs/pyqtgraph/imageview/ImageViewTemplate_pyside.py
new file mode 100644
index 0000000000000000000000000000000000000000..6d6c96322ac59ec9e741f3367813c096e1d3f34b
--- /dev/null
+++ b/libs/pyqtgraph/imageview/ImageViewTemplate_pyside.py
@@ -0,0 +1,154 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'ImageViewTemplate.ui'
+#
+# Created: Thu May  1 15:20:42 2014
+#      by: pyside-uic 0.2.15 running on PySide 1.2.1
+#
+# WARNING! All changes made in this file will be lost!
+
+from PySide import QtCore, QtGui
+
+class Ui_Form(object):
+    def setupUi(self, Form):
+        Form.setObjectName("Form")
+        Form.resize(726, 588)
+        self.gridLayout_3 = QtGui.QGridLayout(Form)
+        self.gridLayout_3.setContentsMargins(0, 0, 0, 0)
+        self.gridLayout_3.setSpacing(0)
+        self.gridLayout_3.setObjectName("gridLayout_3")
+        self.splitter = QtGui.QSplitter(Form)
+        self.splitter.setOrientation(QtCore.Qt.Vertical)
+        self.splitter.setObjectName("splitter")
+        self.layoutWidget = QtGui.QWidget(self.splitter)
+        self.layoutWidget.setObjectName("layoutWidget")
+        self.gridLayout = QtGui.QGridLayout(self.layoutWidget)
+        self.gridLayout.setSpacing(0)
+        self.gridLayout.setContentsMargins(0, 0, 0, 0)
+        self.gridLayout.setObjectName("gridLayout")
+        self.graphicsView = GraphicsView(self.layoutWidget)
+        self.graphicsView.setObjectName("graphicsView")
+        self.gridLayout.addWidget(self.graphicsView, 0, 0, 2, 1)
+        self.histogram = HistogramLUTWidget(self.layoutWidget)
+        self.histogram.setObjectName("histogram")
+        self.gridLayout.addWidget(self.histogram, 0, 1, 1, 2)
+        self.roiBtn = QtGui.QPushButton(self.layoutWidget)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(1)
+        sizePolicy.setHeightForWidth(self.roiBtn.sizePolicy().hasHeightForWidth())
+        self.roiBtn.setSizePolicy(sizePolicy)
+        self.roiBtn.setCheckable(True)
+        self.roiBtn.setObjectName("roiBtn")
+        self.gridLayout.addWidget(self.roiBtn, 1, 1, 1, 1)
+        self.menuBtn = QtGui.QPushButton(self.layoutWidget)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(1)
+        sizePolicy.setHeightForWidth(self.menuBtn.sizePolicy().hasHeightForWidth())
+        self.menuBtn.setSizePolicy(sizePolicy)
+        self.menuBtn.setObjectName("menuBtn")
+        self.gridLayout.addWidget(self.menuBtn, 1, 2, 1, 1)
+        self.roiPlot = PlotWidget(self.splitter)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.roiPlot.sizePolicy().hasHeightForWidth())
+        self.roiPlot.setSizePolicy(sizePolicy)
+        self.roiPlot.setMinimumSize(QtCore.QSize(0, 40))
+        self.roiPlot.setObjectName("roiPlot")
+        self.gridLayout_3.addWidget(self.splitter, 0, 0, 1, 1)
+        self.normGroup = QtGui.QGroupBox(Form)
+        self.normGroup.setObjectName("normGroup")
+        self.gridLayout_2 = QtGui.QGridLayout(self.normGroup)
+        self.gridLayout_2.setContentsMargins(0, 0, 0, 0)
+        self.gridLayout_2.setSpacing(0)
+        self.gridLayout_2.setObjectName("gridLayout_2")
+        self.normSubtractRadio = QtGui.QRadioButton(self.normGroup)
+        self.normSubtractRadio.setObjectName("normSubtractRadio")
+        self.gridLayout_2.addWidget(self.normSubtractRadio, 0, 2, 1, 1)
+        self.normDivideRadio = QtGui.QRadioButton(self.normGroup)
+        self.normDivideRadio.setChecked(False)
+        self.normDivideRadio.setObjectName("normDivideRadio")
+        self.gridLayout_2.addWidget(self.normDivideRadio, 0, 1, 1, 1)
+        self.label_5 = QtGui.QLabel(self.normGroup)
+        font = QtGui.QFont()
+        font.setWeight(75)
+        font.setBold(True)
+        self.label_5.setFont(font)
+        self.label_5.setObjectName("label_5")
+        self.gridLayout_2.addWidget(self.label_5, 0, 0, 1, 1)
+        self.label_3 = QtGui.QLabel(self.normGroup)
+        font = QtGui.QFont()
+        font.setWeight(75)
+        font.setBold(True)
+        self.label_3.setFont(font)
+        self.label_3.setObjectName("label_3")
+        self.gridLayout_2.addWidget(self.label_3, 1, 0, 1, 1)
+        self.label_4 = QtGui.QLabel(self.normGroup)
+        font = QtGui.QFont()
+        font.setWeight(75)
+        font.setBold(True)
+        self.label_4.setFont(font)
+        self.label_4.setObjectName("label_4")
+        self.gridLayout_2.addWidget(self.label_4, 2, 0, 1, 1)
+        self.normROICheck = QtGui.QCheckBox(self.normGroup)
+        self.normROICheck.setObjectName("normROICheck")
+        self.gridLayout_2.addWidget(self.normROICheck, 1, 1, 1, 1)
+        self.normXBlurSpin = QtGui.QDoubleSpinBox(self.normGroup)
+        self.normXBlurSpin.setObjectName("normXBlurSpin")
+        self.gridLayout_2.addWidget(self.normXBlurSpin, 2, 2, 1, 1)
+        self.label_8 = QtGui.QLabel(self.normGroup)
+        self.label_8.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_8.setObjectName("label_8")
+        self.gridLayout_2.addWidget(self.label_8, 2, 1, 1, 1)
+        self.label_9 = QtGui.QLabel(self.normGroup)
+        self.label_9.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_9.setObjectName("label_9")
+        self.gridLayout_2.addWidget(self.label_9, 2, 3, 1, 1)
+        self.normYBlurSpin = QtGui.QDoubleSpinBox(self.normGroup)
+        self.normYBlurSpin.setObjectName("normYBlurSpin")
+        self.gridLayout_2.addWidget(self.normYBlurSpin, 2, 4, 1, 1)
+        self.label_10 = QtGui.QLabel(self.normGroup)
+        self.label_10.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_10.setObjectName("label_10")
+        self.gridLayout_2.addWidget(self.label_10, 2, 5, 1, 1)
+        self.normOffRadio = QtGui.QRadioButton(self.normGroup)
+        self.normOffRadio.setChecked(True)
+        self.normOffRadio.setObjectName("normOffRadio")
+        self.gridLayout_2.addWidget(self.normOffRadio, 0, 3, 1, 1)
+        self.normTimeRangeCheck = QtGui.QCheckBox(self.normGroup)
+        self.normTimeRangeCheck.setObjectName("normTimeRangeCheck")
+        self.gridLayout_2.addWidget(self.normTimeRangeCheck, 1, 3, 1, 1)
+        self.normFrameCheck = QtGui.QCheckBox(self.normGroup)
+        self.normFrameCheck.setObjectName("normFrameCheck")
+        self.gridLayout_2.addWidget(self.normFrameCheck, 1, 2, 1, 1)
+        self.normTBlurSpin = QtGui.QDoubleSpinBox(self.normGroup)
+        self.normTBlurSpin.setObjectName("normTBlurSpin")
+        self.gridLayout_2.addWidget(self.normTBlurSpin, 2, 6, 1, 1)
+        self.gridLayout_3.addWidget(self.normGroup, 1, 0, 1, 1)
+
+        self.retranslateUi(Form)
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def retranslateUi(self, Form):
+        Form.setWindowTitle(QtGui.QApplication.translate("Form", "Form", None, QtGui.QApplication.UnicodeUTF8))
+        self.roiBtn.setText(QtGui.QApplication.translate("Form", "ROI", None, QtGui.QApplication.UnicodeUTF8))
+        self.menuBtn.setText(QtGui.QApplication.translate("Form", "Menu", None, QtGui.QApplication.UnicodeUTF8))
+        self.normGroup.setTitle(QtGui.QApplication.translate("Form", "Normalization", None, QtGui.QApplication.UnicodeUTF8))
+        self.normSubtractRadio.setText(QtGui.QApplication.translate("Form", "Subtract", None, QtGui.QApplication.UnicodeUTF8))
+        self.normDivideRadio.setText(QtGui.QApplication.translate("Form", "Divide", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_5.setText(QtGui.QApplication.translate("Form", "Operation:", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_3.setText(QtGui.QApplication.translate("Form", "Mean:", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_4.setText(QtGui.QApplication.translate("Form", "Blur:", None, QtGui.QApplication.UnicodeUTF8))
+        self.normROICheck.setText(QtGui.QApplication.translate("Form", "ROI", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_8.setText(QtGui.QApplication.translate("Form", "X", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_9.setText(QtGui.QApplication.translate("Form", "Y", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_10.setText(QtGui.QApplication.translate("Form", "T", None, QtGui.QApplication.UnicodeUTF8))
+        self.normOffRadio.setText(QtGui.QApplication.translate("Form", "Off", None, QtGui.QApplication.UnicodeUTF8))
+        self.normTimeRangeCheck.setText(QtGui.QApplication.translate("Form", "Time range", None, QtGui.QApplication.UnicodeUTF8))
+        self.normFrameCheck.setText(QtGui.QApplication.translate("Form", "Frame", None, QtGui.QApplication.UnicodeUTF8))
+
+from ..widgets.HistogramLUTWidget import HistogramLUTWidget
+from ..widgets.GraphicsView import GraphicsView
+from ..widgets.PlotWidget import PlotWidget
diff --git a/libs/pyqtgraph/imageview/__init__.py b/libs/pyqtgraph/imageview/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..0060e823bea8e86591bbd4d9622bde1bc487f6af
--- /dev/null
+++ b/libs/pyqtgraph/imageview/__init__.py
@@ -0,0 +1,6 @@
+"""
+Widget used for display and analysis of 2D and 3D image data.
+Includes ROI plotting over time and image normalization.
+"""
+
+from .ImageView import ImageView
diff --git a/libs/pyqtgraph/imageview/tests/test_imageview.py b/libs/pyqtgraph/imageview/tests/test_imageview.py
new file mode 100644
index 0000000000000000000000000000000000000000..2ca1712c29129a64f9f0afa2b653ddb5735540c2
--- /dev/null
+++ b/libs/pyqtgraph/imageview/tests/test_imageview.py
@@ -0,0 +1,11 @@
+import pyqtgraph as pg
+import numpy as np
+
+app = pg.mkQApp()
+
+def test_nan_image():
+    img = np.ones((10,10))
+    img[0,0] = np.nan
+    v = pg.image(img)
+    app.processEvents()
+    v.window().close()
diff --git a/libs/pyqtgraph/metaarray/MetaArray.py b/libs/pyqtgraph/metaarray/MetaArray.py
new file mode 100644
index 0000000000000000000000000000000000000000..9c3f5b8a193fe4f4e31aa54b3e189830b73a7f34
--- /dev/null
+++ b/libs/pyqtgraph/metaarray/MetaArray.py
@@ -0,0 +1,1498 @@
+# -*- coding: utf-8 -*-
+"""
+MetaArray.py -  Class encapsulating ndarray with meta data
+Copyright 2010  Luke Campagnola
+Distributed under MIT/X11 license. See license.txt for more infomation.
+
+MetaArray is an array class based on numpy.ndarray that allows storage of per-axis meta data
+such as axis values, names, units, column names, etc. It also enables several
+new methods for slicing and indexing the array based on this meta data. 
+More info at http://www.scipy.org/Cookbook/MetaArray
+"""
+
+import numpy as np
+import types, copy, threading, os, re
+import pickle
+from functools import reduce
+#import traceback
+
+## By default, the library will use HDF5 when writing files.
+## This can be overridden by setting USE_HDF5 = False
+USE_HDF5 = True
+try:
+    import h5py
+    HAVE_HDF5 = True
+except:
+    USE_HDF5 = False
+    HAVE_HDF5 = False
+
+
+def axis(name=None, cols=None, values=None, units=None):
+    """Convenience function for generating axis descriptions when defining MetaArrays"""
+    ax = {}
+    cNameOrder = ['name', 'units', 'title']
+    if name is not None:
+        ax['name'] = name
+    if values is not None:
+        ax['values'] = values
+    if units is not None:
+        ax['units'] = units
+    if cols is not None:
+        ax['cols'] = []
+        for c in cols:
+            if type(c) != list and type(c) != tuple:
+                c = [c]
+            col = {}
+            for i in range(0,len(c)):
+                col[cNameOrder[i]] = c[i]
+            ax['cols'].append(col)
+    return ax
+
+class sliceGenerator(object):
+    """Just a compact way to generate tuples of slice objects."""
+    def __getitem__(self, arg):
+        return arg
+    def __getslice__(self, arg):
+        return arg
+SLICER = sliceGenerator()
+    
+
+class MetaArray(object):
+    """N-dimensional array with meta data such as axis titles, units, and column names.
+  
+    May be initialized with a file name, a tuple representing the dimensions of the array,
+    or any arguments that could be passed on to numpy.array()
+  
+    The info argument sets the metadata for the entire array. It is composed of a list
+    of axis descriptions where each axis may have a name, title, units, and a list of column 
+    descriptions. An additional dict at the end of the axis list may specify parameters
+    that apply to values in the entire array.
+  
+    For example:
+        A 2D array of altitude values for a topographical map might look like
+            info=[
+        {'name': 'lat', 'title': 'Lattitude'}, 
+        {'name': 'lon', 'title': 'Longitude'}, 
+        {'title': 'Altitude', 'units': 'm'}
+      ]
+        In this case, every value in the array represents the altitude in feet at the lat, lon
+        position represented by the array index. All of the following return the 
+        value at lat=10, lon=5:
+            array[10, 5]
+            array['lon':5, 'lat':10]
+            array['lat':10][5]
+        Now suppose we want to combine this data with another array of equal dimensions that
+        represents the average rainfall for each location. We could easily store these as two 
+        separate arrays or combine them into a 3D array with this description:
+            info=[
+        {'name': 'vals', 'cols': [
+          {'name': 'altitude', 'units': 'm'}, 
+          {'name': 'rainfall', 'units': 'cm/year'}
+        ]},
+        {'name': 'lat', 'title': 'Lattitude'}, 
+        {'name': 'lon', 'title': 'Longitude'}
+      ]
+        We can now access the altitude values with array[0] or array['altitude'], and the
+        rainfall values with array[1] or array['rainfall']. All of the following return
+        the rainfall value at lat=10, lon=5:
+            array[1, 10, 5]
+            array['lon':5, 'lat':10, 'val': 'rainfall']
+            array['rainfall', 'lon':5, 'lat':10]
+        Notice that in the second example, there is no need for an extra (4th) axis description
+        since the actual values are described (name and units) in the column info for the first axis.
+    """
+  
+    version = '2'
+
+    # Default hdf5 compression to use when writing
+    #   'gzip' is widely available and somewhat slow
+    #   'lzf' is faster, but generally not available outside h5py
+    #   'szip' is also faster, but lacks write support on windows
+    # (so by default, we use no compression)
+    # May also be a tuple (filter, opts), such as ('gzip', 3)
+    defaultCompression = None
+    
+    ## Types allowed as axis or column names
+    nameTypes = [basestring, tuple]
+    @staticmethod
+    def isNameType(var):
+        return any([isinstance(var, t) for t in MetaArray.nameTypes])
+        
+        
+    ## methods to wrap from embedded ndarray / HDF5 
+    wrapMethods = set(['__eq__', '__ne__', '__le__', '__lt__', '__ge__', '__gt__'])
+  
+    def __init__(self, data=None, info=None, dtype=None, file=None, copy=False, **kwargs):
+        object.__init__(self)
+        #self._infoOwned = False
+        self._isHDF = False
+        
+        if file is not None:
+            self._data = None
+            self.readFile(file, **kwargs)
+            if kwargs.get("readAllData", True) and self._data is None:
+                raise Exception("File read failed: %s" % file)
+        else:
+            self._info = info
+            if (hasattr(data, 'implements') and data.implements('MetaArray')):
+                self._info = data._info
+                self._data = data.asarray()
+            elif isinstance(data, tuple):  ## create empty array with specified shape
+                self._data = np.empty(data, dtype=dtype)
+            else:
+                self._data = np.array(data, dtype=dtype, copy=copy)
+
+        ## run sanity checks on info structure
+        self.checkInfo()
+    
+    def checkInfo(self):
+        info = self._info
+        if info is None:
+            if self._data is None:
+                return
+            else:
+                self._info = [{} for i in range(self.ndim)]
+                return
+        else:
+            try:
+                info = list(info)
+            except:
+                raise Exception("Info must be a list of axis specifications")
+            if len(info) < self.ndim+1:
+                info.extend([{}]*(self.ndim+1-len(info)))
+            elif len(info) > self.ndim+1:
+                raise Exception("Info parameter must be list of length ndim+1 or less.")
+            for i in range(len(info)):
+                if not isinstance(info[i], dict):
+                    if info[i] is None:
+                        info[i] = {}
+                    else:
+                        raise Exception("Axis specification must be Dict or None")
+                if i < self.ndim and 'values' in info[i]:
+                    if type(info[i]['values']) is list:
+                        info[i]['values'] = np.array(info[i]['values'])
+                    elif type(info[i]['values']) is not np.ndarray:
+                        raise Exception("Axis values must be specified as list or ndarray")
+                    if info[i]['values'].ndim != 1 or info[i]['values'].shape[0] != self.shape[i]:
+                        raise Exception("Values array for axis %d has incorrect shape. (given %s, but should be %s)" % (i, str(info[i]['values'].shape), str((self.shape[i],))))
+                if i < self.ndim and 'cols' in info[i]:
+                    if not isinstance(info[i]['cols'], list):
+                        info[i]['cols'] = list(info[i]['cols'])
+                    if len(info[i]['cols']) != self.shape[i]:
+                        raise Exception('Length of column list for axis %d does not match data. (given %d, but should be %d)' % (i, len(info[i]['cols']), self.shape[i]))
+   
+    def implements(self, name=None):
+        ## Rather than isinstance(obj, MetaArray) use object.implements('MetaArray')
+        if name is None:
+            return ['MetaArray']
+        else:
+            return name == 'MetaArray'
+    
+    #def __array_finalize__(self,obj):
+        ### array_finalize is called every time a MetaArray is created 
+        ### (whereas __new__ is not necessarily called every time)
+        
+        ### obj is the object from which this array was generated (for example, when slicing or view()ing)
+        
+        ## We use the getattr method to set a default if 'obj' doesn't have the 'info' attribute
+        ##print "Create new MA from object", str(type(obj))
+        ##import traceback
+        ##traceback.print_stack()
+        ##print "finalize", type(self), type(obj)
+        #if not hasattr(self, '_info'):
+            ##if isinstance(obj, MetaArray):
+                ##print "  copy info:", obj._info
+            #self._info = getattr(obj, '_info', [{}]*(obj.ndim+1))
+            #self._infoOwned = False  ## Do not make changes to _info until it is copied at least once
+        ##print "  self info:", self._info
+      
+        ## We could have checked first whether self._info was already defined:
+        ##if not hasattr(self, 'info'):
+        ##    self._info = getattr(obj, 'info', {})
+    
+  
+    def __getitem__(self, ind):
+        #print "getitem:", ind
+        
+        ## should catch scalar requests as early as possible to speed things up (?)
+        
+        nInd = self._interpretIndexes(ind)
+        
+        #a = np.ndarray.__getitem__(self, nInd)
+        a = self._data[nInd]
+        if len(nInd) == self.ndim:
+            if np.all([not isinstance(ind, slice) for ind in nInd]):  ## no slices; we have requested a single value from the array
+                return a
+        #if type(a) != type(self._data) and not isinstance(a, np.ndarray):  ## indexing returned single value
+            #return a
+        
+        ## indexing returned a sub-array; generate new info array to go with it
+        #print "   new MA:", type(a), a.shape
+        info = []
+        extraInfo = self._info[-1].copy()
+        for i in range(0, len(nInd)):   ## iterate over all axes
+            #print "   axis", i
+            if type(nInd[i]) in [slice, list] or isinstance(nInd[i], np.ndarray):  ## If the axis is sliced, keep the info but chop if necessary
+                #print "      slice axis", i, nInd[i]
+                #a._info[i] = self._axisSlice(i, nInd[i])
+                #print "         info:", a._info[i]
+                info.append(self._axisSlice(i, nInd[i]))
+            else: ## If the axis is indexed, then move the information from that single index to the last info dictionary
+                #print "indexed:", i, nInd[i], type(nInd[i])
+                newInfo = self._axisSlice(i, nInd[i])
+                name = None
+                colName = None
+                for k in newInfo:
+                    if k == 'cols':
+                        if 'cols' not in extraInfo:
+                            extraInfo['cols'] = []
+                        extraInfo['cols'].append(newInfo[k])
+                        if 'units' in newInfo[k]:
+                            extraInfo['units'] = newInfo[k]['units']
+                        if 'name' in newInfo[k]:
+                            colName = newInfo[k]['name']
+                    elif k == 'name':
+                        name = newInfo[k]
+                    else:
+                        if k not in extraInfo:
+                            extraInfo[k] = newInfo[k]
+                        extraInfo[k] = newInfo[k]
+                if 'name' not in extraInfo:
+                    if name is None:
+                        if colName is not None:
+                            extraInfo['name'] = colName
+                    else:
+                        if colName is not None:
+                            extraInfo['name'] = str(name) + ': ' + str(colName)
+                        else:
+                            extraInfo['name'] = name
+                        
+                        
+                #print "Lost info:", newInfo
+                #a._info[i] = None
+                #if 'name' in newInfo:
+                    #a._info[-1][newInfo['name']] = newInfo
+        info.append(extraInfo)
+        
+        #self._infoOwned = False
+        #while None in a._info:
+            #a._info.remove(None)
+        return MetaArray(a, info=info)
+  
+    @property
+    def ndim(self):
+        return len(self.shape)  ## hdf5 objects do not have ndim property.
+            
+    @property
+    def shape(self):
+        return self._data.shape
+        
+    @property
+    def dtype(self):
+        return self._data.dtype
+        
+    def __len__(self):
+        return len(self._data)
+        
+    def __getslice__(self, *args):
+        return self.__getitem__(slice(*args))
+  
+    def __setitem__(self, ind, val):
+        nInd = self._interpretIndexes(ind)
+        try:
+            self._data[nInd] = val
+        except:
+            print(self, nInd, val)
+            raise
+        
+    def __getattr__(self, attr):
+        if attr in self.wrapMethods:
+            return getattr(self._data, attr)
+        else:
+            raise AttributeError(attr)
+            #return lambda *args, **kwargs: MetaArray(getattr(a.view(ndarray), attr)(*args, **kwargs)
+        
+    def __eq__(self, b):
+        return self._binop('__eq__', b)
+        
+    def __ne__(self, b):
+        return self._binop('__ne__', b)
+        #if isinstance(b, MetaArray):
+            #b = b.asarray()
+        #return self.asarray() != b
+        
+    def __sub__(self, b):
+        return self._binop('__sub__', b)
+        #if isinstance(b, MetaArray):
+            #b = b.asarray()
+        #return MetaArray(self.asarray() - b, info=self.infoCopy())
+
+    def __add__(self, b):
+        return self._binop('__add__', b)
+
+    def __mul__(self, b):
+        return self._binop('__mul__', b)
+        
+    def __div__(self, b):
+        return self._binop('__div__', b)
+        
+    def __truediv__(self, b):
+        return self._binop('__truediv__', b)
+        
+    def _binop(self, op, b):
+        if isinstance(b, MetaArray):
+            b = b.asarray()
+        a = self.asarray()
+        c = getattr(a, op)(b)
+        if c.shape != a.shape:
+            raise Exception("Binary operators with MetaArray must return an array of the same shape (this shape is %s, result shape was %s)" % (a.shape, c.shape))
+        return MetaArray(c, info=self.infoCopy())
+        
+    def asarray(self):
+        if isinstance(self._data, np.ndarray):
+            return self._data
+        else:
+            return np.array(self._data)
+            
+    def __array__(self):
+        ## supports np.array(metaarray_instance) 
+        return self.asarray()
+            
+    def view(self, typ):
+        ## deprecated; kept for backward compatibility
+        if typ is np.ndarray:
+            return self.asarray()
+        else:
+            raise Exception('invalid view type: %s' % str(typ))
+  
+    def axisValues(self, axis):
+        """Return the list of values for an axis"""
+        ax = self._interpretAxis(axis)
+        if 'values' in self._info[ax]:
+            return self._info[ax]['values']
+        else:
+            raise Exception('Array axis %s (%d) has no associated values.' % (str(axis), ax))
+  
+    def xvals(self, axis):
+        """Synonym for axisValues()"""
+        return self.axisValues(axis)
+        
+    def axisHasValues(self, axis):
+        ax = self._interpretAxis(axis)
+        return 'values' in self._info[ax]
+        
+    def axisHasColumns(self, axis):
+        ax = self._interpretAxis(axis)
+        return 'cols' in self._info[ax]
+  
+    def axisUnits(self, axis):
+        """Return the units for axis"""
+        ax = self._info[self._interpretAxis(axis)]
+        if 'units' in ax:
+            return ax['units']
+        
+    def hasColumn(self, axis, col):
+        ax = self._info[self._interpretAxis(axis)]
+        if 'cols' in ax:
+            for c in ax['cols']:
+                if c['name'] == col:
+                    return True
+        return False
+        
+    def listColumns(self, axis=None):
+        """Return a list of column names for axis. If axis is not specified, then return a dict of {axisName: (column names), ...}."""
+        if axis is None:
+            ret = {}
+            for i in range(self.ndim):
+                if 'cols' in self._info[i]:
+                    cols = [c['name'] for c in self._info[i]['cols']]
+                else:
+                    cols = []
+                ret[self.axisName(i)] = cols
+            return ret
+        else:
+            axis = self._interpretAxis(axis)
+            return [c['name'] for c in self._info[axis]['cols']]
+        
+    def columnName(self, axis, col):
+        ax = self._info[self._interpretAxis(axis)]
+        return ax['cols'][col]['name']
+        
+    def axisName(self, n):
+        return self._info[n].get('name', n)
+        
+    def columnUnits(self, axis, column):
+        """Return the units for column in axis"""
+        ax = self._info[self._interpretAxis(axis)]
+        if 'cols' in ax:
+            for c in ax['cols']:
+                if c['name'] == column:
+                    return c['units']
+            raise Exception("Axis %s has no column named %s" % (str(axis), str(column)))
+        else:
+            raise Exception("Axis %s has no column definitions" % str(axis))
+  
+    def rowsort(self, axis, key=0):
+        """Return this object with all records sorted along axis using key as the index to the values to compare. Does not yet modify meta info."""
+        ## make sure _info is copied locally before modifying it!
+    
+        keyList = self[key]
+        order = keyList.argsort()
+        if type(axis) == int:
+            ind = [slice(None)]*axis
+            ind.append(order)
+        elif isinstance(axis, basestring):
+            ind = (slice(axis, order),)
+        return self[tuple(ind)]
+  
+    def append(self, val, axis):
+        """Return this object with val appended along axis. Does not yet combine meta info."""
+        ## make sure _info is copied locally before modifying it!
+    
+        s = list(self.shape)
+        axis = self._interpretAxis(axis)
+        s[axis] += 1
+        n = MetaArray(tuple(s), info=self._info, dtype=self.dtype)
+        ind = [slice(None)]*self.ndim
+        ind[axis] = slice(None,-1)
+        n[tuple(ind)] = self
+        ind[axis] = -1
+        n[tuple(ind)] = val
+        return n
+  
+    def extend(self, val, axis):
+        """Return the concatenation along axis of this object and val. Does not yet combine meta info."""
+        ## make sure _info is copied locally before modifying it!
+    
+        axis = self._interpretAxis(axis)
+        return MetaArray(np.concatenate(self, val, axis), info=self._info)
+  
+    def infoCopy(self, axis=None):
+        """Return a deep copy of the axis meta info for this object"""
+        if axis is None:
+            return copy.deepcopy(self._info)
+        else:
+            return copy.deepcopy(self._info[self._interpretAxis(axis)])
+  
+    def copy(self):
+        return MetaArray(self._data.copy(), info=self.infoCopy())
+  
+  
+    def _interpretIndexes(self, ind):
+        #print "interpret", ind
+        if not isinstance(ind, tuple):
+            ## a list of slices should be interpreted as a tuple of slices.
+            if isinstance(ind, list) and len(ind) > 0 and isinstance(ind[0], slice):
+                ind = tuple(ind)
+            ## everything else can just be converted to a length-1 tuple
+            else:
+                ind = (ind,)
+                
+        nInd = [slice(None)]*self.ndim
+        numOk = True  ## Named indices not started yet; numbered sill ok
+        for i in range(0,len(ind)):
+            (axis, index, isNamed) = self._interpretIndex(ind[i], i, numOk)
+            #try:
+            nInd[axis] = index
+            #except:
+                #print "ndim:", self.ndim
+                #print "axis:", axis
+                #print "index spec:", ind[i]
+                #print "index num:", index
+                #raise
+            if isNamed:
+                numOk = False
+        return tuple(nInd)
+      
+    def _interpretAxis(self, axis):
+        if isinstance(axis, basestring) or isinstance(axis, tuple):
+            return self._getAxis(axis)
+        else:
+            return axis
+  
+    def _interpretIndex(self, ind, pos, numOk):
+        #print "Interpreting index", ind, pos, numOk
+        
+        ## should probably check for int first to speed things up..
+        if type(ind) is int:
+            if not numOk:
+                raise Exception("string and integer indexes may not follow named indexes")
+            #print "  normal numerical index"
+            return (pos, ind, False)
+        if MetaArray.isNameType(ind):
+            if not numOk:
+                raise Exception("string and integer indexes may not follow named indexes")
+            #print "  String index, column is ", self._getIndex(pos, ind)
+            return (pos, self._getIndex(pos, ind), False)
+        elif type(ind) is slice:
+            #print "  Slice index"
+            if MetaArray.isNameType(ind.start) or MetaArray.isNameType(ind.stop):  ## Not an actual slice!
+                #print "    ..not a real slice"
+                axis = self._interpretAxis(ind.start)
+                #print "    axis is", axis
+                
+                ## x[Axis:Column]
+                if MetaArray.isNameType(ind.stop):
+                    #print "    column name, column is ", self._getIndex(axis, ind.stop)
+                    index = self._getIndex(axis, ind.stop)
+                    
+                ## x[Axis:min:max]
+                elif (isinstance(ind.stop, float) or isinstance(ind.step, float)) and ('values' in self._info[axis]):
+                    #print "    axis value range"
+                    if ind.stop is None:
+                        mask = self.xvals(axis) < ind.step
+                    elif ind.step is None:
+                        mask = self.xvals(axis) >= ind.stop
+                    else:
+                        mask = (self.xvals(axis) >= ind.stop) * (self.xvals(axis) < ind.step)
+                    ##print "mask:", mask
+                    index = mask
+                    
+                ## x[Axis:columnIndex]
+                elif isinstance(ind.stop, int) or isinstance(ind.step, int):
+                    #print "    normal slice after named axis"
+                    if ind.step is None:
+                        index = ind.stop
+                    else:
+                        index = slice(ind.stop, ind.step)
+                    
+                ## x[Axis: [list]]
+                elif type(ind.stop) is list:
+                    #print "    list of indexes from named axis"
+                    index = []
+                    for i in ind.stop:
+                        if type(i) is int:
+                            index.append(i)
+                        elif MetaArray.isNameType(i):
+                            index.append(self._getIndex(axis, i))
+                        else:
+                            ## unrecognized type, try just passing on to array
+                            index = ind.stop
+                            break
+                
+                else:
+                    #print "    other type.. forward on to array for handling", type(ind.stop)
+                    index = ind.stop
+                #print "Axis %s (%s) : %s" % (ind.start, str(axis), str(type(index)))
+                #if type(index) is np.ndarray:
+                    #print "    ", index.shape
+                return (axis, index, True)
+            else:
+                #print "  Looks like a real slice, passing on to array"
+                return (pos, ind, False)
+        elif type(ind) is list:
+            #print "  List index., interpreting each element individually"
+            indList = [self._interpretIndex(i, pos, numOk)[1] for i in ind]
+            return (pos, indList, False)
+        else:
+            if not numOk:
+                raise Exception("string and integer indexes may not follow named indexes")
+            #print "  normal numerical index"
+            return (pos, ind, False)
+  
+    def _getAxis(self, name):
+        for i in range(0, len(self._info)):
+            axis = self._info[i]
+            if 'name' in axis and axis['name'] == name:
+                return i
+        raise Exception("No axis named %s.\n  info=%s" % (name, self._info))
+  
+    def _getIndex(self, axis, name):
+        ax = self._info[axis]
+        if ax is not None and 'cols' in ax:
+            for i in range(0, len(ax['cols'])):
+                if 'name' in ax['cols'][i] and ax['cols'][i]['name'] == name:
+                    return i
+        raise Exception("Axis %d has no column named %s.\n  info=%s" % (axis, name, self._info))
+  
+    def _axisCopy(self, i):
+        return copy.deepcopy(self._info[i])
+  
+    def _axisSlice(self, i, cols):
+        #print "axisSlice", i, cols
+        if 'cols' in self._info[i] or 'values' in self._info[i]:
+            ax = self._axisCopy(i)
+            if 'cols' in ax:
+                #print "  slicing columns..", array(ax['cols']), cols
+                sl = np.array(ax['cols'])[cols]
+                if isinstance(sl, np.ndarray):
+                    sl = list(sl)
+                ax['cols'] = sl
+                #print "  result:", ax['cols']
+            if 'values' in ax:
+                ax['values'] = np.array(ax['values'])[cols]
+        else:
+            ax = self._info[i]
+        #print "     ", ax
+        return ax
+  
+    def prettyInfo(self):
+        s = ''
+        titles = []
+        maxl = 0
+        for i in range(len(self._info)-1):
+            ax = self._info[i]
+            axs = ''
+            if 'name' in ax:
+                axs += '"%s"' % str(ax['name'])
+            else:
+                axs += "%d" % i
+            if 'units' in ax:
+                axs += " (%s)" % str(ax['units'])
+            titles.append(axs)
+            if len(axs) > maxl:
+                maxl = len(axs)
+        
+        for i in range(min(self.ndim, len(self._info)-1)):
+            ax = self._info[i]
+            axs = titles[i]
+            axs += '%s[%d] :' % (' ' * (maxl + 2 - len(axs)), self.shape[i])
+            if 'values' in ax:
+                v0 = ax['values'][0]
+                v1 = ax['values'][-1]
+                axs += " values: [%g ... %g] (step %g)" % (v0, v1, (v1-v0)/(self.shape[i]-1))
+            if 'cols' in ax:
+                axs += " columns: "
+                colstrs = []
+                for c in range(len(ax['cols'])):
+                    col = ax['cols'][c]
+                    cs = str(col.get('name', c))
+                    if 'units' in col:
+                        cs += " (%s)" % col['units']
+                    colstrs.append(cs)
+                axs += '[' + ', '.join(colstrs) + ']'
+            s += axs + "\n"
+        s += str(self._info[-1])
+        return s
+  
+    def __repr__(self):
+        return "%s\n-----------------------------------------------\n%s" % (self.view(np.ndarray).__repr__(), self.prettyInfo())
+
+    def __str__(self):
+        return self.__repr__()
+
+
+    def axisCollapsingFn(self, fn, axis=None, *args, **kargs):
+        #arr = self.view(np.ndarray)
+        fn = getattr(self._data, fn)
+        if axis is None:
+            return fn(axis, *args, **kargs)
+        else:
+            info = self.infoCopy()
+            axis = self._interpretAxis(axis)
+            info.pop(axis)
+            return MetaArray(fn(axis, *args, **kargs), info=info)
+
+    def mean(self, axis=None, *args, **kargs):
+        return self.axisCollapsingFn('mean', axis, *args, **kargs)
+            
+
+    def min(self, axis=None, *args, **kargs):
+        return self.axisCollapsingFn('min', axis, *args, **kargs)
+
+    def max(self, axis=None, *args, **kargs):
+        return self.axisCollapsingFn('max', axis, *args, **kargs)
+
+    def transpose(self, *args):
+        if len(args) == 1 and hasattr(args[0], '__iter__'):
+            order = args[0]
+        else:
+            order = args
+        
+        order = [self._interpretAxis(ax) for ax in order]
+        infoOrder = order  + list(range(len(order), len(self._info)))
+        info = [self._info[i] for i in infoOrder]
+        order = order + list(range(len(order), self.ndim))
+        
+        try:
+            if self._isHDF:
+                return MetaArray(np.array(self._data).transpose(order), info=info)
+            else:
+                return MetaArray(self._data.transpose(order), info=info)
+        except:
+            print(order)
+            raise
+
+    #### File I/O Routines
+    def readFile(self, filename, **kwargs):
+        """Load the data and meta info stored in *filename*
+        Different arguments are allowed depending on the type of file.
+        For HDF5 files:
+        
+            *writable* (bool) if True, then any modifications to data in the array will be stored to disk.
+            *readAllData* (bool) if True, then all data in the array is immediately read from disk
+                          and the file is closed (this is the default for files < 500MB). Otherwise, the file will
+                          be left open and data will be read only as requested (this is 
+                          the default for files >= 500MB).
+        
+        
+        """
+        ## decide which read function to use
+        with open(filename, 'rb') as fd:
+            magic = fd.read(8)
+            if magic == '\x89HDF\r\n\x1a\n':
+                fd.close()
+                self._readHDF5(filename, **kwargs)
+                self._isHDF = True
+            else:
+                fd.seek(0)
+                meta = MetaArray._readMeta(fd)
+
+                if not kwargs.get("readAllData", True):
+                    self._data = np.empty(meta['shape'], dtype=meta['type'])
+                if 'version' in meta:
+                    ver = meta['version']
+                else:
+                    ver = 1
+                rFuncName = '_readData%s' % str(ver)
+                if not hasattr(MetaArray, rFuncName):
+                    raise Exception("This MetaArray library does not support array version '%s'" % ver)
+                rFunc = getattr(self, rFuncName)
+                rFunc(fd, meta, **kwargs)
+                self._isHDF = False
+
+    @staticmethod
+    def _readMeta(fd):
+        """Read meta array from the top of a file. Read lines until a blank line is reached.
+        This function should ideally work for ALL versions of MetaArray.
+        """
+        meta = ''
+        ## Read meta information until the first blank line
+        while True:
+            line = fd.readline().strip()
+            if line == '':
+                break
+            meta += line
+        ret = eval(meta)
+        #print ret
+        return ret
+
+    def _readData1(self, fd, meta, mmap=False, **kwds):
+        ## Read array data from the file descriptor for MetaArray v1 files
+        ## read in axis values for any axis that specifies a length
+        frameSize = 1
+        for ax in meta['info']:
+            if 'values_len' in ax:
+                ax['values'] = np.fromstring(fd.read(ax['values_len']), dtype=ax['values_type'])
+                frameSize *= ax['values_len']
+                del ax['values_len']
+                del ax['values_type']
+        self._info = meta['info']
+        if not kwds.get("readAllData", True):
+            return
+        ## the remaining data is the actual array
+        if mmap:
+            subarr = np.memmap(fd, dtype=meta['type'], mode='r', shape=meta['shape'])
+        else:
+            subarr = np.fromstring(fd.read(), dtype=meta['type'])
+            subarr.shape = meta['shape']
+        self._data = subarr
+            
+    def _readData2(self, fd, meta, mmap=False, subset=None, **kwds):
+        ## read in axis values
+        dynAxis = None
+        frameSize = 1
+        ## read in axis values for any axis that specifies a length
+        for i in range(len(meta['info'])):
+            ax = meta['info'][i]
+            if 'values_len' in ax:
+                if ax['values_len'] == 'dynamic':
+                    if dynAxis is not None:
+                        raise Exception("MetaArray has more than one dynamic axis! (this is not allowed)")
+                    dynAxis = i
+                else:
+                    ax['values'] = np.fromstring(fd.read(ax['values_len']), dtype=ax['values_type'])
+                    frameSize *= ax['values_len']
+                    del ax['values_len']
+                    del ax['values_type']
+        self._info = meta['info']
+        if not kwds.get("readAllData", True):
+            return
+
+        ## No axes are dynamic, just read the entire array in at once
+        if dynAxis is None:
+            #if rewriteDynamic is not None:
+                #raise Exception("")
+            if meta['type'] == 'object':
+                if mmap:
+                    raise Exception('memmap not supported for arrays with dtype=object')
+                subarr = pickle.loads(fd.read())
+            else:
+                if mmap:
+                    subarr = np.memmap(fd, dtype=meta['type'], mode='r', shape=meta['shape'])
+                else:
+                    subarr = np.fromstring(fd.read(), dtype=meta['type'])
+            #subarr = subarr.view(subtype)
+            subarr.shape = meta['shape']
+            #subarr._info = meta['info']
+        ## One axis is dynamic, read in a frame at a time
+        else:
+            if mmap:
+                raise Exception('memmap not supported for non-contiguous arrays. Use rewriteContiguous() to convert.')
+            ax = meta['info'][dynAxis]
+            xVals = []
+            frames = []
+            frameShape = list(meta['shape'])
+            frameShape[dynAxis] = 1
+            frameSize = reduce(lambda a,b: a*b, frameShape)
+            n = 0
+            while True:
+                ## Extract one non-blank line
+                while True:
+                    line = fd.readline()
+                    if line != '\n':
+                        break
+                if line == '':
+                    break
+                    
+                ## evaluate line
+                inf = eval(line)
+                
+                ## read data block
+                #print "read %d bytes as %s" % (inf['len'], meta['type'])
+                if meta['type'] == 'object':
+                    data = pickle.loads(fd.read(inf['len']))
+                else:
+                    data = np.fromstring(fd.read(inf['len']), dtype=meta['type'])
+                
+                if data.size != frameSize * inf['numFrames']:
+                    #print data.size, frameSize, inf['numFrames']
+                    raise Exception("Wrong frame size in MetaArray file! (frame %d)" % n)
+                    
+                ## read in data block
+                shape = list(frameShape)
+                shape[dynAxis] = inf['numFrames']
+                data.shape = shape
+                if subset is not None:
+                    dSlice = subset[dynAxis]
+                    if dSlice.start is None:
+                        dStart = 0
+                    else:
+                        dStart = max(0, dSlice.start - n)
+                    if dSlice.stop is None:
+                        dStop = data.shape[dynAxis]
+                    else:
+                        dStop = min(data.shape[dynAxis], dSlice.stop - n)
+                    newSubset = list(subset[:])
+                    newSubset[dynAxis] = slice(dStart, dStop)
+                    if dStop > dStart:
+                        #print n, data.shape, " => ", newSubset, data[tuple(newSubset)].shape
+                        frames.append(data[tuple(newSubset)].copy())
+                else:
+                    #data = data[subset].copy()  ## what's this for??
+                    frames.append(data)
+                
+                n += inf['numFrames']
+                if 'xVals' in inf:
+                    xVals.extend(inf['xVals'])
+            subarr = np.concatenate(frames, axis=dynAxis)
+            if len(xVals)> 0:
+                ax['values'] = np.array(xVals, dtype=ax['values_type'])
+            del ax['values_len']
+            del ax['values_type']
+        #subarr = subarr.view(subtype)
+        #subarr._info = meta['info']
+        self._info = meta['info']
+        self._data = subarr
+        #raise Exception()  ## stress-testing
+        #return subarr
+
+    def _readHDF5(self, fileName, readAllData=None, writable=False, **kargs):
+        if 'close' in kargs and readAllData is None: ## for backward compatibility
+            readAllData = kargs['close']
+       
+        if readAllData is True and writable is True:
+            raise Exception("Incompatible arguments: readAllData=True and writable=True")
+        
+        if not HAVE_HDF5:
+            try:
+                assert writable==False
+                assert readAllData != False
+                self._readHDF5Remote(fileName)
+                return
+            except:
+                raise Exception("The file '%s' is HDF5-formatted, but the HDF5 library (h5py) was not found." % fileName)
+        
+        ## by default, readAllData=True for files < 500MB
+        if readAllData is None:
+            size = os.stat(fileName).st_size
+            readAllData = (size < 500e6)
+        
+        if writable is True:
+            mode = 'r+'
+        else:
+            mode = 'r'
+        f = h5py.File(fileName, mode)
+        
+        ver = f.attrs['MetaArray']
+        if ver > MetaArray.version:
+            print("Warning: This file was written with MetaArray version %s, but you are using version %s. (Will attempt to read anyway)" % (str(ver), str(MetaArray.version)))
+        meta = MetaArray.readHDF5Meta(f['info'])
+        self._info = meta
+        
+        if writable or not readAllData:  ## read all data, convert to ndarray, close file
+            self._data = f['data']
+            self._openFile = f
+        else:
+            self._data = f['data'][:]
+            f.close()
+            
+    def _readHDF5Remote(self, fileName):
+        ## Used to read HDF5 files via remote process.
+        ## This is needed in the case that HDF5 is not importable due to the use of python-dbg.
+        proc = getattr(MetaArray, '_hdf5Process', None)
+        
+        if proc == False:
+            raise Exception('remote read failed')
+        if proc == None:
+            from .. import multiprocess as mp
+            #print "new process"
+            proc = mp.Process(executable='/usr/bin/python')
+            proc.setProxyOptions(deferGetattr=True)
+            MetaArray._hdf5Process = proc
+            MetaArray._h5py_metaarray = proc._import('pyqtgraph.metaarray')
+        ma = MetaArray._h5py_metaarray.MetaArray(file=fileName)
+        self._data = ma.asarray()._getValue()
+        self._info = ma._info._getValue()
+        #print MetaArray._hdf5Process
+        #import inspect
+        #print MetaArray, id(MetaArray), inspect.getmodule(MetaArray)
+        
+        
+
+    @staticmethod
+    def mapHDF5Array(data, writable=False):
+        off = data.id.get_offset()
+        if writable:
+            mode = 'r+'
+        else:
+            mode = 'r'
+        if off is None:
+            raise Exception("This dataset uses chunked storage; it can not be memory-mapped. (store using mappable=True)")
+        return np.memmap(filename=data.file.filename, offset=off, dtype=data.dtype, shape=data.shape, mode=mode)
+        
+
+
+
+    @staticmethod
+    def readHDF5Meta(root, mmap=False):
+        data = {}
+        
+        ## Pull list of values from attributes and child objects
+        for k in root.attrs:
+            val = root.attrs[k]
+            if isinstance(val, basestring):  ## strings need to be re-evaluated to their original types
+                try:
+                    val = eval(val)
+                except:
+                    raise Exception('Can not evaluate string: "%s"' % val)
+            data[k] = val
+        for k in root:
+            obj = root[k]
+            if isinstance(obj, h5py.highlevel.Group):
+                val = MetaArray.readHDF5Meta(obj)
+            elif isinstance(obj, h5py.highlevel.Dataset):
+                if mmap:
+                    val = MetaArray.mapHDF5Array(obj)
+                else:
+                    val = obj[:]
+            else:
+                raise Exception("Don't know what to do with type '%s'" % str(type(obj)))
+            data[k] = val
+        
+        typ = root.attrs['_metaType_']
+        del data['_metaType_']
+        
+        if typ == 'dict':
+            return data
+        elif typ == 'list' or typ == 'tuple':
+            d2 = [None]*len(data)
+            for k in data:
+                d2[int(k)] = data[k]
+            if typ == 'tuple':
+                d2 = tuple(d2)
+            return d2
+        else:
+            raise Exception("Don't understand metaType '%s'" % typ)
+        
+
+    def write(self, fileName, **opts):
+        """Write this object to a file. The object can be restored by calling MetaArray(file=fileName)
+        opts:
+            appendAxis: the name (or index) of the appendable axis. Allows the array to grow.
+            compression: None, 'gzip' (good compression), 'lzf' (fast compression), etc.
+            chunks: bool or tuple specifying chunk shape
+        """
+        
+        if USE_HDF5 and HAVE_HDF5:
+            return self.writeHDF5(fileName, **opts)
+        else:
+            return self.writeMa(fileName, **opts)
+
+    def writeMeta(self, fileName):
+        """Used to re-write meta info to the given file.
+        This feature is only available for HDF5 files."""
+        f = h5py.File(fileName, 'r+')
+        if f.attrs['MetaArray'] != MetaArray.version:
+            raise Exception("The file %s was created with a different version of MetaArray. Will not modify." % fileName)
+        del f['info']
+        
+        self.writeHDF5Meta(f, 'info', self._info)
+        f.close()
+
+
+    def writeHDF5(self, fileName, **opts):
+        ## default options for writing datasets
+        comp = self.defaultCompression
+        if isinstance(comp, tuple):
+            comp, copts = comp
+        else:
+            copts = None
+
+        dsOpts = {  
+            'compression': comp,
+            'chunks': True,
+        }
+        if copts is not None:
+            dsOpts['compression_opts'] = copts
+        
+        ## if there is an appendable axis, then we can guess the desired chunk shape (optimized for appending)
+        appAxis = opts.get('appendAxis', None)
+        if appAxis is not None:
+            appAxis = self._interpretAxis(appAxis)
+            cs = [min(100000, x) for x in self.shape]
+            cs[appAxis] = 1
+            dsOpts['chunks'] = tuple(cs)
+            
+        ## if there are columns, then we can guess a different chunk shape
+        ## (read one column at a time)
+        else:
+            cs = [min(100000, x) for x in self.shape]
+            for i in range(self.ndim):
+                if 'cols' in self._info[i]:
+                    cs[i] = 1
+            dsOpts['chunks'] = tuple(cs)
+        
+        ## update options if they were passed in
+        for k in dsOpts:
+            if k in opts:
+                dsOpts[k] = opts[k]
+        
+        
+        ## If mappable is in options, it disables chunking/compression
+        if opts.get('mappable', False):
+            dsOpts = {
+                'chunks': None,
+                'compression': None
+            }
+        
+            
+        ## set maximum shape to allow expansion along appendAxis
+        append = False
+        if appAxis is not None:
+            maxShape = list(self.shape)
+            ax = self._interpretAxis(appAxis)
+            maxShape[ax] = None
+            if os.path.exists(fileName):
+                append = True
+            dsOpts['maxshape'] = tuple(maxShape)
+        else:
+            dsOpts['maxshape'] = None
+            
+        if append:
+            f = h5py.File(fileName, 'r+')
+            if f.attrs['MetaArray'] != MetaArray.version:
+                raise Exception("The file %s was created with a different version of MetaArray. Will not modify." % fileName)
+            
+            ## resize data and write in new values
+            data = f['data']
+            shape = list(data.shape)
+            shape[ax] += self.shape[ax]
+            data.resize(tuple(shape))
+            sl = [slice(None)] * len(data.shape)
+            sl[ax] = slice(-self.shape[ax], None)
+            data[tuple(sl)] = self.view(np.ndarray)
+            
+            ## add axis values if they are present.
+            axInfo = f['info'][str(ax)]
+            if 'values' in axInfo:
+                v = axInfo['values']
+                v2 = self._info[ax]['values']
+                shape = list(v.shape)
+                shape[0] += v2.shape[0]
+                v.resize(shape)
+                v[-v2.shape[0]:] = v2
+            f.close()
+        else:
+            f = h5py.File(fileName, 'w')
+            f.attrs['MetaArray'] = MetaArray.version
+            #print dsOpts
+            f.create_dataset('data', data=self.view(np.ndarray), **dsOpts)
+            
+            ## dsOpts is used when storing meta data whenever an array is encountered
+            ## however, 'chunks' will no longer be valid for these arrays if it specifies a chunk shape.
+            ## 'maxshape' is right-out.
+            if isinstance(dsOpts['chunks'], tuple):
+                dsOpts['chunks'] = True
+                if 'maxshape' in dsOpts:
+                    del dsOpts['maxshape']
+            self.writeHDF5Meta(f, 'info', self._info, **dsOpts)
+            f.close()
+
+    def writeHDF5Meta(self, root, name, data, **dsOpts):
+        if isinstance(data, np.ndarray):
+            dsOpts['maxshape'] = (None,) + data.shape[1:]
+            root.create_dataset(name, data=data, **dsOpts)
+        elif isinstance(data, list) or isinstance(data, tuple):
+            gr = root.create_group(name)
+            if isinstance(data, list):
+                gr.attrs['_metaType_'] = 'list'
+            else:
+                gr.attrs['_metaType_'] = 'tuple'
+            #n = int(np.log10(len(data))) + 1
+            for i in range(len(data)):
+                self.writeHDF5Meta(gr, str(i), data[i], **dsOpts)
+        elif isinstance(data, dict):
+            gr = root.create_group(name)
+            gr.attrs['_metaType_'] = 'dict'
+            for k, v in data.items():
+                self.writeHDF5Meta(gr, k, v, **dsOpts)
+        elif isinstance(data, int) or isinstance(data, float) or isinstance(data, np.integer) or isinstance(data, np.floating):
+            root.attrs[name] = data
+        else:
+            try:   ## strings, bools, None are stored as repr() strings
+                root.attrs[name] = repr(data)
+            except:
+                print("Can not store meta data of type '%s' in HDF5. (key is '%s')" % (str(type(data)), str(name)))
+                raise 
+
+        
+    def writeMa(self, fileName, appendAxis=None, newFile=False):
+        """Write an old-style .ma file"""
+        meta = {'shape':self.shape, 'type':str(self.dtype), 'info':self.infoCopy(), 'version':MetaArray.version}
+        axstrs = []
+        
+        ## copy out axis values for dynamic axis if requested
+        if appendAxis is not None:
+            if MetaArray.isNameType(appendAxis):
+                appendAxis = self._interpretAxis(appendAxis)
+            
+            
+            ax = meta['info'][appendAxis]
+            ax['values_len'] = 'dynamic'
+            if 'values' in ax:
+                ax['values_type'] = str(ax['values'].dtype)
+                dynXVals = ax['values']
+                del ax['values']
+            else:
+                dynXVals = None
+                
+        ## Generate axis data string, modify axis info so we know how to read it back in later
+        for ax in meta['info']:
+            if 'values' in ax:
+                axstrs.append(ax['values'].tostring())
+                ax['values_len'] = len(axstrs[-1])
+                ax['values_type'] = str(ax['values'].dtype)
+                del ax['values']
+                
+        ## Decide whether to output the meta block for a new file
+        if not newFile:
+            ## If the file does not exist or its size is 0, then we must write the header
+            newFile = (not os.path.exists(fileName))  or  (os.stat(fileName).st_size == 0)
+        
+        ## write data to file
+        if appendAxis is None or newFile:
+            fd = open(fileName, 'wb')
+            fd.write(str(meta) + '\n\n')
+            for ax in axstrs:
+                fd.write(ax)
+        else:
+            fd = open(fileName, 'ab')
+        
+        if self.dtype != object:
+            dataStr = self.view(np.ndarray).tostring()
+        else:
+            dataStr = pickle.dumps(self.view(np.ndarray))
+        #print self.size, len(dataStr), self.dtype
+        if appendAxis is not None:
+            frameInfo = {'len':len(dataStr), 'numFrames':self.shape[appendAxis]}
+            if dynXVals is not None:
+                frameInfo['xVals'] = list(dynXVals)
+            fd.write('\n'+str(frameInfo)+'\n')
+        fd.write(dataStr)
+        fd.close()
+        
+    def writeCsv(self, fileName=None):
+        """Write 2D array to CSV file or return the string if no filename is given"""
+        if self.ndim > 2:
+            raise Exception("CSV Export is only for 2D arrays")
+        if fileName is not None:
+            file = open(fileName, 'w')
+        ret = ''
+        if 'cols' in self._info[0]:
+            s = ','.join([x['name'] for x in self._info[0]['cols']]) + '\n'
+            if fileName is not None:
+                file.write(s)
+            else:
+                ret += s
+        for row in range(0, self.shape[1]):
+            s = ','.join(["%g" % x for x in self[:, row]]) + '\n'
+            if fileName is not None:
+                file.write(s)
+            else:
+                ret += s
+        if fileName is not None:
+            file.close()
+        else:
+            return ret
+        
+
+
+#class H5MetaList():
+    
+
+#def rewriteContiguous(fileName, newName):
+    #"""Rewrite a dynamic array file as contiguous"""
+    #def _readData2(fd, meta, subtype, mmap):
+        ### read in axis values
+        #dynAxis = None
+        #frameSize = 1
+        ### read in axis values for any axis that specifies a length
+        #for i in range(len(meta['info'])):
+            #ax = meta['info'][i]
+            #if ax.has_key('values_len'):
+                #if ax['values_len'] == 'dynamic':
+                    #if dynAxis is not None:
+                        #raise Exception("MetaArray has more than one dynamic axis! (this is not allowed)")
+                    #dynAxis = i
+                #else:
+                    #ax['values'] = fromstring(fd.read(ax['values_len']), dtype=ax['values_type'])
+                    #frameSize *= ax['values_len']
+                    #del ax['values_len']
+                    #del ax['values_type']
+                    
+        ### No axes are dynamic, just read the entire array in at once
+        #if dynAxis is None:
+            #raise Exception('Array has no dynamic axes.')
+        ### One axis is dynamic, read in a frame at a time
+        #else:
+            #if mmap:
+                #raise Exception('memmap not supported for non-contiguous arrays. Use rewriteContiguous() to convert.')
+            #ax = meta['info'][dynAxis]
+            #xVals = []
+            #frames = []
+            #frameShape = list(meta['shape'])
+            #frameShape[dynAxis] = 1
+            #frameSize = reduce(lambda a,b: a*b, frameShape)
+            #n = 0
+            #while True:
+                ### Extract one non-blank line
+                #while True:
+                    #line = fd.readline()
+                    #if line != '\n':
+                        #break
+                #if line == '':
+                    #break
+                    
+                ### evaluate line
+                #inf = eval(line)
+                
+                ### read data block
+                ##print "read %d bytes as %s" % (inf['len'], meta['type'])
+                #if meta['type'] == 'object':
+                    #data = pickle.loads(fd.read(inf['len']))
+                #else:
+                    #data = fromstring(fd.read(inf['len']), dtype=meta['type'])
+                
+                #if data.size != frameSize * inf['numFrames']:
+                    ##print data.size, frameSize, inf['numFrames']
+                    #raise Exception("Wrong frame size in MetaArray file! (frame %d)" % n)
+                    
+                ### read in data block
+                #shape = list(frameShape)
+                #shape[dynAxis] = inf['numFrames']
+                #data.shape = shape
+                #frames.append(data)
+                
+                #n += inf['numFrames']
+                #if 'xVals' in inf:
+                    #xVals.extend(inf['xVals'])
+            #subarr = np.concatenate(frames, axis=dynAxis)
+            #if len(xVals)> 0:
+                #ax['values'] = array(xVals, dtype=ax['values_type'])
+            #del ax['values_len']
+            #del ax['values_type']
+        #subarr = subarr.view(subtype)
+        #subarr._info = meta['info']
+        #return subarr
+    
+
+
+  
+  
+if __name__ == '__main__':
+    ## Create an array with every option possible
+    
+    arr = np.zeros((2, 5, 3, 5), dtype=int)
+    for i in range(arr.shape[0]):
+        for j in range(arr.shape[1]):
+            for k in range(arr.shape[2]):
+                for l in range(arr.shape[3]):
+                    arr[i,j,k,l] = (i+1)*1000 + (j+1)*100 + (k+1)*10 + (l+1)
+        
+    info = [
+        axis('Axis1'), 
+        axis('Axis2', values=[1,2,3,4,5]), 
+        axis('Axis3', cols=[
+            ('Ax3Col1'),
+            ('Ax3Col2', 'mV', 'Axis3 Column2'),
+            (('Ax3','Col3'), 'A', 'Axis3 Column3')]),
+        {'name': 'Axis4', 'values': np.array([1.1, 1.2, 1.3, 1.4, 1.5]), 'units': 's'},
+        {'extra': 'info'}
+    ]
+    
+    ma = MetaArray(arr, info=info)
+    
+    print("====  Original Array =======")
+    print(ma)
+    print("\n\n")
+    
+    #### Tests follow:
+    
+    
+    #### Index/slice tests: check that all values and meta info are correct after slice
+    print("\n -- normal integer indexing\n")
+    
+    print("\n  ma[1]")
+    print(ma[1])
+    
+    print("\n  ma[1, 2:4]")
+    print(ma[1, 2:4])
+    
+    print("\n  ma[1, 1:5:2]")
+    print(ma[1, 1:5:2])
+    
+    print("\n -- named axis indexing\n")
+    
+    print("\n  ma['Axis2':3]")
+    print(ma['Axis2':3])
+    
+    print("\n  ma['Axis2':3:5]")
+    print(ma['Axis2':3:5])
+    
+    print("\n  ma[1, 'Axis2':3]")
+    print(ma[1, 'Axis2':3])
+    
+    print("\n  ma[:, 'Axis2':3]")
+    print(ma[:, 'Axis2':3])
+    
+    print("\n  ma['Axis2':3, 'Axis4':0:2]")
+    print(ma['Axis2':3, 'Axis4':0:2])
+    
+    
+    print("\n -- column name indexing\n")
+    
+    print("\n  ma['Axis3':'Ax3Col1']")
+    print(ma['Axis3':'Ax3Col1'])
+    
+    print("\n  ma['Axis3':('Ax3','Col3')]")
+    print(ma['Axis3':('Ax3','Col3')])
+    
+    print("\n  ma[:, :, 'Ax3Col2']")
+    print(ma[:, :, 'Ax3Col2'])
+    
+    print("\n  ma[:, :, ('Ax3','Col3')]")
+    print(ma[:, :, ('Ax3','Col3')])
+    
+    
+    print("\n -- axis value range indexing\n")
+    
+    print("\n  ma['Axis2':1.5:4.5]")
+    print(ma['Axis2':1.5:4.5])
+    
+    print("\n  ma['Axis4':1.15:1.45]")
+    print(ma['Axis4':1.15:1.45])
+    
+    print("\n  ma['Axis4':1.15:1.25]")
+    print(ma['Axis4':1.15:1.25])
+    
+    
+    
+    print("\n -- list indexing\n")
+    
+    print("\n  ma[:, [0,2,4]]")
+    print(ma[:, [0,2,4]])
+    
+    print("\n  ma['Axis4':[0,2,4]]")
+    print(ma['Axis4':[0,2,4]])
+    
+    print("\n  ma['Axis3':[0, ('Ax3','Col3')]]")
+    print(ma['Axis3':[0, ('Ax3','Col3')]])
+    
+    
+    
+    print("\n -- boolean indexing\n")
+    
+    print("\n  ma[:, array([True, True, False, True, False])]")
+    print(ma[:, np.array([True, True, False, True, False])])
+    
+    print("\n  ma['Axis4':array([True, False, False, False])]")
+    print(ma['Axis4':np.array([True, False, False, False])])
+    
+    
+    
+    
+    
+    #### Array operations 
+    #  - Concatenate
+    #  - Append
+    #  - Extend
+    #  - Rowsort
+    
+    
+    
+    
+    #### File I/O tests
+    
+    print("\n================  File I/O Tests  ===================\n")
+    import tempfile
+    tf = tempfile.mktemp()
+    tf = 'test.ma'
+    # write whole array
+    
+    print("\n  -- write/read test")
+    ma.write(tf)
+    ma2 = MetaArray(file=tf)
+    
+    #print ma2
+    print("\nArrays are equivalent:", (ma == ma2).all())
+    #print "Meta info is equivalent:", ma.infoCopy() == ma2.infoCopy()
+    os.remove(tf)
+    
+    # CSV write
+    
+    # append mode
+    
+    
+    print("\n================append test (%s)===============" % tf)
+    ma['Axis2':0:2].write(tf, appendAxis='Axis2')
+    for i in range(2,ma.shape[1]):
+        ma['Axis2':[i]].write(tf, appendAxis='Axis2')
+    
+    ma2 = MetaArray(file=tf)
+    
+    #print ma2
+    print("\nArrays are equivalent:", (ma == ma2).all())
+    #print "Meta info is equivalent:", ma.infoCopy() == ma2.infoCopy()
+    
+    os.remove(tf)    
+    
+    
+    
+    ## memmap test
+    print("\n==========Memmap test============")
+    ma.write(tf, mappable=True)
+    ma2 = MetaArray(file=tf, mmap=True)
+    print("\nArrays are equivalent:", (ma == ma2).all())
+    os.remove(tf)    
+    
diff --git a/libs/pyqtgraph/metaarray/__init__.py b/libs/pyqtgraph/metaarray/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..a12f40d54ca28a96ca1f0a230e94d3eb78e8c56d
--- /dev/null
+++ b/libs/pyqtgraph/metaarray/__init__.py
@@ -0,0 +1 @@
+from .MetaArray import *
diff --git a/libs/pyqtgraph/metaarray/license.txt b/libs/pyqtgraph/metaarray/license.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7ef3e5e96e103ef3e959fda9561f76049c7dffc5
--- /dev/null
+++ b/libs/pyqtgraph/metaarray/license.txt
@@ -0,0 +1,8 @@
+Copyright (c) 2010  Luke Campagnola    ('luke.campagnola@%s.com' % 'gmail')
+The MIT License
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
diff --git a/libs/pyqtgraph/metaarray/readMeta.m b/libs/pyqtgraph/metaarray/readMeta.m
new file mode 100644
index 0000000000000000000000000000000000000000..f468a75d0cfa19305a317838cc771dae35057bcf
--- /dev/null
+++ b/libs/pyqtgraph/metaarray/readMeta.m
@@ -0,0 +1,86 @@
+function f = readMeta(file)
+info = hdf5info(file);
+f = readMetaRecursive(info.GroupHierarchy.Groups(1));
+end
+
+
+function f = readMetaRecursive(root)
+typ = 0;
+for i = 1:length(root.Attributes)
+    if strcmp(root.Attributes(i).Shortname, '_metaType_')
+        typ = root.Attributes(i).Value.Data;
+        break
+    end
+end
+if typ == 0
+    printf('group has no _metaType_')
+    typ = 'dict';
+end
+
+list = 0;
+if strcmp(typ, 'list') || strcmp(typ, 'tuple')
+    data = {};
+    list = 1;
+elseif strcmp(typ, 'dict')
+    data = struct();
+else
+    printf('Unrecognized meta type %s', typ);
+    data = struct();
+end
+
+for i = 1:length(root.Attributes)
+    name = root.Attributes(i).Shortname;
+    if strcmp(name, '_metaType_')
+        continue
+    end
+    val = root.Attributes(i).Value;
+    if isa(val, 'hdf5.h5string')
+        val = val.Data;
+    end
+    if list
+        ind = str2num(name)+1;
+        data{ind} = val;
+    else
+        data.(name) = val;
+    end
+end
+
+for i = 1:length(root.Datasets)
+    fullName = root.Datasets(i).Name;
+    name = stripName(fullName);
+    file = root.Datasets(i).Filename;
+    data2 = hdf5read(file, fullName);
+    if list
+        ind = str2num(name)+1;
+        data{ind} = data2;
+    else
+        data.(name) = data2;
+    end
+end
+
+for i = 1:length(root.Groups)
+    name = stripName(root.Groups(i).Name);
+    data2 = readMetaRecursive(root.Groups(i));
+    if list
+        ind = str2num(name)+1;
+        data{ind} = data2;
+    else
+        data.(name) = data2;
+    end
+end
+f = data;
+return;
+end
+
+
+function f = stripName(str)
+inds = strfind(str, '/');
+if isempty(inds)
+    f = str;
+else
+    f = str(inds(length(inds))+1:length(str));
+end
+end
+
+
+
diff --git a/libs/pyqtgraph/multiprocess/__init__.py b/libs/pyqtgraph/multiprocess/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..843b42a308eda774f4cdbeb58d81e14632384a1f
--- /dev/null
+++ b/libs/pyqtgraph/multiprocess/__init__.py
@@ -0,0 +1,24 @@
+"""
+Multiprocessing utility library
+(parallelization done the way I like it)
+
+Luke Campagnola
+2012.06.10
+
+This library provides:
+
+  - simple mechanism for starting a new python interpreter process that can be controlled from the original process
+    (this allows, for example, displaying and manipulating plots in a remote process
+    while the parent process is free to do other work)
+  - proxy system that allows objects hosted in the remote process to be used as if they were local
+  - Qt signal connection between processes
+  - very simple in-line parallelization (fork only; does not work on windows) for number-crunching
+
+TODO:
+    allow remote processes to serve as rendering engines that pass pixmaps back to the parent process for display
+    (RemoteGraphicsView class)
+"""
+
+from .processes import *
+from .parallelizer import Parallelize, CanceledError
+from .remoteproxy import proxy
\ No newline at end of file
diff --git a/libs/pyqtgraph/multiprocess/bootstrap.py b/libs/pyqtgraph/multiprocess/bootstrap.py
new file mode 100644
index 0000000000000000000000000000000000000000..bb71a7035c4b9467cf6ca6284bc920ae1b21d7e0
--- /dev/null
+++ b/libs/pyqtgraph/multiprocess/bootstrap.py
@@ -0,0 +1,28 @@
+"""For starting up remote processes"""
+import sys, pickle, os
+
+if __name__ == '__main__':
+    if hasattr(os, 'setpgrp'):
+        os.setpgrp()  ## prevents signals (notably keyboard interrupt) being forwarded from parent to this process
+    if sys.version[0] == '3':
+        #name, port, authkey, ppid, targetStr, path, pyside = pickle.load(sys.stdin.buffer)
+        opts = pickle.load(sys.stdin.buffer)
+    else:
+        #name, port, authkey, ppid, targetStr, path, pyside = pickle.load(sys.stdin)
+        opts = pickle.load(sys.stdin)
+    #print "key:",  ' '.join([str(ord(x)) for x in authkey])
+    path = opts.pop('path', None)
+    if path is not None:
+        ## rewrite sys.path without assigning a new object--no idea who already has a reference to the existing list.
+        while len(sys.path) > 0:
+            sys.path.pop()
+        sys.path.extend(path)
+        
+    if opts.pop('pyside', False):
+        import PySide
+        
+    
+    targetStr = opts.pop('targetStr')
+    target = pickle.loads(targetStr)  ## unpickling the target should import everything we need
+    target(**opts)  ## Send all other options to the target function
+    sys.exit(0)
diff --git a/libs/pyqtgraph/multiprocess/parallelizer.py b/libs/pyqtgraph/multiprocess/parallelizer.py
new file mode 100644
index 0000000000000000000000000000000000000000..f4ddd95c75d000aceb7b21db7de56fa80dede944
--- /dev/null
+++ b/libs/pyqtgraph/multiprocess/parallelizer.py
@@ -0,0 +1,330 @@
+import os, sys, time, multiprocessing, re
+from .processes import ForkedProcess
+from .remoteproxy import ClosedError
+
+class CanceledError(Exception):
+    """Raised when the progress dialog is canceled during a processing operation."""
+    pass
+
+class Parallelize(object):
+    """
+    Class for ultra-simple inline parallelization on multi-core CPUs
+    
+    Example::
+    
+        ## Here is the serial (single-process) task:
+        
+        tasks = [1, 2, 4, 8]
+        results = []
+        for task in tasks:
+            result = processTask(task)
+            results.append(result)
+        print(results)
+        
+        
+        ## Here is the parallelized version:
+        
+        tasks = [1, 2, 4, 8]
+        results = []
+        with Parallelize(tasks, workers=4, results=results) as tasker:
+            for task in tasker:
+                result = processTask(task)
+                tasker.results.append(result)
+        print(results)
+        
+        
+    The only major caveat is that *result* in the example above must be picklable,
+    since it is automatically sent via pipe back to the parent process.
+    """
+
+    def __init__(self, tasks=None, workers=None, block=True, progressDialog=None, randomReseed=True, **kwds):
+        """
+        ===============  ===================================================================
+        **Arguments:**
+        tasks            list of objects to be processed (Parallelize will determine how to 
+                         distribute the tasks). If unspecified, then each worker will receive
+                         a single task with a unique id number.
+        workers          number of worker processes or None to use number of CPUs in the 
+                         system
+        progressDialog   optional dict of arguments for ProgressDialog
+                         to update while tasks are processed
+        randomReseed     If True, each forked process will reseed its random number generator
+                         to ensure independent results. Works with the built-in random
+                         and numpy.random.
+        kwds             objects to be shared by proxy with child processes (they will 
+                         appear as attributes of the tasker)
+        ===============  ===================================================================
+        """
+        
+        ## Generate progress dialog. 
+        ## Note that we want to avoid letting forked child processes play with progress dialogs..
+        self.showProgress = False
+        if progressDialog is not None:
+            self.showProgress = True
+            if isinstance(progressDialog, basestring):
+                progressDialog = {'labelText': progressDialog}
+            from ..widgets.ProgressDialog import ProgressDialog
+            self.progressDlg = ProgressDialog(**progressDialog)
+        
+        if workers is None:
+            workers = self.suggestedWorkerCount()
+        if not hasattr(os, 'fork'):
+            workers = 1
+        self.workers = workers
+        if tasks is None:
+            tasks = range(workers)
+        self.tasks = list(tasks)
+        self.reseed = randomReseed
+        self.kwds = kwds.copy()
+        self.kwds['_taskStarted'] = self._taskStarted
+        
+    def __enter__(self):
+        self.proc = None
+        if self.workers == 1: 
+            return self.runSerial()
+        else:
+            return self.runParallel()
+    
+    def __exit__(self, *exc_info):
+        
+        if self.proc is not None:  ## worker 
+            exceptOccurred = exc_info[0] is not None ## hit an exception during processing.
+                
+            try:
+                if exceptOccurred:
+                    sys.excepthook(*exc_info)
+            finally:
+                #print os.getpid(), 'exit'
+                os._exit(1 if exceptOccurred else 0)
+                
+        else:  ## parent
+            if self.showProgress:
+                self.progressDlg.__exit__(None, None, None)
+
+    def runSerial(self):
+        if self.showProgress:
+            self.progressDlg.__enter__()
+            self.progressDlg.setMaximum(len(self.tasks))
+        self.progress = {os.getpid(): []}
+        return Tasker(self, None, self.tasks, self.kwds)
+
+    
+    def runParallel(self):
+        self.childs = []
+        
+        ## break up tasks into one set per worker
+        workers = self.workers
+        chunks = [[] for i in xrange(workers)]
+        i = 0
+        for i in range(len(self.tasks)):
+            chunks[i%workers].append(self.tasks[i])
+        
+        ## fork and assign tasks to each worker
+        for i in range(workers):
+            proc = ForkedProcess(target=None, preProxy=self.kwds, randomReseed=self.reseed)
+            if not proc.isParent:
+                self.proc = proc
+                return Tasker(self, proc, chunks[i], proc.forkedProxies)
+            else:
+                self.childs.append(proc)
+        
+        ## Keep track of the progress of each worker independently.
+        self.progress = dict([(ch.childPid, []) for ch in self.childs])
+        ## for each child process, self.progress[pid] is a list
+        ## of task indexes. The last index is the task currently being
+        ## processed; all others are finished.
+            
+            
+        try:
+            if self.showProgress:
+                self.progressDlg.__enter__()
+                self.progressDlg.setMaximum(len(self.tasks))
+            ## process events from workers until all have exited.
+                
+            activeChilds = self.childs[:]
+            self.exitCodes = []
+            pollInterval = 0.01
+            while len(activeChilds) > 0:
+                waitingChildren = 0
+                rem = []
+                for ch in activeChilds:
+                    try:
+                        n = ch.processRequests()
+                        if n > 0:
+                            waitingChildren += 1
+                    except ClosedError:
+                        #print ch.childPid, 'process finished'
+                        rem.append(ch)
+                        if self.showProgress:
+                            self.progressDlg += 1
+                #print "remove:", [ch.childPid for ch in rem]
+                for ch in rem:
+                    activeChilds.remove(ch)
+                    while True:
+                        try:
+                            pid, exitcode = os.waitpid(ch.childPid, 0)
+                            self.exitCodes.append(exitcode)
+                            break
+                        except OSError as ex:
+                            if ex.errno == 4:  ## If we get this error, just try again
+                                continue
+                                #print "Ignored system call interruption"
+                            else:
+                                raise
+                    
+                    #print [ch.childPid for ch in activeChilds]
+                    
+                if self.showProgress and self.progressDlg.wasCanceled():
+                    for ch in activeChilds:
+                        ch.kill()
+                    raise CanceledError()
+                    
+                ## adjust polling interval--prefer to get exactly 1 event per poll cycle.
+                if waitingChildren > 1:
+                    pollInterval *= 0.7
+                elif waitingChildren == 0:
+                    pollInterval /= 0.7
+                pollInterval = max(min(pollInterval, 0.5), 0.0005) ## but keep it within reasonable limits
+                
+                time.sleep(pollInterval)
+        finally:
+            if self.showProgress:
+                self.progressDlg.__exit__(None, None, None)
+        if len(self.exitCodes) < len(self.childs):
+            raise Exception("Parallelizer started %d processes but only received exit codes from %d." % (len(self.childs), len(self.exitCodes)))
+        for code in self.exitCodes:
+            if code != 0:
+                raise Exception("Error occurred in parallel-executed subprocess (console output may have more information).")
+        return []  ## no tasks for parent process.
+    
+    
+    @staticmethod
+    def suggestedWorkerCount():
+        if 'linux' in sys.platform:
+            ## I think we can do a little better here..
+            ## cpu_count does not consider that there is little extra benefit to using hyperthreaded cores.
+            try:
+                cores = {}
+                pid = None
+                
+                for line in open('/proc/cpuinfo'):
+                    m = re.match(r'physical id\s+:\s+(\d+)', line)
+                    if m is not None:
+                        pid = m.groups()[0]
+                    m = re.match(r'cpu cores\s+:\s+(\d+)', line)
+                    if m is not None:
+                        cores[pid] = int(m.groups()[0])
+                return sum(cores.values())
+            except:
+                return multiprocessing.cpu_count()
+                
+        else:
+            return multiprocessing.cpu_count()
+        
+    def _taskStarted(self, pid, i, **kwds):
+        ## called remotely by tasker to indicate it has started working on task i
+        #print pid, 'reported starting task', i
+        if self.showProgress:
+            if len(self.progress[pid]) > 0:
+                self.progressDlg += 1
+            if pid == os.getpid():  ## single-worker process
+                if self.progressDlg.wasCanceled():
+                    raise CanceledError()
+        self.progress[pid].append(i)
+    
+    
+class Tasker(object):
+    def __init__(self, parallelizer, process, tasks, kwds):
+        self.proc = process
+        self.par = parallelizer
+        self.tasks = tasks
+        for k, v in kwds.iteritems():
+            setattr(self, k, v)
+        
+    def __iter__(self):
+        ## we could fix this up such that tasks are retrieved from the parent process one at a time..
+        for i, task in enumerate(self.tasks):
+            self.index = i
+            #print os.getpid(), 'starting task', i
+            self._taskStarted(os.getpid(), i, _callSync='off')
+            yield task
+        if self.proc is not None:
+            #print os.getpid(), 'no more tasks'
+            self.proc.close()
+    
+    def process(self):
+        """
+        Process requests from parent.
+        Usually it is not necessary to call this unless you would like to 
+        receive messages (such as exit requests) during an iteration.
+        """
+        if self.proc is not None:
+            self.proc.processRequests()
+    
+    def numWorkers(self):
+        """
+        Return the number of parallel workers
+        """
+        return self.par.workers
+    
+#class Parallelizer:
+    #"""
+    #Use::
+    
+        #p = Parallelizer()
+        #with p(4) as i:
+            #p.finish(do_work(i))
+        #print p.results()
+    
+    #"""
+    #def __init__(self):
+        #pass
+
+    #def __call__(self, n):
+        #self.replies = []
+        #self.conn = None  ## indicates this is the parent process
+        #return Session(self, n)
+            
+    #def finish(self, data):
+        #if self.conn is None:
+            #self.replies.append((self.i, data))
+        #else:
+            ##print "send", self.i, data
+            #self.conn.send((self.i, data))
+            #os._exit(0)
+            
+    #def result(self):
+        #print self.replies
+        
+#class Session:
+    #def __init__(self, par, n):
+        #self.par = par
+        #self.n = n
+        
+    #def __enter__(self):
+        #self.childs = []
+        #for i in range(1, self.n):
+            #c1, c2 = multiprocessing.Pipe()
+            #pid = os.fork()
+            #if pid == 0:  ## child
+                #self.par.i = i
+                #self.par.conn = c2
+                #self.childs = None
+                #c1.close()
+                #return i
+            #else:
+                #self.childs.append(c1)
+                #c2.close()
+        #self.par.i = 0
+        #return 0
+            
+        
+        
+    #def __exit__(self, *exc_info):
+        #if exc_info[0] is not None:
+            #sys.excepthook(*exc_info)
+        #if self.childs is not None:
+            #self.par.replies.extend([conn.recv() for conn in self.childs])
+        #else:
+            #self.par.finish(None)
+        
diff --git a/libs/pyqtgraph/multiprocess/processes.py b/libs/pyqtgraph/multiprocess/processes.py
new file mode 100644
index 0000000000000000000000000000000000000000..a121487b98ec175f9e78e7aa0372aa194ca09dd4
--- /dev/null
+++ b/libs/pyqtgraph/multiprocess/processes.py
@@ -0,0 +1,477 @@
+import subprocess, atexit, os, sys, time, random, socket, signal
+import multiprocessing.connection
+try:
+    import cPickle as pickle
+except ImportError:
+    import pickle
+
+from .remoteproxy import RemoteEventHandler, ClosedError, NoResultError, LocalObjectProxy, ObjectProxy
+from ..Qt import USE_PYSIDE
+from ..util import cprint  # color printing for debugging
+
+
+__all__ = ['Process', 'QtProcess', 'ForkedProcess', 'ClosedError', 'NoResultError']
+
+class Process(RemoteEventHandler):
+    """
+    Bases: RemoteEventHandler
+    
+    This class is used to spawn and control a new python interpreter.
+    It uses subprocess.Popen to start the new process and communicates with it
+    using multiprocessing.Connection objects over a network socket.
+    
+    By default, the remote process will immediately enter an event-processing
+    loop that carries out requests send from the parent process.
+    
+    Remote control works mainly through proxy objects::
+    
+        proc = Process()              ## starts process, returns handle
+        rsys = proc._import('sys')    ## asks remote process to import 'sys', returns
+                                      ## a proxy which references the imported module
+        rsys.stdout.write('hello\n')  ## This message will be printed from the remote 
+                                      ## process. Proxy objects can usually be used
+                                      ## exactly as regular objects are.
+        proc.close()                  ## Request the remote process shut down
+    
+    Requests made via proxy objects may be synchronous or asynchronous and may
+    return objects either by proxy or by value (if they are picklable). See
+    ProxyObject for more information.
+    """
+    _process_count = 1  # just used for assigning colors to each process for debugging
+
+    def __init__(self, name=None, target=None, executable=None, copySysPath=True, debug=False, timeout=20, wrapStdout=None):
+        """
+        ==============  =============================================================
+        **Arguments:**
+        name            Optional name for this process used when printing messages
+                        from the remote process.
+        target          Optional function to call after starting remote process.
+                        By default, this is startEventLoop(), which causes the remote
+                        process to process requests from the parent process until it
+                        is asked to quit. If you wish to specify a different target,
+                        it must be picklable (bound methods are not).
+        copySysPath     If True, copy the contents of sys.path to the remote process
+        debug           If True, print detailed information about communication
+                        with the child process.
+        wrapStdout      If True (default on windows) then stdout and stderr from the
+                        child process will be caught by the parent process and
+                        forwarded to its stdout/stderr. This provides a workaround
+                        for a python bug: http://bugs.python.org/issue3905
+                        but has the side effect that child output is significantly
+                        delayed relative to the parent output.
+        ==============  =============================================================
+        """
+        if target is None:
+            target = startEventLoop
+        if name is None:
+            name = str(self)
+        if executable is None:
+            executable = sys.executable
+        self.debug = 7 if debug is True else False  # 7 causes printing in white
+        
+        ## random authentication key
+        authkey = os.urandom(20)
+
+        ## Windows seems to have a hard time with hmac 
+        if sys.platform.startswith('win'):
+            authkey = None
+
+        #print "key:", ' '.join([str(ord(x)) for x in authkey])
+        ## Listen for connection from remote process (and find free port number)
+        l = multiprocessing.connection.Listener(('localhost', 0), authkey=authkey)
+        port = l.address[1]
+
+        ## start remote process, instruct it to run target function
+        sysPath = sys.path if copySysPath else None
+        bootstrap = os.path.abspath(os.path.join(os.path.dirname(__file__), 'bootstrap.py'))
+        self.debugMsg('Starting child process (%s %s)' % (executable, bootstrap))
+
+        # Decide on printing color for this process
+        if debug:
+            procDebug = (Process._process_count%6) + 1  # pick a color for this process to print in
+            Process._process_count += 1
+        else:
+            procDebug = False
+        
+        if wrapStdout is None:
+            wrapStdout = sys.platform.startswith('win')
+
+        if wrapStdout:
+            ## note: we need all three streams to have their own PIPE due to this bug:
+            ## http://bugs.python.org/issue3905
+            stdout = subprocess.PIPE
+            stderr = subprocess.PIPE
+            self.proc = subprocess.Popen((executable, bootstrap), stdin=subprocess.PIPE, stdout=stdout, stderr=stderr)
+            ## to circumvent the bug and still make the output visible, we use 
+            ## background threads to pass data from pipes to stdout/stderr
+            self._stdoutForwarder = FileForwarder(self.proc.stdout, "stdout", procDebug)
+            self._stderrForwarder = FileForwarder(self.proc.stderr, "stderr", procDebug)
+        else:
+            self.proc = subprocess.Popen((executable, bootstrap), stdin=subprocess.PIPE)
+
+        targetStr = pickle.dumps(target)  ## double-pickle target so that child has a chance to 
+                                          ## set its sys.path properly before unpickling the target
+        pid = os.getpid() # we must send pid to child because windows does not have getppid
+        
+        ## Send everything the remote process needs to start correctly
+        data = dict(
+            name=name+'_child', 
+            port=port, 
+            authkey=authkey, 
+            ppid=pid, 
+            targetStr=targetStr, 
+            path=sysPath, 
+            pyside=USE_PYSIDE,
+            debug=procDebug
+            )
+        pickle.dump(data, self.proc.stdin)
+        self.proc.stdin.close()
+        
+        ## open connection for remote process
+        self.debugMsg('Listening for child process on port %d, authkey=%s..' % (port, repr(authkey)))
+        while True:
+            try:
+                conn = l.accept()
+                break
+            except IOError as err:
+                if err.errno == 4:  # interrupted; try again
+                    continue
+                else:
+                    raise
+
+        RemoteEventHandler.__init__(self, conn, name+'_parent', pid=self.proc.pid, debug=self.debug)
+        self.debugMsg('Connected to child process.')
+        
+        atexit.register(self.join)
+
+        
+    def join(self, timeout=10):
+        self.debugMsg('Joining child process..')
+        if self.proc.poll() is None:
+            self.close()
+            start = time.time()
+            while self.proc.poll() is None:
+                if timeout is not None and time.time() - start > timeout:
+                    raise Exception('Timed out waiting for remote process to end.')
+                time.sleep(0.05)
+        self.debugMsg('Child process exited. (%d)' % self.proc.returncode)
+
+    def debugMsg(self, msg):
+        if hasattr(self, '_stdoutForwarder'):
+            ## Lock output from subprocess to make sure we do not get line collisions
+            with self._stdoutForwarder.lock:
+                with self._stderrForwarder.lock:
+                    RemoteEventHandler.debugMsg(self, msg)
+        else:
+            RemoteEventHandler.debugMsg(self, msg)
+
+        
+def startEventLoop(name, port, authkey, ppid, debug=False):
+    if debug:
+        import os
+        cprint.cout(debug, '[%d] connecting to server at port localhost:%d, authkey=%s..\n' 
+                    % (os.getpid(), port, repr(authkey)), -1)
+    conn = multiprocessing.connection.Client(('localhost', int(port)), authkey=authkey)
+    if debug:
+        cprint.cout(debug, '[%d] connected; starting remote proxy.\n' % os.getpid(), -1)
+    global HANDLER
+    #ppid = 0 if not hasattr(os, 'getppid') else os.getppid()
+    HANDLER = RemoteEventHandler(conn, name, ppid, debug=debug)
+    while True:
+        try:
+            HANDLER.processRequests()  # exception raised when the loop should exit
+            time.sleep(0.01)
+        except ClosedError:
+            break
+
+
+class ForkedProcess(RemoteEventHandler):
+    """
+    ForkedProcess is a substitute for Process that uses os.fork() to generate a new process.
+    This is much faster than starting a completely new interpreter and child processes
+    automatically have a copy of the entire program state from before the fork. This
+    makes it an appealing approach when parallelizing expensive computations. (see
+    also Parallelizer)
+    
+    However, fork() comes with some caveats and limitations:
+
+    - fork() is not available on Windows.
+    - It is not possible to have a QApplication in both parent and child process
+      (unless both QApplications are created _after_ the call to fork())
+      Attempts by the forked process to access Qt GUI elements created by the parent
+      will most likely cause the child to crash.
+    - Likewise, database connections are unlikely to function correctly in a forked child.
+    - Threads are not copied by fork(); the new process 
+      will have only one thread that starts wherever fork() was called in the parent process.
+    - Forked processes are unceremoniously terminated when join() is called; they are not 
+      given any opportunity to clean up. (This prevents them calling any cleanup code that
+      was only intended to be used by the parent process)
+    - Normally when fork()ing, open file handles are shared with the parent process, 
+      which is potentially dangerous. ForkedProcess is careful to close all file handles 
+      that are not explicitly needed--stdout, stderr, and a single pipe to the parent 
+      process.
+      
+    """
+    
+    def __init__(self, name=None, target=0, preProxy=None, randomReseed=True):
+        """
+        When initializing, an optional target may be given. 
+        If no target is specified, self.eventLoop will be used.
+        If None is given, no target will be called (and it will be up 
+        to the caller to properly shut down the forked process)
+        
+        preProxy may be a dict of values that will appear as ObjectProxy
+        in the remote process (but do not need to be sent explicitly since 
+        they are available immediately before the call to fork().
+        Proxies will be availabe as self.proxies[name].
+        
+        If randomReseed is True, the built-in random and numpy.random generators
+        will be reseeded in the child process.
+        """
+        self.hasJoined = False
+        if target == 0:
+            target = self.eventLoop
+        if name is None:
+            name = str(self)
+        
+        conn, remoteConn = multiprocessing.Pipe()
+        
+        proxyIDs = {}
+        if preProxy is not None:
+            for k, v in preProxy.iteritems():
+                proxyId = LocalObjectProxy.registerObject(v)
+                proxyIDs[k] = proxyId
+        
+        ppid = os.getpid()  # write this down now; windows doesn't have getppid
+        pid = os.fork()
+        if pid == 0:
+            self.isParent = False
+            ## We are now in the forked process; need to be extra careful what we touch while here.
+            ##   - no reading/writing file handles/sockets owned by parent process (stdout is ok)
+            ##   - don't touch QtGui or QApplication at all; these are landmines.
+            ##   - don't let the process call exit handlers
+            
+            os.setpgrp()  ## prevents signals (notably keyboard interrupt) being forwarded from parent to this process
+            
+            ## close all file handles we do not want shared with parent
+            conn.close()
+            sys.stdin.close()  ## otherwise we screw with interactive prompts.
+            fid = remoteConn.fileno()
+            os.closerange(3, fid)
+            os.closerange(fid+1, 4096) ## just guessing on the maximum descriptor count..
+            
+            ## Override any custom exception hooks
+            def excepthook(*args):
+                import traceback
+                traceback.print_exception(*args)
+            sys.excepthook = excepthook 
+            
+            ## Make it harder to access QApplication instance
+            for qtlib in ('PyQt4', 'PySide', 'PyQt5'):
+                if qtlib in sys.modules:
+                    sys.modules[qtlib+'.QtGui'].QApplication = None
+                    sys.modules.pop(qtlib+'.QtGui', None)
+                    sys.modules.pop(qtlib+'.QtCore', None)
+            
+            ## sabotage atexit callbacks
+            atexit._exithandlers = []
+            atexit.register(lambda: os._exit(0))
+            
+            if randomReseed:
+                if 'numpy.random' in sys.modules:
+                    sys.modules['numpy.random'].seed(os.getpid() ^ int(time.time()*10000%10000))
+                if 'random' in sys.modules:
+                    sys.modules['random'].seed(os.getpid() ^ int(time.time()*10000%10000))
+            
+            #ppid = 0 if not hasattr(os, 'getppid') else os.getppid()
+            RemoteEventHandler.__init__(self, remoteConn, name+'_child', pid=ppid)
+            
+            self.forkedProxies = {}
+            for name, proxyId in proxyIDs.iteritems():
+                self.forkedProxies[name] = ObjectProxy(ppid, proxyId=proxyId, typeStr=repr(preProxy[name]))
+            
+            if target is not None:
+                target()
+                
+        else:
+            self.isParent = True
+            self.childPid = pid
+            remoteConn.close()
+            RemoteEventHandler.handlers = {}  ## don't want to inherit any of this from the parent.
+            
+            RemoteEventHandler.__init__(self, conn, name+'_parent', pid=pid)
+            atexit.register(self.join)
+        
+        
+    def eventLoop(self):
+        while True:
+            try:
+                self.processRequests()  # exception raised when the loop should exit
+                time.sleep(0.01)
+            except ClosedError:
+                break
+            except:
+                print("Error occurred in forked event loop:")
+                sys.excepthook(*sys.exc_info())
+        sys.exit(0)
+        
+    def join(self, timeout=10):
+        if self.hasJoined:
+            return
+        #os.kill(pid, 9)  
+        try:
+            self.close(callSync='sync', timeout=timeout, noCleanup=True)  ## ask the child process to exit and require that it return a confirmation.
+            os.waitpid(self.childPid, 0)
+        except IOError:  ## probably remote process has already quit
+            pass  
+        self.hasJoined = True
+
+    def kill(self):
+        """Immediately kill the forked remote process. 
+        This is generally safe because forked processes are already
+        expected to _avoid_ any cleanup at exit."""
+        os.kill(self.childPid, signal.SIGKILL)
+        self.hasJoined = True
+        
+        
+
+##Special set of subclasses that implement a Qt event loop instead.
+        
+class RemoteQtEventHandler(RemoteEventHandler):
+    def __init__(self, *args, **kwds):
+        RemoteEventHandler.__init__(self, *args, **kwds)
+        
+    def startEventTimer(self):
+        from ..Qt import QtGui, QtCore
+        self.timer = QtCore.QTimer()
+        self.timer.timeout.connect(self.processRequests)
+        self.timer.start(10)
+    
+    def processRequests(self):
+        try:
+            RemoteEventHandler.processRequests(self)
+        except ClosedError:
+            from ..Qt import QtGui, QtCore
+            QtGui.QApplication.instance().quit()
+            self.timer.stop()
+            #raise SystemExit
+
+class QtProcess(Process):
+    """
+    QtProcess is essentially the same as Process, with two major differences:
+    
+    - The remote process starts by running startQtEventLoop() which creates a 
+      QApplication in the remote process and uses a QTimer to trigger
+      remote event processing. This allows the remote process to have its own 
+      GUI.
+    - A QTimer is also started on the parent process which polls for requests
+      from the child process. This allows Qt signals emitted within the child 
+      process to invoke slots on the parent process and vice-versa. This can 
+      be disabled using processRequests=False in the constructor.
+      
+    Example::
+    
+        proc = QtProcess()            
+        rQtGui = proc._import('PyQt4.QtGui')
+        btn = rQtGui.QPushButton('button on child process')
+        btn.show()
+        
+        def slot():
+            print('slot invoked on parent process')
+        btn.clicked.connect(proxy(slot))   # be sure to send a proxy of the slot
+    """
+    
+    def __init__(self, **kwds):
+        if 'target' not in kwds:
+            kwds['target'] = startQtEventLoop
+        from ..Qt import QtGui  ## avoid module-level import to keep bootstrap snappy.
+        self._processRequests = kwds.pop('processRequests', True)
+        if self._processRequests and QtGui.QApplication.instance() is None:
+            raise Exception("Must create QApplication before starting QtProcess, or use QtProcess(processRequests=False)")
+        Process.__init__(self, **kwds)
+        self.startEventTimer()
+        
+    def startEventTimer(self):
+        from ..Qt import QtCore  ## avoid module-level import to keep bootstrap snappy.
+        self.timer = QtCore.QTimer()
+        if self._processRequests:
+            self.startRequestProcessing()
+    
+    def startRequestProcessing(self, interval=0.01):
+        """Start listening for requests coming from the child process.
+        This allows signals to be connected from the child process to the parent.
+        """
+        self.timer.timeout.connect(self.processRequests)
+        self.timer.start(interval*1000)
+        
+    def stopRequestProcessing(self):
+        self.timer.stop()
+    
+    def processRequests(self):
+        try:
+            Process.processRequests(self)
+        except ClosedError:
+            self.timer.stop()
+    
+def startQtEventLoop(name, port, authkey, ppid, debug=False):
+    if debug:
+        import os
+        cprint.cout(debug, '[%d] connecting to server at port localhost:%d, authkey=%s..\n' % (os.getpid(), port, repr(authkey)), -1)
+    conn = multiprocessing.connection.Client(('localhost', int(port)), authkey=authkey)
+    if debug:
+        cprint.cout(debug, '[%d] connected; starting remote proxy.\n' % os.getpid(), -1)
+    from ..Qt import QtGui, QtCore
+    app = QtGui.QApplication.instance()
+    #print app
+    if app is None:
+        app = QtGui.QApplication([])
+        app.setQuitOnLastWindowClosed(False)  ## generally we want the event loop to stay open 
+                                              ## until it is explicitly closed by the parent process.
+    
+    global HANDLER
+    HANDLER = RemoteQtEventHandler(conn, name, ppid, debug=debug)
+    HANDLER.startEventTimer()
+    app.exec_()
+
+import threading
+class FileForwarder(threading.Thread):
+    """
+    Background thread that forwards data from one pipe to another. 
+    This is used to catch data from stdout/stderr of the child process
+    and print it back out to stdout/stderr. We need this because this
+    bug: http://bugs.python.org/issue3905  _requires_ us to catch
+    stdout/stderr.
+
+    *output* may be a file or 'stdout' or 'stderr'. In the latter cases,
+    sys.stdout/stderr are retrieved once for every line that is output,
+    which ensures that the correct behavior is achieved even if 
+    sys.stdout/stderr are replaced at runtime.
+    """
+    def __init__(self, input, output, color):
+        threading.Thread.__init__(self)
+        self.input = input
+        self.output = output
+        self.lock = threading.Lock()
+        self.daemon = True
+        self.color = color
+        self.start()
+
+    def run(self):
+        if self.output == 'stdout':
+            while True:
+                line = self.input.readline()
+                with self.lock:
+                    cprint.cout(self.color, line, -1)
+        elif self.output == 'stderr':
+            while True:
+                line = self.input.readline()
+                with self.lock:
+                    cprint.cerr(self.color, line, -1)
+        else:
+            while True:
+                line = self.input.readline()
+                with self.lock:
+                    self.output.write(line)
+
+
+
diff --git a/libs/pyqtgraph/multiprocess/remoteproxy.py b/libs/pyqtgraph/multiprocess/remoteproxy.py
new file mode 100644
index 0000000000000000000000000000000000000000..4f484b7444ff81f2de4e9ca248b6e29f868e8661
--- /dev/null
+++ b/libs/pyqtgraph/multiprocess/remoteproxy.py
@@ -0,0 +1,1117 @@
+import os, time, sys, traceback, weakref
+import numpy as np
+import threading
+try:
+    import __builtin__ as builtins
+    import cPickle as pickle
+except ImportError:
+    import builtins
+    import pickle
+
+# color printing for debugging
+from ..util import cprint
+
+class ClosedError(Exception):
+    """Raised when an event handler receives a request to close the connection
+    or discovers that the connection has been closed."""
+    pass
+
+class NoResultError(Exception):
+    """Raised when a request for the return value of a remote call fails
+    because the call has not yet returned."""
+    pass
+
+    
+class RemoteEventHandler(object):
+    """
+    This class handles communication between two processes. One instance is present on 
+    each process and listens for communication from the other process. This enables
+    (amongst other things) ObjectProxy instances to look up their attributes and call 
+    their methods.
+    
+    This class is responsible for carrying out actions on behalf of the remote process.
+    Each instance holds one end of a Connection which allows python
+    objects to be passed between processes.
+    
+    For the most common operations, see _import(), close(), and transfer()
+    
+    To handle and respond to incoming requests, RemoteEventHandler requires that its
+    processRequests method is called repeatedly (this is usually handled by the Process
+    classes defined in multiprocess.processes).
+    
+    
+    
+    
+    """
+    handlers = {}   ## maps {process ID : handler}. This allows unpickler to determine which process
+                    ## an object proxy belongs to
+                         
+    def __init__(self, connection, name, pid, debug=False):
+        self.debug = debug
+        self.conn = connection
+        self.name = name
+        self.results = {} ## reqId: (status, result); cache of request results received from the remote process
+                          ## status is either 'result' or 'error'
+                          ##   if 'error', then result will be (exception, formatted exceprion)
+                          ##   where exception may be None if it could not be passed through the Connection.
+        self.resultLock = threading.RLock()
+                          
+        self.proxies = {} ## maps {weakref(proxy): proxyId}; used to inform the remote process when a proxy has been deleted.
+        self.proxyLock = threading.RLock()
+        
+        ## attributes that affect the behavior of the proxy. 
+        ## See ObjectProxy._setProxyOptions for description
+        self.proxyOptions = {
+            'callSync': 'sync',      ## 'sync', 'async', 'off'
+            'timeout': 10,           ## float
+            'returnType': 'auto',    ## 'proxy', 'value', 'auto'
+            'autoProxy': False,      ## bool
+            'deferGetattr': False,   ## True, False
+            'noProxyTypes': [ type(None), str, int, float, tuple, list, dict, LocalObjectProxy, ObjectProxy ],
+        }
+        self.optsLock = threading.RLock()
+        
+        self.nextRequestId = 0
+        self.exited = False
+        
+        # Mutexes to help prevent issues when multiple threads access the same RemoteEventHandler
+        self.processLock = threading.RLock()
+        self.sendLock = threading.RLock()
+        
+        RemoteEventHandler.handlers[pid] = self  ## register this handler as the one communicating with pid
+    
+    @classmethod
+    def getHandler(cls, pid):
+        try:
+            return cls.handlers[pid]
+        except:
+            print(pid, cls.handlers)
+            raise
+    
+    def debugMsg(self, msg):
+        if not self.debug:
+            return
+        cprint.cout(self.debug, "[%d] %s\n" % (os.getpid(), str(msg)), -1) 
+    
+    def getProxyOption(self, opt):
+        with self.optsLock:
+            return self.proxyOptions[opt]
+        
+    def setProxyOptions(self, **kwds):
+        """
+        Set the default behavior options for object proxies.
+        See ObjectProxy._setProxyOptions for more info.
+        """
+        with self.optsLock:
+            self.proxyOptions.update(kwds)
+    
+    def processRequests(self):
+        """Process all pending requests from the pipe, return
+        after no more events are immediately available. (non-blocking)
+        Returns the number of events processed.
+        """
+        with self.processLock:
+            
+            if self.exited:
+                self.debugMsg('  processRequests: exited already; raise ClosedError.')
+                raise ClosedError()
+            
+            numProcessed = 0
+            
+            while self.conn.poll():
+                #try:
+                    #poll = self.conn.poll()
+                    #if not poll:
+                        #break
+                #except IOError:  # this can happen if the remote process dies.
+                                ## might it also happen in other circumstances?
+                    #raise ClosedError()
+                        
+                try:
+                    self.handleRequest()
+                    numProcessed += 1
+                except ClosedError:
+                    self.debugMsg('processRequests: got ClosedError from handleRequest; setting exited=True.')
+                    self.exited = True
+                    raise
+                #except IOError as err:  ## let handleRequest take care of this.
+                    #self.debugMsg('  got IOError from handleRequest; try again.')
+                    #if err.errno == 4:  ## interrupted system call; try again
+                        #continue
+                    #else:
+                        #raise
+                except:
+                    print("Error in process %s" % self.name)
+                    sys.excepthook(*sys.exc_info())
+                    
+            if numProcessed > 0:
+                self.debugMsg('processRequests: finished %d requests' % numProcessed)
+            return numProcessed
+    
+    def handleRequest(self):
+        """Handle a single request from the remote process. 
+        Blocks until a request is available."""
+        result = None
+        while True:
+            try:
+                ## args, kwds are double-pickled to ensure this recv() call never fails                
+                cmd, reqId, nByteMsgs, optStr = self.conn.recv() 
+                break
+            except EOFError:
+                self.debugMsg('  handleRequest: got EOFError from recv; raise ClosedError.')
+                ## remote process has shut down; end event loop
+                raise ClosedError()
+            except IOError as err:
+                if err.errno == 4:  ## interrupted system call; try again
+                    self.debugMsg('  handleRequest: got IOError 4 from recv; try again.')
+                    continue
+                else:
+                    self.debugMsg('  handleRequest: got IOError %d from recv (%s); raise ClosedError.' % (err.errno, err.strerror))
+                    raise ClosedError()
+        
+        self.debugMsg("  handleRequest: received %s %s" % (str(cmd), str(reqId)))
+            
+        ## read byte messages following the main request
+        byteData = []
+        if nByteMsgs > 0:
+            self.debugMsg("    handleRequest: reading %d byte messages" % nByteMsgs)
+        for i in range(nByteMsgs):
+            while True:
+                try:
+                    byteData.append(self.conn.recv_bytes())
+                    break
+                except EOFError:
+                    self.debugMsg("    handleRequest: got EOF while reading byte messages; raise ClosedError.")
+                    raise ClosedError()
+                except IOError as err:
+                    if err.errno == 4:
+                        self.debugMsg("    handleRequest: got IOError 4 while reading byte messages; try again.")
+                        continue
+                    else:
+                        self.debugMsg("    handleRequest: got IOError while reading byte messages; raise ClosedError.")
+                        raise ClosedError()
+            
+        
+        try:
+            if cmd == 'result' or cmd == 'error':
+                resultId = reqId
+                reqId = None  ## prevents attempt to return information from this request
+                              ## (this is already a return from a previous request)
+            
+            opts = pickle.loads(optStr)
+            self.debugMsg("    handleRequest: id=%s opts=%s" % (str(reqId), str(opts)))
+            #print os.getpid(), "received request:", cmd, reqId, opts
+            returnType = opts.get('returnType', 'auto')
+            
+            if cmd == 'result':
+                with self.resultLock:
+                    self.results[resultId] = ('result', opts['result'])
+            elif cmd == 'error':
+                with self.resultLock:
+                    self.results[resultId] = ('error', (opts['exception'], opts['excString']))
+            elif cmd == 'getObjAttr':
+                result = getattr(opts['obj'], opts['attr'])
+            elif cmd == 'callObj':
+                obj = opts['obj']
+                fnargs = opts['args']
+                fnkwds = opts['kwds']
+                
+                ## If arrays were sent as byte messages, they must be re-inserted into the 
+                ## arguments
+                if len(byteData) > 0:
+                    for i,arg in enumerate(fnargs):
+                        if isinstance(arg, tuple) and len(arg) > 0 and arg[0] == '__byte_message__':
+                            ind = arg[1]
+                            dtype, shape = arg[2]
+                            fnargs[i] = np.fromstring(byteData[ind], dtype=dtype).reshape(shape)
+                    for k,arg in fnkwds.items():
+                        if isinstance(arg, tuple) and len(arg) > 0 and arg[0] == '__byte_message__':
+                            ind = arg[1]
+                            dtype, shape = arg[2]
+                            fnkwds[k] = np.fromstring(byteData[ind], dtype=dtype).reshape(shape)
+                
+                if len(fnkwds) == 0:  ## need to do this because some functions do not allow keyword arguments.
+                    try:
+                        result = obj(*fnargs)
+                    except:
+                        print("Failed to call object %s: %d, %s" % (obj, len(fnargs), fnargs[1:]))
+                        raise
+                else:
+                    result = obj(*fnargs, **fnkwds)
+                    
+            elif cmd == 'getObjValue':
+                result = opts['obj']  ## has already been unpickled into its local value
+                returnType = 'value'
+            elif cmd == 'transfer':
+                result = opts['obj']
+                returnType = 'proxy'
+            elif cmd == 'transferArray':
+                ## read array data from next message:
+                result = np.fromstring(byteData[0], dtype=opts['dtype']).reshape(opts['shape'])
+                returnType = 'proxy'
+            elif cmd == 'import':
+                name = opts['module']
+                fromlist = opts.get('fromlist', [])
+                mod = builtins.__import__(name, fromlist=fromlist)
+                
+                if len(fromlist) == 0:
+                    parts = name.lstrip('.').split('.')
+                    result = mod
+                    for part in parts[1:]:
+                        result = getattr(result, part)
+                else:
+                    result = map(mod.__getattr__, fromlist)
+                
+            elif cmd == 'del':
+                LocalObjectProxy.releaseProxyId(opts['proxyId'])
+                #del self.proxiedObjects[opts['objId']]
+                
+            elif cmd == 'close':
+                if reqId is not None:
+                    result = True
+                    returnType = 'value'
+                    
+            exc = None
+        except:
+            exc = sys.exc_info()
+
+            
+            
+        if reqId is not None:
+            if exc is None:
+                self.debugMsg("    handleRequest: sending return value for %d: %s" % (reqId, str(result))) 
+                #print "returnValue:", returnValue, result
+                if returnType == 'auto':
+                    with self.optsLock:
+                        noProxyTypes = self.proxyOptions['noProxyTypes']
+                    result = self.autoProxy(result, noProxyTypes)
+                elif returnType == 'proxy':
+                    result = LocalObjectProxy(result)
+                
+                try:
+                    self.replyResult(reqId, result)
+                except:
+                    sys.excepthook(*sys.exc_info())
+                    self.replyError(reqId, *sys.exc_info())
+            else:
+                self.debugMsg("    handleRequest: returning exception for %d" % reqId) 
+                self.replyError(reqId, *exc)
+                    
+        elif exc is not None:
+            sys.excepthook(*exc)
+    
+        if cmd == 'close':
+            if opts.get('noCleanup', False) is True:
+                os._exit(0)  ## exit immediately, do not pass GO, do not collect $200.
+                             ## (more importantly, do not call any code that would
+                             ## normally be invoked at exit)
+            else:
+                raise ClosedError()
+        
+    
+    
+    def replyResult(self, reqId, result):
+        self.send(request='result', reqId=reqId, callSync='off', opts=dict(result=result))
+    
+    def replyError(self, reqId, *exc):
+        print("error: %s %s %s" % (self.name, str(reqId), str(exc[1])))
+        excStr = traceback.format_exception(*exc)
+        try:
+            self.send(request='error', reqId=reqId, callSync='off', opts=dict(exception=exc[1], excString=excStr))
+        except:
+            self.send(request='error', reqId=reqId, callSync='off', opts=dict(exception=None, excString=excStr))
+    
+    def send(self, request, opts=None, reqId=None, callSync='sync', timeout=10, returnType=None, byteData=None, **kwds):
+        """Send a request or return packet to the remote process.
+        Generally it is not necessary to call this method directly; it is for internal use.
+        (The docstring has information that is nevertheless useful to the programmer
+        as it describes the internal protocol used to communicate between processes)
+        
+        ==============  ====================================================================
+        **Arguments:**
+        request         String describing the type of request being sent (see below)
+        reqId           Integer uniquely linking a result back to the request that generated
+                        it. (most requests leave this blank)
+        callSync        'sync':  return the actual result of the request
+                        'async': return a Request object which can be used to look up the
+                                result later
+                        'off':   return no result
+        timeout         Time in seconds to wait for a response when callSync=='sync'
+        opts            Extra arguments sent to the remote process that determine the way
+                        the request will be handled (see below)
+        returnType      'proxy', 'value', or 'auto'
+        byteData        If specified, this is a list of objects to be sent as byte messages
+                        to the remote process.
+                        This is used to send large arrays without the cost of pickling.
+        ==============  ====================================================================
+        
+        Description of request strings and options allowed for each:
+        
+        =============  =============  ========================================================
+        request        option         description
+        -------------  -------------  --------------------------------------------------------
+        getObjAttr                    Request the remote process return (proxy to) an
+                                      attribute of an object.
+                       obj            reference to object whose attribute should be 
+                                      returned
+                       attr           string name of attribute to return
+                       returnValue    bool or 'auto' indicating whether to return a proxy or
+                                      the actual value. 
+                       
+        callObj                       Request the remote process call a function or 
+                                      method. If a request ID is given, then the call's
+                                      return value will be sent back (or information
+                                      about the error that occurred while running the
+                                      function)
+                       obj            the (reference to) object to call
+                       args           tuple of arguments to pass to callable
+                       kwds           dict of keyword arguments to pass to callable
+                       returnValue    bool or 'auto' indicating whether to return a proxy or
+                                      the actual value. 
+                       
+        getObjValue                   Request the remote process return the value of
+                                      a proxied object (must be picklable)
+                       obj            reference to object whose value should be returned
+                       
+        transfer                      Copy an object to the remote process and request
+                                      it return a proxy for the new object.
+                       obj            The object to transfer.
+                       
+        import                        Request the remote process import new symbols
+                                      and return proxy(ies) to the imported objects
+                       module         the string name of the module to import
+                       fromlist       optional list of string names to import from module
+                       
+        del                           Inform the remote process that a proxy has been 
+                                      released (thus the remote process may be able to 
+                                      release the original object)
+                       proxyId        id of proxy which is no longer referenced by 
+                                      remote host
+                                      
+        close                         Instruct the remote process to stop its event loop
+                                      and exit. Optionally, this request may return a 
+                                      confirmation.
+            
+        result                        Inform the remote process that its request has 
+                                      been processed                        
+                       result         return value of a request
+                       
+        error                         Inform the remote process that its request failed
+                       exception      the Exception that was raised (or None if the 
+                                      exception could not be pickled)
+                       excString      string-formatted version of the exception and 
+                                      traceback
+        =============  =====================================================================
+        """
+        if self.exited:
+            self.debugMsg('  send: exited already; raise ClosedError.')
+            raise ClosedError()
+        
+        with self.sendLock:
+            #if len(kwds) > 0:
+                #print "Warning: send() ignored args:", kwds
+                
+            if opts is None:
+                opts = {}
+            
+            assert callSync in ['off', 'sync', 'async'], 'callSync must be one of "off", "sync", or "async"'
+            if reqId is None:
+                if callSync != 'off': ## requested return value; use the next available request ID
+                    reqId = self.nextRequestId
+                    self.nextRequestId += 1
+            else:
+                ## If requestId is provided, this _must_ be a response to a previously received request.
+                assert request in ['result', 'error']
+            
+            if returnType is not None:
+                opts['returnType'] = returnType
+                
+            #print os.getpid(), "send request:", request, reqId, opts
+            
+            ## double-pickle args to ensure that at least status and request ID get through
+            try:
+                optStr = pickle.dumps(opts)
+            except:
+                print("====  Error pickling this object:  ====")
+                print(opts)
+                print("=======================================")
+                raise
+            
+            nByteMsgs = 0
+            if byteData is not None:
+                nByteMsgs = len(byteData)
+                
+            ## Send primary request
+            request = (request, reqId, nByteMsgs, optStr)
+            self.debugMsg('send request: cmd=%s nByteMsgs=%d id=%s opts=%s' % (str(request[0]), nByteMsgs, str(reqId), str(opts)))
+            self.conn.send(request)
+            
+            ## follow up by sending byte messages
+            if byteData is not None:
+                for obj in byteData:  ## Remote process _must_ be prepared to read the same number of byte messages!
+                    self.conn.send_bytes(obj)
+                self.debugMsg('  sent %d byte messages' % len(byteData))
+            
+            self.debugMsg('  call sync: %s' % callSync)
+            if callSync == 'off':
+                return
+            
+        req = Request(self, reqId, description=str(request), timeout=timeout)
+        if callSync == 'async':
+            return req
+            
+        if callSync == 'sync':
+            try:
+                return req.result()
+            except NoResultError:
+                return req
+        
+    def close(self, callSync='off', noCleanup=False, **kwds):
+        try:
+            self.send(request='close', opts=dict(noCleanup=noCleanup), callSync=callSync, **kwds)
+            self.exited = True
+        except ClosedError:
+            pass
+    
+    def getResult(self, reqId):
+        ## raises NoResultError if the result is not available yet
+        #print self.results.keys(), os.getpid()
+        with self.resultLock:
+            haveResult = reqId in self.results
+        
+        if not haveResult:
+            try:
+                self.processRequests()
+            except ClosedError:  ## even if remote connection has closed, we may have 
+                                 ## received new data during this call to processRequests()
+                pass
+        
+        with self.resultLock:
+            if reqId not in self.results:
+                raise NoResultError()
+            status, result = self.results.pop(reqId)
+        
+        if status == 'result': 
+            return result
+        elif status == 'error':
+            #print ''.join(result)
+            exc, excStr = result
+            if exc is not None:
+                print("===== Remote process raised exception on request: =====")
+                print(''.join(excStr))
+                print("===== Local Traceback to request follows: =====")
+                raise exc
+            else:
+                print(''.join(excStr))
+                raise Exception("Error getting result. See above for exception from remote process.")
+                
+        else:
+            raise Exception("Internal error.")
+    
+    def _import(self, mod, **kwds):
+        """
+        Request the remote process import a module (or symbols from a module)
+        and return the proxied results. Uses built-in __import__() function, but 
+        adds a bit more processing:
+        
+            _import('module')  =>  returns module
+            _import('module.submodule')  =>  returns submodule 
+                                             (note this differs from behavior of __import__)
+            _import('module', fromlist=[name1, name2, ...])  =>  returns [module.name1, module.name2, ...]
+                                             (this also differs from behavior of __import__)
+            
+        """
+        return self.send(request='import', callSync='sync', opts=dict(module=mod), **kwds)
+        
+    def getObjAttr(self, obj, attr, **kwds):
+        return self.send(request='getObjAttr', opts=dict(obj=obj, attr=attr), **kwds)
+        
+    def getObjValue(self, obj, **kwds):
+        return self.send(request='getObjValue', opts=dict(obj=obj), **kwds)
+        
+    def callObj(self, obj, args, kwds, **opts):
+        opts = opts.copy()
+        args = list(args)
+        
+        ## Decide whether to send arguments by value or by proxy
+        with self.optsLock:
+            noProxyTypes = opts.pop('noProxyTypes', None)
+            if noProxyTypes is None:
+                noProxyTypes = self.proxyOptions['noProxyTypes']
+                
+            autoProxy = opts.pop('autoProxy', self.proxyOptions['autoProxy'])
+        
+        if autoProxy is True:
+            args = [self.autoProxy(v, noProxyTypes) for v in args]
+            for k, v in kwds.iteritems():
+                opts[k] = self.autoProxy(v, noProxyTypes)
+        
+        byteMsgs = []
+        
+        ## If there are arrays in the arguments, send those as byte messages.
+        ## We do this because pickling arrays is too expensive.
+        for i,arg in enumerate(args):
+            if arg.__class__ == np.ndarray:
+                args[i] = ("__byte_message__", len(byteMsgs), (arg.dtype, arg.shape))
+                byteMsgs.append(arg)
+        for k,v in kwds.items():
+            if v.__class__ == np.ndarray:
+                kwds[k] = ("__byte_message__", len(byteMsgs), (v.dtype, v.shape))
+                byteMsgs.append(v)
+        
+        return self.send(request='callObj', opts=dict(obj=obj, args=args, kwds=kwds), byteData=byteMsgs, **opts)
+
+    def registerProxy(self, proxy):
+        with self.proxyLock:
+            ref = weakref.ref(proxy, self.deleteProxy)
+            self.proxies[ref] = proxy._proxyId
+    
+    def deleteProxy(self, ref):
+        with self.proxyLock:
+            proxyId = self.proxies.pop(ref)
+            
+        try:
+            self.send(request='del', opts=dict(proxyId=proxyId), callSync='off')
+        except IOError:  ## if remote process has closed down, there is no need to send delete requests anymore
+            pass
+
+    def transfer(self, obj, **kwds):
+        """
+        Transfer an object by value to the remote host (the object must be picklable) 
+        and return a proxy for the new remote object.
+        """
+        if obj.__class__ is np.ndarray:
+            opts = {'dtype': obj.dtype, 'shape': obj.shape}
+            return self.send(request='transferArray', opts=opts, byteData=[obj], **kwds)            
+        else:
+            return self.send(request='transfer', opts=dict(obj=obj), **kwds)
+        
+    def autoProxy(self, obj, noProxyTypes):
+        ## Return object wrapped in LocalObjectProxy _unless_ its type is in noProxyTypes.
+        for typ in noProxyTypes:
+            if isinstance(obj, typ):
+                return obj
+        return LocalObjectProxy(obj)
+        
+        
+class Request(object):
+    """
+    Request objects are returned when calling an ObjectProxy in asynchronous mode
+    or if a synchronous call has timed out. Use hasResult() to ask whether
+    the result of the call has been returned yet. Use result() to get
+    the returned value.
+    """
+    def __init__(self, process, reqId, description=None, timeout=10):
+        self.proc = process
+        self.description = description
+        self.reqId = reqId
+        self.gotResult = False
+        self._result = None
+        self.timeout = timeout
+        
+    def result(self, block=True, timeout=None):
+        """
+        Return the result for this request. 
+        
+        If block is True, wait until the result has arrived or *timeout* seconds passes.
+        If the timeout is reached, raise NoResultError. (use timeout=None to disable)
+        If block is False, raise NoResultError immediately if the result has not arrived yet.
+        
+        If the process's connection has closed before the result arrives, raise ClosedError.
+        """
+        
+        if self.gotResult:
+            return self._result
+            
+        if timeout is None:
+            timeout = self.timeout 
+        
+        if block:
+            start = time.time()
+            while not self.hasResult():
+                if self.proc.exited:
+                    raise ClosedError()
+                time.sleep(0.005)
+                if timeout >= 0 and time.time() - start > timeout:
+                    print("Request timed out: %s" % self.description)
+                    import traceback
+                    traceback.print_stack()
+                    raise NoResultError()
+            return self._result
+        else:
+            self._result = self.proc.getResult(self.reqId)  ## raises NoResultError if result is not available yet
+            self.gotResult = True
+            return self._result
+        
+    def hasResult(self):
+        """Returns True if the result for this request has arrived."""
+        try:
+            self.result(block=False)
+        except NoResultError:
+            pass
+        
+        return self.gotResult
+
+class LocalObjectProxy(object):
+    """
+    Used for wrapping local objects to ensure that they are send by proxy to a remote host.
+    Note that 'proxy' is just a shorter alias for LocalObjectProxy.
+    
+    For example::
+    
+        data = [1,2,3,4,5]
+        remotePlot.plot(data)         ## by default, lists are pickled and sent by value
+        remotePlot.plot(proxy(data))  ## force the object to be sent by proxy
+    
+    """
+    nextProxyId = 0
+    proxiedObjects = {}  ## maps {proxyId: object}
+    
+    
+    @classmethod
+    def registerObject(cls, obj):
+        ## assign it a unique ID so we can keep a reference to the local object
+        
+        pid = cls.nextProxyId
+        cls.nextProxyId += 1
+        cls.proxiedObjects[pid] = obj
+        #print "register:", cls.proxiedObjects
+        return pid
+    
+    @classmethod
+    def lookupProxyId(cls, pid):
+        return cls.proxiedObjects[pid]
+    
+    @classmethod
+    def releaseProxyId(cls, pid):
+        del cls.proxiedObjects[pid]
+        #print "release:", cls.proxiedObjects 
+    
+    def __init__(self, obj, **opts):
+        """
+        Create a 'local' proxy object that, when sent to a remote host,
+        will appear as a normal ObjectProxy to *obj*. 
+        Any extra keyword arguments are passed to proxy._setProxyOptions()
+        on the remote side.
+        """
+        self.processId = os.getpid()
+        #self.objectId = id(obj)
+        self.typeStr = repr(obj)
+        #self.handler = handler
+        self.obj = obj
+        self.opts = opts
+        
+    def __reduce__(self):
+        ## a proxy is being pickled and sent to a remote process.
+        ## every time this happens, a new proxy will be generated in the remote process,
+        ## so we keep a new ID so we can track when each is released.
+        pid = LocalObjectProxy.registerObject(self.obj)
+        return (unpickleObjectProxy, (self.processId, pid, self.typeStr, None, self.opts))
+        
+## alias
+proxy = LocalObjectProxy
+
+def unpickleObjectProxy(processId, proxyId, typeStr, attributes=None, opts=None):
+    if processId == os.getpid():
+        obj = LocalObjectProxy.lookupProxyId(proxyId)
+        if attributes is not None:
+            for attr in attributes:
+                obj = getattr(obj, attr)
+        return obj
+    else:
+        proxy = ObjectProxy(processId, proxyId=proxyId, typeStr=typeStr)
+        if opts is not None:
+            proxy._setProxyOptions(**opts)
+        return proxy
+    
+class ObjectProxy(object):
+    """
+    Proxy to an object stored by the remote process. Proxies are created
+    by calling Process._import(), Process.transfer(), or by requesting/calling
+    attributes on existing proxy objects.
+    
+    For the most part, this object can be used exactly as if it
+    were a local object::
+    
+        rsys = proc._import('sys')   # returns proxy to sys module on remote process
+        rsys.stdout                  # proxy to remote sys.stdout
+        rsys.stdout.write            # proxy to remote sys.stdout.write
+        rsys.stdout.write('hello')   # calls sys.stdout.write('hello') on remote machine
+                                     # and returns the result (None)
+    
+    When calling a proxy to a remote function, the call can be made synchronous
+    (result of call is returned immediately), asynchronous (result is returned later),
+    or return can be disabled entirely::
+    
+        ros = proc._import('os')
+        
+        ## synchronous call; result is returned immediately
+        pid = ros.getpid()
+        
+        ## asynchronous call
+        request = ros.getpid(_callSync='async')
+        while not request.hasResult():
+            time.sleep(0.01)
+        pid = request.result()
+        
+        ## disable return when we know it isn't needed
+        rsys.stdout.write('hello', _callSync='off')
+    
+    Additionally, values returned from a remote function call are automatically
+    returned either by value (must be picklable) or by proxy. 
+    This behavior can be forced::
+    
+        rnp = proc._import('numpy')
+        arrProxy = rnp.array([1,2,3,4], _returnType='proxy')
+        arrValue = rnp.array([1,2,3,4], _returnType='value')
+    
+    The default callSync and returnType behaviors (as well as others) can be set 
+    for each proxy individually using ObjectProxy._setProxyOptions() or globally using 
+    proc.setProxyOptions(). 
+    
+    """
+    def __init__(self, processId, proxyId, typeStr='', parent=None):
+        object.__init__(self)
+        ## can't set attributes directly because setattr is overridden.
+        self.__dict__['_processId'] = processId
+        self.__dict__['_typeStr'] = typeStr
+        self.__dict__['_proxyId'] = proxyId
+        self.__dict__['_attributes'] = ()
+        ## attributes that affect the behavior of the proxy. 
+        ## in all cases, a value of None causes the proxy to ask
+        ## its parent event handler to make the decision
+        self.__dict__['_proxyOptions'] = {
+            'callSync': None,      ## 'sync', 'async', None 
+            'timeout': None,       ## float, None
+            'returnType': None,    ## 'proxy', 'value', 'auto', None
+            'deferGetattr': None,  ## True, False, None
+            'noProxyTypes': None,  ## list of types to send by value instead of by proxy
+        }
+        
+        self.__dict__['_handler'] = RemoteEventHandler.getHandler(processId)
+        self.__dict__['_handler'].registerProxy(self)  ## handler will watch proxy; inform remote process when the proxy is deleted.
+    
+    def _setProxyOptions(self, **kwds):
+        """
+        Change the behavior of this proxy. For all options, a value of None
+        will cause the proxy to instead use the default behavior defined
+        by its parent Process.
+        
+        Options are:
+        
+        =============  =============================================================
+        callSync       'sync', 'async', 'off', or None. 
+                       If 'async', then calling methods will return a Request object
+                       which can be used to inquire later about the result of the 
+                       method call.
+                       If 'sync', then calling a method
+                       will block until the remote process has returned its result
+                       or the timeout has elapsed (in this case, a Request object
+                       is returned instead).
+                       If 'off', then the remote process is instructed _not_ to 
+                       reply and the method call will return None immediately.
+        returnType     'auto', 'proxy', 'value', or None. 
+                       If 'proxy', then the value returned when calling a method
+                       will be a proxy to the object on the remote process.
+                       If 'value', then attempt to pickle the returned object and
+                       send it back.
+                       If 'auto', then the decision is made by consulting the
+                       'noProxyTypes' option.
+        autoProxy      bool or None. If True, arguments to __call__ are 
+                       automatically converted to proxy unless their type is 
+                       listed in noProxyTypes (see below). If False, arguments
+                       are left untouched. Use proxy(obj) to manually convert
+                       arguments before sending. 
+        timeout        float or None. Length of time to wait during synchronous 
+                       requests before returning a Request object instead.
+        deferGetattr   True, False, or None. 
+                       If False, all attribute requests will be sent to the remote 
+                       process immediately and will block until a response is
+                       received (or timeout has elapsed).
+                       If True, requesting an attribute from the proxy returns a
+                       new proxy immediately. The remote process is _not_ contacted
+                       to make this request. This is faster, but it is possible to 
+                       request an attribute that does not exist on the proxied
+                       object. In this case, AttributeError will not be raised
+                       until an attempt is made to look up the attribute on the
+                       remote process.
+        noProxyTypes   List of object types that should _not_ be proxied when
+                       sent to the remote process.
+        =============  =============================================================
+        """
+        self._proxyOptions.update(kwds)
+    
+    def _getValue(self):
+        """
+        Return the value of the proxied object
+        (the remote object must be picklable)
+        """
+        return self._handler.getObjValue(self)
+        
+    def _getProxyOption(self, opt):
+        val = self._proxyOptions[opt]
+        if val is None:
+            return self._handler.getProxyOption(opt)
+        return val
+    
+    def _getProxyOptions(self):
+        return dict([(k, self._getProxyOption(k)) for k in self._proxyOptions])
+    
+    def __reduce__(self):
+        return (unpickleObjectProxy, (self._processId, self._proxyId, self._typeStr, self._attributes))
+    
+    def __repr__(self):
+        #objRepr = self.__getattr__('__repr__')(callSync='value')
+        return "<ObjectProxy for process %d, object 0x%x: %s >" % (self._processId, self._proxyId, self._typeStr)
+        
+        
+    def __getattr__(self, attr, **kwds):
+        """
+        Calls __getattr__ on the remote object and returns the attribute
+        by value or by proxy depending on the options set (see
+        ObjectProxy._setProxyOptions and RemoteEventHandler.setProxyOptions)
+        
+        If the option 'deferGetattr' is True for this proxy, then a new proxy object
+        is returned _without_ asking the remote object whether the named attribute exists.
+        This can save time when making multiple chained attribute requests,
+        but may also defer a possible AttributeError until later, making
+        them more difficult to debug.
+        """
+        opts = self._getProxyOptions()
+        for k in opts:
+            if '_'+k in kwds:
+                opts[k] = kwds.pop('_'+k)
+        if opts['deferGetattr'] is True:
+            return self._deferredAttr(attr)
+        else:
+            #opts = self._getProxyOptions()
+            return self._handler.getObjAttr(self, attr, **opts)
+    
+    def _deferredAttr(self, attr):
+        return DeferredObjectProxy(self, attr)
+    
+    def __call__(self, *args, **kwds):
+        """
+        Attempts to call the proxied object from the remote process.
+        Accepts extra keyword arguments:
+        
+            _callSync    'off', 'sync', or 'async'
+            _returnType   'value', 'proxy', or 'auto'
+        
+        If the remote call raises an exception on the remote process,
+        it will be re-raised on the local process.
+        
+        """
+        opts = self._getProxyOptions()
+        for k in opts:
+            if '_'+k in kwds:
+                opts[k] = kwds.pop('_'+k)
+        return self._handler.callObj(obj=self, args=args, kwds=kwds, **opts)
+    
+    
+    ## Explicitly proxy special methods. Is there a better way to do this??
+    
+    def _getSpecialAttr(self, attr):
+        ## this just gives us an easy way to change the behavior of the special methods
+        return self._deferredAttr(attr)
+    
+    def __getitem__(self, *args):
+        return self._getSpecialAttr('__getitem__')(*args)
+    
+    def __setitem__(self, *args):
+        return self._getSpecialAttr('__setitem__')(*args, _callSync='off')
+        
+    def __setattr__(self, *args):
+        return self._getSpecialAttr('__setattr__')(*args, _callSync='off')
+        
+    def __str__(self, *args):
+        return self._getSpecialAttr('__str__')(*args, _returnType='value')
+        
+    def __len__(self, *args):
+        return self._getSpecialAttr('__len__')(*args)
+    
+    def __add__(self, *args):
+        return self._getSpecialAttr('__add__')(*args)
+    
+    def __sub__(self, *args):
+        return self._getSpecialAttr('__sub__')(*args)
+        
+    def __div__(self, *args):
+        return self._getSpecialAttr('__div__')(*args)
+        
+    def __truediv__(self, *args):
+        return self._getSpecialAttr('__truediv__')(*args)
+        
+    def __floordiv__(self, *args):
+        return self._getSpecialAttr('__floordiv__')(*args)
+        
+    def __mul__(self, *args):
+        return self._getSpecialAttr('__mul__')(*args)
+        
+    def __pow__(self, *args):
+        return self._getSpecialAttr('__pow__')(*args)
+        
+    def __iadd__(self, *args):
+        return self._getSpecialAttr('__iadd__')(*args, _callSync='off')
+    
+    def __isub__(self, *args):
+        return self._getSpecialAttr('__isub__')(*args, _callSync='off')
+        
+    def __idiv__(self, *args):
+        return self._getSpecialAttr('__idiv__')(*args, _callSync='off')
+        
+    def __itruediv__(self, *args):
+        return self._getSpecialAttr('__itruediv__')(*args, _callSync='off')
+        
+    def __ifloordiv__(self, *args):
+        return self._getSpecialAttr('__ifloordiv__')(*args, _callSync='off')
+        
+    def __imul__(self, *args):
+        return self._getSpecialAttr('__imul__')(*args, _callSync='off')
+        
+    def __ipow__(self, *args):
+        return self._getSpecialAttr('__ipow__')(*args, _callSync='off')
+        
+    def __rshift__(self, *args):
+        return self._getSpecialAttr('__rshift__')(*args)
+        
+    def __lshift__(self, *args):
+        return self._getSpecialAttr('__lshift__')(*args)
+        
+    def __irshift__(self, *args):
+        return self._getSpecialAttr('__irshift__')(*args, _callSync='off')
+        
+    def __ilshift__(self, *args):
+        return self._getSpecialAttr('__ilshift__')(*args, _callSync='off')
+        
+    def __eq__(self, *args):
+        return self._getSpecialAttr('__eq__')(*args)
+    
+    def __ne__(self, *args):
+        return self._getSpecialAttr('__ne__')(*args)
+        
+    def __lt__(self, *args):
+        return self._getSpecialAttr('__lt__')(*args)
+    
+    def __gt__(self, *args):
+        return self._getSpecialAttr('__gt__')(*args)
+        
+    def __le__(self, *args):
+        return self._getSpecialAttr('__le__')(*args)
+    
+    def __ge__(self, *args):
+        return self._getSpecialAttr('__ge__')(*args)
+        
+    def __and__(self, *args):
+        return self._getSpecialAttr('__and__')(*args)
+        
+    def __or__(self, *args):
+        return self._getSpecialAttr('__or__')(*args)
+        
+    def __xor__(self, *args):
+        return self._getSpecialAttr('__xor__')(*args)
+        
+    def __iand__(self, *args):
+        return self._getSpecialAttr('__iand__')(*args, _callSync='off')
+        
+    def __ior__(self, *args):
+        return self._getSpecialAttr('__ior__')(*args, _callSync='off')
+        
+    def __ixor__(self, *args):
+        return self._getSpecialAttr('__ixor__')(*args, _callSync='off')
+        
+    def __mod__(self, *args):
+        return self._getSpecialAttr('__mod__')(*args)
+        
+    def __radd__(self, *args):
+        return self._getSpecialAttr('__radd__')(*args)
+    
+    def __rsub__(self, *args):
+        return self._getSpecialAttr('__rsub__')(*args)
+        
+    def __rdiv__(self, *args):
+        return self._getSpecialAttr('__rdiv__')(*args)
+        
+    def __rfloordiv__(self, *args):
+        return self._getSpecialAttr('__rfloordiv__')(*args)
+        
+    def __rtruediv__(self, *args):
+        return self._getSpecialAttr('__rtruediv__')(*args)
+        
+    def __rmul__(self, *args):
+        return self._getSpecialAttr('__rmul__')(*args)
+        
+    def __rpow__(self, *args):
+        return self._getSpecialAttr('__rpow__')(*args)
+        
+    def __rrshift__(self, *args):
+        return self._getSpecialAttr('__rrshift__')(*args)
+        
+    def __rlshift__(self, *args):
+        return self._getSpecialAttr('__rlshift__')(*args)
+        
+    def __rand__(self, *args):
+        return self._getSpecialAttr('__rand__')(*args)
+        
+    def __ror__(self, *args):
+        return self._getSpecialAttr('__ror__')(*args)
+        
+    def __rxor__(self, *args):
+        return self._getSpecialAttr('__ror__')(*args)
+        
+    def __rmod__(self, *args):
+        return self._getSpecialAttr('__rmod__')(*args)
+        
+    def __hash__(self):
+        ## Required for python3 since __eq__ is defined.
+        return id(self)
+        
+class DeferredObjectProxy(ObjectProxy):
+    """
+    This class represents an attribute (or sub-attribute) of a proxied object.
+    It is used to speed up attribute requests. Take the following scenario::
+    
+        rsys = proc._import('sys')
+        rsys.stdout.write('hello')
+        
+    For this simple example, a total of 4 synchronous requests are made to 
+    the remote process: 
+    
+    1) import sys
+    2) getattr(sys, 'stdout')
+    3) getattr(stdout, 'write')
+    4) write('hello')
+    
+    This takes a lot longer than running the equivalent code locally. To
+    speed things up, we can 'defer' the two attribute lookups so they are
+    only carried out when neccessary::
+    
+        rsys = proc._import('sys')
+        rsys._setProxyOptions(deferGetattr=True)
+        rsys.stdout.write('hello')
+        
+    This example only makes two requests to the remote process; the two 
+    attribute lookups immediately return DeferredObjectProxy instances 
+    immediately without contacting the remote process. When the call 
+    to write() is made, all attribute requests are processed at the same time.
+    
+    Note that if the attributes requested do not exist on the remote object, 
+    making the call to write() will raise an AttributeError.
+    """
+    def __init__(self, parentProxy, attribute):
+        ## can't set attributes directly because setattr is overridden.
+        for k in ['_processId', '_typeStr', '_proxyId', '_handler']:
+            self.__dict__[k] = getattr(parentProxy, k)
+        self.__dict__['_parent'] = parentProxy  ## make sure parent stays alive
+        self.__dict__['_attributes'] = parentProxy._attributes + (attribute,)
+        self.__dict__['_proxyOptions'] = parentProxy._proxyOptions.copy()
+    
+    def __repr__(self):
+        return ObjectProxy.__repr__(self) + '.' + '.'.join(self._attributes)
+    
+    def _undefer(self):
+        """
+        Return a non-deferred ObjectProxy referencing the same object
+        """
+        return self._parent.__getattr__(self._attributes[-1], _deferGetattr=False)
+
diff --git a/libs/pyqtgraph/numpy_fix.py b/libs/pyqtgraph/numpy_fix.py
new file mode 100644
index 0000000000000000000000000000000000000000..2fa8ef1f0e745c9ed99a567347f962b03cec0809
--- /dev/null
+++ b/libs/pyqtgraph/numpy_fix.py
@@ -0,0 +1,22 @@
+try:
+    import numpy as np
+    
+    ## Wrap np.concatenate to catch and avoid a segmentation fault bug
+    ## (numpy trac issue #2084)
+    if not hasattr(np, 'concatenate_orig'):
+        np.concatenate_orig = np.concatenate
+    def concatenate(vals, *args, **kwds):
+        """Wrapper around numpy.concatenate (see pyqtgraph/numpy_fix.py)"""
+        dtypes = [getattr(v, 'dtype', None) for v in vals]
+        names = [getattr(dt, 'names', None) for dt in dtypes]
+        if len(dtypes) < 2 or all([n is None for n in names]):
+            return np.concatenate_orig(vals, *args, **kwds)
+        if any([dt != dtypes[0] for dt in dtypes[1:]]):
+            raise TypeError("Cannot concatenate structured arrays of different dtype.")
+        return np.concatenate_orig(vals, *args, **kwds)
+    
+    np.concatenate = concatenate
+    
+except ImportError:
+    pass
+
diff --git a/libs/pyqtgraph/opengl/GLGraphicsItem.py b/libs/pyqtgraph/opengl/GLGraphicsItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..12c5b70711cb5b2048bb89a30b4c5c63979a2ad1
--- /dev/null
+++ b/libs/pyqtgraph/opengl/GLGraphicsItem.py
@@ -0,0 +1,298 @@
+from ..Qt import QtGui, QtCore
+from .. import Transform3D
+from OpenGL.GL import *
+from OpenGL import GL
+
+GLOptions = {
+    'opaque': {
+        GL_DEPTH_TEST: True,
+        GL_BLEND: False,
+        GL_ALPHA_TEST: False,
+        GL_CULL_FACE: False,
+    },
+    'translucent': {
+        GL_DEPTH_TEST: True,
+        GL_BLEND: True,
+        GL_ALPHA_TEST: False,
+        GL_CULL_FACE: False,
+        'glBlendFunc': (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA),
+    },
+    'additive': {
+        GL_DEPTH_TEST: False,
+        GL_BLEND: True,
+        GL_ALPHA_TEST: False,
+        GL_CULL_FACE: False,
+        'glBlendFunc': (GL_SRC_ALPHA, GL_ONE),
+    },
+}    
+
+
+class GLGraphicsItem(QtCore.QObject):
+    _nextId = 0
+    
+    def __init__(self, parentItem=None):
+        QtCore.QObject.__init__(self)
+        self._id = GLGraphicsItem._nextId
+        GLGraphicsItem._nextId += 1
+        
+        self.__parent = None
+        self.__view = None
+        self.__children = set()
+        self.__transform = Transform3D()
+        self.__visible = True
+        self.setParentItem(parentItem)
+        self.setDepthValue(0)
+        self.__glOpts = {}
+        
+    def setParentItem(self, item):
+        """Set this item's parent in the scenegraph hierarchy."""
+        if self.__parent is not None:
+            self.__parent.__children.remove(self)
+        if item is not None:
+            item.__children.add(self)
+        self.__parent = item
+        
+        if self.__parent is not None and self.view() is not self.__parent.view():
+            if self.view() is not None:
+                self.view().removeItem(self)
+            self.__parent.view().addItem(self)
+    
+    def setGLOptions(self, opts):
+        """
+        Set the OpenGL state options to use immediately before drawing this item.
+        (Note that subclasses must call setupGLState before painting for this to work)
+        
+        The simplest way to invoke this method is to pass in the name of
+        a predefined set of options (see the GLOptions variable):
+        
+        ============= ======================================================
+        opaque        Enables depth testing and disables blending
+        translucent   Enables depth testing and blending
+                      Elements must be drawn sorted back-to-front for
+                      translucency to work correctly.
+        additive      Disables depth testing, enables blending.
+                      Colors are added together, so sorting is not required.
+        ============= ======================================================
+        
+        It is also possible to specify any arbitrary settings as a dictionary. 
+        This may consist of {'functionName': (args...)} pairs where functionName must 
+        be a callable attribute of OpenGL.GL, or {GL_STATE_VAR: bool} pairs 
+        which will be interpreted as calls to glEnable or glDisable(GL_STATE_VAR).
+        
+        For example::
+            
+            {
+                GL_ALPHA_TEST: True,
+                GL_CULL_FACE: False,
+                'glBlendFunc': (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA),
+            }
+            
+        
+        """
+        if isinstance(opts, basestring):
+            opts = GLOptions[opts]
+        self.__glOpts = opts.copy()
+        self.update()
+        
+    def updateGLOptions(self, opts):
+        """
+        Modify the OpenGL state options to use immediately before drawing this item.
+        *opts* must be a dictionary as specified by setGLOptions.
+        Values may also be None, in which case the key will be ignored.
+        """
+        self.__glOpts.update(opts)
+        
+    
+    def parentItem(self):
+        """Return a this item's parent in the scenegraph hierarchy."""
+        return self.__parent
+        
+    def childItems(self):
+        """Return a list of this item's children in the scenegraph hierarchy."""
+        return list(self.__children)
+        
+    def _setView(self, v):
+        self.__view = v
+        
+    def view(self):
+        return self.__view
+        
+    def setDepthValue(self, value):
+        """
+        Sets the depth value of this item. Default is 0.
+        This controls the order in which items are drawn--those with a greater depth value will be drawn later.
+        Items with negative depth values are drawn before their parent.
+        (This is analogous to QGraphicsItem.zValue)
+        The depthValue does NOT affect the position of the item or the values it imparts to the GL depth buffer.
+        """
+        self.__depthValue = value
+        
+    def depthValue(self):
+        """Return the depth value of this item. See setDepthValue for more information."""
+        return self.__depthValue
+        
+    def setTransform(self, tr):
+        """Set the local transform for this object.
+        Must be a :class:`Transform3D <pyqtgraph.Transform3D>` instance. This transform
+        determines how the local coordinate system of the item is mapped to the coordinate
+        system of its parent."""
+        self.__transform = Transform3D(tr)
+        self.update()
+        
+    def resetTransform(self):
+        """Reset this item's transform to an identity transformation."""
+        self.__transform.setToIdentity()
+        self.update()
+        
+    def applyTransform(self, tr, local):
+        """
+        Multiply this object's transform by *tr*. 
+        If local is True, then *tr* is multiplied on the right of the current transform::
+        
+            newTransform = transform * tr
+            
+        If local is False, then *tr* is instead multiplied on the left::
+        
+            newTransform = tr * transform
+        """
+        if local:
+            self.setTransform(self.transform() * tr)
+        else:
+            self.setTransform(tr * self.transform())
+        
+    def transform(self):
+        """Return this item's transform object."""
+        return self.__transform
+        
+    def viewTransform(self):
+        """Return the transform mapping this item's local coordinate system to the 
+        view coordinate system."""
+        tr = self.__transform
+        p = self
+        while True:
+            p = p.parentItem()
+            if p is None:
+                break
+            tr = p.transform() * tr
+        return Transform3D(tr)
+        
+    def translate(self, dx, dy, dz, local=False):
+        """
+        Translate the object by (*dx*, *dy*, *dz*) in its parent's coordinate system.
+        If *local* is True, then translation takes place in local coordinates.
+        """
+        tr = Transform3D()
+        tr.translate(dx, dy, dz)
+        self.applyTransform(tr, local=local)
+        
+    def rotate(self, angle, x, y, z, local=False):
+        """
+        Rotate the object around the axis specified by (x,y,z).
+        *angle* is in degrees.
+        
+        """
+        tr = Transform3D()
+        tr.rotate(angle, x, y, z)
+        self.applyTransform(tr, local=local)
+    
+    def scale(self, x, y, z, local=True):
+        """
+        Scale the object by (*dx*, *dy*, *dz*) in its local coordinate system.
+        If *local* is False, then scale takes place in the parent's coordinates.
+        """
+        tr = Transform3D()
+        tr.scale(x, y, z)
+        self.applyTransform(tr, local=local)
+    
+    
+    def hide(self):
+        """Hide this item. 
+        This is equivalent to setVisible(False)."""
+        self.setVisible(False)
+        
+    def show(self):
+        """Make this item visible if it was previously hidden.
+        This is equivalent to setVisible(True)."""
+        self.setVisible(True)
+    
+    def setVisible(self, vis):
+        """Set the visibility of this item."""
+        self.__visible = vis
+        self.update()
+        
+    def visible(self):
+        """Return True if the item is currently set to be visible.
+        Note that this does not guarantee that the item actually appears in the
+        view, as it may be obscured or outside of the current view area."""
+        return self.__visible
+    
+    
+    def initializeGL(self):
+        """
+        Called after an item is added to a GLViewWidget. 
+        The widget's GL context is made current before this method is called.
+        (So this would be an appropriate time to generate lists, upload textures, etc.)
+        """
+        pass
+    
+    def setupGLState(self):
+        """
+        This method is responsible for preparing the GL state options needed to render 
+        this item (blending, depth testing, etc). The method is called immediately before painting the item.
+        """
+        for k,v in self.__glOpts.items():
+            if v is None:
+                continue
+            if isinstance(k, basestring):
+                func = getattr(GL, k)
+                func(*v)
+            else:
+                if v is True:
+                    glEnable(k)
+                else:
+                    glDisable(k)
+    
+    def paint(self):
+        """
+        Called by the GLViewWidget to draw this item.
+        It is the responsibility of the item to set up its own modelview matrix,
+        but the caller will take care of pushing/popping.
+        """
+        self.setupGLState()
+        
+    def update(self):
+        """
+        Indicates that this item needs to be redrawn, and schedules an update 
+        with the view it is displayed in.
+        """
+        v = self.view()
+        if v is None:
+            return
+        v.update()
+        
+    def mapToParent(self, point):
+        tr = self.transform()
+        if tr is None:
+            return point
+        return tr.map(point)
+        
+    def mapFromParent(self, point):
+        tr = self.transform()
+        if tr is None:
+            return point
+        return tr.inverted()[0].map(point)
+        
+    def mapToView(self, point):
+        tr = self.viewTransform()
+        if tr is None:
+            return point
+        return tr.map(point)
+        
+    def mapFromView(self, point):
+        tr = self.viewTransform()
+        if tr is None:
+            return point
+        return tr.inverted()[0].map(point)
+        
+        
+        
\ No newline at end of file
diff --git a/libs/pyqtgraph/opengl/GLViewWidget.py b/libs/pyqtgraph/opengl/GLViewWidget.py
new file mode 100644
index 0000000000000000000000000000000000000000..0ab91188d20b502d9d87f4a11cdadabea714a6f0
--- /dev/null
+++ b/libs/pyqtgraph/opengl/GLViewWidget.py
@@ -0,0 +1,471 @@
+from ..Qt import QtCore, QtGui, QtOpenGL, USE_PYQT5
+from OpenGL.GL import *
+import OpenGL.GL.framebufferobjects as glfbo
+import numpy as np
+from .. import Vector
+from .. import functions as fn
+
+##Vector = QtGui.QVector3D
+
+ShareWidget = None
+
+class GLViewWidget(QtOpenGL.QGLWidget):
+    """
+    Basic widget for displaying 3D data
+        - Rotation/scale controls
+        - Axis/grid display
+        - Export options
+
+    """
+    
+    def __init__(self, parent=None):
+        global ShareWidget
+
+        if ShareWidget is None:
+            ## create a dummy widget to allow sharing objects (textures, shaders, etc) between views
+            ShareWidget = QtOpenGL.QGLWidget()
+            
+        QtOpenGL.QGLWidget.__init__(self, parent, ShareWidget)
+        
+        self.setFocusPolicy(QtCore.Qt.ClickFocus)
+        
+        self.opts = {
+            'center': Vector(0,0,0),  ## will always appear at the center of the widget
+            'distance': 10.0,         ## distance of camera from center
+            'fov':  60,               ## horizontal field of view in degrees
+            'elevation':  30,         ## camera's angle of elevation in degrees
+            'azimuth': 45,            ## camera's azimuthal angle in degrees 
+                                      ## (rotation around z-axis 0 points along x-axis)
+            'viewport': None,         ## glViewport params; None == whole widget
+        }
+        self.setBackgroundColor('k')
+        self.items = []
+        self.noRepeatKeys = [QtCore.Qt.Key_Right, QtCore.Qt.Key_Left, QtCore.Qt.Key_Up, QtCore.Qt.Key_Down, QtCore.Qt.Key_PageUp, QtCore.Qt.Key_PageDown]
+        self.keysPressed = {}
+        self.keyTimer = QtCore.QTimer()
+        self.keyTimer.timeout.connect(self.evalKeyState)
+        
+        self.makeCurrent()
+
+    def addItem(self, item):
+        self.items.append(item)
+        if hasattr(item, 'initializeGL'):
+            self.makeCurrent()
+            try:
+                item.initializeGL()
+            except:
+                self.checkOpenGLVersion('Error while adding item %s to GLViewWidget.' % str(item))
+                
+        item._setView(self)
+        #print "set view", item, self, item.view()
+        self.update()
+        
+    def removeItem(self, item):
+        self.items.remove(item)
+        item._setView(None)
+        self.update()
+        
+        
+    def initializeGL(self):
+        self.resizeGL(self.width(), self.height())
+        
+    def setBackgroundColor(self, *args, **kwds):
+        """
+        Set the background color of the widget. Accepts the same arguments as
+        pg.mkColor().
+        """
+        self.opts['bgcolor'] = fn.mkColor(*args, **kwds)
+        self.update()
+        
+    def getViewport(self):
+        vp = self.opts['viewport']
+        if vp is None:
+            return (0, 0, self.width(), self.height())
+        else:
+            return vp
+        
+    def resizeGL(self, w, h):
+        pass
+        #glViewport(*self.getViewport())
+        #self.update()
+
+    def setProjection(self, region=None):
+        m = self.projectionMatrix(region)
+        glMatrixMode(GL_PROJECTION)
+        glLoadIdentity()
+        a = np.array(m.copyDataTo()).reshape((4,4))
+        glMultMatrixf(a.transpose())
+
+    def projectionMatrix(self, region=None):
+        # Xw = (Xnd + 1) * width/2 + X
+        if region is None:
+            region = (0, 0, self.width(), self.height())
+        
+        x0, y0, w, h = self.getViewport()
+        dist = self.opts['distance']
+        fov = self.opts['fov']
+        nearClip = dist * 0.001
+        farClip = dist * 1000.
+
+        r = nearClip * np.tan(fov * 0.5 * np.pi / 180.)
+        t = r * h / w
+
+        # convert screen coordinates (region) to normalized device coordinates
+        # Xnd = (Xw - X0) * 2/width - 1
+        ## Note that X0 and width in these equations must be the values used in viewport
+        left  = r * ((region[0]-x0) * (2.0/w) - 1)
+        right = r * ((region[0]+region[2]-x0) * (2.0/w) - 1)
+        bottom = t * ((region[1]-y0) * (2.0/h) - 1)
+        top    = t * ((region[1]+region[3]-y0) * (2.0/h) - 1)
+
+        tr = QtGui.QMatrix4x4()
+        tr.frustum(left, right, bottom, top, nearClip, farClip)
+        return tr
+        
+    def setModelview(self):
+        glMatrixMode(GL_MODELVIEW)
+        glLoadIdentity()
+        m = self.viewMatrix()
+        a = np.array(m.copyDataTo()).reshape((4,4))
+        glMultMatrixf(a.transpose())
+        
+    def viewMatrix(self):
+        tr = QtGui.QMatrix4x4()
+        tr.translate( 0.0, 0.0, -self.opts['distance'])
+        tr.rotate(self.opts['elevation']-90, 1, 0, 0)
+        tr.rotate(self.opts['azimuth']+90, 0, 0, -1)
+        center = self.opts['center']
+        tr.translate(-center.x(), -center.y(), -center.z())
+        return tr
+
+    def itemsAt(self, region=None):
+        """
+        Return a list of the items displayed in the region (x, y, w, h)
+        relative to the widget.        
+        """
+        region = (region[0], self.height()-(region[1]+region[3]), region[2], region[3])
+        
+        #buf = np.zeros(100000, dtype=np.uint)
+        buf = glSelectBuffer(100000)
+        try:
+            glRenderMode(GL_SELECT)
+            glInitNames()
+            glPushName(0)
+            self._itemNames = {}
+            self.paintGL(region=region, useItemNames=True)
+            
+        finally:
+            hits = glRenderMode(GL_RENDER)
+            
+        items = [(h.near, h.names[0]) for h in hits]
+        items.sort(key=lambda i: i[0])
+        return [self._itemNames[i[1]] for i in items]
+    
+    def paintGL(self, region=None, viewport=None, useItemNames=False):
+        """
+        viewport specifies the arguments to glViewport. If None, then we use self.opts['viewport']
+        region specifies the sub-region of self.opts['viewport'] that should be rendered.
+        Note that we may use viewport != self.opts['viewport'] when exporting.
+        """
+        if viewport is None:
+            glViewport(*self.getViewport())
+        else:
+            glViewport(*viewport)
+        self.setProjection(region=region)
+        self.setModelview()
+        bgcolor = self.opts['bgcolor']
+        glClearColor(bgcolor.red(), bgcolor.green(), bgcolor.blue(), 1.0)
+        glClear( GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT )
+        self.drawItemTree(useItemNames=useItemNames)
+        
+    def drawItemTree(self, item=None, useItemNames=False):
+        if item is None:
+            items = [x for x in self.items if x.parentItem() is None]
+        else:
+            items = item.childItems()
+            items.append(item)
+        items.sort(key=lambda a: a.depthValue())
+        for i in items:
+            if not i.visible():
+                continue
+            if i is item:
+                try:
+                    glPushAttrib(GL_ALL_ATTRIB_BITS)
+                    if useItemNames:
+                        glLoadName(i._id)
+                        self._itemNames[i._id] = i
+                    i.paint()
+                except:
+                    from .. import debug
+                    debug.printExc()
+                    msg = "Error while drawing item %s." % str(item)
+                    ver = glGetString(GL_VERSION)
+                    if ver is not None:
+                        ver = ver.split()[0]
+                        if int(ver.split(b'.')[0]) < 2:
+                            print(msg + " The original exception is printed above; however, pyqtgraph requires OpenGL version 2.0 or greater for many of its 3D features and your OpenGL version is %s. Installing updated display drivers may resolve this issue." % ver)
+                        else:
+                            print(msg)
+                    
+                finally:
+                    glPopAttrib()
+            else:
+                glMatrixMode(GL_MODELVIEW)
+                glPushMatrix()
+                try:
+                    tr = i.transform()
+                    a = np.array(tr.copyDataTo()).reshape((4,4))
+                    glMultMatrixf(a.transpose())
+                    self.drawItemTree(i, useItemNames=useItemNames)
+                finally:
+                    glMatrixMode(GL_MODELVIEW)
+                    glPopMatrix()
+            
+    def setCameraPosition(self, pos=None, distance=None, elevation=None, azimuth=None):
+        if distance is not None:
+            self.opts['distance'] = distance
+        if elevation is not None:
+            self.opts['elevation'] = elevation
+        if azimuth is not None:
+            self.opts['azimuth'] = azimuth
+        self.update()
+        
+        
+        
+    def cameraPosition(self):
+        """Return current position of camera based on center, dist, elevation, and azimuth"""
+        center = self.opts['center']
+        dist = self.opts['distance']
+        elev = self.opts['elevation'] * np.pi/180.
+        azim = self.opts['azimuth'] * np.pi/180.
+        
+        pos = Vector(
+            center.x() + dist * np.cos(elev) * np.cos(azim),
+            center.y() + dist * np.cos(elev) * np.sin(azim),
+            center.z() + dist * np.sin(elev)
+        )
+        
+        return pos
+
+    def orbit(self, azim, elev):
+        """Orbits the camera around the center position. *azim* and *elev* are given in degrees."""
+        self.opts['azimuth'] += azim
+        #self.opts['elevation'] += elev
+        self.opts['elevation'] = np.clip(self.opts['elevation'] + elev, -90, 90)
+        self.update()
+        
+    def pan(self, dx, dy, dz, relative=False):
+        """
+        Moves the center (look-at) position while holding the camera in place. 
+        
+        If relative=True, then the coordinates are interpreted such that x
+        if in the global xy plane and points to the right side of the view, y is
+        in the global xy plane and orthogonal to x, and z points in the global z
+        direction. Distances are scaled roughly such that a value of 1.0 moves
+        by one pixel on screen.
+        
+        """
+        if not relative:
+            self.opts['center'] += QtGui.QVector3D(dx, dy, dz)
+        else:
+            cPos = self.cameraPosition()
+            cVec = self.opts['center'] - cPos
+            dist = cVec.length()  ## distance from camera to center
+            xDist = dist * 2. * np.tan(0.5 * self.opts['fov'] * np.pi / 180.)  ## approx. width of view at distance of center point
+            xScale = xDist / self.width()
+            zVec = QtGui.QVector3D(0,0,1)
+            xVec = QtGui.QVector3D.crossProduct(zVec, cVec).normalized()
+            yVec = QtGui.QVector3D.crossProduct(xVec, zVec).normalized()
+            self.opts['center'] = self.opts['center'] + xVec * xScale * dx + yVec * xScale * dy + zVec * xScale * dz
+        self.update()
+        
+    def pixelSize(self, pos):
+        """
+        Return the approximate size of a screen pixel at the location pos
+        Pos may be a Vector or an (N,3) array of locations
+        """
+        cam = self.cameraPosition()
+        if isinstance(pos, np.ndarray):
+            cam = np.array(cam).reshape((1,)*(pos.ndim-1)+(3,))
+            dist = ((pos-cam)**2).sum(axis=-1)**0.5
+        else:
+            dist = (pos-cam).length()
+        xDist = dist * 2. * np.tan(0.5 * self.opts['fov'] * np.pi / 180.)
+        return xDist / self.width()
+        
+    def mousePressEvent(self, ev):
+        self.mousePos = ev.pos()
+        
+    def mouseMoveEvent(self, ev):
+        diff = ev.pos() - self.mousePos
+        self.mousePos = ev.pos()
+        
+        if ev.buttons() == QtCore.Qt.LeftButton:
+            self.orbit(-diff.x(), diff.y())
+            #print self.opts['azimuth'], self.opts['elevation']
+        elif ev.buttons() == QtCore.Qt.MidButton:
+            if (ev.modifiers() & QtCore.Qt.ControlModifier):
+                self.pan(diff.x(), 0, diff.y(), relative=True)
+            else:
+                self.pan(diff.x(), diff.y(), 0, relative=True)
+        
+    def mouseReleaseEvent(self, ev):
+        pass
+        # Example item selection code:
+        #region = (ev.pos().x()-5, ev.pos().y()-5, 10, 10)
+        #print(self.itemsAt(region))
+        
+        ## debugging code: draw the picking region
+        #glViewport(*self.getViewport())
+        #glClear( GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT )
+        #region = (region[0], self.height()-(region[1]+region[3]), region[2], region[3])
+        #self.paintGL(region=region)
+        #self.swapBuffers()
+        
+        
+    def wheelEvent(self, ev):
+        delta = 0
+        if not USE_PYQT5:
+            delta = ev.delta()
+        else:
+            delta = ev.angleDelta().x()
+            if delta == 0:
+                delta = ev.angleDelta().y()
+        if (ev.modifiers() & QtCore.Qt.ControlModifier):
+            self.opts['fov'] *= 0.999**delta
+        else:
+            self.opts['distance'] *= 0.999**delta
+        self.update()
+
+    def keyPressEvent(self, ev):
+        if ev.key() in self.noRepeatKeys:
+            ev.accept()
+            if ev.isAutoRepeat():
+                return
+            self.keysPressed[ev.key()] = 1
+            self.evalKeyState()
+      
+    def keyReleaseEvent(self, ev):
+        if ev.key() in self.noRepeatKeys:
+            ev.accept()
+            if ev.isAutoRepeat():
+                return
+            try:
+                del self.keysPressed[ev.key()]
+            except:
+                self.keysPressed = {}
+            self.evalKeyState()
+        
+    def evalKeyState(self):
+        speed = 2.0
+        if len(self.keysPressed) > 0:
+            for key in self.keysPressed:
+                if key == QtCore.Qt.Key_Right:
+                    self.orbit(azim=-speed, elev=0)
+                elif key == QtCore.Qt.Key_Left:
+                    self.orbit(azim=speed, elev=0)
+                elif key == QtCore.Qt.Key_Up:
+                    self.orbit(azim=0, elev=-speed)
+                elif key == QtCore.Qt.Key_Down:
+                    self.orbit(azim=0, elev=speed)
+                elif key == QtCore.Qt.Key_PageUp:
+                    pass
+                elif key == QtCore.Qt.Key_PageDown:
+                    pass
+                self.keyTimer.start(16)
+        else:
+            self.keyTimer.stop()
+
+    def checkOpenGLVersion(self, msg):
+        ## Only to be called from within exception handler.
+        ver = glGetString(GL_VERSION).split()[0]
+        if int(ver.split('.')[0]) < 2:
+            from .. import debug
+            pyqtgraph.debug.printExc()
+            raise Exception(msg + " The original exception is printed above; however, pyqtgraph requires OpenGL version 2.0 or greater for many of its 3D features and your OpenGL version is %s. Installing updated display drivers may resolve this issue." % ver)
+        else:
+            raise
+            
+
+            
+    def readQImage(self):
+        """
+        Read the current buffer pixels out as a QImage.
+        """
+        w = self.width()
+        h = self.height()
+        self.repaint()
+        pixels = np.empty((h, w, 4), dtype=np.ubyte)
+        pixels[:] = 128
+        pixels[...,0] = 50
+        pixels[...,3] = 255
+        
+        glReadPixels(0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, pixels)
+        
+        # swap B,R channels for Qt
+        tmp = pixels[...,0].copy()
+        pixels[...,0] = pixels[...,2]
+        pixels[...,2] = tmp
+        pixels = pixels[::-1] # flip vertical
+        
+        img = fn.makeQImage(pixels, transpose=False)
+        return img
+        
+        
+    def renderToArray(self, size, format=GL_BGRA, type=GL_UNSIGNED_BYTE, textureSize=1024, padding=256):
+        w,h = map(int, size)
+        
+        self.makeCurrent()
+        tex = None
+        fb = None
+        try:
+            output = np.empty((w, h, 4), dtype=np.ubyte)
+            fb = glfbo.glGenFramebuffers(1)
+            glfbo.glBindFramebuffer(glfbo.GL_FRAMEBUFFER, fb )
+            
+            glEnable(GL_TEXTURE_2D)
+            tex = glGenTextures(1)
+            glBindTexture(GL_TEXTURE_2D, tex)
+            texwidth = textureSize
+            data = np.zeros((texwidth,texwidth,4), dtype=np.ubyte)
+            
+            ## Test texture dimensions first
+            glTexImage2D(GL_PROXY_TEXTURE_2D, 0, GL_RGBA, texwidth, texwidth, 0, GL_RGBA, GL_UNSIGNED_BYTE, None)
+            if glGetTexLevelParameteriv(GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH) == 0:
+                raise Exception("OpenGL failed to create 2D texture (%dx%d); too large for this hardware." % shape[:2])
+            ## create teture
+            glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texwidth, texwidth, 0, GL_RGBA, GL_UNSIGNED_BYTE, data.transpose((1,0,2)))
+            
+            self.opts['viewport'] = (0, 0, w, h)  # viewport is the complete image; this ensures that paintGL(region=...) 
+                                                  # is interpreted correctly.
+            p2 = 2 * padding
+            for x in range(-padding, w-padding, texwidth-p2):
+                for y in range(-padding, h-padding, texwidth-p2):
+                    x2 = min(x+texwidth, w+padding)
+                    y2 = min(y+texwidth, h+padding)
+                    w2 = x2-x
+                    h2 = y2-y
+                    
+                    ## render to texture
+                    glfbo.glFramebufferTexture2D(glfbo.GL_FRAMEBUFFER, glfbo.GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tex, 0)
+                    
+                    self.paintGL(region=(x, h-y-h2, w2, h2), viewport=(0, 0, w2, h2))  # only render sub-region
+                    
+                    ## read texture back to array
+                    data = glGetTexImage(GL_TEXTURE_2D, 0, format, type)
+                    data = np.fromstring(data, dtype=np.ubyte).reshape(texwidth,texwidth,4).transpose(1,0,2)[:, ::-1]
+                    output[x+padding:x2-padding, y+padding:y2-padding] = data[padding:w2-padding, -(h2-padding):-padding]
+                    
+        finally:
+            self.opts['viewport'] = None
+            glfbo.glBindFramebuffer(glfbo.GL_FRAMEBUFFER, 0)
+            glBindTexture(GL_TEXTURE_2D, 0)
+            if tex is not None:
+                glDeleteTextures([tex])
+            if fb is not None:
+                glfbo.glDeleteFramebuffers([fb])
+            
+        return output
+        
+        
+        
diff --git a/libs/pyqtgraph/opengl/MeshData.py b/libs/pyqtgraph/opengl/MeshData.py
new file mode 100644
index 0000000000000000000000000000000000000000..5adf4b648806ecb57d1e079ed97f79794797afc7
--- /dev/null
+++ b/libs/pyqtgraph/opengl/MeshData.py
@@ -0,0 +1,504 @@
+from ..Qt import QtGui
+from .. import functions as fn
+import numpy as np
+
+class MeshData(object):
+    """
+    Class for storing and operating on 3D mesh data. May contain:
+    
+    - list of vertex locations
+    - list of edges
+    - list of triangles
+    - colors per vertex, edge, or tri
+    - normals per vertex or tri
+    
+    This class handles conversion between the standard [list of vertexes, list of faces]
+    format (suitable for use with glDrawElements) and 'indexed' [list of vertexes] format
+    (suitable for use with glDrawArrays). It will automatically compute face normal
+    vectors as well as averaged vertex normal vectors. 
+    
+    The class attempts to be as efficient as possible in caching conversion results and
+    avoiding unnecessary conversions.
+    """
+
+    def __init__(self, vertexes=None, faces=None, edges=None, vertexColors=None, faceColors=None):
+        """
+        ==============  =====================================================
+        **Arguments:**
+        vertexes        (Nv, 3) array of vertex coordinates.
+                        If faces is not specified, then this will instead be
+                        interpreted as (Nf, 3, 3) array of coordinates.
+        faces           (Nf, 3) array of indexes into the vertex array.
+        edges           [not available yet]
+        vertexColors    (Nv, 4) array of vertex colors.
+                        If faces is not specified, then this will instead be
+                        interpreted as (Nf, 3, 4) array of colors.
+        faceColors      (Nf, 4) array of face colors.
+        ==============  =====================================================
+        
+        All arguments are optional.
+        """
+        self._vertexes = None  # (Nv,3) array of vertex coordinates
+        self._vertexesIndexedByFaces = None   #  (Nf, 3, 3) array of vertex coordinates
+        self._vertexesIndexedByEdges = None   #  (Ne, 2, 3) array of vertex coordinates
+        
+        ## mappings between vertexes, faces, and edges
+        self._faces = None   # Nx3 array of indexes into self._vertexes specifying three vertexes for each face
+        self._edges = None   # Nx2 array of indexes into self._vertexes specifying two vertexes per edge
+        self._vertexFaces = None  ## maps vertex ID to a list of face IDs (inverse mapping of _faces)
+        self._vertexEdges = None  ## maps vertex ID to a list of edge IDs (inverse mapping of _edges)
+        
+        ## Per-vertex data
+        self._vertexNormals = None                # (Nv, 3) array of normals, one per vertex
+        self._vertexNormalsIndexedByFaces = None  # (Nf, 3, 3) array of normals
+        self._vertexColors = None                 # (Nv, 3) array of colors
+        self._vertexColorsIndexedByFaces = None   # (Nf, 3, 4) array of colors
+        self._vertexColorsIndexedByEdges = None   # (Nf, 2, 4) array of colors
+        
+        ## Per-face data
+        self._faceNormals = None                # (Nf, 3) array of face normals
+        self._faceNormalsIndexedByFaces = None  # (Nf, 3, 3) array of face normals
+        self._faceColors = None                 # (Nf, 4) array of face colors
+        self._faceColorsIndexedByFaces = None   # (Nf, 3, 4) array of face colors
+        self._faceColorsIndexedByEdges = None   # (Ne, 2, 4) array of face colors
+        
+        ## Per-edge data
+        self._edgeColors = None                # (Ne, 4) array of edge colors
+        self._edgeColorsIndexedByEdges = None  # (Ne, 2, 4) array of edge colors
+        #self._meshColor = (1, 1, 1, 0.1)  # default color to use if no face/edge/vertex colors are given
+        
+        
+        
+        if vertexes is not None:
+            if faces is None:
+                self.setVertexes(vertexes, indexed='faces')
+                if vertexColors is not None:
+                    self.setVertexColors(vertexColors, indexed='faces')
+                if faceColors is not None:
+                    self.setFaceColors(faceColors, indexed='faces')
+            else:
+                self.setVertexes(vertexes)
+                self.setFaces(faces)
+                if vertexColors is not None:
+                    self.setVertexColors(vertexColors)
+                if faceColors is not None:
+                    self.setFaceColors(faceColors)
+            
+    def faces(self):
+        """Return an array (Nf, 3) of vertex indexes, three per triangular face in the mesh.
+        
+        If faces have not been computed for this mesh, the function returns None.
+        """
+        return self._faces
+    
+    def edges(self):
+        """Return an array (Nf, 3) of vertex indexes, two per edge in the mesh."""
+        if self._edges is None:
+            self._computeEdges()
+        return self._edges
+        
+    def setFaces(self, faces):
+        """Set the (Nf, 3) array of faces. Each rown in the array contains
+        three indexes into the vertex array, specifying the three corners 
+        of a triangular face."""
+        self._faces = faces
+        self._edges = None
+        self._vertexFaces = None
+        self._vertexesIndexedByFaces = None
+        self.resetNormals()
+        self._vertexColorsIndexedByFaces = None
+        self._faceColorsIndexedByFaces = None
+    
+    def vertexes(self, indexed=None):
+        """Return an array (N,3) of the positions of vertexes in the mesh. 
+        By default, each unique vertex appears only once in the array.
+        If indexed is 'faces', then the array will instead contain three vertexes
+        per face in the mesh (and a single vertex may appear more than once in the array)."""
+        if indexed is None:
+            if self._vertexes is None and self._vertexesIndexedByFaces is not None:
+                self._computeUnindexedVertexes()
+            return self._vertexes
+        elif indexed == 'faces':
+            if self._vertexesIndexedByFaces is None and self._vertexes is not None:
+                self._vertexesIndexedByFaces = self._vertexes[self.faces()]
+            return self._vertexesIndexedByFaces
+        else:
+            raise Exception("Invalid indexing mode. Accepts: None, 'faces'")
+        
+    def setVertexes(self, verts=None, indexed=None, resetNormals=True):
+        """
+        Set the array (Nv, 3) of vertex coordinates.
+        If indexed=='faces', then the data must have shape (Nf, 3, 3) and is
+        assumed to be already indexed as a list of faces.
+        This will cause any pre-existing normal vectors to be cleared
+        unless resetNormals=False.
+        """
+        if indexed is None:
+            if verts is not None:
+                self._vertexes = verts
+            self._vertexesIndexedByFaces = None
+        elif indexed=='faces':
+            self._vertexes = None
+            if verts is not None:
+                self._vertexesIndexedByFaces = verts
+        else:
+            raise Exception("Invalid indexing mode. Accepts: None, 'faces'")
+        
+        if resetNormals:
+            self.resetNormals()
+    
+    def resetNormals(self):
+        self._vertexNormals = None
+        self._vertexNormalsIndexedByFaces = None
+        self._faceNormals = None
+        self._faceNormalsIndexedByFaces = None
+        
+    def hasFaceIndexedData(self):
+        """Return True if this object already has vertex positions indexed by face"""
+        return self._vertexesIndexedByFaces is not None
+    
+    def hasEdgeIndexedData(self):
+        return self._vertexesIndexedByEdges is not None
+    
+    def hasVertexColor(self):
+        """Return True if this data set has vertex color information"""
+        for v in (self._vertexColors, self._vertexColorsIndexedByFaces, self._vertexColorsIndexedByEdges):
+            if v is not None:
+                return True
+        return False
+        
+    def hasFaceColor(self):
+        """Return True if this data set has face color information"""
+        for v in (self._faceColors, self._faceColorsIndexedByFaces, self._faceColorsIndexedByEdges):
+            if v is not None:
+                return True
+        return False
+    
+    def faceNormals(self, indexed=None):
+        """
+        Return an array (Nf, 3) of normal vectors for each face.
+        If indexed='faces', then instead return an indexed array
+        (Nf, 3, 3)  (this is just the same array with each vector
+        copied three times).
+        """
+        if self._faceNormals is None:
+            v = self.vertexes(indexed='faces')
+            self._faceNormals = np.cross(v[:,1]-v[:,0], v[:,2]-v[:,0])
+        
+        if indexed is None:
+            return self._faceNormals
+        elif indexed == 'faces':
+            if self._faceNormalsIndexedByFaces is None:
+                norms = np.empty((self._faceNormals.shape[0], 3, 3))
+                norms[:] = self._faceNormals[:,np.newaxis,:]
+                self._faceNormalsIndexedByFaces = norms
+            return self._faceNormalsIndexedByFaces
+        else:
+            raise Exception("Invalid indexing mode. Accepts: None, 'faces'")
+        
+    def vertexNormals(self, indexed=None):
+        """
+        Return an array of normal vectors.
+        By default, the array will be (N, 3) with one entry per unique vertex in the mesh.
+        If indexed is 'faces', then the array will contain three normal vectors per face
+        (and some vertexes may be repeated).
+        """
+        if self._vertexNormals is None:
+            faceNorms = self.faceNormals()
+            vertFaces = self.vertexFaces()
+            self._vertexNormals = np.empty(self._vertexes.shape, dtype=float)
+            for vindex in xrange(self._vertexes.shape[0]):
+                faces = vertFaces[vindex]
+                if len(faces) == 0:
+                    self._vertexNormals[vindex] = (0,0,0)
+                    continue
+                norms = faceNorms[faces]  ## get all face normals
+                norm = norms.sum(axis=0)       ## sum normals
+                norm /= (norm**2).sum()**0.5  ## and re-normalize
+                self._vertexNormals[vindex] = norm
+                
+        if indexed is None:
+            return self._vertexNormals
+        elif indexed == 'faces':
+            return self._vertexNormals[self.faces()]
+        else:
+            raise Exception("Invalid indexing mode. Accepts: None, 'faces'")
+        
+    def vertexColors(self, indexed=None):
+        """
+        Return an array (Nv, 4) of vertex colors.
+        If indexed=='faces', then instead return an indexed array
+        (Nf, 3, 4). 
+        """
+        if indexed is None:
+            return self._vertexColors
+        elif indexed == 'faces':
+            if self._vertexColorsIndexedByFaces is None:
+                self._vertexColorsIndexedByFaces = self._vertexColors[self.faces()]
+            return self._vertexColorsIndexedByFaces
+        else:
+            raise Exception("Invalid indexing mode. Accepts: None, 'faces'")
+        
+    def setVertexColors(self, colors, indexed=None):
+        """
+        Set the vertex color array (Nv, 4).
+        If indexed=='faces', then the array will be interpreted
+        as indexed and should have shape (Nf, 3, 4)
+        """
+        if indexed is None:
+            self._vertexColors = colors
+            self._vertexColorsIndexedByFaces = None
+        elif indexed == 'faces':
+            self._vertexColors = None
+            self._vertexColorsIndexedByFaces = colors
+        else:
+            raise Exception("Invalid indexing mode. Accepts: None, 'faces'")
+        
+    def faceColors(self, indexed=None):
+        """
+        Return an array (Nf, 4) of face colors.
+        If indexed=='faces', then instead return an indexed array
+        (Nf, 3, 4)  (note this is just the same array with each color
+        repeated three times). 
+        """
+        if indexed is None:
+            return self._faceColors
+        elif indexed == 'faces':
+            if self._faceColorsIndexedByFaces is None and self._faceColors is not None:
+                Nf = self._faceColors.shape[0]
+                self._faceColorsIndexedByFaces = np.empty((Nf, 3, 4), dtype=self._faceColors.dtype)
+                self._faceColorsIndexedByFaces[:] = self._faceColors.reshape(Nf, 1, 4)
+            return self._faceColorsIndexedByFaces
+        else:
+            raise Exception("Invalid indexing mode. Accepts: None, 'faces'")
+        
+    def setFaceColors(self, colors, indexed=None):
+        """
+        Set the face color array (Nf, 4).
+        If indexed=='faces', then the array will be interpreted
+        as indexed and should have shape (Nf, 3, 4)
+        """
+        if indexed is None:
+            self._faceColors = colors
+            self._faceColorsIndexedByFaces = None
+        elif indexed == 'faces':
+            self._faceColors = None
+            self._faceColorsIndexedByFaces = colors
+        else:
+            raise Exception("Invalid indexing mode. Accepts: None, 'faces'")
+        
+    def faceCount(self):
+        """
+        Return the number of faces in the mesh.
+        """
+        if self._faces is not None:
+            return self._faces.shape[0]
+        elif self._vertexesIndexedByFaces is not None:
+            return self._vertexesIndexedByFaces.shape[0]
+        
+    def edgeColors(self):
+        return self._edgeColors
+        
+    #def _setIndexedFaces(self, faces, vertexColors=None, faceColors=None):
+        #self._vertexesIndexedByFaces = faces
+        #self._vertexColorsIndexedByFaces = vertexColors
+        #self._faceColorsIndexedByFaces = faceColors
+        
+    def _computeUnindexedVertexes(self):
+        ## Given (Nv, 3, 3) array of vertexes-indexed-by-face, convert backward to unindexed vertexes
+        ## This is done by collapsing into a list of 'unique' vertexes (difference < 1e-14) 
+        
+        ## I think generally this should be discouraged..
+        faces = self._vertexesIndexedByFaces
+        verts = {}  ## used to remember the index of each vertex position
+        self._faces = np.empty(faces.shape[:2], dtype=np.uint)
+        self._vertexes = []
+        self._vertexFaces = []
+        self._faceNormals = None
+        self._vertexNormals = None
+        for i in xrange(faces.shape[0]):
+            face = faces[i]
+            inds = []
+            for j in range(face.shape[0]):
+                pt = face[j]
+                pt2 = tuple([round(x*1e14) for x in pt])  ## quantize to be sure that nearly-identical points will be merged
+                index = verts.get(pt2, None)
+                if index is None:
+                    #self._vertexes.append(QtGui.QVector3D(*pt))
+                    self._vertexes.append(pt)
+                    self._vertexFaces.append([])
+                    index = len(self._vertexes)-1
+                    verts[pt2] = index
+                self._vertexFaces[index].append(i)  # keep track of which vertexes belong to which faces
+                self._faces[i,j] = index
+        self._vertexes = np.array(self._vertexes, dtype=float)
+    
+    #def _setUnindexedFaces(self, faces, vertexes, vertexColors=None, faceColors=None):
+        #self._vertexes = vertexes #[QtGui.QVector3D(*v) for v in vertexes]
+        #self._faces = faces.astype(np.uint)
+        #self._edges = None
+        #self._vertexFaces = None
+        #self._faceNormals = None
+        #self._vertexNormals = None
+        #self._vertexColors = vertexColors
+        #self._faceColors = faceColors
+
+    def vertexFaces(self):
+        """
+        Return list mapping each vertex index to a list of face indexes that use the vertex.
+        """
+        if self._vertexFaces is None:
+            self._vertexFaces = [[] for i in xrange(len(self.vertexes()))]
+            for i in xrange(self._faces.shape[0]):
+                face = self._faces[i]
+                for ind in face:
+                    self._vertexFaces[ind].append(i)
+        return self._vertexFaces
+        
+    #def reverseNormals(self):
+        #"""
+        #Reverses the direction of all normal vectors.
+        #"""
+        #pass
+        
+    #def generateEdgesFromFaces(self):
+        #"""
+        #Generate a set of edges by listing all the edges of faces and removing any duplicates.
+        #Useful for displaying wireframe meshes.
+        #"""
+        #pass
+        
+    def _computeEdges(self):
+        if not self.hasFaceIndexedData:
+            ## generate self._edges from self._faces
+            nf = len(self._faces)
+            edges = np.empty(nf*3, dtype=[('i', np.uint, 2)])
+            edges['i'][0:nf] = self._faces[:,:2]
+            edges['i'][nf:2*nf] = self._faces[:,1:3]
+            edges['i'][-nf:,0] = self._faces[:,2]
+            edges['i'][-nf:,1] = self._faces[:,0]
+            
+            # sort per-edge
+            mask = edges['i'][:,0] > edges['i'][:,1]
+            edges['i'][mask] = edges['i'][mask][:,::-1]
+            
+            # remove duplicate entries
+            self._edges = np.unique(edges)['i']
+            #print self._edges
+        elif self._vertexesIndexedByFaces is not None:
+            verts = self._vertexesIndexedByFaces
+            edges = np.empty((verts.shape[0], 3, 2), dtype=np.uint)
+            nf = verts.shape[0]
+            edges[:,0,0] = np.arange(nf) * 3
+            edges[:,0,1] = edges[:,0,0] + 1
+            edges[:,1,0] = edges[:,0,1]
+            edges[:,1,1] = edges[:,1,0] + 1
+            edges[:,2,0] = edges[:,1,1]
+            edges[:,2,1] = edges[:,0,0]
+            self._edges = edges
+        else:
+            raise Exception("MeshData cannot generate edges--no faces in this data.")
+        
+        
+    def save(self):
+        """Serialize this mesh to a string appropriate for disk storage"""
+        import pickle
+        if self._faces is not None:
+            names = ['_vertexes', '_faces']
+        else:
+            names = ['_vertexesIndexedByFaces']
+            
+        if self._vertexColors is not None:
+            names.append('_vertexColors')
+        elif self._vertexColorsIndexedByFaces is not None:
+            names.append('_vertexColorsIndexedByFaces')
+            
+        if self._faceColors is not None:
+            names.append('_faceColors')
+        elif self._faceColorsIndexedByFaces is not None:
+            names.append('_faceColorsIndexedByFaces')
+            
+        state = dict([(n,getattr(self, n)) for n in names])
+        return pickle.dumps(state)
+        
+    def restore(self, state):
+        """Restore the state of a mesh previously saved using save()"""
+        import pickle
+        state = pickle.loads(state)
+        for k in state:
+            if isinstance(state[k], list):
+                if isinstance(state[k][0], QtGui.QVector3D):
+                    state[k] = [[v.x(), v.y(), v.z()] for v in state[k]]
+                state[k] = np.array(state[k])
+            setattr(self, k, state[k])
+
+
+
+    @staticmethod
+    def sphere(rows, cols, radius=1.0, offset=True):
+        """
+        Return a MeshData instance with vertexes and faces computed
+        for a spherical surface.
+        """
+        verts = np.empty((rows+1, cols, 3), dtype=float)
+        
+        ## compute vertexes
+        phi = (np.arange(rows+1) * np.pi / rows).reshape(rows+1, 1)
+        s = radius * np.sin(phi)
+        verts[...,2] = radius * np.cos(phi)
+        th = ((np.arange(cols) * 2 * np.pi / cols).reshape(1, cols)) 
+        if offset:
+            th = th + ((np.pi / cols) * np.arange(rows+1).reshape(rows+1,1))  ## rotate each row by 1/2 column
+        verts[...,0] = s * np.cos(th)
+        verts[...,1] = s * np.sin(th)
+        verts = verts.reshape((rows+1)*cols, 3)[cols-1:-(cols-1)]  ## remove redundant vertexes from top and bottom
+        
+        ## compute faces
+        faces = np.empty((rows*cols*2, 3), dtype=np.uint)
+        rowtemplate1 = ((np.arange(cols).reshape(cols, 1) + np.array([[0, 1, 0]])) % cols) + np.array([[0, 0, cols]])
+        rowtemplate2 = ((np.arange(cols).reshape(cols, 1) + np.array([[0, 1, 1]])) % cols) + np.array([[cols, 0, cols]])
+        for row in range(rows):
+            start = row * cols * 2 
+            faces[start:start+cols] = rowtemplate1 + row * cols
+            faces[start+cols:start+(cols*2)] = rowtemplate2 + row * cols
+        faces = faces[cols:-cols]  ## cut off zero-area triangles at top and bottom
+        
+        ## adjust for redundant vertexes that were removed from top and bottom
+        vmin = cols-1
+        faces[faces<vmin] = vmin
+        faces -= vmin  
+        vmax = verts.shape[0]-1
+        faces[faces>vmax] = vmax
+        
+        return MeshData(vertexes=verts, faces=faces)
+        
+    @staticmethod
+    def cylinder(rows, cols, radius=[1.0, 1.0], length=1.0, offset=False):
+        """
+        Return a MeshData instance with vertexes and faces computed
+        for a cylindrical surface.
+        The cylinder may be tapered with different radii at each end (truncated cone)
+        """
+        verts = np.empty((rows+1, cols, 3), dtype=float)
+        if isinstance(radius, int):
+            radius = [radius, radius] # convert to list
+        ## compute vertexes
+        th = np.linspace(2 * np.pi, 0, cols).reshape(1, cols)
+        r = np.linspace(radius[0],radius[1],num=rows+1, endpoint=True).reshape(rows+1, 1) # radius as a function of z
+        verts[...,2] = np.linspace(0, length, num=rows+1, endpoint=True).reshape(rows+1, 1) # z
+        if offset:
+            th = th + ((np.pi / cols) * np.arange(rows+1).reshape(rows+1,1))  ## rotate each row by 1/2 column
+        verts[...,0] = r * np.cos(th) # x = r cos(th)
+        verts[...,1] = r * np.sin(th) # y = r sin(th)
+        verts = verts.reshape((rows+1)*cols, 3) # just reshape: no redundant vertices...
+        ## compute faces
+        faces = np.empty((rows*cols*2, 3), dtype=np.uint)
+        rowtemplate1 = ((np.arange(cols).reshape(cols, 1) + np.array([[0, 1, 0]])) % cols) + np.array([[0, 0, cols]])
+        rowtemplate2 = ((np.arange(cols).reshape(cols, 1) + np.array([[0, 1, 1]])) % cols) + np.array([[cols, 0, cols]])
+        for row in range(rows):
+            start = row * cols * 2 
+            faces[start:start+cols] = rowtemplate1 + row * cols
+            faces[start+cols:start+(cols*2)] = rowtemplate2 + row * cols
+        
+        return MeshData(vertexes=verts, faces=faces)
+        
diff --git a/libs/pyqtgraph/opengl/__init__.py b/libs/pyqtgraph/opengl/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..931003e4106dff4f5544dd5d121f0ea97bd538fd
--- /dev/null
+++ b/libs/pyqtgraph/opengl/__init__.py
@@ -0,0 +1,22 @@
+from .GLViewWidget import GLViewWidget
+
+## dynamic imports cause too many problems.
+#from .. import importAll
+#importAll('items', globals(), locals())
+
+from .items.GLGridItem import * 
+from .items.GLBarGraphItem import * 
+from .items.GLScatterPlotItem import *                                                                                                                      
+from .items.GLMeshItem import *                                                                                                                             
+from .items.GLLinePlotItem import *                                                                                                                         
+from .items.GLAxisItem import *                                                                                                                             
+from .items.GLImageItem import *                                                                                                                            
+from .items.GLSurfacePlotItem import *                                                                                                                      
+from .items.GLBoxItem import *                                                                                                                              
+from .items.GLVolumeItem import *                                                                                                                           
+
+from .MeshData import MeshData
+## for backward compatibility:
+#MeshData.MeshData = MeshData  ## breaks autodoc.
+
+from . import shaders
diff --git a/libs/pyqtgraph/opengl/glInfo.py b/libs/pyqtgraph/opengl/glInfo.py
new file mode 100644
index 0000000000000000000000000000000000000000..84346d81a75c0ebc34bce6073f9e2d4b5013efef
--- /dev/null
+++ b/libs/pyqtgraph/opengl/glInfo.py
@@ -0,0 +1,16 @@
+from ..Qt import QtCore, QtGui, QtOpenGL
+from OpenGL.GL import *
+app = QtGui.QApplication([])
+
+class GLTest(QtOpenGL.QGLWidget):
+    def __init__(self):
+        QtOpenGL.QGLWidget.__init__(self)
+        self.makeCurrent()
+        print("GL version:" + glGetString(GL_VERSION))
+        print("MAX_TEXTURE_SIZE: %d" % glGetIntegerv(GL_MAX_TEXTURE_SIZE))
+        print("MAX_3D_TEXTURE_SIZE: %d" % glGetIntegerv(GL_MAX_3D_TEXTURE_SIZE))
+        print("Extensions: " + glGetString(GL_EXTENSIONS))
+
+GLTest()
+
+
diff --git a/libs/pyqtgraph/opengl/items/GLAxisItem.py b/libs/pyqtgraph/opengl/items/GLAxisItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..989a44cad76c96f616ba495b47318495b74336da
--- /dev/null
+++ b/libs/pyqtgraph/opengl/items/GLAxisItem.py
@@ -0,0 +1,64 @@
+from OpenGL.GL import *
+from .. GLGraphicsItem import GLGraphicsItem
+from ... import QtGui
+
+__all__ = ['GLAxisItem']
+
+class GLAxisItem(GLGraphicsItem):
+    """
+    **Bases:** :class:`GLGraphicsItem <pyqtgraph.opengl.GLGraphicsItem>`
+    
+    Displays three lines indicating origin and orientation of local coordinate system. 
+    
+    """
+    
+    def __init__(self, size=None, antialias=True, glOptions='translucent'):
+        GLGraphicsItem.__init__(self)
+        if size is None:
+            size = QtGui.QVector3D(1,1,1)
+        self.antialias = antialias
+        self.setSize(size=size)
+        self.setGLOptions(glOptions)
+    
+    def setSize(self, x=None, y=None, z=None, size=None):
+        """
+        Set the size of the axes (in its local coordinate system; this does not affect the transform)
+        Arguments can be x,y,z or size=QVector3D().
+        """
+        if size is not None:
+            x = size.x()
+            y = size.y()
+            z = size.z()
+        self.__size = [x,y,z]
+        self.update()
+        
+    def size(self):
+        return self.__size[:]
+    
+    
+    def paint(self):
+
+        #glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
+        #glEnable( GL_BLEND )
+        #glEnable( GL_ALPHA_TEST )
+        self.setupGLState()
+        
+        if self.antialias:
+            glEnable(GL_LINE_SMOOTH)
+            glHint(GL_LINE_SMOOTH_HINT, GL_NICEST)
+            
+        glBegin( GL_LINES )
+        
+        x,y,z = self.size()
+        glColor4f(0, 1, 0, .6)  # z is green
+        glVertex3f(0, 0, 0)
+        glVertex3f(0, 0, z)
+
+        glColor4f(1, 1, 0, .6)  # y is yellow
+        glVertex3f(0, 0, 0)
+        glVertex3f(0, y, 0)
+
+        glColor4f(0, 0, 1, .6)  # x is blue
+        glVertex3f(0, 0, 0)
+        glVertex3f(x, 0, 0)
+        glEnd()
diff --git a/libs/pyqtgraph/opengl/items/GLBarGraphItem.py b/libs/pyqtgraph/opengl/items/GLBarGraphItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..b3060dc9ca697965d35d17c7fe2cb1d582c9c645
--- /dev/null
+++ b/libs/pyqtgraph/opengl/items/GLBarGraphItem.py
@@ -0,0 +1,29 @@
+from .GLMeshItem import GLMeshItem
+from ..MeshData import MeshData
+import numpy as np
+
+class GLBarGraphItem(GLMeshItem):
+    def __init__(self, pos, size):
+        """
+        pos is (...,3) array of the bar positions (the corner of each bar)
+        size is (...,3) array of the sizes of each bar
+        """
+        nCubes = reduce(lambda a,b: a*b, pos.shape[:-1])
+        cubeVerts = np.mgrid[0:2,0:2,0:2].reshape(3,8).transpose().reshape(1,8,3)
+        cubeFaces = np.array([
+            [0,1,2], [3,2,1],
+            [4,5,6], [7,6,5],
+            [0,1,4], [5,4,1],
+            [2,3,6], [7,6,3],
+            [0,2,4], [6,4,2],
+            [1,3,5], [7,5,3]]).reshape(1,12,3)
+        size = size.reshape((nCubes, 1, 3))
+        pos = pos.reshape((nCubes, 1, 3))
+        verts = cubeVerts * size + pos
+        faces = cubeFaces + (np.arange(nCubes) * 8).reshape(nCubes,1,1)
+        md = MeshData(verts.reshape(nCubes*8,3), faces.reshape(nCubes*12,3))
+        
+        GLMeshItem.__init__(self, meshdata=md, shader='shaded', smooth=False)
+
+        
+        
\ No newline at end of file
diff --git a/libs/pyqtgraph/opengl/items/GLBoxItem.py b/libs/pyqtgraph/opengl/items/GLBoxItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..f0a6ae6c91a66fd89471b25a61f82dd660d6a273
--- /dev/null
+++ b/libs/pyqtgraph/opengl/items/GLBoxItem.py
@@ -0,0 +1,88 @@
+from OpenGL.GL import *
+from .. GLGraphicsItem import GLGraphicsItem
+from ...Qt import QtGui
+from ... import functions as fn
+
+__all__ = ['GLBoxItem']
+
+class GLBoxItem(GLGraphicsItem):
+    """
+    **Bases:** :class:`GLGraphicsItem <pyqtgraph.opengl.GLGraphicsItem>`
+    
+    Displays a wire-frame box.
+    """
+    def __init__(self, size=None, color=None, glOptions='translucent'):
+        GLGraphicsItem.__init__(self)
+        if size is None:
+            size = QtGui.QVector3D(1,1,1)
+        self.setSize(size=size)
+        if color is None:
+            color = (255,255,255,80)
+        self.setColor(color)
+        self.setGLOptions(glOptions)
+    
+    def setSize(self, x=None, y=None, z=None, size=None):
+        """
+        Set the size of the box (in its local coordinate system; this does not affect the transform)
+        Arguments can be x,y,z or size=QVector3D().
+        """
+        if size is not None:
+            x = size.x()
+            y = size.y()
+            z = size.z()
+        self.__size = [x,y,z]
+        self.update()
+        
+    def size(self):
+        return self.__size[:]
+    
+    def setColor(self, *args):
+        """Set the color of the box. Arguments are the same as those accepted by functions.mkColor()"""
+        self.__color = fn.Color(*args)
+        
+    def color(self):
+        return self.__color
+    
+    def paint(self):
+        #glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
+        #glEnable( GL_BLEND )
+        #glEnable( GL_ALPHA_TEST )
+        ##glAlphaFunc( GL_ALWAYS,0.5 )
+        #glEnable( GL_POINT_SMOOTH )
+        #glDisable( GL_DEPTH_TEST )
+        self.setupGLState()
+        
+        glBegin( GL_LINES )
+        
+        glColor4f(*self.color().glColor())
+        x,y,z = self.size()
+        glVertex3f(0, 0, 0)
+        glVertex3f(0, 0, z)
+        glVertex3f(x, 0, 0)
+        glVertex3f(x, 0, z)
+        glVertex3f(0, y, 0)
+        glVertex3f(0, y, z)
+        glVertex3f(x, y, 0)
+        glVertex3f(x, y, z)
+
+        glVertex3f(0, 0, 0)
+        glVertex3f(0, y, 0)
+        glVertex3f(x, 0, 0)
+        glVertex3f(x, y, 0)
+        glVertex3f(0, 0, z)
+        glVertex3f(0, y, z)
+        glVertex3f(x, 0, z)
+        glVertex3f(x, y, z)
+        
+        glVertex3f(0, 0, 0)
+        glVertex3f(x, 0, 0)
+        glVertex3f(0, y, 0)
+        glVertex3f(x, y, 0)
+        glVertex3f(0, 0, z)
+        glVertex3f(x, 0, z)
+        glVertex3f(0, y, z)
+        glVertex3f(x, y, z)
+        
+        glEnd()
+        
+        
\ No newline at end of file
diff --git a/libs/pyqtgraph/opengl/items/GLGridItem.py b/libs/pyqtgraph/opengl/items/GLGridItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..4d6bc9d6d134cfa508e0d232f93e042bad5a3270
--- /dev/null
+++ b/libs/pyqtgraph/opengl/items/GLGridItem.py
@@ -0,0 +1,78 @@
+import numpy as np
+
+from OpenGL.GL import *
+from .. GLGraphicsItem import GLGraphicsItem
+from ... import QtGui
+
+__all__ = ['GLGridItem']
+
+class GLGridItem(GLGraphicsItem):
+    """
+    **Bases:** :class:`GLGraphicsItem <pyqtgraph.opengl.GLGraphicsItem>`
+    
+    Displays a wire-grame grid. 
+    """
+    
+    def __init__(self, size=None, color=None, antialias=True, glOptions='translucent'):
+        GLGraphicsItem.__init__(self)
+        self.setGLOptions(glOptions)
+        self.antialias = antialias
+        if size is None:
+            size = QtGui.QVector3D(20,20,1)
+        self.setSize(size=size)
+        self.setSpacing(1, 1, 1)
+    
+    def setSize(self, x=None, y=None, z=None, size=None):
+        """
+        Set the size of the axes (in its local coordinate system; this does not affect the transform)
+        Arguments can be x,y,z or size=QVector3D().
+        """
+        if size is not None:
+            x = size.x()
+            y = size.y()
+            z = size.z()
+        self.__size = [x,y,z]
+        self.update()
+        
+    def size(self):
+        return self.__size[:]
+
+    def setSpacing(self, x=None, y=None, z=None, spacing=None):
+        """
+        Set the spacing between grid lines.
+        Arguments can be x,y,z or spacing=QVector3D().
+        """
+        if spacing is not None:
+            x = spacing.x()
+            y = spacing.y()
+            z = spacing.z()
+        self.__spacing = [x,y,z]
+        self.update() 
+        
+    def spacing(self):
+        return self.__spacing[:]
+        
+    def paint(self):
+        self.setupGLState()
+        
+        if self.antialias:
+            glEnable(GL_LINE_SMOOTH)
+            glEnable(GL_BLEND)
+            glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
+            glHint(GL_LINE_SMOOTH_HINT, GL_NICEST)
+            
+        glBegin( GL_LINES )
+        
+        x,y,z = self.size()
+        xs,ys,zs = self.spacing()
+        xvals = np.arange(-x/2., x/2. + xs*0.001, xs) 
+        yvals = np.arange(-y/2., y/2. + ys*0.001, ys) 
+        glColor4f(1, 1, 1, .3)
+        for x in xvals:
+            glVertex3f(x, yvals[0], 0)
+            glVertex3f(x,  yvals[-1], 0)
+        for y in yvals:
+            glVertex3f(xvals[0], y, 0)
+            glVertex3f(xvals[-1], y, 0)
+        
+        glEnd()
diff --git a/libs/pyqtgraph/opengl/items/GLImageItem.py b/libs/pyqtgraph/opengl/items/GLImageItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..59ddaf6f570a6c33954d329a63e2b4901dbb440e
--- /dev/null
+++ b/libs/pyqtgraph/opengl/items/GLImageItem.py
@@ -0,0 +1,99 @@
+from OpenGL.GL import *
+from .. GLGraphicsItem import GLGraphicsItem
+from ...Qt import QtGui
+import numpy as np
+
+__all__ = ['GLImageItem']
+
+class GLImageItem(GLGraphicsItem):
+    """
+    **Bases:** :class:`GLGraphicsItem <pyqtgraph.opengl.GLGraphicsItem>`
+    
+    Displays image data as a textured quad.
+    """
+    
+    
+    def __init__(self, data, smooth=False, glOptions='translucent'):
+        """
+        
+        ==============  =======================================================================================
+        **Arguments:**
+        data            Volume data to be rendered. *Must* be 3D numpy array (x, y, RGBA) with dtype=ubyte.
+                        (See functions.makeRGBA)
+        smooth          (bool) If True, the volume slices are rendered with linear interpolation 
+        ==============  =======================================================================================
+        """
+        
+        self.smooth = smooth
+        self._needUpdate = False
+        GLGraphicsItem.__init__(self)
+        self.setData(data)
+        self.setGLOptions(glOptions)
+        
+    def initializeGL(self):
+        glEnable(GL_TEXTURE_2D)
+        self.texture = glGenTextures(1)
+        
+    def setData(self, data):
+        self.data = data
+        self._needUpdate = True
+        self.update()
+        
+    def _updateTexture(self):
+        glBindTexture(GL_TEXTURE_2D, self.texture)
+        if self.smooth:
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR)
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR)
+        else:
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST)
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST)
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER)
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER)
+        #glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_BORDER)
+        shape = self.data.shape
+        
+        ## Test texture dimensions first
+        glTexImage2D(GL_PROXY_TEXTURE_2D, 0, GL_RGBA, shape[0], shape[1], 0, GL_RGBA, GL_UNSIGNED_BYTE, None)
+        if glGetTexLevelParameteriv(GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH) == 0:
+            raise Exception("OpenGL failed to create 2D texture (%dx%d); too large for this hardware." % shape[:2])
+        
+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, shape[0], shape[1], 0, GL_RGBA, GL_UNSIGNED_BYTE, self.data.transpose((1,0,2)))
+        glDisable(GL_TEXTURE_2D)
+        
+        #self.lists = {}
+        #for ax in [0,1,2]:
+            #for d in [-1, 1]:
+                #l = glGenLists(1)
+                #self.lists[(ax,d)] = l
+                #glNewList(l, GL_COMPILE)
+                #self.drawVolume(ax, d)
+                #glEndList()
+
+                
+    def paint(self):
+        if self._needUpdate:
+            self._updateTexture()
+        glEnable(GL_TEXTURE_2D)
+        glBindTexture(GL_TEXTURE_2D, self.texture)
+        
+        self.setupGLState()
+        
+        #glEnable(GL_DEPTH_TEST)
+        ##glDisable(GL_CULL_FACE)
+        #glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
+        #glEnable( GL_BLEND )
+        #glEnable( GL_ALPHA_TEST )
+        glColor4f(1,1,1,1)
+
+        glBegin(GL_QUADS)
+        glTexCoord2f(0,0)
+        glVertex3f(0,0,0)
+        glTexCoord2f(1,0)
+        glVertex3f(self.data.shape[0], 0, 0)
+        glTexCoord2f(1,1)
+        glVertex3f(self.data.shape[0], self.data.shape[1], 0)
+        glTexCoord2f(0,1)
+        glVertex3f(0, self.data.shape[1], 0)
+        glEnd()
+        glDisable(GL_TEXTURE_3D)
+                
diff --git a/libs/pyqtgraph/opengl/items/GLLinePlotItem.py b/libs/pyqtgraph/opengl/items/GLLinePlotItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..f5cb7545cedae84ef661c1b053193b6e0e5307f1
--- /dev/null
+++ b/libs/pyqtgraph/opengl/items/GLLinePlotItem.py
@@ -0,0 +1,112 @@
+from OpenGL.GL import *
+from OpenGL.arrays import vbo
+from .. GLGraphicsItem import GLGraphicsItem
+from .. import shaders
+from ... import QtGui
+import numpy as np
+
+__all__ = ['GLLinePlotItem']
+
+class GLLinePlotItem(GLGraphicsItem):
+    """Draws line plots in 3D."""
+    
+    def __init__(self, **kwds):
+        """All keyword arguments are passed to setData()"""
+        GLGraphicsItem.__init__(self)
+        glopts = kwds.pop('glOptions', 'additive')
+        self.setGLOptions(glopts)
+        self.pos = None
+        self.mode = 'line_strip'
+        self.width = 1.
+        self.color = (1.0,1.0,1.0,1.0)
+        self.setData(**kwds)
+    
+    def setData(self, **kwds):
+        """
+        Update the data displayed by this item. All arguments are optional; 
+        for example it is allowed to update vertex positions while leaving 
+        colors unchanged, etc.
+        
+        ====================  ==================================================
+        **Arguments:**
+        ------------------------------------------------------------------------
+        pos                   (N,3) array of floats specifying point locations.
+        color                 (N,4) array of floats (0.0-1.0) or
+                              tuple of floats specifying
+                              a single color for the entire item.
+        width                 float specifying line width
+        antialias             enables smooth line drawing
+        mode                  'lines': Each pair of vertexes draws a single line
+                                       segment.
+                              'line_strip': All vertexes are drawn as a
+                                            continuous set of line segments.
+        ====================  ==================================================
+        """
+        args = ['pos', 'color', 'width', 'mode', 'antialias']
+        for k in kwds.keys():
+            if k not in args:
+                raise Exception('Invalid keyword argument: %s (allowed arguments are %s)' % (k, str(args)))
+        self.antialias = False
+        for arg in args:
+            if arg in kwds:
+                setattr(self, arg, kwds[arg])
+                #self.vbo.pop(arg, None)
+        self.update()
+
+    def initializeGL(self):
+        pass
+        
+    #def setupGLState(self):
+        #"""Prepare OpenGL state for drawing. This function is called immediately before painting."""
+        ##glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)  ## requires z-sorting to render properly.
+        #glBlendFunc(GL_SRC_ALPHA, GL_ONE)
+        #glEnable( GL_BLEND )
+        #glEnable( GL_ALPHA_TEST )
+        #glDisable( GL_DEPTH_TEST )
+        
+        ##glEnable( GL_POINT_SMOOTH )
+
+        ##glHint(GL_POINT_SMOOTH_HINT, GL_NICEST)
+        ##glPointParameterfv(GL_POINT_DISTANCE_ATTENUATION, (0, 0, -1e-3))
+        ##glPointParameterfv(GL_POINT_SIZE_MAX, (65500,))
+        ##glPointParameterfv(GL_POINT_SIZE_MIN, (0,))
+        
+    def paint(self):
+        if self.pos is None:
+            return
+        self.setupGLState()
+        
+        glEnableClientState(GL_VERTEX_ARRAY)
+
+        try:
+            glVertexPointerf(self.pos)
+            
+            if isinstance(self.color, np.ndarray):
+                glEnableClientState(GL_COLOR_ARRAY)
+                glColorPointerf(self.color)
+            else:
+                if isinstance(self.color, QtGui.QColor):
+                    glColor4f(*fn.glColor(self.color))
+                else:
+                    glColor4f(*self.color)
+            glLineWidth(self.width)
+            #glPointSize(self.width)
+            
+            if self.antialias:
+                glEnable(GL_LINE_SMOOTH)
+                glEnable(GL_BLEND)
+                glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
+                glHint(GL_LINE_SMOOTH_HINT, GL_NICEST)
+                
+            if self.mode == 'line_strip':
+                glDrawArrays(GL_LINE_STRIP, 0, int(self.pos.size / self.pos.shape[-1]))
+            elif self.mode == 'lines':
+                glDrawArrays(GL_LINES, 0, int(self.pos.size / self.pos.shape[-1]))
+            else:
+                raise Exception("Unknown line mode '%s'. (must be 'lines' or 'line_strip')" % self.mode)
+                
+        finally:
+            glDisableClientState(GL_COLOR_ARRAY)
+            glDisableClientState(GL_VERTEX_ARRAY)
+    
+        
diff --git a/libs/pyqtgraph/opengl/items/GLMeshItem.py b/libs/pyqtgraph/opengl/items/GLMeshItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..55e75942b121dff36736581d14ae52ed3955692a
--- /dev/null
+++ b/libs/pyqtgraph/opengl/items/GLMeshItem.py
@@ -0,0 +1,227 @@
+from OpenGL.GL import *
+from .. GLGraphicsItem import GLGraphicsItem
+from .. MeshData import MeshData
+from ...Qt import QtGui
+from .. import shaders
+from ... import functions as fn
+import numpy as np
+
+
+
+__all__ = ['GLMeshItem']
+
+class GLMeshItem(GLGraphicsItem):
+    """
+    **Bases:** :class:`GLGraphicsItem <pyqtgraph.opengl.GLGraphicsItem>`
+    
+    Displays a 3D triangle mesh. 
+    """
+    def __init__(self, **kwds):
+        """
+        ============== =====================================================
+        **Arguments:**
+        meshdata       MeshData object from which to determine geometry for 
+                       this item.
+        color          Default face color used if no vertex or face colors 
+                       are specified.
+        edgeColor      Default edge color to use if no edge colors are
+                       specified in the mesh data.
+        drawEdges      If True, a wireframe mesh will be drawn. 
+                       (default=False)
+        drawFaces      If True, mesh faces are drawn. (default=True)
+        shader         Name of shader program to use when drawing faces.
+                       (None for no shader)
+        smooth         If True, normal vectors are computed for each vertex
+                       and interpolated within each face.
+        computeNormals If False, then computation of normal vectors is 
+                       disabled. This can provide a performance boost for 
+                       meshes that do not make use of normals.
+        ============== =====================================================
+        """
+        self.opts = {
+            'meshdata': None,
+            'color': (1., 1., 1., 1.),
+            'drawEdges': False,
+            'drawFaces': True,
+            'edgeColor': (0.5, 0.5, 0.5, 1.0),
+            'shader': None,
+            'smooth': True,
+            'computeNormals': True,
+        }
+        
+        GLGraphicsItem.__init__(self)
+        glopts = kwds.pop('glOptions', 'opaque')
+        self.setGLOptions(glopts)
+        shader = kwds.pop('shader', None)
+        self.setShader(shader)
+        
+        self.setMeshData(**kwds)
+        
+        ## storage for data compiled from MeshData object
+        self.vertexes = None
+        self.normals = None
+        self.colors = None
+        self.faces = None
+        
+    def setShader(self, shader):
+        """Set the shader used when rendering faces in the mesh. (see the GL shaders example)"""
+        self.opts['shader'] = shader
+        self.update()
+        
+    def shader(self):
+        shader = self.opts['shader']
+        if isinstance(shader, shaders.ShaderProgram):
+            return shader
+        else:
+            return shaders.getShaderProgram(shader)
+        
+    def setColor(self, c):
+        """Set the default color to use when no vertex or face colors are specified."""
+        self.opts['color'] = c
+        self.update()
+        
+    def setMeshData(self, **kwds):
+        """
+        Set mesh data for this item. This can be invoked two ways:
+        
+        1. Specify *meshdata* argument with a new MeshData object
+        2. Specify keyword arguments to be passed to MeshData(..) to create a new instance.
+        """
+        md = kwds.get('meshdata', None)
+        if md is None:
+            opts = {}
+            for k in ['vertexes', 'faces', 'edges', 'vertexColors', 'faceColors']:
+                try:
+                    opts[k] = kwds.pop(k)
+                except KeyError:
+                    pass
+            md = MeshData(**opts)
+        
+        self.opts['meshdata'] = md
+        self.opts.update(kwds)
+        self.meshDataChanged()
+        self.update()
+        
+    
+    def meshDataChanged(self):
+        """
+        This method must be called to inform the item that the MeshData object
+        has been altered.
+        """
+        
+        self.vertexes = None
+        self.faces = None
+        self.normals = None
+        self.colors = None
+        self.edges = None
+        self.edgeColors = None
+        self.update()
+    
+    def parseMeshData(self):
+        ## interpret vertex / normal data before drawing
+        ## This can:
+        ##   - automatically generate normals if they were not specified
+        ##   - pull vertexes/noormals/faces from MeshData if that was specified
+        
+        if self.vertexes is not None and self.normals is not None:
+            return
+        #if self.opts['normals'] is None:
+            #if self.opts['meshdata'] is None:
+                #self.opts['meshdata'] = MeshData(vertexes=self.opts['vertexes'], faces=self.opts['faces'])
+        if self.opts['meshdata'] is not None:
+            md = self.opts['meshdata']
+            if self.opts['smooth'] and not md.hasFaceIndexedData():
+                self.vertexes = md.vertexes()
+                if self.opts['computeNormals']:
+                    self.normals = md.vertexNormals()
+                self.faces = md.faces()
+                if md.hasVertexColor():
+                    self.colors = md.vertexColors()
+                if md.hasFaceColor():
+                    self.colors = md.faceColors()
+            else:
+                self.vertexes = md.vertexes(indexed='faces')
+                if self.opts['computeNormals']:
+                    if self.opts['smooth']:
+                        self.normals = md.vertexNormals(indexed='faces')
+                    else:
+                        self.normals = md.faceNormals(indexed='faces')
+                self.faces = None
+                if md.hasVertexColor():
+                    self.colors = md.vertexColors(indexed='faces')
+                elif md.hasFaceColor():
+                    self.colors = md.faceColors(indexed='faces')
+                    
+            if self.opts['drawEdges']:
+                if not md.hasFaceIndexedData():
+                    self.edges = md.edges()
+                    self.edgeVerts = md.vertexes()
+                else:
+                    self.edges = md.edges()
+                    self.edgeVerts = md.vertexes(indexed='faces')
+            return
+    
+    def paint(self):
+        self.setupGLState()
+        
+        self.parseMeshData()        
+        
+        if self.opts['drawFaces']:
+            with self.shader():
+                verts = self.vertexes
+                norms = self.normals
+                color = self.colors
+                faces = self.faces
+                if verts is None:
+                    return
+                glEnableClientState(GL_VERTEX_ARRAY)
+                try:
+                    glVertexPointerf(verts)
+                    
+                    if self.colors is None:
+                        color = self.opts['color']
+                        if isinstance(color, QtGui.QColor):
+                            glColor4f(*fn.glColor(color))
+                        else:
+                            glColor4f(*color)
+                    else:
+                        glEnableClientState(GL_COLOR_ARRAY)
+                        glColorPointerf(color)
+                    
+                    
+                    if norms is not None:
+                        glEnableClientState(GL_NORMAL_ARRAY)
+                        glNormalPointerf(norms)
+                    
+                    if faces is None:
+                        glDrawArrays(GL_TRIANGLES, 0, np.product(verts.shape[:-1]))
+                    else:
+                        faces = faces.astype(np.uint).flatten()
+                        glDrawElements(GL_TRIANGLES, faces.shape[0], GL_UNSIGNED_INT, faces)
+                finally:
+                    glDisableClientState(GL_NORMAL_ARRAY)
+                    glDisableClientState(GL_VERTEX_ARRAY)
+                    glDisableClientState(GL_COLOR_ARRAY)
+            
+        if self.opts['drawEdges']:
+            verts = self.edgeVerts
+            edges = self.edges
+            glEnableClientState(GL_VERTEX_ARRAY)
+            try:
+                glVertexPointerf(verts)
+                
+                if self.edgeColors is None:
+                    color = self.opts['edgeColor']
+                    if isinstance(color, QtGui.QColor):
+                        glColor4f(*fn.glColor(color))
+                    else:
+                        glColor4f(*color)
+                else:
+                    glEnableClientState(GL_COLOR_ARRAY)
+                    glColorPointerf(color)
+                edges = edges.flatten()
+                glDrawElements(GL_LINES, edges.shape[0], GL_UNSIGNED_INT, edges)
+            finally:
+                glDisableClientState(GL_VERTEX_ARRAY)
+                glDisableClientState(GL_COLOR_ARRAY)
+            
diff --git a/libs/pyqtgraph/opengl/items/GLScatterPlotItem.py b/libs/pyqtgraph/opengl/items/GLScatterPlotItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..dc4b298ae184fe22b9bc3b0986f571f1f0e6fd85
--- /dev/null
+++ b/libs/pyqtgraph/opengl/items/GLScatterPlotItem.py
@@ -0,0 +1,183 @@
+from OpenGL.GL import *
+from OpenGL.arrays import vbo
+from .. GLGraphicsItem import GLGraphicsItem
+from .. import shaders
+from ... import QtGui
+import numpy as np
+
+__all__ = ['GLScatterPlotItem']
+
+class GLScatterPlotItem(GLGraphicsItem):
+    """Draws points at a list of 3D positions."""
+    
+    def __init__(self, **kwds):
+        GLGraphicsItem.__init__(self)
+        glopts = kwds.pop('glOptions', 'additive')
+        self.setGLOptions(glopts)
+        self.pos = []
+        self.size = 10
+        self.color = [1.0,1.0,1.0,0.5]
+        self.pxMode = True
+        #self.vbo = {}      ## VBO does not appear to improve performance very much.
+        self.setData(**kwds)
+    
+    def setData(self, **kwds):
+        """
+        Update the data displayed by this item. All arguments are optional; 
+        for example it is allowed to update spot positions while leaving 
+        colors unchanged, etc.
+        
+        ====================  ==================================================
+        **Arguments:**
+        pos                   (N,3) array of floats specifying point locations.
+        color                 (N,4) array of floats (0.0-1.0) specifying
+                              spot colors OR a tuple of floats specifying
+                              a single color for all spots.
+        size                  (N,) array of floats specifying spot sizes or 
+                              a single value to apply to all spots.
+        pxMode                If True, spot sizes are expressed in pixels. 
+                              Otherwise, they are expressed in item coordinates.
+        ====================  ==================================================
+        """
+        args = ['pos', 'color', 'size', 'pxMode']
+        for k in kwds.keys():
+            if k not in args:
+                raise Exception('Invalid keyword argument: %s (allowed arguments are %s)' % (k, str(args)))
+            
+        args.remove('pxMode')
+        for arg in args:
+            if arg in kwds:
+                setattr(self, arg, kwds[arg])
+                #self.vbo.pop(arg, None)
+                
+        self.pxMode = kwds.get('pxMode', self.pxMode)
+        self.update()
+
+    def initializeGL(self):
+        
+        ## Generate texture for rendering points
+        w = 64
+        def fn(x,y):
+            r = ((x-w/2.)**2 + (y-w/2.)**2) ** 0.5
+            return 255 * (w/2. - np.clip(r, w/2.-1.0, w/2.))
+        pData = np.empty((w, w, 4))
+        pData[:] = 255
+        pData[:,:,3] = np.fromfunction(fn, pData.shape[:2])
+        #print pData.shape, pData.min(), pData.max()
+        pData = pData.astype(np.ubyte)
+        
+        if getattr(self, "pointTexture", None) is None:
+            self.pointTexture = glGenTextures(1)
+        glActiveTexture(GL_TEXTURE0)
+        glEnable(GL_TEXTURE_2D)
+        glBindTexture(GL_TEXTURE_2D, self.pointTexture)
+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, pData.shape[0], pData.shape[1], 0, GL_RGBA, GL_UNSIGNED_BYTE, pData)
+        
+        self.shader = shaders.getShaderProgram('pointSprite')
+        
+    #def getVBO(self, name):
+        #if name not in self.vbo:
+            #self.vbo[name] = vbo.VBO(getattr(self, name).astype('f'))
+        #return self.vbo[name]
+        
+    #def setupGLState(self):
+        #"""Prepare OpenGL state for drawing. This function is called immediately before painting."""
+        ##glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)  ## requires z-sorting to render properly.
+        #glBlendFunc(GL_SRC_ALPHA, GL_ONE)
+        #glEnable( GL_BLEND )
+        #glEnable( GL_ALPHA_TEST )
+        #glDisable( GL_DEPTH_TEST )
+        
+        ##glEnable( GL_POINT_SMOOTH )
+
+        ##glHint(GL_POINT_SMOOTH_HINT, GL_NICEST)
+        ##glPointParameterfv(GL_POINT_DISTANCE_ATTENUATION, (0, 0, -1e-3))
+        ##glPointParameterfv(GL_POINT_SIZE_MAX, (65500,))
+        ##glPointParameterfv(GL_POINT_SIZE_MIN, (0,))
+        
+    def paint(self):
+        self.setupGLState()
+        
+        glEnable(GL_POINT_SPRITE)
+        
+        glActiveTexture(GL_TEXTURE0)
+        glEnable( GL_TEXTURE_2D )
+        glBindTexture(GL_TEXTURE_2D, self.pointTexture)
+    
+        glTexEnvi(GL_POINT_SPRITE, GL_COORD_REPLACE, GL_TRUE)
+        #glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE)    ## use texture color exactly
+        #glTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE )  ## texture modulates current color
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR)
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR)
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE)
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE)
+        glEnable(GL_PROGRAM_POINT_SIZE)
+        
+            
+        with self.shader:
+            #glUniform1i(self.shader.uniform('texture'), 0)  ## inform the shader which texture to use
+            glEnableClientState(GL_VERTEX_ARRAY)
+            try:
+                pos = self.pos
+                #if pos.ndim > 2:
+                    #pos = pos.reshape((reduce(lambda a,b: a*b, pos.shape[:-1]), pos.shape[-1]))
+                glVertexPointerf(pos)
+            
+                if isinstance(self.color, np.ndarray):
+                    glEnableClientState(GL_COLOR_ARRAY)
+                    glColorPointerf(self.color)
+                else:
+                    if isinstance(self.color, QtGui.QColor):
+                        glColor4f(*fn.glColor(self.color))
+                    else:
+                        glColor4f(*self.color)
+                
+                if not self.pxMode or isinstance(self.size, np.ndarray):
+                    glEnableClientState(GL_NORMAL_ARRAY)
+                    norm = np.empty(pos.shape)
+                    if self.pxMode:
+                        norm[...,0] = self.size
+                    else:
+                        gpos = self.mapToView(pos.transpose()).transpose()
+                        pxSize = self.view().pixelSize(gpos)
+                        norm[...,0] = self.size / pxSize
+                    
+                    glNormalPointerf(norm)
+                else:
+                    glNormal3f(self.size, 0, 0)  ## vertex shader uses norm.x to determine point size
+                    #glPointSize(self.size)
+                glDrawArrays(GL_POINTS, 0, int(pos.size / pos.shape[-1]))
+            finally:
+                glDisableClientState(GL_NORMAL_ARRAY)
+                glDisableClientState(GL_VERTEX_ARRAY)
+                glDisableClientState(GL_COLOR_ARRAY)
+                #posVBO.unbind()
+                
+        #for i in range(len(self.pos)):
+            #pos = self.pos[i]
+            
+            #if isinstance(self.color, np.ndarray):
+                #color = self.color[i]
+            #else:
+                #color = self.color
+            #if isinstance(self.color, QtGui.QColor):
+                #color = fn.glColor(self.color)
+                
+            #if isinstance(self.size, np.ndarray):
+                #size = self.size[i]
+            #else:
+                #size = self.size
+                
+            #pxSize = self.view().pixelSize(QtGui.QVector3D(*pos))
+            
+            #glPointSize(size / pxSize)
+            #glBegin( GL_POINTS )
+            #glColor4f(*color)  # x is blue
+            ##glNormal3f(size, 0, 0)
+            #glVertex3f(*pos)
+            #glEnd()
+
+        
+        
+        
+        
diff --git a/libs/pyqtgraph/opengl/items/GLSurfacePlotItem.py b/libs/pyqtgraph/opengl/items/GLSurfacePlotItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..e39ef3bba645681f40f1ea4aa0ff8eedb88887fa
--- /dev/null
+++ b/libs/pyqtgraph/opengl/items/GLSurfacePlotItem.py
@@ -0,0 +1,138 @@
+from OpenGL.GL import *
+from .GLMeshItem import GLMeshItem
+from .. MeshData import MeshData
+from ...Qt import QtGui
+import numpy as np
+
+
+
+__all__ = ['GLSurfacePlotItem']
+
+class GLSurfacePlotItem(GLMeshItem):
+    """
+    **Bases:** :class:`GLMeshItem <pyqtgraph.opengl.GLMeshItem>`
+    
+    Displays a surface plot on a regular x,y grid
+    """
+    def __init__(self, x=None, y=None, z=None, colors=None, **kwds):
+        """
+        The x, y, z, and colors arguments are passed to setData().
+        All other keyword arguments are passed to GLMeshItem.__init__().
+        """
+        
+        self._x = None
+        self._y = None
+        self._z = None
+        self._color = None
+        self._vertexes = None
+        self._meshdata = MeshData()
+        GLMeshItem.__init__(self, meshdata=self._meshdata, **kwds)
+        
+        self.setData(x, y, z, colors)
+        
+        
+        
+    def setData(self, x=None, y=None, z=None, colors=None):
+        """
+        Update the data in this surface plot. 
+        
+        ==============  =====================================================================
+        **Arguments:**
+        x,y             1D arrays of values specifying the x,y positions of vertexes in the
+                        grid. If these are omitted, then the values will be assumed to be
+                        integers.
+        z               2D array of height values for each grid vertex.
+        colors          (width, height, 4) array of vertex colors.
+        ==============  =====================================================================
+        
+        All arguments are optional.
+        
+        Note that if vertex positions are updated, the normal vectors for each triangle must 
+        be recomputed. This is somewhat expensive if the surface was initialized with smooth=False
+        and very expensive if smooth=True. For faster performance, initialize with 
+        computeNormals=False and use per-vertex colors or a normal-independent shader program.
+        """
+        if x is not None:
+            if self._x is None or len(x) != len(self._x):
+                self._vertexes = None
+            self._x = x
+        
+        if y is not None:
+            if self._y is None or len(y) != len(self._y):
+                self._vertexes = None
+            self._y = y
+        
+        if z is not None:
+            #if self._x is None:
+                #self._x = np.arange(z.shape[0])
+                #self._vertexes = None
+            #if self._y is None:
+                #self._y = np.arange(z.shape[1])
+                #self._vertexes = None
+                
+            if self._x is not None and z.shape[0] != len(self._x):
+                raise Exception('Z values must have shape (len(x), len(y))')
+            if self._y is not None and z.shape[1] != len(self._y):
+                raise Exception('Z values must have shape (len(x), len(y))')
+            self._z = z
+            if self._vertexes is not None and self._z.shape != self._vertexes.shape[:2]:
+                self._vertexes = None
+        
+        if colors is not None:
+            self._colors = colors
+            self._meshdata.setVertexColors(colors)
+        
+        if self._z is None:
+            return
+        
+        updateMesh = False
+        newVertexes = False
+        
+        ## Generate vertex and face array
+        if self._vertexes is None:
+            newVertexes = True
+            self._vertexes = np.empty((self._z.shape[0], self._z.shape[1], 3), dtype=float)
+            self.generateFaces()
+            self._meshdata.setFaces(self._faces)
+            updateMesh = True
+        
+        ## Copy x, y, z data into vertex array
+        if newVertexes or x is not None:
+            if x is None:
+                if self._x is None:
+                    x = np.arange(self._z.shape[0])
+                else:
+                    x = self._x
+            self._vertexes[:, :, 0] = x.reshape(len(x), 1)
+            updateMesh = True
+        
+        if newVertexes or y is not None:
+            if y is None:
+                if self._y is None:
+                    y = np.arange(self._z.shape[1])
+                else:
+                    y = self._y
+            self._vertexes[:, :, 1] = y.reshape(1, len(y))
+            updateMesh = True
+        
+        if newVertexes or z is not None:
+            self._vertexes[...,2] = self._z
+            updateMesh = True
+        
+        ## Update MeshData
+        if updateMesh:
+            self._meshdata.setVertexes(self._vertexes.reshape(self._vertexes.shape[0]*self._vertexes.shape[1], 3))
+            self.meshDataChanged()
+        
+        
+    def generateFaces(self):
+        cols = self._z.shape[1]-1
+        rows = self._z.shape[0]-1
+        faces = np.empty((cols*rows*2, 3), dtype=np.uint)
+        rowtemplate1 = np.arange(cols).reshape(cols, 1) + np.array([[0, 1, cols+1]])
+        rowtemplate2 = np.arange(cols).reshape(cols, 1) + np.array([[cols+1, 1, cols+2]])
+        for row in range(rows):
+            start = row * cols * 2 
+            faces[start:start+cols] = rowtemplate1 + row * (cols+1)
+            faces[start+cols:start+(cols*2)] = rowtemplate2 + row * (cols+1)
+        self._faces = faces
diff --git a/libs/pyqtgraph/opengl/items/GLVolumeItem.py b/libs/pyqtgraph/opengl/items/GLVolumeItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..cbe22db936d48dec3a422595878f4a5112de5e7e
--- /dev/null
+++ b/libs/pyqtgraph/opengl/items/GLVolumeItem.py
@@ -0,0 +1,230 @@
+from OpenGL.GL import *
+from .. GLGraphicsItem import GLGraphicsItem
+from ...Qt import QtGui
+import numpy as np
+from ... import debug
+
+__all__ = ['GLVolumeItem']
+
+class GLVolumeItem(GLGraphicsItem):
+    """
+    **Bases:** :class:`GLGraphicsItem <pyqtgraph.opengl.GLGraphicsItem>`
+    
+    Displays volumetric data. 
+    """
+    
+    
+    def __init__(self, data, sliceDensity=1, smooth=True, glOptions='translucent'):
+        """
+        ==============  =======================================================================================
+        **Arguments:**
+        data            Volume data to be rendered. *Must* be 4D numpy array (x, y, z, RGBA) with dtype=ubyte.
+        sliceDensity    Density of slices to render through the volume. A value of 1 means one slice per voxel.
+        smooth          (bool) If True, the volume slices are rendered with linear interpolation 
+        ==============  =======================================================================================
+        """
+        
+        self.sliceDensity = sliceDensity
+        self.smooth = smooth
+        self.data = None
+        self._needUpload = False
+        self.texture = None
+        GLGraphicsItem.__init__(self)
+        self.setGLOptions(glOptions)
+        self.setData(data)
+        
+    def setData(self, data):
+        self.data = data
+        self._needUpload = True
+        self.update()
+        
+    def _uploadData(self):
+        glEnable(GL_TEXTURE_3D)
+        if self.texture is None:
+            self.texture = glGenTextures(1)
+        glBindTexture(GL_TEXTURE_3D, self.texture)
+        if self.smooth:
+            glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR)
+            glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR)
+        else:
+            glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_NEAREST)
+            glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_NEAREST)
+        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER)
+        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER)
+        glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_BORDER)
+        shape = self.data.shape
+        
+        ## Test texture dimensions first
+        glTexImage3D(GL_PROXY_TEXTURE_3D, 0, GL_RGBA, shape[0], shape[1], shape[2], 0, GL_RGBA, GL_UNSIGNED_BYTE, None)
+        if glGetTexLevelParameteriv(GL_PROXY_TEXTURE_3D, 0, GL_TEXTURE_WIDTH) == 0:
+            raise Exception("OpenGL failed to create 3D texture (%dx%dx%d); too large for this hardware." % shape[:3])
+        
+        glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA, shape[0], shape[1], shape[2], 0, GL_RGBA, GL_UNSIGNED_BYTE, self.data.transpose((2,1,0,3)))
+        glDisable(GL_TEXTURE_3D)
+        
+        self.lists = {}
+        for ax in [0,1,2]:
+            for d in [-1, 1]:
+                l = glGenLists(1)
+                self.lists[(ax,d)] = l
+                glNewList(l, GL_COMPILE)
+                self.drawVolume(ax, d)
+                glEndList()
+        
+        self._needUpload = False
+        
+    def paint(self):
+        if self.data is None:
+            return
+        
+        if self._needUpload:
+            self._uploadData()
+        
+        self.setupGLState()
+        
+        glEnable(GL_TEXTURE_3D)
+        glBindTexture(GL_TEXTURE_3D, self.texture)
+        
+        #glEnable(GL_DEPTH_TEST)
+        #glDisable(GL_CULL_FACE)
+        #glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
+        #glEnable( GL_BLEND )
+        #glEnable( GL_ALPHA_TEST )
+        glColor4f(1,1,1,1)
+
+        view = self.view()
+        center = QtGui.QVector3D(*[x/2. for x in self.data.shape[:3]])
+        cam = self.mapFromParent(view.cameraPosition()) - center
+        #print "center", center, "cam", view.cameraPosition(), self.mapFromParent(view.cameraPosition()), "diff", cam
+        cam = np.array([cam.x(), cam.y(), cam.z()])
+        ax = np.argmax(abs(cam))
+        d = 1 if cam[ax] > 0 else -1
+        glCallList(self.lists[(ax,d)])  ## draw axes
+        glDisable(GL_TEXTURE_3D)
+                
+    def drawVolume(self, ax, d):
+        N = 5
+        
+        imax = [0,1,2]
+        imax.remove(ax)
+        
+        tp = [[0,0,0],[0,0,0],[0,0,0],[0,0,0]]
+        vp = [[0,0,0],[0,0,0],[0,0,0],[0,0,0]]
+        nudge = [0.5/x for x in self.data.shape]
+        tp[0][imax[0]] = 0+nudge[imax[0]]
+        tp[0][imax[1]] = 0+nudge[imax[1]]
+        tp[1][imax[0]] = 1-nudge[imax[0]]
+        tp[1][imax[1]] = 0+nudge[imax[1]]
+        tp[2][imax[0]] = 1-nudge[imax[0]]
+        tp[2][imax[1]] = 1-nudge[imax[1]]
+        tp[3][imax[0]] = 0+nudge[imax[0]]
+        tp[3][imax[1]] = 1-nudge[imax[1]]
+        
+        vp[0][imax[0]] = 0
+        vp[0][imax[1]] = 0
+        vp[1][imax[0]] = self.data.shape[imax[0]]
+        vp[1][imax[1]] = 0
+        vp[2][imax[0]] = self.data.shape[imax[0]]
+        vp[2][imax[1]] = self.data.shape[imax[1]]
+        vp[3][imax[0]] = 0
+        vp[3][imax[1]] = self.data.shape[imax[1]]
+        slices = self.data.shape[ax] * self.sliceDensity
+        r = list(range(slices))
+        if d == -1:
+            r = r[::-1]
+            
+        glBegin(GL_QUADS)
+        tzVals = np.linspace(nudge[ax], 1.0-nudge[ax], slices)
+        vzVals = np.linspace(0, self.data.shape[ax], slices)
+        for i in r:
+            z = tzVals[i]
+            w = vzVals[i]
+            
+            tp[0][ax] = z
+            tp[1][ax] = z
+            tp[2][ax] = z
+            tp[3][ax] = z
+            
+            vp[0][ax] = w
+            vp[1][ax] = w
+            vp[2][ax] = w
+            vp[3][ax] = w
+            
+            
+            glTexCoord3f(*tp[0])
+            glVertex3f(*vp[0])
+            glTexCoord3f(*tp[1])
+            glVertex3f(*vp[1])
+            glTexCoord3f(*tp[2])
+            glVertex3f(*vp[2])
+            glTexCoord3f(*tp[3])
+            glVertex3f(*vp[3])
+        glEnd()
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        ## Interesting idea:
+        ## remove projection/modelview matrixes, recreate in texture coords. 
+        ## it _sorta_ works, but needs tweaking.
+        #mvm = glGetDoublev(GL_MODELVIEW_MATRIX)
+        #pm = glGetDoublev(GL_PROJECTION_MATRIX)
+        #m = QtGui.QMatrix4x4(mvm.flatten()).inverted()[0]
+        #p = QtGui.QMatrix4x4(pm.flatten()).inverted()[0]
+        
+        #glMatrixMode(GL_PROJECTION)
+        #glPushMatrix()
+        #glLoadIdentity()
+        #N=1
+        #glOrtho(-N,N,-N,N,-100,100)
+        
+        #glMatrixMode(GL_MODELVIEW)
+        #glLoadIdentity()
+        
+        
+        #glMatrixMode(GL_TEXTURE)
+        #glLoadIdentity()
+        #glMultMatrixf(m.copyDataTo())
+        
+        #view = self.view()
+        #w = view.width()
+        #h = view.height()
+        #dist = view.opts['distance']
+        #fov = view.opts['fov']
+        #nearClip = dist * .1
+        #farClip = dist * 5.
+        #r = nearClip * np.tan(fov)
+        #t = r * h / w
+        
+        #p = QtGui.QMatrix4x4()
+        #p.frustum( -r, r, -t, t, nearClip, farClip)
+        #glMultMatrixf(p.inverted()[0].copyDataTo())
+        
+        
+        #glBegin(GL_QUADS)
+        
+        #M=1
+        #for i in range(500):
+            #z = i/500.
+            #w = -i/500.
+            #glTexCoord3f(-M, -M, z)
+            #glVertex3f(-N, -N, w)
+            #glTexCoord3f(M, -M, z)
+            #glVertex3f(N, -N, w)
+            #glTexCoord3f(M, M, z)
+            #glVertex3f(N, N, w)
+            #glTexCoord3f(-M, M, z)
+            #glVertex3f(-N, N, w)
+        #glEnd()
+        #glDisable(GL_TEXTURE_3D)
+
+        #glMatrixMode(GL_PROJECTION)
+        #glPopMatrix()
+        
+        
+
diff --git a/libs/pyqtgraph/opengl/items/__init__.py b/libs/pyqtgraph/opengl/items/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/libs/pyqtgraph/opengl/shaders.py b/libs/pyqtgraph/opengl/shaders.py
new file mode 100644
index 0000000000000000000000000000000000000000..8922cd21434605d9a2801b478b1681fdb8304666
--- /dev/null
+++ b/libs/pyqtgraph/opengl/shaders.py
@@ -0,0 +1,402 @@
+try:
+    from OpenGL import NullFunctionError
+except ImportError:
+    from OpenGL.error import NullFunctionError
+from OpenGL.GL import *
+from OpenGL.GL import shaders
+import re
+
+## For centralizing and managing vertex/fragment shader programs.
+
+def initShaders():
+    global Shaders
+    Shaders = [
+        ShaderProgram(None, []),
+        
+        ## increases fragment alpha as the normal turns orthogonal to the view
+        ## this is useful for viewing shells that enclose a volume (such as isosurfaces)
+        ShaderProgram('balloon', [
+            VertexShader("""
+                varying vec3 normal;
+                void main() {
+                    // compute here for use in fragment shader
+                    normal = normalize(gl_NormalMatrix * gl_Normal);
+                    gl_FrontColor = gl_Color;
+                    gl_BackColor = gl_Color;
+                    gl_Position = ftransform();
+                }
+            """),
+            FragmentShader("""
+                varying vec3 normal;
+                void main() {
+                    vec4 color = gl_Color;
+                    color.w = min(color.w + 2.0 * color.w * pow(normal.x*normal.x + normal.y*normal.y, 5.0), 1.0);
+                    gl_FragColor = color;
+                }
+            """)
+        ]),
+        
+        ## colors fragments based on face normals relative to view
+        ## This means that the colors will change depending on how the view is rotated
+        ShaderProgram('viewNormalColor', [   
+            VertexShader("""
+                varying vec3 normal;
+                void main() {
+                    // compute here for use in fragment shader
+                    normal = normalize(gl_NormalMatrix * gl_Normal);
+                    gl_FrontColor = gl_Color;
+                    gl_BackColor = gl_Color;
+                    gl_Position = ftransform();
+                }
+            """),
+            FragmentShader("""
+                varying vec3 normal;
+                void main() {
+                    vec4 color = gl_Color;
+                    color.x = (normal.x + 1.0) * 0.5;
+                    color.y = (normal.y + 1.0) * 0.5;
+                    color.z = (normal.z + 1.0) * 0.5;
+                    gl_FragColor = color;
+                }
+            """)
+        ]),
+        
+        ## colors fragments based on absolute face normals.
+        ShaderProgram('normalColor', [   
+            VertexShader("""
+                varying vec3 normal;
+                void main() {
+                    // compute here for use in fragment shader
+                    normal = normalize(gl_Normal);
+                    gl_FrontColor = gl_Color;
+                    gl_BackColor = gl_Color;
+                    gl_Position = ftransform();
+                }
+            """),
+            FragmentShader("""
+                varying vec3 normal;
+                void main() {
+                    vec4 color = gl_Color;
+                    color.x = (normal.x + 1.0) * 0.5;
+                    color.y = (normal.y + 1.0) * 0.5;
+                    color.z = (normal.z + 1.0) * 0.5;
+                    gl_FragColor = color;
+                }
+            """)
+        ]),
+        
+        ## very simple simulation of lighting. 
+        ## The light source position is always relative to the camera.
+        ShaderProgram('shaded', [   
+            VertexShader("""
+                varying vec3 normal;
+                void main() {
+                    // compute here for use in fragment shader
+                    normal = normalize(gl_NormalMatrix * gl_Normal);
+                    gl_FrontColor = gl_Color;
+                    gl_BackColor = gl_Color;
+                    gl_Position = ftransform();
+                }
+            """),
+            FragmentShader("""
+                varying vec3 normal;
+                void main() {
+                    float p = dot(normal, normalize(vec3(1.0, -1.0, -1.0)));
+                    p = p < 0. ? 0. : p * 0.8;
+                    vec4 color = gl_Color;
+                    color.x = color.x * (0.2 + p);
+                    color.y = color.y * (0.2 + p);
+                    color.z = color.z * (0.2 + p);
+                    gl_FragColor = color;
+                }
+            """)
+        ]),
+        
+        ## colors get brighter near edges of object
+        ShaderProgram('edgeHilight', [   
+            VertexShader("""
+                varying vec3 normal;
+                void main() {
+                    // compute here for use in fragment shader
+                    normal = normalize(gl_NormalMatrix * gl_Normal);
+                    gl_FrontColor = gl_Color;
+                    gl_BackColor = gl_Color;
+                    gl_Position = ftransform();
+                }
+            """),
+            FragmentShader("""
+                varying vec3 normal;
+                void main() {
+                    vec4 color = gl_Color;
+                    float s = pow(normal.x*normal.x + normal.y*normal.y, 2.0);
+                    color.x = color.x + s * (1.0-color.x);
+                    color.y = color.y + s * (1.0-color.y);
+                    color.z = color.z + s * (1.0-color.z);
+                    gl_FragColor = color;
+                }
+            """)
+        ]),
+        
+        ## colors fragments by z-value.
+        ## This is useful for coloring surface plots by height.
+        ## This shader uses a uniform called "colorMap" to determine how to map the colors:
+        ##    red   = pow(z * colorMap[0] + colorMap[1], colorMap[2])
+        ##    green = pow(z * colorMap[3] + colorMap[4], colorMap[5])
+        ##    blue  = pow(z * colorMap[6] + colorMap[7], colorMap[8])
+        ## (set the values like this: shader['uniformMap'] = array([...])
+        ShaderProgram('heightColor', [
+            VertexShader("""
+                varying vec4 pos;
+                void main() {
+                    gl_FrontColor = gl_Color;
+                    gl_BackColor = gl_Color;
+                    pos = gl_Vertex;
+                    gl_Position = ftransform();
+                }
+            """),
+            FragmentShader("""
+                uniform float colorMap[9];
+                varying vec4 pos;
+                //out vec4 gl_FragColor;   // only needed for later glsl versions
+                //in vec4 gl_Color;
+                void main() {
+                    vec4 color = gl_Color;
+                    color.x = colorMap[0] * (pos.z + colorMap[1]);
+                    if (colorMap[2] != 1.0)
+                        color.x = pow(color.x, colorMap[2]);
+                    color.x = color.x < 0. ? 0. : (color.x > 1. ? 1. : color.x);
+                    
+                    color.y = colorMap[3] * (pos.z + colorMap[4]);
+                    if (colorMap[5] != 1.0)
+                        color.y = pow(color.y, colorMap[5]);
+                    color.y = color.y < 0. ? 0. : (color.y > 1. ? 1. : color.y);
+                    
+                    color.z = colorMap[6] * (pos.z + colorMap[7]);
+                    if (colorMap[8] != 1.0)
+                        color.z = pow(color.z, colorMap[8]);
+                    color.z = color.z < 0. ? 0. : (color.z > 1. ? 1. : color.z);
+                    
+                    color.w = 1.0;
+                    gl_FragColor = color;
+                }
+            """),
+        ], uniforms={'colorMap': [1, 1, 1, 1, 0.5, 1, 1, 0, 1]}),
+        ShaderProgram('pointSprite', [   ## allows specifying point size using normal.x
+            ## See:
+            ##
+            ##  http://stackoverflow.com/questions/9609423/applying-part-of-a-texture-sprite-sheet-texture-map-to-a-point-sprite-in-ios
+            ##  http://stackoverflow.com/questions/3497068/textured-points-in-opengl-es-2-0
+            ##
+            ##
+            VertexShader("""
+                void main() {
+                    gl_FrontColor=gl_Color;
+                    gl_PointSize = gl_Normal.x;
+                    gl_Position = ftransform();
+                } 
+            """),
+            #FragmentShader("""
+                ##version 120
+                #uniform sampler2D texture;
+                #void main ( )
+                #{
+                    #gl_FragColor = texture2D(texture, gl_PointCoord) * gl_Color;
+                #}
+            #""")
+        ]),
+    ]
+
+
+CompiledShaderPrograms = {}
+    
+def getShaderProgram(name):
+    return ShaderProgram.names[name]
+
+class Shader(object):
+    def __init__(self, shaderType, code):
+        self.shaderType = shaderType
+        self.code = code
+        self.compiled = None
+        
+    def shader(self):
+        if self.compiled is None:
+            try:
+                self.compiled = shaders.compileShader(self.code, self.shaderType)
+            except NullFunctionError:
+                raise Exception("This OpenGL implementation does not support shader programs; many OpenGL features in pyqtgraph will not work.")
+            except RuntimeError as exc:
+                ## Format compile errors a bit more nicely
+                if len(exc.args) == 3:
+                    err, code, typ = exc.args
+                    if not err.startswith('Shader compile failure'):
+                        raise
+                    code = code[0].decode('utf_8').split('\n')
+                    err, c, msgs = err.partition(':')
+                    err = err + '\n'
+                    msgs = re.sub('b\'','',msgs)
+                    msgs = re.sub('\'$','',msgs)
+                    msgs = re.sub('\\\\n','\n',msgs)
+                    msgs = msgs.split('\n')
+                    errNums = [()] * len(code)
+                    for i, msg in enumerate(msgs):
+                        msg = msg.strip()
+                        if msg == '':
+                            continue
+                        m = re.match(r'(\d+\:)?\d+\((\d+)\)', msg)
+                        if m is not None:
+                            line = int(m.groups()[1])
+                            errNums[line-1] = errNums[line-1] + (str(i+1),)
+                            #code[line-1] = '%d\t%s' % (i+1, code[line-1])
+                        err = err + "%d %s\n" % (i+1, msg)
+                    errNums = [','.join(n) for n in errNums]
+                    maxlen = max(map(len, errNums))
+                    code = [errNums[i] + " "*(maxlen-len(errNums[i])) + line for i, line in enumerate(code)]
+                    err = err + '\n'.join(code)
+                    raise Exception(err)
+                else:
+                    raise
+        return self.compiled
+
+class VertexShader(Shader):
+    def __init__(self, code):
+        Shader.__init__(self, GL_VERTEX_SHADER, code)
+        
+class FragmentShader(Shader):
+    def __init__(self, code):
+        Shader.__init__(self, GL_FRAGMENT_SHADER, code)
+        
+        
+        
+
+class ShaderProgram(object):
+    names = {}
+    
+    def __init__(self, name, shaders, uniforms=None):
+        self.name = name
+        ShaderProgram.names[name] = self
+        self.shaders = shaders
+        self.prog = None
+        self.blockData = {}
+        self.uniformData = {}
+        
+        ## parse extra options from the shader definition
+        if uniforms is not None:
+            for k,v in uniforms.items():
+                self[k] = v
+        
+    def setBlockData(self, blockName, data):
+        if data is None:
+            del self.blockData[blockName]
+        else:
+            self.blockData[blockName] = data
+
+    def setUniformData(self, uniformName, data):
+        if data is None:
+            del self.uniformData[uniformName]
+        else:
+            self.uniformData[uniformName] = data
+            
+    def __setitem__(self, item, val):
+        self.setUniformData(item, val)
+        
+    def __delitem__(self, item):
+        self.setUniformData(item, None)
+
+    def program(self):
+        if self.prog is None:
+            try:
+                compiled = [s.shader() for s in self.shaders]  ## compile all shaders
+                self.prog = shaders.compileProgram(*compiled)  ## compile program
+            except:
+                self.prog = -1
+                raise
+        return self.prog
+        
+    def __enter__(self):
+        if len(self.shaders) > 0 and self.program() != -1:
+            glUseProgram(self.program())
+            
+            try:
+                ## load uniform values into program
+                for uniformName, data in self.uniformData.items():
+                    loc = self.uniform(uniformName)
+                    if loc == -1:
+                        raise Exception('Could not find uniform variable "%s"' % uniformName)
+                    glUniform1fv(loc, len(data), data)
+                    
+                ### bind buffer data to program blocks
+                #if len(self.blockData) > 0:
+                    #bindPoint = 1
+                    #for blockName, data in self.blockData.items():
+                        ### Program should have a uniform block declared:
+                        ### 
+                        ### layout (std140) uniform blockName {
+                        ###     vec4 diffuse;
+                        ### };
+                        
+                        ### pick any-old binding point. (there are a limited number of these per-program
+                        #bindPoint = 1
+                        
+                        ### get the block index for a uniform variable in the shader
+                        #blockIndex = glGetUniformBlockIndex(self.program(), blockName)
+                        
+                        ### give the shader block a binding point
+                        #glUniformBlockBinding(self.program(), blockIndex, bindPoint)
+                        
+                        ### create a buffer
+                        #buf = glGenBuffers(1)
+                        #glBindBuffer(GL_UNIFORM_BUFFER, buf)
+                        #glBufferData(GL_UNIFORM_BUFFER, size, data, GL_DYNAMIC_DRAW)
+                        ### also possible to use glBufferSubData to fill parts of the buffer
+                        
+                        ### bind buffer to the same binding point
+                        #glBindBufferBase(GL_UNIFORM_BUFFER, bindPoint, buf)
+            except:
+                glUseProgram(0)
+                raise
+                    
+            
+        
+    def __exit__(self, *args):
+        if len(self.shaders) > 0:
+            glUseProgram(0)
+        
+    def uniform(self, name):
+        """Return the location integer for a uniform variable in this program"""
+        return glGetUniformLocation(self.program(), name.encode('utf_8'))
+
+    #def uniformBlockInfo(self, blockName):
+        #blockIndex = glGetUniformBlockIndex(self.program(), blockName)
+        #count = glGetActiveUniformBlockiv(self.program(), blockIndex, GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS)
+        #indices = []
+        #for i in range(count):
+            #indices.append(glGetActiveUniformBlockiv(self.program(), blockIndex, GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES))
+        
+class HeightColorShader(ShaderProgram):
+    def __enter__(self):
+        ## Program should have a uniform block declared:
+        ## 
+        ## layout (std140) uniform blockName {
+        ##     vec4 diffuse;
+        ##     vec4 ambient;
+        ## };
+        
+        ## pick any-old binding point. (there are a limited number of these per-program
+        bindPoint = 1
+        
+        ## get the block index for a uniform variable in the shader
+        blockIndex = glGetUniformBlockIndex(self.program(), "blockName")
+        
+        ## give the shader block a binding point
+        glUniformBlockBinding(self.program(), blockIndex, bindPoint)
+        
+        ## create a buffer
+        buf = glGenBuffers(1)
+        glBindBuffer(GL_UNIFORM_BUFFER, buf)
+        glBufferData(GL_UNIFORM_BUFFER, size, data, GL_DYNAMIC_DRAW)
+        ## also possible to use glBufferSubData to fill parts of the buffer
+        
+        ## bind buffer to the same binding point
+        glBindBufferBase(GL_UNIFORM_BUFFER, bindPoint, buf)
+        
+initShaders()
diff --git a/libs/pyqtgraph/ordereddict.py b/libs/pyqtgraph/ordereddict.py
new file mode 100644
index 0000000000000000000000000000000000000000..7242b5060de134c3e4b7cd41fa10843d7c2e4cdb
--- /dev/null
+++ b/libs/pyqtgraph/ordereddict.py
@@ -0,0 +1,127 @@
+# Copyright (c) 2009 Raymond Hettinger
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+#     The above copyright notice and this permission notice shall be
+#     included in all copies or substantial portions of the Software.
+#
+#     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+#     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+#     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+#     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+#     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+#     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+#     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+#     OTHER DEALINGS IN THE SOFTWARE.
+
+from UserDict import DictMixin
+
+class OrderedDict(dict, DictMixin):
+
+    def __init__(self, *args, **kwds):
+        if len(args) > 1:
+            raise TypeError('expected at most 1 arguments, got %d' % len(args))
+        try:
+            self.__end
+        except AttributeError:
+            self.clear()
+        self.update(*args, **kwds)
+
+    def clear(self):
+        self.__end = end = []
+        end += [None, end, end]         # sentinel node for doubly linked list
+        self.__map = {}                 # key --> [key, prev, next]
+        dict.clear(self)
+
+    def __setitem__(self, key, value):
+        if key not in self:
+            end = self.__end
+            curr = end[1]
+            curr[2] = end[1] = self.__map[key] = [key, curr, end]
+        dict.__setitem__(self, key, value)
+
+    def __delitem__(self, key):
+        dict.__delitem__(self, key)
+        key, prev, next = self.__map.pop(key)
+        prev[2] = next
+        next[1] = prev
+
+    def __iter__(self):
+        end = self.__end
+        curr = end[2]
+        while curr is not end:
+            yield curr[0]
+            curr = curr[2]
+
+    def __reversed__(self):
+        end = self.__end
+        curr = end[1]
+        while curr is not end:
+            yield curr[0]
+            curr = curr[1]
+
+    def popitem(self, last=True):
+        if not self:
+            raise KeyError('dictionary is empty')
+        if last:
+            key = reversed(self).next()
+        else:
+            key = iter(self).next()
+        value = self.pop(key)
+        return key, value
+
+    def __reduce__(self):
+        items = [[k, self[k]] for k in self]
+        tmp = self.__map, self.__end
+        del self.__map, self.__end
+        inst_dict = vars(self).copy()
+        self.__map, self.__end = tmp
+        if inst_dict:
+            return (self.__class__, (items,), inst_dict)
+        return self.__class__, (items,)
+
+    def keys(self):
+        return list(self)
+
+    setdefault = DictMixin.setdefault
+    update = DictMixin.update
+    pop = DictMixin.pop
+    values = DictMixin.values
+    items = DictMixin.items
+    iterkeys = DictMixin.iterkeys
+    itervalues = DictMixin.itervalues
+    iteritems = DictMixin.iteritems
+
+    def __repr__(self):
+        if not self:
+            return '%s()' % (self.__class__.__name__,)
+        return '%s(%r)' % (self.__class__.__name__, self.items())
+
+    def copy(self):
+        return self.__class__(self)
+
+    @classmethod
+    def fromkeys(cls, iterable, value=None):
+        d = cls()
+        for key in iterable:
+            d[key] = value
+        return d
+
+    def __eq__(self, other):
+        if isinstance(other, OrderedDict):
+            if len(self) != len(other):
+                return False
+            for p, q in  zip(self.items(), other.items()):
+                if p != q:
+                    return False
+            return True
+        return dict.__eq__(self, other)
+
+    def __ne__(self, other):
+        return not self == other
diff --git a/libs/pyqtgraph/parametertree/Parameter.py b/libs/pyqtgraph/parametertree/Parameter.py
new file mode 100644
index 0000000000000000000000000000000000000000..5f37ccdc0800d62729bce7c064e2474a98200e04
--- /dev/null
+++ b/libs/pyqtgraph/parametertree/Parameter.py
@@ -0,0 +1,766 @@
+from ..Qt import QtGui, QtCore
+import os, weakref, re
+from ..pgcollections import OrderedDict
+from ..python2_3 import asUnicode
+from .ParameterItem import ParameterItem
+
+PARAM_TYPES = {}
+PARAM_NAMES = {}
+
+def registerParameterType(name, cls, override=False):
+    global PARAM_TYPES
+    if name in PARAM_TYPES and not override:
+        raise Exception("Parameter type '%s' already exists (use override=True to replace)" % name)
+    PARAM_TYPES[name] = cls
+    PARAM_NAMES[cls] = name
+
+def __reload__(old):
+    PARAM_TYPES.update(old.get('PARAM_TYPES', {}))
+    PARAM_NAMES.update(old.get('PARAM_NAMES', {}))
+
+class Parameter(QtCore.QObject):
+    """
+    A Parameter is the basic unit of data in a parameter tree. Each parameter has
+    a name, a type, a value, and several other properties that modify the behavior of the 
+    Parameter. Parameters may have parent / child / sibling relationships to construct
+    organized hierarchies. Parameters generally do not have any inherent GUI or visual
+    interpretation; instead they manage ParameterItem instances which take care of
+    display and user interaction.
+    
+    Note: It is fairly uncommon to use the Parameter class directly; mostly you 
+    will use subclasses which provide specialized type and data handling. The static
+    pethod Parameter.create(...) is an easy way to generate instances of these subclasses.
+       
+    For more Parameter types, see ParameterTree.parameterTypes module.
+    
+    ===================================  =========================================================
+    **Signals:**
+    sigStateChanged(self, change, info)  Emitted when anything changes about this parameter at 
+                                         all.
+                                         The second argument is a string indicating what changed 
+                                         ('value', 'childAdded', etc..)
+                                         The third argument can be any extra information about 
+                                         the change
+    sigTreeStateChanged(self, changes)   Emitted when any child in the tree changes state
+                                         (but only if monitorChildren() is called)
+                                         the format of *changes* is [(param, change, info), ...]
+    sigValueChanged(self, value)         Emitted when value is finished changing
+    sigValueChanging(self, value)        Emitted immediately for all value changes, 
+                                         including during editing.
+    sigChildAdded(self, child, index)    Emitted when a child is added
+    sigChildRemoved(self, child)         Emitted when a child is removed
+    sigRemoved(self)                     Emitted when this parameter is removed
+    sigParentChanged(self, parent)       Emitted when this parameter's parent has changed
+    sigLimitsChanged(self, limits)       Emitted when this parameter's limits have changed
+    sigDefaultChanged(self, default)     Emitted when this parameter's default value has changed
+    sigNameChanged(self, name)           Emitted when this parameter's name has changed
+    sigOptionsChanged(self, opts)        Emitted when any of this parameter's options have changed
+    ===================================  =========================================================
+    """
+    ## name, type, limits, etc.
+    ## can also carry UI hints (slider vs spinbox, etc.)
+    
+    sigValueChanged = QtCore.Signal(object, object)  ## self, value   emitted when value is finished being edited
+    sigValueChanging = QtCore.Signal(object, object)  ## self, value  emitted as value is being edited
+    
+    sigChildAdded = QtCore.Signal(object, object, object)  ## self, child, index
+    sigChildRemoved = QtCore.Signal(object, object)  ## self, child
+    sigRemoved = QtCore.Signal(object) ## self
+    sigParentChanged = QtCore.Signal(object, object)  ## self, parent
+    sigLimitsChanged = QtCore.Signal(object, object)  ## self, limits
+    sigDefaultChanged = QtCore.Signal(object, object)  ## self, default
+    sigNameChanged = QtCore.Signal(object, object)  ## self, name
+    sigOptionsChanged = QtCore.Signal(object, object)  ## self, {opt:val, ...}
+    
+    ## Emitted when anything changes about this parameter at all.
+    ## The second argument is a string indicating what changed ('value', 'childAdded', etc..)
+    ## The third argument can be any extra information about the change
+    sigStateChanged = QtCore.Signal(object, object, object) ## self, change, info
+    
+    ## emitted when any child in the tree changes state
+    ## (but only if monitorChildren() is called)
+    sigTreeStateChanged = QtCore.Signal(object, object)  # self, changes
+                                                         # changes = [(param, change, info), ...]
+    
+    # bad planning.
+    #def __new__(cls, *args, **opts):
+        #try:
+            #cls = PARAM_TYPES[opts['type']]
+        #except KeyError:
+            #pass
+        #return QtCore.QObject.__new__(cls, *args, **opts)
+    
+    @staticmethod
+    def create(**opts):
+        """
+        Static method that creates a new Parameter (or subclass) instance using 
+        opts['type'] to select the appropriate class.
+        
+        All options are passed directly to the new Parameter's __init__ method.
+        Use registerParameterType() to add new class types.
+        """
+        typ = opts.get('type', None)
+        if typ is None:
+            cls = Parameter
+        else:
+            cls = PARAM_TYPES[opts['type']]
+        return cls(**opts)
+    
+    def __init__(self, **opts):
+        """
+        Initialize a Parameter object. Although it is rare to directly create a
+        Parameter instance, the options available to this method are also allowed
+        by most Parameter subclasses.
+        
+        =======================      =========================================================
+        **Keyword Arguments:**
+        name                         The name to give this Parameter. This is the name that
+                                     will appear in the left-most column of a ParameterTree
+                                     for this Parameter.
+        value                        The value to initially assign to this Parameter.
+        default                      The default value for this Parameter (most Parameters
+                                     provide an option to 'reset to default').
+        children                     A list of children for this Parameter. Children
+                                     may be given either as a Parameter instance or as a
+                                     dictionary to pass to Parameter.create(). In this way,
+                                     it is possible to specify complex hierarchies of
+                                     Parameters from a single nested data structure.
+        readonly                     If True, the user will not be allowed to edit this
+                                     Parameter. (default=False)
+        enabled                      If False, any widget(s) for this parameter will appear
+                                     disabled. (default=True)
+        visible                      If False, the Parameter will not appear when displayed
+                                     in a ParameterTree. (default=True)
+        renamable                    If True, the user may rename this Parameter.
+                                     (default=False)
+        removable                    If True, the user may remove this Parameter.
+                                     (default=False)
+        expanded                     If True, the Parameter will appear expanded when
+                                     displayed in a ParameterTree (its children will be
+                                     visible). (default=True)
+        title                        (str or None) If specified, then the parameter will be 
+                                     displayed to the user using this string as its name. 
+                                     However, the parameter will still be referred to 
+                                     internally using the *name* specified above. Note that
+                                     this option is not compatible with renamable=True.
+                                     (default=None; added in version 0.9.9)
+        =======================      =========================================================
+        """
+        
+        
+        QtCore.QObject.__init__(self)
+        
+        self.opts = {
+            'type': None,
+            'readonly': False,
+            'visible': True,
+            'enabled': True,
+            'renamable': False,
+            'removable': False,
+            'strictNaming': False,  # forces name to be usable as a python variable
+            'expanded': True,
+            'title': None,
+            #'limits': None,  ## This is a bad plan--each parameter type may have a different data type for limits.
+        }
+        self.opts.update(opts)
+        
+        self.childs = []
+        self.names = {}   ## map name:child
+        self.items = weakref.WeakKeyDictionary()  ## keeps track of tree items representing this parameter
+        self._parent = None
+        self.treeStateChanges = []  ## cache of tree state changes to be delivered on next emit
+        self.blockTreeChangeEmit = 0
+        #self.monitoringChildren = False  ## prevent calling monitorChildren more than once
+        
+        if 'value' not in self.opts:
+            self.opts['value'] = None
+        
+        if 'name' not in self.opts or not isinstance(self.opts['name'], basestring):
+            raise Exception("Parameter must have a string name specified in opts.")
+        self.setName(opts['name'])
+        
+        self.addChildren(self.opts.get('children', []))
+            
+        if 'value' in self.opts and 'default' not in self.opts:
+            self.opts['default'] = self.opts['value']
+    
+        ## Connect all state changed signals to the general sigStateChanged
+        self.sigValueChanged.connect(lambda param, data: self.emitStateChanged('value', data))
+        self.sigChildAdded.connect(lambda param, *data: self.emitStateChanged('childAdded', data))
+        self.sigChildRemoved.connect(lambda param, data: self.emitStateChanged('childRemoved', data))
+        self.sigParentChanged.connect(lambda param, data: self.emitStateChanged('parent', data))
+        self.sigLimitsChanged.connect(lambda param, data: self.emitStateChanged('limits', data))
+        self.sigDefaultChanged.connect(lambda param, data: self.emitStateChanged('default', data))
+        self.sigNameChanged.connect(lambda param, data: self.emitStateChanged('name', data))
+        self.sigOptionsChanged.connect(lambda param, data: self.emitStateChanged('options', data))
+        
+        #self.watchParam(self)  ## emit treechange signals if our own state changes
+        
+    def name(self):
+        """Return the name of this Parameter."""
+        return self.opts['name']
+
+    def setName(self, name):
+        """Attempt to change the name of this parameter; return the actual name. 
+        (The parameter may reject the name change or automatically pick a different name)"""
+        if self.opts['strictNaming']:
+            if len(name) < 1 or re.search(r'\W', name) or re.match(r'\d', name[0]):
+                raise Exception("Parameter name '%s' is invalid. (Must contain only alphanumeric and underscore characters and may not start with a number)" % name)
+        parent = self.parent()
+        if parent is not None:
+            name = parent._renameChild(self, name)  ## first ask parent if it's ok to rename
+        if self.opts['name'] != name:
+            self.opts['name'] = name
+            self.sigNameChanged.emit(self, name)
+        return name
+
+    def type(self):
+        """Return the type string for this Parameter."""
+        return self.opts['type']
+        
+    def isType(self, typ):
+        """
+        Return True if this parameter type matches the name *typ*.
+        This can occur either of two ways:
+        
+        - If self.type() == *typ*
+        - If this parameter's class is registered with the name *typ*
+        """
+        if self.type() == typ:
+            return True
+        global PARAM_TYPES
+        cls = PARAM_TYPES.get(typ, None)
+        if cls is None:
+            raise Exception("Type name '%s' is not registered." % str(typ))
+        return self.__class__ is cls
+        
+    def childPath(self, child):
+        """
+        Return the path of parameter names from self to child.
+        If child is not a (grand)child of self, return None.
+        """
+        path = []
+        while child is not self:
+            path.insert(0, child.name())
+            child = child.parent()
+            if child is None:
+                return None
+        return path
+
+    def setValue(self, value, blockSignal=None):
+        """
+        Set the value of this Parameter; return the actual value that was set.
+        (this may be different from the value that was requested)
+        """
+        try:
+            if blockSignal is not None:
+                self.sigValueChanged.disconnect(blockSignal)
+            if self.opts['value'] == value:
+                return value
+            self.opts['value'] = value
+            self.sigValueChanged.emit(self, value)
+        finally:
+            if blockSignal is not None:
+                self.sigValueChanged.connect(blockSignal)
+            
+        return value
+
+    def value(self):
+        """
+        Return the value of this Parameter.
+        """
+        return self.opts['value']
+
+    def getValues(self):
+        """Return a tree of all values that are children of this parameter"""
+        vals = OrderedDict()
+        for ch in self:
+            vals[ch.name()] = (ch.value(), ch.getValues())
+        return vals
+    
+    def saveState(self, filter=None):
+        """
+        Return a structure representing the entire state of the parameter tree.
+        The tree state may be restored from this structure using restoreState().
+
+        If *filter* is set to 'user', then only user-settable data will be included in the
+        returned state.
+        """
+        if filter is None:
+            state = self.opts.copy()
+            if state['type'] is None:
+                global PARAM_NAMES
+                state['type'] = PARAM_NAMES.get(type(self), None)
+        elif filter == 'user':
+            state = {'value': self.value()}
+        else:
+            raise ValueError("Unrecognized filter argument: '%s'" % filter)
+
+        ch = OrderedDict([(ch.name(), ch.saveState(filter=filter)) for ch in self])
+        if len(ch) > 0:
+            state['children'] = ch
+        return state
+
+    def restoreState(self, state, recursive=True, addChildren=True, removeChildren=True, blockSignals=True):
+        """
+        Restore the state of this parameter and its children from a structure generated using saveState()
+        If recursive is True, then attempt to restore the state of child parameters as well.
+        If addChildren is True, then any children which are referenced in the state object will be
+        created if they do not already exist.
+        If removeChildren is True, then any children which are not referenced in the state object will 
+        be removed.
+        If blockSignals is True, no signals will be emitted until the tree has been completely restored. 
+        This prevents signal handlers from responding to a partially-rebuilt network.
+        """
+        childState = state.get('children', [])
+        
+        ## list of children may be stored either as list or dict.
+        if isinstance(childState, dict):
+            cs = []
+            for k,v in childState.items():
+                cs.append(v.copy())
+                cs[-1].setdefault('name', k)
+            childState = cs
+        
+        if blockSignals:
+            self.blockTreeChangeSignal()
+            
+        try:
+            self.setOpts(**state)
+            
+            if not recursive:
+                return
+            
+            ptr = 0  ## pointer to first child that has not been restored yet
+            foundChilds = set()
+            #print "==============", self.name()
+            
+            for ch in childState:
+                name = ch['name']
+                #typ = ch.get('type', None)
+                #print('child: %s, %s' % (self.name()+'.'+name, typ))
+                
+                ## First, see if there is already a child with this name
+                gotChild = False
+                for i, ch2 in enumerate(self.childs[ptr:]):
+                    #print "  ", ch2.name(), ch2.type()
+                    if ch2.name() != name: # or not ch2.isType(typ):
+                        continue
+                    gotChild = True
+                    #print "    found it"
+                    if i != 0:  ## move parameter to next position
+                        #self.removeChild(ch2)
+                        self.insertChild(ptr, ch2)
+                        #print "  moved to position", ptr
+                    ch2.restoreState(ch, recursive=recursive, addChildren=addChildren, removeChildren=removeChildren)
+                    foundChilds.add(ch2)
+                    
+                    break
+                
+                if not gotChild:
+                    if not addChildren:
+                        #print "  ignored child"
+                        continue
+                    #print "    created new"
+                    ch2 = Parameter.create(**ch)
+                    self.insertChild(ptr, ch2)
+                    foundChilds.add(ch2)
+                    
+                ptr += 1
+                
+            if removeChildren:
+                for ch in self.childs[:]:
+                    if ch not in foundChilds:
+                        #print "  remove:", ch
+                        self.removeChild(ch)
+        finally:
+            if blockSignals:
+                self.unblockTreeChangeSignal()
+            
+            
+        
+    def defaultValue(self):
+        """Return the default value for this parameter."""
+        return self.opts['default']
+        
+    def setDefault(self, val):
+        """Set the default value for this parameter."""
+        if self.opts['default'] == val:
+            return
+        self.opts['default'] = val
+        self.sigDefaultChanged.emit(self, val)
+
+    def setToDefault(self):
+        """Set this parameter's value to the default."""
+        if self.hasDefault():
+            self.setValue(self.defaultValue())
+
+    def hasDefault(self):
+        """Returns True if this parameter has a default value."""
+        return 'default' in self.opts
+        
+    def valueIsDefault(self):
+        """Returns True if this parameter's value is equal to the default value."""
+        return self.value() == self.defaultValue()
+        
+    def setLimits(self, limits):
+        """Set limits on the acceptable values for this parameter. 
+        The format of limits depends on the type of the parameter and
+        some parameters do not make use of limits at all."""
+        if 'limits' in self.opts and self.opts['limits'] == limits:
+            return
+        self.opts['limits'] = limits
+        self.sigLimitsChanged.emit(self, limits)
+        return limits
+
+    def writable(self):
+        """
+        Returns True if this parameter's value can be changed by the user.
+        Note that the value of the parameter can *always* be changed by
+        calling setValue().
+        """
+        return not self.readonly()
+
+    def setWritable(self, writable=True):
+        """Set whether this Parameter should be editable by the user. (This is 
+        exactly the opposite of setReadonly)."""
+        self.setOpts(readonly=not writable)
+        
+    def readonly(self):
+        """
+        Return True if this parameter is read-only. (this is the opposite of writable())
+        """
+        return self.opts.get('readonly', False)
+        
+    def setReadonly(self, readonly=True):
+        """Set whether this Parameter's value may be edited by the user
+        (this is the opposite of setWritable())."""
+        self.setOpts(readonly=readonly)
+        
+    def setOpts(self, **opts):
+        """
+        Set any arbitrary options on this parameter.
+        The exact behavior of this function will depend on the parameter type, but
+        most parameters will accept a common set of options: value, name, limits,
+        default, readonly, removable, renamable, visible, enabled, and expanded.
+        
+        See :func:`Parameter.__init__ <pyqtgraph.parametertree.Parameter.__init__>`
+        for more information on default options.
+        """
+        changed = OrderedDict()
+        for k in opts:
+            if k == 'value':
+                self.setValue(opts[k])
+            elif k == 'name':
+                self.setName(opts[k])
+            elif k == 'limits':
+                self.setLimits(opts[k])
+            elif k == 'default':
+                self.setDefault(opts[k])
+            elif k not in self.opts or self.opts[k] != opts[k]:
+                self.opts[k] = opts[k]
+                changed[k] = opts[k]
+                
+        if len(changed) > 0:
+            self.sigOptionsChanged.emit(self, changed)
+        
+    def emitStateChanged(self, changeDesc, data):
+        ## Emits stateChanged signal and 
+        ## requests emission of new treeStateChanged signal
+        self.sigStateChanged.emit(self, changeDesc, data)
+        #self.treeStateChanged(self, changeDesc, data)
+        self.treeStateChanges.append((self, changeDesc, data))
+        self.emitTreeChanges()
+
+    def makeTreeItem(self, depth):
+        """
+        Return a TreeWidgetItem suitable for displaying/controlling the content of 
+        this parameter. This is called automatically when a ParameterTree attempts
+        to display this Parameter.
+        Most subclasses will want to override this function.
+        """
+        if hasattr(self, 'itemClass'):
+            #print "Param:", self, "Make item from itemClass:", self.itemClass
+            return self.itemClass(self, depth)
+        else:
+            return ParameterItem(self, depth=depth)
+
+
+    def addChild(self, child, autoIncrementName=None):
+        """
+        Add another parameter to the end of this parameter's child list.
+        
+        See insertChild() for a description of the *autoIncrementName* 
+        argument.
+        """
+        return self.insertChild(len(self.childs), child, autoIncrementName=autoIncrementName)
+
+    def addChildren(self, children):
+        """
+        Add a list or dict of children to this parameter. This method calls
+        addChild once for each value in *children*.
+        """
+        ## If children was specified as dict, then assume keys are the names.
+        if isinstance(children, dict):
+            ch2 = []
+            for name, opts in children.items():
+                if isinstance(opts, dict) and 'name' not in opts:
+                    opts = opts.copy()
+                    opts['name'] = name
+                ch2.append(opts)
+            children = ch2
+        
+        for chOpts in children:
+            #print self, "Add child:", type(chOpts), id(chOpts)
+            self.addChild(chOpts)
+        
+        
+    def insertChild(self, pos, child, autoIncrementName=None):
+        """
+        Insert a new child at pos.
+        If pos is a Parameter, then insert at the position of that Parameter.
+        If child is a dict, then a parameter is constructed using
+        :func:`Parameter.create <pyqtgraph.parametertree.Parameter.create>`.
+        
+        By default, the child's 'autoIncrementName' option determines whether
+        the name will be adjusted to avoid prior name collisions. This 
+        behavior may be overridden by specifying the *autoIncrementName* 
+        argument. This argument was added in version 0.9.9.
+        """
+        if isinstance(child, dict):
+            child = Parameter.create(**child)
+        
+        name = child.name()
+        if name in self.names and child is not self.names[name]:
+            if autoIncrementName is True or (autoIncrementName is None and child.opts.get('autoIncrementName', False)):
+                name = self.incrementName(name)
+                child.setName(name)
+            else:
+                raise Exception("Already have child named %s" % str(name))
+        if isinstance(pos, Parameter):
+            pos = self.childs.index(pos)
+            
+        with self.treeChangeBlocker():
+            if child.parent() is not None:
+                child.remove()
+                
+            self.names[name] = child
+            self.childs.insert(pos, child)
+            
+            child.parentChanged(self)
+            self.sigChildAdded.emit(self, child, pos)
+            child.sigTreeStateChanged.connect(self.treeStateChanged)
+        return child
+        
+    def removeChild(self, child):
+        """Remove a child parameter."""
+        name = child.name()
+        if name not in self.names or self.names[name] is not child:
+            raise Exception("Parameter %s is not my child; can't remove." % str(child))
+        del self.names[name]
+        self.childs.pop(self.childs.index(child))
+        child.parentChanged(None)
+        self.sigChildRemoved.emit(self, child)
+        try:
+            child.sigTreeStateChanged.disconnect(self.treeStateChanged)
+        except (TypeError, RuntimeError):  ## already disconnected
+            pass
+
+    def clearChildren(self):
+        """Remove all child parameters."""
+        for ch in self.childs[:]:
+            self.removeChild(ch)
+
+    def children(self):  
+        """Return a list of this parameter's children.
+        Warning: this overrides QObject.children
+        """
+        return self.childs[:]
+    
+    def hasChildren(self):
+        """Return True if this Parameter has children."""
+        return len(self.childs) > 0
+
+    def parentChanged(self, parent):
+        """This method is called when the parameter's parent has changed.
+        It may be useful to extend this method in subclasses."""
+        self._parent = parent
+        self.sigParentChanged.emit(self, parent)
+        
+    def parent(self):
+        """Return the parent of this parameter."""
+        return self._parent
+        
+    def remove(self):
+        """Remove this parameter from its parent's child list"""
+        parent = self.parent()
+        if parent is None:
+            raise Exception("Cannot remove; no parent.")
+        parent.removeChild(self)
+        self.sigRemoved.emit(self)
+
+    def incrementName(self, name):
+        ## return an unused name by adding a number to the name given
+        base, num = re.match('(.*)(\d*)', name).groups()
+        numLen = len(num)
+        if numLen == 0:
+            num = 2
+            numLen = 1
+        else:
+            num = int(num)
+        while True:
+            newName = base + ("%%0%dd"%numLen) % num
+            if newName not in self.names:
+                return newName
+            num += 1
+
+    def __iter__(self):
+        for ch in self.childs:
+            yield ch
+
+    def __getitem__(self, names):
+        """Get the value of a child parameter. The name may also be a tuple giving
+        the path to a sub-parameter::
+        
+            value = param[('child', 'grandchild')]
+        """
+        if not isinstance(names, tuple):
+            names = (names,)
+        return self.param(*names).value()
+
+    def __setitem__(self, names, value):
+        """Set the value of a child parameter. The name may also be a tuple giving
+        the path to a sub-parameter::
+        
+            param[('child', 'grandchild')] = value
+        """
+        if isinstance(names, basestring):
+            names = (names,)
+        return self.param(*names).setValue(value)
+
+    def child(self, *names):
+        """Return a child parameter. 
+        Accepts the name of the child or a tuple (path, to, child)
+
+        Added in version 0.9.9. Ealier versions used the 'param' method, which is still
+        implemented for backward compatibility."""
+        try:
+            param = self.names[names[0]]
+        except KeyError:
+            raise Exception("Parameter %s has no child named %s" % (self.name(), names[0]))
+        
+        if len(names) > 1:
+            return param.param(*names[1:])
+        else:
+            return param
+        
+    def param(self, *names):
+        # for backward compatibility.
+        return self.child(*names)
+
+    def __repr__(self):
+        return asUnicode("<%s '%s' at 0x%x>") % (self.__class__.__name__, self.name(), id(self))
+       
+    def __getattr__(self, attr):
+        ## Leaving this undocumented because I might like to remove it in the future..
+        #print type(self), attr
+        
+        if 'names' not in self.__dict__:
+            raise AttributeError(attr)
+        if attr in self.names:
+            import traceback
+            traceback.print_stack()
+            print("Warning: Use of Parameter.subParam is deprecated. Use Parameter.param(name) instead.")
+            return self.param(attr)
+        else:
+            raise AttributeError(attr)
+       
+    def _renameChild(self, child, name):
+        ## Only to be called from Parameter.rename
+        if name in self.names:
+            return child.name()
+        self.names[name] = child
+        del self.names[child.name()]
+        return name
+
+    def registerItem(self, item):
+        self.items[item] = None
+        
+    def hide(self):
+        """Hide this parameter. It and its children will no longer be visible in any ParameterTree
+        widgets it is connected to."""
+        self.show(False)
+        
+    def show(self, s=True):
+        """Show this parameter. """
+        self.opts['visible'] = s
+        self.sigOptionsChanged.emit(self, {'visible': s})
+
+
+    def treeChangeBlocker(self):
+        """
+        Return an object that can be used to temporarily block and accumulate
+        sigTreeStateChanged signals. This is meant to be used when numerous changes are 
+        about to be made to the tree and only one change signal should be
+        emitted at the end.
+        
+        Example::
+
+            with param.treeChangeBlocker():
+                param.addChild(...)
+                param.removeChild(...)
+                param.setValue(...)
+        """
+        return SignalBlocker(self.blockTreeChangeSignal, self.unblockTreeChangeSignal)
+
+    def blockTreeChangeSignal(self):
+        """
+        Used to temporarily block and accumulate tree change signals.
+        *You must remember to unblock*, so it is advisable to use treeChangeBlocker() instead.
+        """
+        self.blockTreeChangeEmit += 1
+
+    def unblockTreeChangeSignal(self):
+        """Unblocks enission of sigTreeStateChanged and flushes the changes out through a single signal."""
+        self.blockTreeChangeEmit -= 1
+        self.emitTreeChanges()
+        
+        
+    def treeStateChanged(self, param, changes):
+        """
+        Called when the state of any sub-parameter has changed. 
+        
+        ==============  ================================================================
+        **Arguments:**
+        param           The immediate child whose tree state has changed.
+                        note that the change may have originated from a grandchild.
+        changes         List of tuples describing all changes that have been made
+                        in this event: (param, changeDescr, data)
+        ==============  ================================================================
+                     
+        This function can be extended to react to tree state changes.
+        """
+        self.treeStateChanges.extend(changes)
+        self.emitTreeChanges()
+    
+    def emitTreeChanges(self):
+        if self.blockTreeChangeEmit == 0:
+            changes = self.treeStateChanges
+            self.treeStateChanges = []
+            if len(changes) > 0:
+                self.sigTreeStateChanged.emit(self, changes)
+
+
+class SignalBlocker(object):
+    def __init__(self, enterFn, exitFn):
+        self.enterFn = enterFn
+        self.exitFn = exitFn
+        
+    def __enter__(self):
+        self.enterFn()
+        
+    def __exit__(self, exc_type, exc_value, tb):
+        self.exitFn()
+    
+    
+    
diff --git a/libs/pyqtgraph/parametertree/ParameterItem.py b/libs/pyqtgraph/parametertree/ParameterItem.py
new file mode 100644
index 0000000000000000000000000000000000000000..c149c4110e00810beab251b72f99ab681a1f0006
--- /dev/null
+++ b/libs/pyqtgraph/parametertree/ParameterItem.py
@@ -0,0 +1,171 @@
+from ..Qt import QtGui, QtCore
+from ..python2_3 import asUnicode
+import os, weakref, re
+
+class ParameterItem(QtGui.QTreeWidgetItem):
+    """
+    Abstract ParameterTree item. 
+    Used to represent the state of a Parameter from within a ParameterTree.
+    
+    - Sets first column of item to name
+    - generates context menu if item is renamable or removable
+    - handles child added / removed events
+    - provides virtual functions for handling changes from parameter
+    
+    For more ParameterItem types, see ParameterTree.parameterTypes module.
+    """
+    
+    def __init__(self, param, depth=0):
+        title = param.opts.get('title', None)
+        if title is None:
+            title = param.name()
+        QtGui.QTreeWidgetItem.__init__(self, [title, ''])
+
+        self.param = param
+        self.param.registerItem(self)  ## let parameter know this item is connected to it (for debugging)
+        self.depth = depth
+        
+        param.sigValueChanged.connect(self.valueChanged)
+        param.sigChildAdded.connect(self.childAdded)
+        param.sigChildRemoved.connect(self.childRemoved)
+        param.sigNameChanged.connect(self.nameChanged)
+        param.sigLimitsChanged.connect(self.limitsChanged)
+        param.sigDefaultChanged.connect(self.defaultChanged)
+        param.sigOptionsChanged.connect(self.optsChanged)
+        param.sigParentChanged.connect(self.parentChanged)
+        
+        opts = param.opts
+        
+        ## Generate context menu for renaming/removing parameter
+        self.contextMenu = QtGui.QMenu()
+        self.contextMenu.addSeparator()
+        flags = QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled
+        if opts.get('renamable', False):
+            if param.opts.get('title', None) is not None:
+                raise Exception("Cannot make parameter with both title != None and renamable == True.")
+            flags |= QtCore.Qt.ItemIsEditable
+            self.contextMenu.addAction('Rename').triggered.connect(self.editName)
+        if opts.get('removable', False):
+            self.contextMenu.addAction("Remove").triggered.connect(self.requestRemove)
+        
+        ## handle movable / dropEnabled options
+        if opts.get('movable', False):
+            flags |= QtCore.Qt.ItemIsDragEnabled
+        if opts.get('dropEnabled', False):
+            flags |= QtCore.Qt.ItemIsDropEnabled
+        self.setFlags(flags)
+        
+        ## flag used internally during name editing
+        self.ignoreNameColumnChange = False
+    
+    
+    def valueChanged(self, param, val):
+        ## called when the parameter's value has changed
+        pass
+    
+    def isFocusable(self):
+        """Return True if this item should be included in the tab-focus order"""
+        return False
+        
+    def setFocus(self):
+        """Give input focus to this item.
+        Can be reimplemented to display editor widgets, etc.
+        """
+        pass
+    
+    def focusNext(self, forward=True):
+        """Give focus to the next (or previous) focusable item in the parameter tree"""
+        self.treeWidget().focusNext(self, forward=forward)
+        
+    
+    def treeWidgetChanged(self):
+        """Called when this item is added or removed from a tree.
+        Expansion, visibility, and column widgets must all be configured AFTER 
+        the item is added to a tree, not during __init__.
+        """
+        self.setHidden(not self.param.opts.get('visible', True))
+        self.setExpanded(self.param.opts.get('expanded', True))
+        
+    def childAdded(self, param, child, pos):
+        item = child.makeTreeItem(depth=self.depth+1)
+        self.insertChild(pos, item)
+        item.treeWidgetChanged()
+        
+        for i, ch in enumerate(child):
+            item.childAdded(child, ch, i)
+        
+    def childRemoved(self, param, child):
+        for i in range(self.childCount()):
+            item = self.child(i)
+            if item.param is child:
+                self.takeChild(i)
+                break
+                
+    def parentChanged(self, param, parent):
+        ## called when the parameter's parent has changed.
+        pass
+                
+    def contextMenuEvent(self, ev):
+        if not self.param.opts.get('removable', False) and not self.param.opts.get('renamable', False):
+            return
+            
+        self.contextMenu.popup(ev.globalPos())
+        
+    def columnChangedEvent(self, col):
+        """Called when the text in a column has been edited (or otherwise changed).
+        By default, we only use changes to column 0 to rename the parameter.
+        """
+        if col == 0  and (self.param.opts.get('title', None) is None):
+            if self.ignoreNameColumnChange:
+                return
+            try:
+                newName = self.param.setName(asUnicode(self.text(col)))
+            except Exception:
+                self.setText(0, self.param.name())
+                raise
+                
+            try:
+                self.ignoreNameColumnChange = True
+                self.nameChanged(self, newName)  ## If the parameter rejects the name change, we need to set it back.
+            finally:
+                self.ignoreNameColumnChange = False
+                
+    def nameChanged(self, param, name):
+        ## called when the parameter's name has changed.
+        if self.param.opts.get('title', None) is None:
+            self.setText(0, name)
+    
+    def limitsChanged(self, param, limits):
+        """Called when the parameter's limits have changed"""
+        pass
+    
+    def defaultChanged(self, param, default):
+        """Called when the parameter's default value has changed"""
+        pass
+
+    def optsChanged(self, param, opts):
+        """Called when any options are changed that are not
+        name, value, default, or limits"""
+        #print opts
+        if 'visible' in opts:
+            self.setHidden(not opts['visible'])
+        
+    def editName(self):
+        self.treeWidget().editItem(self, 0)
+        
+    def selected(self, sel):
+        """Called when this item has been selected (sel=True) OR deselected (sel=False)"""
+        pass
+
+    def requestRemove(self):
+        ## called when remove is selected from the context menu.
+        ## we need to delay removal until the action is complete
+        ## since destroying the menu in mid-action will cause a crash.
+        QtCore.QTimer.singleShot(0, self.param.remove)
+
+    ## for python 3 support, we need to redefine hash and eq methods.
+    def __hash__(self):
+        return id(self)
+
+    def __eq__(self, x):
+        return x is self
diff --git a/libs/pyqtgraph/parametertree/ParameterSystem.py b/libs/pyqtgraph/parametertree/ParameterSystem.py
new file mode 100644
index 0000000000000000000000000000000000000000..33bb2de8e9fe8d38e3de9a5d1ec345dfd25ff894
--- /dev/null
+++ b/libs/pyqtgraph/parametertree/ParameterSystem.py
@@ -0,0 +1,127 @@
+from .parameterTypes import GroupParameter
+from .. import functions as fn
+from .SystemSolver import SystemSolver
+
+
+class ParameterSystem(GroupParameter):
+    """
+    ParameterSystem is a subclass of GroupParameter that manages a tree of 
+    sub-parameters with a set of interdependencies--changing any one parameter
+    may affect other parameters in the system.
+    
+    See parametertree/SystemSolver for more information.
+    
+    NOTE: This API is experimental and may change substantially across minor 
+    version numbers. 
+    """
+    def __init__(self, *args, **kwds):
+        GroupParameter.__init__(self, *args, **kwds)
+        self._system = None
+        self._fixParams = []  # all auto-generated 'fixed' params
+        sys = kwds.pop('system', None)
+        if sys is not None:
+            self.setSystem(sys)
+        self._ignoreChange = [] # params whose changes should be ignored temporarily
+        self.sigTreeStateChanged.connect(self.updateSystem)
+        
+    def setSystem(self, sys):
+        self._system = sys
+        
+        # auto-generate defaults to match child parameters
+        defaults = {}
+        vals = {}
+        for param in self:
+            name = param.name()
+            constraints = ''
+            if hasattr(sys, '_' + name):
+                constraints += 'n'
+                
+            if not param.readonly():
+                constraints += 'f'
+                if 'n' in constraints:
+                    ch = param.addChild(dict(name='fixed', type='bool', value=False))
+                    self._fixParams.append(ch)
+                    param.setReadonly(True)
+                    param.setOpts(expanded=False)
+                else:
+                    vals[name] = param.value()
+                    ch = param.addChild(dict(name='fixed', type='bool', value=True, readonly=True))
+                    #self._fixParams.append(ch)
+                
+            defaults[name] = [None, param.type(), None, constraints]
+        
+        sys.defaultState.update(defaults)
+        sys.reset()
+        for name, value in vals.items():
+            setattr(sys, name, value)
+        
+        self.updateAllParams()
+    
+    def updateSystem(self, param, changes):
+        changes = [ch for ch in changes if ch[0] not in self._ignoreChange]
+        
+        #resets = [ch[0] for ch in changes if ch[1] == 'setToDefault']
+        sets = [ch[0] for ch in changes if ch[1] == 'value']
+        #for param in resets:
+            #setattr(self._system, param.name(), None)
+
+        for param in sets:
+            #if param in resets:
+                #continue
+            
+            #if param in self._fixParams:
+                #param.parent().setWritable(param.value())
+            #else:
+            if param in self._fixParams:
+                parent = param.parent()
+                if param.value():
+                    setattr(self._system, parent.name(), parent.value())
+                else:
+                    setattr(self._system, parent.name(), None)
+            else:
+                setattr(self._system, param.name(), param.value())
+            
+        self.updateAllParams()
+    
+    def updateAllParams(self):
+        try:
+            self.sigTreeStateChanged.disconnect(self.updateSystem)
+            for name, state in self._system._vars.items():
+                param = self.child(name)
+                try:
+                    v = getattr(self._system, name)
+                    if self._system._vars[name][2] is None:
+                        self.updateParamState(self.child(name), 'autoSet')
+                        param.setValue(v)
+                    else:
+                        self.updateParamState(self.child(name), 'fixed')
+                except RuntimeError:
+                    self.updateParamState(param, 'autoUnset')
+        finally:
+            self.sigTreeStateChanged.connect(self.updateSystem)
+                
+    def updateParamState(self, param, state):
+        if state == 'autoSet':
+            bg = fn.mkBrush((200, 255, 200, 255))
+            bold = False
+            readonly = True
+        elif state == 'autoUnset':
+            bg = fn.mkBrush(None)
+            bold = False
+            readonly = False
+        elif state == 'fixed':
+            bg = fn.mkBrush('y')
+            bold = True
+            readonly = False
+            
+        param.setReadonly(readonly)
+        
+        #for item in param.items:
+            #item.setBackground(0, bg)
+            #f = item.font(0)
+            #f.setWeight(f.Bold if bold else f.Normal)
+            #item.setFont(0, f)
+            
+            
+            
+
diff --git a/libs/pyqtgraph/parametertree/ParameterTree.py b/libs/pyqtgraph/parametertree/ParameterTree.py
new file mode 100644
index 0000000000000000000000000000000000000000..ef7c1030b7a815701bfc56ecd633be2bedef6d21
--- /dev/null
+++ b/libs/pyqtgraph/parametertree/ParameterTree.py
@@ -0,0 +1,154 @@
+from ..Qt import QtCore, QtGui
+from ..widgets.TreeWidget import TreeWidget
+import os, weakref, re
+from .ParameterItem import ParameterItem
+#import functions as fn
+        
+            
+
+class ParameterTree(TreeWidget):
+    """Widget used to display or control data from a hierarchy of Parameters"""
+    
+    def __init__(self, parent=None, showHeader=True):
+        """
+        ============== ========================================================
+        **Arguments:**
+        parent         (QWidget) An optional parent widget
+        showHeader     (bool) If True, then the QTreeView header is displayed.
+        ============== ========================================================
+        """
+        TreeWidget.__init__(self, parent)
+        self.setVerticalScrollMode(self.ScrollPerPixel)
+        self.setHorizontalScrollMode(self.ScrollPerPixel)
+        self.setAnimated(False)
+        self.setColumnCount(2)
+        self.setHeaderLabels(["Parameter", "Value"])
+        self.setAlternatingRowColors(True)
+        self.paramSet = None
+        self.header().setResizeMode(QtGui.QHeaderView.ResizeToContents)
+        self.setHeaderHidden(not showHeader)
+        self.itemChanged.connect(self.itemChangedEvent)
+        self.lastSel = None
+        self.setRootIsDecorated(False)
+        
+    def setParameters(self, param, showTop=True):
+        """
+        Set the top-level :class:`Parameter <pyqtgraph.parametertree.Parameter>`
+        to be displayed in this ParameterTree.
+
+        If *showTop* is False, then the top-level parameter is hidden and only 
+        its children will be visible. This is a convenience method equivalent 
+        to::
+        
+            tree.clear()
+            tree.addParameters(param, showTop)
+        """
+        self.clear()
+        self.addParameters(param, showTop=showTop)
+        
+    def addParameters(self, param, root=None, depth=0, showTop=True):
+        """
+        Adds one top-level :class:`Parameter <pyqtgraph.parametertree.Parameter>`
+        to the view. 
+        
+        ============== ==========================================================
+        **Arguments:** 
+        param          The :class:`Parameter <pyqtgraph.parametertree.Parameter>` 
+                       to add.
+        root           The item within the tree to which *param* should be added.
+                       By default, *param* is added as a top-level item.
+        showTop        If False, then *param* will be hidden, and only its 
+                       children will be visible in the tree.
+        ============== ==========================================================
+        """
+        item = param.makeTreeItem(depth=depth)
+        if root is None:
+            root = self.invisibleRootItem()
+            ## Hide top-level item
+            if not showTop:
+                item.setText(0, '')
+                item.setSizeHint(0, QtCore.QSize(1,1))
+                item.setSizeHint(1, QtCore.QSize(1,1))
+                depth -= 1
+        root.addChild(item)
+        item.treeWidgetChanged()
+            
+        for ch in param:
+            self.addParameters(ch, root=item, depth=depth+1)
+
+    def clear(self):
+        """
+        Remove all parameters from the tree.        
+        """
+        self.invisibleRootItem().takeChildren()        
+            
+    def focusNext(self, item, forward=True):
+        """Give input focus to the next (or previous) item after *item*
+        """
+        while True:
+            parent = item.parent()
+            if parent is None:
+                return
+            nextItem = self.nextFocusableChild(parent, item, forward=forward)
+            if nextItem is not None:
+                nextItem.setFocus()
+                self.setCurrentItem(nextItem)
+                return
+            item = parent
+
+    def focusPrevious(self, item):
+        self.focusNext(item, forward=False)
+
+    def nextFocusableChild(self, root, startItem=None, forward=True):
+        if startItem is None:
+            if forward:
+                index = 0
+            else:
+                index = root.childCount()-1
+        else:
+            if forward:
+                index = root.indexOfChild(startItem) + 1
+            else:
+                index = root.indexOfChild(startItem) - 1
+            
+        if forward:
+            inds = list(range(index, root.childCount()))
+        else:
+            inds = list(range(index, -1, -1))
+            
+        for i in inds:
+            item = root.child(i)
+            if hasattr(item, 'isFocusable') and item.isFocusable():
+                return item
+            else:
+                item = self.nextFocusableChild(item, forward=forward)
+                if item is not None:
+                    return item
+        return None
+
+    def contextMenuEvent(self, ev):
+        item = self.currentItem()
+        if hasattr(item, 'contextMenuEvent'):
+            item.contextMenuEvent(ev)
+            
+    def itemChangedEvent(self, item, col):
+        if hasattr(item, 'columnChangedEvent'):
+            item.columnChangedEvent(col)
+            
+    def selectionChanged(self, *args):
+        sel = self.selectedItems()
+        if len(sel) != 1:
+            sel = None
+        if self.lastSel is not None and isinstance(self.lastSel, ParameterItem):
+            self.lastSel.selected(False)
+        if sel is None:
+            self.lastSel = None
+            return
+        self.lastSel = sel[0]
+        if hasattr(sel[0], 'selected'):
+            sel[0].selected(True)
+        return TreeWidget.selectionChanged(self, *args)
+        
+    def wheelEvent(self, ev):
+        self.clearSelection()
+        return TreeWidget.wheelEvent(self, ev)
diff --git a/libs/pyqtgraph/parametertree/SystemSolver.py b/libs/pyqtgraph/parametertree/SystemSolver.py
new file mode 100644
index 0000000000000000000000000000000000000000..045346d59c4a1263e6e553efe19c80a4deb0d8a1
--- /dev/null
+++ b/libs/pyqtgraph/parametertree/SystemSolver.py
@@ -0,0 +1,381 @@
+from collections import OrderedDict
+import numpy as np
+
+class SystemSolver(object):
+    """
+    This abstract class is used to formalize and manage user interaction with a 
+    complex system of equations (related to "constraint satisfaction problems").
+    It is often the case that devices must be controlled
+    through a large number of free variables, and interactions between these 
+    variables make the system difficult to manage and conceptualize as a user
+    interface. This class does _not_ attempt to numerically solve the system
+    of equations. Rather, it provides a framework for subdividing the system
+    into manageable pieces and specifying closed-form solutions to these small 
+    pieces.
+    
+    For an example, see the simple Camera class below.
+    
+    Theory of operation: Conceptualize the system as 1) a set of variables
+    whose values may be either user-specified or automatically generated, and 
+    2) a set of functions that define *how* each variable should be generated. 
+    When a variable is accessed (as an instance attribute), the solver first
+    checks to see if it already has a value (either user-supplied, or cached
+    from a previous calculation). If it does not, then the solver calls a 
+    method on itself (the method must be named `_variableName`) that will
+    either return the calculated value (which usually involves acccessing
+    other variables in the system), or raise RuntimeError if it is unable to
+    calculate the value (usually because the user has not provided sufficient
+    input to fully constrain the system). 
+    
+    Each method that calculates a variable value may include multiple 
+    try/except blocks, so that if one method generates a RuntimeError, it may 
+    fall back on others. 
+    In this way, the system may be solved by recursively searching the tree of 
+    possible relationships between variables. This allows the user flexibility
+    in deciding which variables are the most important to specify, while 
+    avoiding the apparent combinatorial explosion of calculation pathways
+    that must be considered by the developer.
+    
+    Solved values are cached for efficiency, and automatically cleared when 
+    a state change invalidates the cache. The rules for this are simple: any
+    time a value is set, it invalidates the cache *unless* the previous value
+    was None (which indicates that no other variable has yet requested that 
+    value). More complex cache management may be defined in subclasses.
+    
+    
+    Subclasses must define:
+    
+    1) The *defaultState* class attribute: This is a dict containing a 
+       description of the variables in the system--their default values,
+       data types, and the ways they can be constrained. The format is::
+       
+           { name: [value, type, constraint, allowed_constraints], ...}
+       
+       * *value* is the default value. May be None if it has not been specified
+         yet.
+       * *type* may be float, int, bool, np.ndarray, ...
+       * *constraint* may be None, single value, or (min, max)
+            * None indicates that the value is not constrained--it may be 
+              automatically generated if the value is requested.
+       * *allowed_constraints* is a string composed of (n)one, (f)ixed, and (r)ange. 
+       
+       Note: do not put mutable objects inside defaultState!
+       
+    2) For each variable that may be automatically determined, a method must 
+       be defined with the name `_variableName`. This method may either return
+       the 
+    """
+
+    defaultState = OrderedDict()
+
+    def __init__(self):
+        self.__dict__['_vars'] = OrderedDict()
+        self.__dict__['_currentGets'] = set()
+        self.reset()
+        
+    def reset(self):
+        """
+        Reset all variables in the solver to their default state.
+        """
+        self._currentGets.clear()
+        for k in self.defaultState:
+            self._vars[k] = self.defaultState[k][:]
+
+    def __getattr__(self, name):
+        if name in self._vars:
+            return self.get(name)
+        raise AttributeError(name)
+    
+    def __setattr__(self, name, value):
+        """
+        Set the value of a state variable. 
+        If None is given for the value, then the constraint will also be set to None.
+        If a tuple is given for a scalar variable, then the tuple is used as a range constraint instead of a value.
+        Otherwise, the constraint is set to 'fixed'.
+        
+        """
+        # First check this is a valid attribute
+        if name in self._vars:
+            if value is None:
+                self.set(name, value, None)
+            elif isinstance(value, tuple) and self._vars[name][1] is not np.ndarray:
+                self.set(name, None, value)
+            else:
+                self.set(name, value, 'fixed')
+        else:
+            # also allow setting any other pre-existing attribute
+            if hasattr(self, name):
+                object.__setattr__(self, name, value)
+            else:
+                raise AttributeError(name)
+        
+    def get(self, name):
+        """
+        Return the value for parameter *name*. 
+        
+        If the value has not been specified, then attempt to compute it from
+        other interacting parameters.
+        
+        If no value can be determined, then raise RuntimeError.
+        """
+        if name in self._currentGets:
+                raise RuntimeError("Cyclic dependency while calculating '%s'." % name)
+        self._currentGets.add(name)
+        try:
+            v = self._vars[name][0]
+            if v is None:
+                cfunc = getattr(self, '_' + name, None)
+                if cfunc is None:
+                    v = None
+                else:
+                    v = cfunc()
+                if v is None:
+                    raise RuntimeError("Parameter '%s' is not specified." % name)
+                v = self.set(name, v)
+        finally:
+            self._currentGets.remove(name)
+        
+        return v
+    
+    def set(self, name, value=None, constraint=True):
+        """
+        Set a variable *name* to *value*. The actual set value is returned (in
+        some cases, the value may be cast into another type).
+        
+        If *value* is None, then the value is left to be determined in the 
+        future. At any time, the value may be re-assigned arbitrarily unless
+        a constraint is given.
+        
+        If *constraint* is True (the default), then supplying a value that 
+        violates a previously specified constraint will raise an exception.
+        
+        If *constraint* is 'fixed', then the value is set (if provided) and
+        the variable will not be updated automatically in the future.
+
+        If *constraint* is a tuple, then the value is constrained to be within the 
+        given (min, max). Either constraint may be None to disable 
+        it. In some cases, a constraint cannot be satisfied automatically,
+        and the user will be forced to resolve the constraint manually.
+        
+        If *constraint* is None, then any constraints are removed for the variable.
+        """
+        var = self._vars[name]
+        if constraint is None:
+            if 'n' not in var[3]:
+                raise TypeError("Empty constraints not allowed for '%s'" % name)
+            var[2] = constraint
+        elif constraint == 'fixed':
+            if 'f' not in var[3]:
+                raise TypeError("Fixed constraints not allowed for '%s'" % name)
+            var[2] = constraint
+        elif isinstance(constraint, tuple):
+            if 'r' not in var[3]:
+                raise TypeError("Range constraints not allowed for '%s'" % name)
+            assert len(constraint) == 2
+            var[2] = constraint
+        elif constraint is not True:
+            raise TypeError("constraint must be None, True, 'fixed', or tuple. (got %s)" % constraint)
+        
+        # type checking / massaging
+        if var[1] is np.ndarray:
+            value = np.array(value, dtype=float)
+        elif var[1] in (int, float, tuple) and value is not None:
+            value = var[1](value)
+            
+        # constraint checks
+        if constraint is True and not self.check_constraint(name, value):
+            raise ValueError("Setting %s = %s violates constraint %s" % (name, value, var[2]))
+        
+        # invalidate other dependent values
+        if var[0] is not None:
+            # todo: we can make this more clever..(and might need to) 
+            # we just know that a value of None cannot have dependencies
+            # (because if anyone else had asked for this value, it wouldn't be 
+            # None anymore)
+            self.resetUnfixed()
+            
+        var[0] = value
+        return value
+    
+    def check_constraint(self, name, value):
+        c = self._vars[name][2]
+        if c is None or value is None:
+            return True
+        if isinstance(c, tuple):
+            return ((c[0] is None or c[0] <= value) and
+                    (c[1] is None or c[1] >= value))
+        else:
+            return value == c
+    
+    def saveState(self):
+        """
+        Return a serializable description of the solver's current state.
+        """
+        state = OrderedDict()
+        for name, var in self._vars.items():
+            state[name] = (var[0], var[2])
+        return state
+    
+    def restoreState(self, state):
+        """
+        Restore the state of all values and constraints in the solver.
+        """
+        self.reset()
+        for name, var in state.items():
+            self.set(name, var[0], var[1])
+    
+    def resetUnfixed(self):
+        """
+        For any variable that does not have a fixed value, reset
+        its value to None.
+        """
+        for var in self._vars.values():
+            if var[2] != 'fixed':
+                var[0] = None
+                
+    def solve(self):
+        for k in self._vars:
+            getattr(self, k)
+                
+    def __repr__(self):
+        state = OrderedDict()
+        for name, var in self._vars.items():
+            if var[2] == 'fixed':
+                state[name] = var[0]
+        state = ', '.join(["%s=%s" % (n, v) for n,v in state.items()])
+        return "<%s %s>" % (self.__class__.__name__, state)
+
+
+
+
+
+if __name__ == '__main__':
+    
+    class Camera(SystemSolver):
+        """
+        Consider a simple SLR camera. The variables we will consider that 
+        affect the camera's behavior while acquiring a photo are aperture, shutter speed,
+        ISO, and flash (of course there are many more, but let's keep the example simple).
+
+        In rare cases, the user wants to manually specify each of these variables and
+        no more work needs to be done to take the photo. More often, the user wants to
+        specify more interesting constraints like depth of field, overall exposure, 
+        or maximum allowed ISO value.
+
+        If we add a simple light meter measurement into this system and an 'exposure'
+        variable that indicates the desired exposure (0 is "perfect", -1 is one stop 
+        darker, etc), then the system of equations governing the camera behavior would
+        have the following variables:
+
+            aperture, shutter, iso, flash, exposure, light meter
+
+        The first four variables are the "outputs" of the system (they directly drive 
+        the camera), the last is a constant (the camera itself cannot affect the 
+        reading on the light meter), and 'exposure' specifies a desired relationship 
+        between other variables in the system.
+
+        So the question is: how can I formalize a system like this as a user interface?
+        Typical cameras have a fairly limited approach: provide the user with a list
+        of modes, each of which defines a particular set of constraints. For example:
+
+            manual: user provides aperture, shutter, iso, and flash
+            aperture priority: user provides aperture and exposure, camera selects
+                            iso, shutter, and flash automatically
+            shutter priority: user provides shutter and exposure, camera selects
+                            iso, aperture, and flash
+            program: user specifies exposure, camera selects all other variables
+                    automatically
+            action: camera selects all variables while attempting to maximize 
+                    shutter speed
+            portrait: camera selects all variables while attempting to minimize 
+                    aperture
+
+        A more general approach might allow the user to provide more explicit 
+        constraints on each variable (for example: I want a shutter speed of 1/30 or 
+        slower, an ISO no greater than 400, an exposure between -1 and 1, and the 
+        smallest aperture possible given all other constraints) and have the camera 
+        solve the system of equations, with a warning if no solution is found. This
+        is exactly what we will implement in this example class.
+        """
+
+        defaultState = OrderedDict([
+            # Field stop aperture
+            ('aperture', [None, float, None, 'nf']),
+            # Duration that shutter is held open. 
+            ('shutter', [None, float, None, 'nf']),
+            # ISO (sensitivity) value. 100, 200, 400, 800, 1600.. 
+            ('iso', [None, int, None, 'nf']),
+            
+            # Flash is a value indicating the brightness of the flash. A table
+            # is used to decide on "balanced" settings for each flash level:
+            #   0: no flash
+            #   1: s=1/60,  a=2.0, iso=100
+            #   2: s=1/60,  a=4.0, iso=100   ..and so on..
+            ('flash', [None, float, None, 'nf']),
+            
+            # exposure is a value indicating how many stops brighter (+1) or
+            # darker (-1) the photographer would like the photo to appear from
+            # the 'balanced' settings indicated by the light meter (see below).
+            ('exposure', [None, float, None, 'f']),
+            
+            # Let's define this as an external light meter (not affected by 
+            # aperture) with logarithmic output. We arbitrarily choose the
+            # following settings as "well balanced" for each light meter value:
+            #   -1: s=1/60,  a=2.0, iso=100
+            #    0: s=1/60,  a=4.0, iso=100
+            #    1: s=1/120, a=4.0, iso=100    ..and so on..
+            # Note that the only allowed constraint mode is (f)ixed, since the
+            # camera never _computes_ the light meter value, it only reads it.
+            ('lightMeter', [None, float, None, 'f']),  
+            
+            # Indicates the camera's final decision on how it thinks the photo will 
+            # look, given the chosen settings. This value is _only_ determined
+            # automatically.
+            ('balance', [None, float, None, 'n']),
+            ])
+        
+        def _aperture(self):
+            """
+            Determine aperture automatically under a variety of conditions.
+            """
+            iso = self.iso
+            exp = self.exposure
+            light = self.lightMeter
+            
+            try:
+                # shutter-priority mode
+                sh = self.shutter   # this raises RuntimeError if shutter has not
+                                   # been specified
+                ap = 4.0 * (sh / (1./60.)) * (iso / 100.) * (2 ** exp) * (2 ** light)
+                ap = np.clip(ap, 2.0, 16.0)
+            except RuntimeError:
+                # program mode; we can select a suitable shutter
+                # value at the same time.
+                sh = (1./60.)
+                raise
+            
+            
+            
+            return ap
+
+        def _balance(self):
+            iso = self.iso
+            light = self.lightMeter
+            sh = self.shutter
+            ap = self.aperture
+            fl = self.flash
+            
+            bal = (4.0 / ap) * (sh / (1./60.)) * (iso / 100.) * (2 ** light)
+            return np.log2(bal)
+    
+    camera = Camera()
+    
+    camera.iso = 100
+    camera.exposure = 0
+    camera.lightMeter = 2
+    camera.shutter = 1./60.
+    camera.flash = 0
+    
+    camera.solve()
+    print(camera.saveState())
+    
diff --git a/libs/pyqtgraph/parametertree/__init__.py b/libs/pyqtgraph/parametertree/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..722410d5c052513f9cd8a49c624e854925db1c5d
--- /dev/null
+++ b/libs/pyqtgraph/parametertree/__init__.py
@@ -0,0 +1,5 @@
+from .Parameter import Parameter, registerParameterType
+from .ParameterTree import ParameterTree
+from .ParameterItem import ParameterItem
+from .ParameterSystem import ParameterSystem, SystemSolver
+from . import parameterTypes as types
\ No newline at end of file
diff --git a/libs/pyqtgraph/parametertree/parameterTypes.py b/libs/pyqtgraph/parametertree/parameterTypes.py
new file mode 100644
index 0000000000000000000000000000000000000000..7b1c5ee6104cc26eac63c847253d0beed9cc53fb
--- /dev/null
+++ b/libs/pyqtgraph/parametertree/parameterTypes.py
@@ -0,0 +1,663 @@
+from ..Qt import QtCore, QtGui
+from ..python2_3 import asUnicode
+from .Parameter import Parameter, registerParameterType
+from .ParameterItem import ParameterItem
+from ..widgets.SpinBox import SpinBox
+from ..widgets.ColorButton import ColorButton
+#from ..widgets.GradientWidget import GradientWidget ## creates import loop
+from .. import pixmaps as pixmaps
+from .. import functions as fn
+import os
+from ..pgcollections import OrderedDict
+
+class WidgetParameterItem(ParameterItem):
+    """
+    ParameterTree item with:
+    
+    * label in second column for displaying value
+    * simple widget for editing value (displayed instead of label when item is selected)
+    * button that resets value to default
+    
+    ==========================  =============================================================
+    **Registered Types:**
+    int                         Displays a :class:`SpinBox <pyqtgraph.SpinBox>` in integer
+                                mode.
+    float                       Displays a :class:`SpinBox <pyqtgraph.SpinBox>`.
+    bool                        Displays a QCheckBox
+    str                         Displays a QLineEdit
+    color                       Displays a :class:`ColorButton <pyqtgraph.ColorButton>`
+    colormap                    Displays a :class:`GradientWidget <pyqtgraph.GradientWidget>`
+    ==========================  =============================================================
+    
+    This class can be subclassed by overriding makeWidget() to provide a custom widget.
+    """
+    def __init__(self, param, depth):
+        ParameterItem.__init__(self, param, depth)
+        
+        self.hideWidget = True  ## hide edit widget, replace with label when not selected
+                                ## set this to False to keep the editor widget always visible
+        
+        
+        ## build widget into column 1 with a display label and default button.
+        w = self.makeWidget()  
+        self.widget = w
+        self.eventProxy = EventProxy(w, self.widgetEventFilter)
+        
+        opts = self.param.opts
+        if 'tip' in opts:
+            w.setToolTip(opts['tip'])
+        
+        self.defaultBtn = QtGui.QPushButton()
+        self.defaultBtn.setFixedWidth(20)
+        self.defaultBtn.setFixedHeight(20)
+        modDir = os.path.dirname(__file__)
+        self.defaultBtn.setIcon(QtGui.QIcon(pixmaps.getPixmap('default')))
+        self.defaultBtn.clicked.connect(self.defaultClicked)
+        
+        self.displayLabel = QtGui.QLabel()
+        
+        layout = QtGui.QHBoxLayout()
+        layout.setContentsMargins(0, 0, 0, 0)
+        layout.setSpacing(2)
+        layout.addWidget(w)
+        layout.addWidget(self.displayLabel)
+        layout.addWidget(self.defaultBtn)
+        self.layoutWidget = QtGui.QWidget()
+        self.layoutWidget.setLayout(layout)
+        
+        if w.sigChanged is not None:
+            w.sigChanged.connect(self.widgetValueChanged)
+            
+        if hasattr(w, 'sigChanging'):
+            w.sigChanging.connect(self.widgetValueChanging)
+            
+        ## update value shown in widget. 
+        if opts.get('value', None) is not None:
+            self.valueChanged(self, opts['value'], force=True)
+        else:
+            ## no starting value was given; use whatever the widget has
+            self.widgetValueChanged()
+
+        self.updateDefaultBtn()
+
+    def makeWidget(self):
+        """
+        Return a single widget that should be placed in the second tree column.
+        The widget must be given three attributes:
+        
+        ==========  ============================================================
+        sigChanged  a signal that is emitted when the widget's value is changed
+        value       a function that returns the value
+        setValue    a function that sets the value
+        ==========  ============================================================
+            
+        This is a good function to override in subclasses.
+        """
+        opts = self.param.opts
+        t = opts['type']
+        if t == 'int':
+            defs = {
+                'value': 0, 'min': None, 'max': None, 'int': True, 
+                'step': 1.0, 'minStep': 1.0, 'dec': False, 
+                'siPrefix': False, 'suffix': ''
+            } 
+            defs.update(opts)
+            if 'limits' in opts:
+                defs['bounds'] = opts['limits']
+            w = SpinBox()
+            w.setOpts(**defs)
+            w.sigChanged = w.sigValueChanged
+            w.sigChanging = w.sigValueChanging
+        elif t == 'float':
+            defs = {
+                'value': 0, 'min': None, 'max': None, 
+                'step': 1.0, 'dec': False, 
+                'siPrefix': False, 'suffix': ''
+            }
+            defs.update(opts)
+            if 'limits' in opts:
+                defs['bounds'] = opts['limits']
+            w = SpinBox()
+            w.setOpts(**defs)
+            w.sigChanged = w.sigValueChanged
+            w.sigChanging = w.sigValueChanging
+        elif t == 'bool':
+            w = QtGui.QCheckBox()
+            w.sigChanged = w.toggled
+            w.value = w.isChecked
+            w.setValue = w.setChecked
+            w.setEnabled(not opts.get('readonly', False))
+            self.hideWidget = False
+        elif t == 'str':
+            w = QtGui.QLineEdit()
+            w.sigChanged = w.editingFinished
+            w.value = lambda: asUnicode(w.text())
+            w.setValue = lambda v: w.setText(asUnicode(v))
+            w.sigChanging = w.textChanged
+        elif t == 'color':
+            w = ColorButton()
+            w.sigChanged = w.sigColorChanged
+            w.sigChanging = w.sigColorChanging
+            w.value = w.color
+            w.setValue = w.setColor
+            self.hideWidget = False
+            w.setFlat(True)
+            w.setEnabled(not opts.get('readonly', False))            
+        elif t == 'colormap':
+            from ..widgets.GradientWidget import GradientWidget ## need this here to avoid import loop
+            w = GradientWidget(orientation='bottom')
+            w.sigChanged = w.sigGradientChangeFinished
+            w.sigChanging = w.sigGradientChanged
+            w.value = w.colorMap
+            w.setValue = w.setColorMap
+            self.hideWidget = False
+        else:
+            raise Exception("Unknown type '%s'" % asUnicode(t))
+        return w
+        
+    def widgetEventFilter(self, obj, ev):
+        ## filter widget's events
+        ## catch TAB to change focus
+        ## catch focusOut to hide editor
+        if ev.type() == ev.KeyPress:
+            if ev.key() == QtCore.Qt.Key_Tab:
+                self.focusNext(forward=True)
+                return True ## don't let anyone else see this event
+            elif ev.key() == QtCore.Qt.Key_Backtab:
+                self.focusNext(forward=False)
+                return True ## don't let anyone else see this event
+            
+        #elif ev.type() == ev.FocusOut:
+            #self.hideEditor()
+        return False
+        
+    def setFocus(self):
+        self.showEditor()
+        
+    def isFocusable(self):
+        return self.param.writable()        
+        
+    def valueChanged(self, param, val, force=False):
+        ## called when the parameter's value has changed
+        ParameterItem.valueChanged(self, param, val)
+        self.widget.sigChanged.disconnect(self.widgetValueChanged)
+        try:
+            if force or val != self.widget.value():
+                self.widget.setValue(val)
+            self.updateDisplayLabel(val)  ## always make sure label is updated, even if values match!
+        finally:
+            self.widget.sigChanged.connect(self.widgetValueChanged)
+        self.updateDefaultBtn()
+        
+    def updateDefaultBtn(self):
+        ## enable/disable default btn 
+        self.defaultBtn.setEnabled(not self.param.valueIsDefault() and self.param.writable())        
+        
+        # hide / show
+        self.defaultBtn.setVisible(not self.param.readonly())
+
+    def updateDisplayLabel(self, value=None):
+        """Update the display label to reflect the value of the parameter."""
+        if value is None:
+            value = self.param.value()
+        opts = self.param.opts
+        if isinstance(self.widget, QtGui.QAbstractSpinBox):
+            text = asUnicode(self.widget.lineEdit().text())
+        elif isinstance(self.widget, QtGui.QComboBox):
+            text = self.widget.currentText()
+        else:
+            text = asUnicode(value)
+        self.displayLabel.setText(text)
+
+    def widgetValueChanged(self):
+        ## called when the widget's value has been changed by the user
+        val = self.widget.value()
+        newVal = self.param.setValue(val)
+
+    def widgetValueChanging(self, *args):
+        """
+        Called when the widget's value is changing, but not finalized.
+        For example: editing text before pressing enter or changing focus.
+        """
+        # This is a bit sketchy: assume the last argument of each signal is
+        # the value..
+        self.param.sigValueChanging.emit(self.param, args[-1])
+        
+    def selected(self, sel):
+        """Called when this item has been selected (sel=True) OR deselected (sel=False)"""
+        ParameterItem.selected(self, sel)
+        
+        if self.widget is None:
+            return
+        if sel and self.param.writable():
+            self.showEditor()
+        elif self.hideWidget:
+            self.hideEditor()
+
+    def showEditor(self):
+        self.widget.show()
+        self.displayLabel.hide()
+        self.widget.setFocus(QtCore.Qt.OtherFocusReason)
+        if isinstance(self.widget, SpinBox):
+            self.widget.selectNumber()  # select the numerical portion of the text for quick editing
+
+    def hideEditor(self):
+        self.widget.hide()
+        self.displayLabel.show()
+
+    def limitsChanged(self, param, limits):
+        """Called when the parameter's limits have changed"""
+        ParameterItem.limitsChanged(self, param, limits)
+        
+        t = self.param.opts['type']
+        if t == 'int' or t == 'float':
+            self.widget.setOpts(bounds=limits)
+        else:
+            return  ## don't know what to do with any other types..
+
+    def defaultChanged(self, param, value):
+        self.updateDefaultBtn()
+
+    def treeWidgetChanged(self):
+        """Called when this item is added or removed from a tree."""
+        ParameterItem.treeWidgetChanged(self)
+        
+        ## add all widgets for this item into the tree
+        if self.widget is not None:
+            tree = self.treeWidget()
+            if tree is None:
+                return
+            tree.setItemWidget(self, 1, self.layoutWidget)
+            self.displayLabel.hide()
+            self.selected(False)            
+
+    def defaultClicked(self):
+        self.param.setToDefault()
+
+    def optsChanged(self, param, opts):
+        """Called when any options are changed that are not
+        name, value, default, or limits"""
+        #print "opts changed:", opts
+        ParameterItem.optsChanged(self, param, opts)
+        
+        if 'readonly' in opts:
+            self.updateDefaultBtn()
+            if isinstance(self.widget, (QtGui.QCheckBox,ColorButton)):
+                self.widget.setEnabled(not opts['readonly'])
+        
+        ## If widget is a SpinBox, pass options straight through
+        if isinstance(self.widget, SpinBox):
+            if 'units' in opts and 'suffix' not in opts:
+                opts['suffix'] = opts['units']
+            self.widget.setOpts(**opts)
+            self.updateDisplayLabel()
+        
+        
+        
+            
+class EventProxy(QtCore.QObject):
+    def __init__(self, qobj, callback):
+        QtCore.QObject.__init__(self)
+        self.callback = callback
+        qobj.installEventFilter(self)
+        
+    def eventFilter(self, obj, ev):
+        return self.callback(obj, ev)
+
+        
+
+
+class SimpleParameter(Parameter):
+    itemClass = WidgetParameterItem
+    
+    def __init__(self, *args, **kargs):
+        Parameter.__init__(self, *args, **kargs)
+        
+        ## override a few methods for color parameters
+        if self.opts['type'] == 'color':
+            self.value = self.colorValue
+            self.saveState = self.saveColorState
+    
+    def colorValue(self):
+        return fn.mkColor(Parameter.value(self))
+    
+    def saveColorState(self, *args, **kwds):
+        state = Parameter.saveState(self, *args, **kwds)
+        state['value'] = fn.colorTuple(self.value())
+        return state
+        
+    
+registerParameterType('int', SimpleParameter, override=True)
+registerParameterType('float', SimpleParameter, override=True)
+registerParameterType('bool', SimpleParameter, override=True)
+registerParameterType('str', SimpleParameter, override=True)
+registerParameterType('color', SimpleParameter, override=True)
+registerParameterType('colormap', SimpleParameter, override=True)
+
+
+
+
+class GroupParameterItem(ParameterItem):
+    """
+    Group parameters are used mainly as a generic parent item that holds (and groups!) a set
+    of child parameters. It also provides a simple mechanism for displaying a button or combo
+    that can be used to add new parameters to the group.
+    """
+    def __init__(self, param, depth):
+        ParameterItem.__init__(self, param, depth)
+        self.updateDepth(depth) 
+                
+        self.addItem = None
+        if 'addText' in param.opts:
+            addText = param.opts['addText']
+            if 'addList' in param.opts:
+                self.addWidget = QtGui.QComboBox()
+                self.addWidget.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToContents)
+                self.updateAddList()
+                self.addWidget.currentIndexChanged.connect(self.addChanged)
+            else:
+                self.addWidget = QtGui.QPushButton(addText)
+                self.addWidget.clicked.connect(self.addClicked)
+            w = QtGui.QWidget()
+            l = QtGui.QHBoxLayout()
+            l.setContentsMargins(0,0,0,0)
+            w.setLayout(l)
+            l.addWidget(self.addWidget)
+            l.addStretch()
+            #l.addItem(QtGui.QSpacerItem(200, 10, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum))
+            self.addWidgetBox = w
+            self.addItem = QtGui.QTreeWidgetItem([])
+            self.addItem.setFlags(QtCore.Qt.ItemIsEnabled)
+            ParameterItem.addChild(self, self.addItem)
+            
+    def updateDepth(self, depth):
+        ## Change item's appearance based on its depth in the tree
+        ## This allows highest-level groups to be displayed more prominently.
+        if depth == 0:
+            for c in [0,1]:
+                self.setBackground(c, QtGui.QBrush(QtGui.QColor(100,100,100)))
+                self.setForeground(c, QtGui.QBrush(QtGui.QColor(220,220,255)))
+                font = self.font(c)
+                font.setBold(True)
+                font.setPointSize(font.pointSize()+1)
+                self.setFont(c, font)
+                self.setSizeHint(0, QtCore.QSize(0, 25))
+        else:
+            for c in [0,1]:
+                self.setBackground(c, QtGui.QBrush(QtGui.QColor(220,220,220)))
+                font = self.font(c)
+                font.setBold(True)
+                #font.setPointSize(font.pointSize()+1)
+                self.setFont(c, font)
+                self.setSizeHint(0, QtCore.QSize(0, 20))
+    
+    def addClicked(self):
+        """Called when "add new" button is clicked
+        The parameter MUST have an 'addNew' method defined.
+        """
+        self.param.addNew()
+
+    def addChanged(self):
+        """Called when "add new" combo is changed
+        The parameter MUST have an 'addNew' method defined.
+        """
+        if self.addWidget.currentIndex() == 0:
+            return
+        typ = asUnicode(self.addWidget.currentText())
+        self.param.addNew(typ)
+        self.addWidget.setCurrentIndex(0)
+
+    def treeWidgetChanged(self):
+        ParameterItem.treeWidgetChanged(self)
+        self.treeWidget().setFirstItemColumnSpanned(self, True)
+        if self.addItem is not None:
+            self.treeWidget().setItemWidget(self.addItem, 0, self.addWidgetBox)
+            self.treeWidget().setFirstItemColumnSpanned(self.addItem, True)
+        
+    def addChild(self, child):  ## make sure added childs are actually inserted before add btn
+        if self.addItem is not None:
+            ParameterItem.insertChild(self, self.childCount()-1, child)
+        else:
+            ParameterItem.addChild(self, child)
+            
+    def optsChanged(self, param, changed):
+        if 'addList' in changed:
+            self.updateAddList()
+                
+    def updateAddList(self):
+        self.addWidget.blockSignals(True)
+        try:
+            self.addWidget.clear()
+            self.addWidget.addItem(self.param.opts['addText'])
+            for t in self.param.opts['addList']:
+                self.addWidget.addItem(t)
+        finally:
+            self.addWidget.blockSignals(False)
+            
+class GroupParameter(Parameter):
+    """
+    Group parameters are used mainly as a generic parent item that holds (and groups!) a set
+    of child parameters. 
+    
+    It also provides a simple mechanism for displaying a button or combo
+    that can be used to add new parameters to the group. To enable this, the group 
+    must be initialized with the 'addText' option (the text will be displayed on
+    a button which, when clicked, will cause addNew() to be called). If the 'addList'
+    option is specified as well, then a dropdown-list of addable items will be displayed
+    instead of a button.
+    """
+    itemClass = GroupParameterItem
+
+    def addNew(self, typ=None):
+        """
+        This method is called when the user has requested to add a new item to the group.
+        """
+        raise Exception("Must override this function in subclass.")
+    
+    def setAddList(self, vals):
+        """Change the list of options available for the user to add to the group."""
+        self.setOpts(addList=vals)
+
+    
+
+registerParameterType('group', GroupParameter, override=True)
+
+
+
+
+
+class ListParameterItem(WidgetParameterItem):
+    """
+    WidgetParameterItem subclass providing comboBox that lets the user select from a list of options.
+    
+    """
+    def __init__(self, param, depth):
+        self.targetValue = None
+        WidgetParameterItem.__init__(self, param, depth)
+        
+        
+    def makeWidget(self):
+        opts = self.param.opts
+        t = opts['type']
+        w = QtGui.QComboBox()
+        w.setMaximumHeight(20)  ## set to match height of spin box and line edit
+        w.sigChanged = w.currentIndexChanged
+        w.value = self.value
+        w.setValue = self.setValue
+        self.widget = w  ## needs to be set before limits are changed
+        self.limitsChanged(self.param, self.param.opts['limits'])
+        if len(self.forward) > 0:
+            self.setValue(self.param.value())
+        return w
+        
+    def value(self):
+        key = asUnicode(self.widget.currentText())
+        
+        return self.forward.get(key, None)
+            
+    def setValue(self, val):
+        self.targetValue = val
+        if val not in self.reverse[0]:
+            self.widget.setCurrentIndex(0)
+        else:
+            key = self.reverse[1][self.reverse[0].index(val)]
+            ind = self.widget.findText(key)
+            self.widget.setCurrentIndex(ind)
+
+    def limitsChanged(self, param, limits):
+        # set up forward / reverse mappings for name:value
+        
+        if len(limits) == 0:
+            limits = ['']  ## Can never have an empty list--there is always at least a singhe blank item.
+        
+        self.forward, self.reverse = ListParameter.mapping(limits)
+        try:
+            self.widget.blockSignals(True)
+            val = self.targetValue  #asUnicode(self.widget.currentText())
+            
+            self.widget.clear()
+            for k in self.forward:
+                self.widget.addItem(k)
+                if k == val:
+                    self.widget.setCurrentIndex(self.widget.count()-1)
+                    self.updateDisplayLabel()
+        finally:
+            self.widget.blockSignals(False)
+            
+
+
+class ListParameter(Parameter):
+    itemClass = ListParameterItem
+
+    def __init__(self, **opts):
+        self.forward = OrderedDict()  ## {name: value, ...}
+        self.reverse = ([], [])       ## ([value, ...], [name, ...])
+        
+        ## Parameter uses 'limits' option to define the set of allowed values
+        if 'values' in opts:
+            opts['limits'] = opts['values']
+        if opts.get('limits', None) is None:
+            opts['limits'] = []
+        Parameter.__init__(self, **opts)
+        self.setLimits(opts['limits'])
+        
+    def setLimits(self, limits):
+        self.forward, self.reverse = self.mapping(limits)
+        
+        Parameter.setLimits(self, limits)
+        if len(self.reverse[0]) > 0 and self.value() not in self.reverse[0]:
+            self.setValue(self.reverse[0][0])
+            
+    #def addItem(self, name, value=None):
+        #if name in self.forward:
+            #raise Exception("Name '%s' is already in use for this parameter" % name)
+        #limits = self.opts['limits']
+        #if isinstance(limits, dict):
+            #limits = limits.copy()
+            #limits[name] = value
+            #self.setLimits(limits)
+        #else:
+            #if value is not None:
+                #raise Exception  ## raise exception or convert to dict?
+            #limits = limits[:]
+            #limits.append(name)
+        ## what if limits == None?
+            
+    @staticmethod
+    def mapping(limits):
+        ## Return forward and reverse mapping objects given a limit specification
+        forward = OrderedDict()  ## {name: value, ...}
+        reverse = ([], [])       ## ([value, ...], [name, ...])
+        if isinstance(limits, dict):
+            for k, v in limits.items():
+                forward[k] = v
+                reverse[0].append(v)
+                reverse[1].append(k)
+        else:
+            for v in limits:
+                n = asUnicode(v)
+                forward[n] = v
+                reverse[0].append(v)
+                reverse[1].append(n)
+        return forward, reverse
+
+registerParameterType('list', ListParameter, override=True)
+
+
+
+class ActionParameterItem(ParameterItem):
+    def __init__(self, param, depth):
+        ParameterItem.__init__(self, param, depth)
+        self.layoutWidget = QtGui.QWidget()
+        self.layout = QtGui.QHBoxLayout()
+        self.layoutWidget.setLayout(self.layout)
+        self.button = QtGui.QPushButton(param.name())
+        #self.layout.addSpacing(100)
+        self.layout.addWidget(self.button)
+        self.layout.addStretch()
+        self.button.clicked.connect(self.buttonClicked)
+        param.sigNameChanged.connect(self.paramRenamed)
+        self.setText(0, '')
+        
+    def treeWidgetChanged(self):
+        ParameterItem.treeWidgetChanged(self)
+        tree = self.treeWidget()
+        if tree is None:
+            return
+        
+        tree.setFirstItemColumnSpanned(self, True)
+        tree.setItemWidget(self, 0, self.layoutWidget)
+        
+    def paramRenamed(self, param, name):
+        self.button.setText(name)
+        
+    def buttonClicked(self):
+        self.param.activate()
+        
+class ActionParameter(Parameter):
+    """Used for displaying a button within the tree."""
+    itemClass = ActionParameterItem
+    sigActivated = QtCore.Signal(object)
+    
+    def activate(self):
+        self.sigActivated.emit(self)
+        self.emitStateChanged('activated', None)
+        
+registerParameterType('action', ActionParameter, override=True)
+
+
+
+class TextParameterItem(WidgetParameterItem):
+    def __init__(self, param, depth):
+        WidgetParameterItem.__init__(self, param, depth)
+        self.hideWidget = False
+        self.subItem = QtGui.QTreeWidgetItem()
+        self.addChild(self.subItem)
+
+    def treeWidgetChanged(self):
+        ## TODO: fix so that superclass method can be called
+        ## (WidgetParameter should just natively support this style)
+        #WidgetParameterItem.treeWidgetChanged(self)
+        self.treeWidget().setFirstItemColumnSpanned(self.subItem, True)
+        self.treeWidget().setItemWidget(self.subItem, 0, self.textBox)
+        
+        # for now, these are copied from ParameterItem.treeWidgetChanged
+        self.setHidden(not self.param.opts.get('visible', True))
+        self.setExpanded(self.param.opts.get('expanded', True))
+        
+    def makeWidget(self):
+        self.textBox = QtGui.QTextEdit()
+        self.textBox.setMaximumHeight(100)
+        self.textBox.setReadOnly(self.param.opts.get('readonly', False))
+        self.textBox.value = lambda: str(self.textBox.toPlainText())
+        self.textBox.setValue = self.textBox.setPlainText
+        self.textBox.sigChanged = self.textBox.textChanged
+        return self.textBox
+        
+class TextParameter(Parameter):
+    """Editable string; displayed as large text box in the tree."""
+    itemClass = TextParameterItem
+
+    
+    
+registerParameterType('text', TextParameter, override=True)
diff --git a/libs/pyqtgraph/parametertree/tests/test_parametertypes.py b/libs/pyqtgraph/parametertree/tests/test_parametertypes.py
new file mode 100644
index 0000000000000000000000000000000000000000..c7cd2cb335a327d0ed67a2adef8536161d94174d
--- /dev/null
+++ b/libs/pyqtgraph/parametertree/tests/test_parametertypes.py
@@ -0,0 +1,18 @@
+import pyqtgraph.parametertree as pt
+import pyqtgraph as pg
+app = pg.mkQApp()
+
+def test_opts():
+    paramSpec = [
+        dict(name='bool', type='bool', readonly=True),
+        dict(name='color', type='color', readonly=True),
+    ]
+
+    param = pt.Parameter.create(name='params', type='group', children=paramSpec)
+    tree = pt.ParameterTree()
+    tree.setParameters(param)
+
+    assert param.param('bool').items.keys()[0].widget.isEnabled() is False
+    assert param.param('color').items.keys()[0].widget.isEnabled() is False
+
+
diff --git a/libs/pyqtgraph/pgcollections.py b/libs/pyqtgraph/pgcollections.py
new file mode 100644
index 0000000000000000000000000000000000000000..76850622cfd195d723d70dabb3e2c40affcb7070
--- /dev/null
+++ b/libs/pyqtgraph/pgcollections.py
@@ -0,0 +1,477 @@
+# -*- coding: utf-8 -*-
+"""
+advancedTypes.py - Basic data structures not included with python 
+Copyright 2010  Luke Campagnola
+Distributed under MIT/X11 license. See license.txt for more infomation.
+
+Includes:
+  - OrderedDict - Dictionary which preserves the order of its elements
+  - BiDict, ReverseDict - Bi-directional dictionaries
+  - ThreadsafeDict, ThreadsafeList - Self-mutexed data structures
+"""
+
+import threading, sys, copy, collections
+#from debug import *
+
+try:
+    from collections import OrderedDict
+except ImportError:
+    # fallback: try to use the ordereddict backport when using python 2.6
+    from ordereddict import OrderedDict
+        
+
+class ReverseDict(dict):
+    """extends dict so that reverse lookups are possible by requesting the key as a list of length 1:
+       d = BiDict({'x': 1, 'y': 2})
+       d['x']
+         1
+       d[[2]]
+         'y'
+    """
+    def __init__(self, data=None):
+        if data is None:
+            data = {}
+        self.reverse = {}
+        for k in data:
+            self.reverse[data[k]] = k
+        dict.__init__(self, data)
+        
+    def __getitem__(self, item):
+        if type(item) is list:
+            return self.reverse[item[0]]
+        else:
+            return dict.__getitem__(self, item)
+
+    def __setitem__(self, item, value):
+        self.reverse[value] = item
+        dict.__setitem__(self, item, value)
+
+    def __deepcopy__(self, memo):
+        raise Exception("deepcopy not implemented")
+        
+        
+class BiDict(dict):
+    """extends dict so that reverse lookups are possible by adding each reverse combination to the dict.
+    This only works if all values and keys are unique."""
+    def __init__(self, data=None):
+        if data is None:
+            data = {}
+        dict.__init__(self)
+        for k in data:
+            self[data[k]] = k
+        
+    def __setitem__(self, item, value):
+        dict.__setitem__(self, item, value)
+        dict.__setitem__(self, value, item)
+    
+    def __deepcopy__(self, memo):
+        raise Exception("deepcopy not implemented")
+
+class ThreadsafeDict(dict):
+    """Extends dict so that getitem, setitem, and contains are all thread-safe.
+    Also adds lock/unlock functions for extended exclusive operations
+    Converts all sub-dicts and lists to threadsafe as well.
+    """
+    
+    def __init__(self, *args, **kwargs):
+        self.mutex = threading.RLock()
+        dict.__init__(self, *args, **kwargs)
+        for k in self:
+            if type(self[k]) is dict:
+                self[k] = ThreadsafeDict(self[k])
+
+    def __getitem__(self, attr):
+        self.lock()
+        try:
+            val = dict.__getitem__(self, attr)
+        finally:
+            self.unlock()
+        return val
+
+    def __setitem__(self, attr, val):
+        if type(val) is dict:
+            val = ThreadsafeDict(val)
+        self.lock()
+        try:
+            dict.__setitem__(self, attr, val)
+        finally:
+            self.unlock()
+        
+    def __contains__(self, attr):
+        self.lock()
+        try:
+            val = dict.__contains__(self, attr)
+        finally:
+            self.unlock()
+        return val
+
+    def __len__(self):
+        self.lock()
+        try:
+            val = dict.__len__(self)
+        finally:
+            self.unlock()
+        return val
+
+    def clear(self):
+        self.lock()
+        try:
+            dict.clear(self)
+        finally:
+            self.unlock()
+
+    def lock(self):
+        self.mutex.acquire()
+        
+    def unlock(self):
+        self.mutex.release()
+
+    def __deepcopy__(self, memo):
+        raise Exception("deepcopy not implemented")
+        
+class ThreadsafeList(list):
+    """Extends list so that getitem, setitem, and contains are all thread-safe.
+    Also adds lock/unlock functions for extended exclusive operations
+    Converts all sub-lists and dicts to threadsafe as well.
+    """
+    
+    def __init__(self, *args, **kwargs):
+        self.mutex = threading.RLock()
+        list.__init__(self, *args, **kwargs)
+        for k in self:
+            self[k] = mkThreadsafe(self[k])
+
+    def __getitem__(self, attr):
+        self.lock()
+        try:
+            val = list.__getitem__(self, attr)
+        finally:
+            self.unlock()
+        return val
+
+    def __setitem__(self, attr, val):
+        val = makeThreadsafe(val)
+        self.lock()
+        try:
+            list.__setitem__(self, attr, val)
+        finally:
+            self.unlock()
+        
+    def __contains__(self, attr):
+        self.lock()
+        try:
+            val = list.__contains__(self, attr)
+        finally:
+            self.unlock()
+        return val
+
+    def __len__(self):
+        self.lock()
+        try:
+            val = list.__len__(self)
+        finally:
+            self.unlock()
+        return val
+    
+    def lock(self):
+        self.mutex.acquire()
+        
+    def unlock(self):
+        self.mutex.release()
+
+    def __deepcopy__(self, memo):
+        raise Exception("deepcopy not implemented")
+        
+        
+def makeThreadsafe(obj):
+    if type(obj) is dict:
+        return ThreadsafeDict(obj)
+    elif type(obj) is list:
+        return ThreadsafeList(obj)
+    elif type(obj) in [str, int, float, bool, tuple]:
+        return obj
+    else:
+        raise Exception("Not sure how to make object of type %s thread-safe" % str(type(obj)))
+        
+        
+class Locker(object):
+    def __init__(self, lock):
+        self.lock = lock
+        self.lock.acquire()
+    def __del__(self):
+        try:
+            self.lock.release()
+        except:
+            pass
+
+class CaselessDict(OrderedDict):
+    """Case-insensitive dict. Values can be set and retrieved using keys of any case.
+    Note that when iterating, the original case is returned for each key."""
+    def __init__(self, *args):
+        OrderedDict.__init__(self, {}) ## requirement for the empty {} here seems to be a python bug?
+        self.keyMap = OrderedDict([(k.lower(), k) for k in OrderedDict.keys(self)])
+        if len(args) == 0:
+            return
+        elif len(args) == 1 and isinstance(args[0], dict):
+            for k in args[0]:
+                self[k] = args[0][k]
+        else:
+            raise Exception("CaselessDict may only be instantiated with a single dict.")
+        
+    #def keys(self):
+        #return self.keyMap.values()
+    
+    def __setitem__(self, key, val):
+        kl = key.lower()
+        if kl in self.keyMap:
+            OrderedDict.__setitem__(self, self.keyMap[kl], val)
+        else:
+            OrderedDict.__setitem__(self, key, val)
+            self.keyMap[kl] = key
+            
+    def __getitem__(self, key):
+        kl = key.lower()
+        if kl not in self.keyMap:
+            raise KeyError(key)
+        return OrderedDict.__getitem__(self, self.keyMap[kl])
+        
+    def __contains__(self, key):
+        return key.lower() in self.keyMap
+    
+    def update(self, d):
+        for k, v in d.iteritems():
+            self[k] = v
+            
+    def copy(self):
+        return CaselessDict(OrderedDict.copy(self))
+        
+    def __delitem__(self, key):
+        kl = key.lower()
+        if kl not in self.keyMap:
+            raise KeyError(key)
+        OrderedDict.__delitem__(self, self.keyMap[kl])
+        del self.keyMap[kl]
+            
+    def __deepcopy__(self, memo):
+        raise Exception("deepcopy not implemented")
+
+    def clear(self):
+        OrderedDict.clear(self)
+        self.keyMap.clear()
+
+
+
+class ProtectedDict(dict):
+    """
+    A class allowing read-only 'view' of a dict. 
+    The object can be treated like a normal dict, but will never modify the original dict it points to.
+    Any values accessed from the dict will also be read-only.
+    """
+    def __init__(self, data):
+        self._data_ = data
+    
+    ## List of methods to directly wrap from _data_
+    wrapMethods = ['_cmp_', '__contains__', '__eq__', '__format__', '__ge__', '__gt__', '__le__', '__len__', '__lt__', '__ne__', '__reduce__', '__reduce_ex__', '__repr__', '__str__', 'count', 'has_key', 'iterkeys', 'keys', ]
+    
+    ## List of methods which wrap from _data_ but return protected results
+    protectMethods = ['__getitem__', '__iter__', 'get', 'items', 'values']
+    
+    ## List of methods to disable
+    disableMethods = ['__delitem__', '__setitem__', 'clear', 'pop', 'popitem', 'setdefault', 'update']
+    
+    
+    ## Template methods 
+    def wrapMethod(methodName):
+        return lambda self, *a, **k: getattr(self._data_, methodName)(*a, **k)
+        
+    def protectMethod(methodName):
+        return lambda self, *a, **k: protect(getattr(self._data_, methodName)(*a, **k))
+    
+    def error(self, *args, **kargs):
+        raise Exception("Can not modify read-only list.")
+    
+    
+    ## Directly (and explicitly) wrap some methods from _data_
+    ## Many of these methods can not be intercepted using __getattribute__, so they
+    ## must be implemented explicitly
+    for methodName in wrapMethods:
+        locals()[methodName] = wrapMethod(methodName)
+
+    ## Wrap some methods from _data_ with the results converted to protected objects
+    for methodName in protectMethods:
+        locals()[methodName] = protectMethod(methodName)
+
+    ## Disable any methods that could change data in the list
+    for methodName in disableMethods:
+        locals()[methodName] = error
+
+    
+    ## Add a few extra methods.
+    def copy(self):
+        raise Exception("It is not safe to copy protected dicts! (instead try deepcopy, but be careful.)")
+    
+    def itervalues(self):
+        for v in self._data_.itervalues():
+            yield protect(v)
+        
+    def iteritems(self):
+        for k, v in self._data_.iteritems():
+            yield (k, protect(v))
+        
+    def deepcopy(self):
+        return copy.deepcopy(self._data_)
+    
+    def __deepcopy__(self, memo):
+        return copy.deepcopy(self._data_, memo)
+
+
+            
+class ProtectedList(collections.Sequence):
+    """
+    A class allowing read-only 'view' of a list or dict. 
+    The object can be treated like a normal list, but will never modify the original list it points to.
+    Any values accessed from the list will also be read-only.
+    
+    Note: It would be nice if we could inherit from list or tuple so that isinstance checks would work.
+          However, doing this causes tuple(obj) to return unprotected results (importantly, this means
+          unpacking into function arguments will also fail)
+    """
+    def __init__(self, data):
+        self._data_ = data
+        #self.__mro__ = (ProtectedList, object)
+        
+    ## List of methods to directly wrap from _data_
+    wrapMethods = ['__contains__', '__eq__', '__format__', '__ge__', '__gt__', '__le__', '__len__', '__lt__', '__ne__', '__reduce__', '__reduce_ex__', '__repr__', '__str__', 'count', 'index']
+    
+    ## List of methods which wrap from _data_ but return protected results
+    protectMethods = ['__getitem__', '__getslice__', '__mul__', '__reversed__', '__rmul__']
+    
+    ## List of methods to disable
+    disableMethods = ['__delitem__', '__delslice__', '__iadd__', '__imul__', '__setitem__', '__setslice__', 'append', 'extend', 'insert', 'pop', 'remove', 'reverse', 'sort']
+    
+    
+    ## Template methods 
+    def wrapMethod(methodName):
+        return lambda self, *a, **k: getattr(self._data_, methodName)(*a, **k)
+        
+    def protectMethod(methodName):
+        return lambda self, *a, **k: protect(getattr(self._data_, methodName)(*a, **k))
+    
+    def error(self, *args, **kargs):
+        raise Exception("Can not modify read-only list.")
+    
+    
+    ## Directly (and explicitly) wrap some methods from _data_
+    ## Many of these methods can not be intercepted using __getattribute__, so they
+    ## must be implemented explicitly
+    for methodName in wrapMethods:
+        locals()[methodName] = wrapMethod(methodName)
+
+    ## Wrap some methods from _data_ with the results converted to protected objects
+    for methodName in protectMethods:
+        locals()[methodName] = protectMethod(methodName)
+
+    ## Disable any methods that could change data in the list
+    for methodName in disableMethods:
+        locals()[methodName] = error
+
+    
+    ## Add a few extra methods.
+    def __iter__(self):
+        for item in self._data_:
+            yield protect(item)
+    
+    
+    def __add__(self, op):
+        if isinstance(op, ProtectedList):
+            return protect(self._data_.__add__(op._data_))
+        elif isinstance(op, list):
+            return protect(self._data_.__add__(op))
+        else:
+            raise TypeError("Argument must be a list.")
+    
+    def __radd__(self, op):
+        if isinstance(op, ProtectedList):
+            return protect(op._data_.__add__(self._data_))
+        elif isinstance(op, list):
+            return protect(op.__add__(self._data_))
+        else:
+            raise TypeError("Argument must be a list.")
+        
+    def deepcopy(self):
+        return copy.deepcopy(self._data_)
+    
+    def __deepcopy__(self, memo):
+        return copy.deepcopy(self._data_, memo)
+    
+    def poop(self):
+        raise Exception("This is a list. It does not poop.")
+
+
+class ProtectedTuple(collections.Sequence):
+    """
+    A class allowing read-only 'view' of a tuple.
+    The object can be treated like a normal tuple, but its contents will be returned as protected objects.
+    
+    Note: It would be nice if we could inherit from list or tuple so that isinstance checks would work.
+          However, doing this causes tuple(obj) to return unprotected results (importantly, this means
+          unpacking into function arguments will also fail)
+    """
+    def __init__(self, data):
+        self._data_ = data
+    
+    ## List of methods to directly wrap from _data_
+    wrapMethods = ['__contains__', '__eq__', '__format__', '__ge__', '__getnewargs__', '__gt__', '__hash__', '__le__', '__len__', '__lt__', '__ne__', '__reduce__', '__reduce_ex__', '__repr__', '__str__', 'count', 'index']
+    
+    ## List of methods which wrap from _data_ but return protected results
+    protectMethods = ['__getitem__', '__getslice__', '__iter__', '__add__', '__mul__', '__reversed__', '__rmul__']
+    
+    
+    ## Template methods 
+    def wrapMethod(methodName):
+        return lambda self, *a, **k: getattr(self._data_, methodName)(*a, **k)
+        
+    def protectMethod(methodName):
+        return lambda self, *a, **k: protect(getattr(self._data_, methodName)(*a, **k))
+    
+    
+    ## Directly (and explicitly) wrap some methods from _data_
+    ## Many of these methods can not be intercepted using __getattribute__, so they
+    ## must be implemented explicitly
+    for methodName in wrapMethods:
+        locals()[methodName] = wrapMethod(methodName)
+
+    ## Wrap some methods from _data_ with the results converted to protected objects
+    for methodName in protectMethods:
+        locals()[methodName] = protectMethod(methodName)
+
+    
+    ## Add a few extra methods.
+    def deepcopy(self):
+        return copy.deepcopy(self._data_)
+    
+    def __deepcopy__(self, memo):
+        return copy.deepcopy(self._data_, memo)
+    
+
+
+def protect(obj):
+    if isinstance(obj, dict):
+        return ProtectedDict(obj)
+    elif isinstance(obj, list):
+        return ProtectedList(obj)
+    elif isinstance(obj, tuple):
+        return ProtectedTuple(obj)
+    else:
+        return obj
+    
+    
+if __name__ == '__main__':
+    d = {'x': 1, 'y': [1,2], 'z': ({'a': 2, 'b': [3,4], 'c': (5,6)}, 1, 2)}
+    dp = protect(d)
+    
+    l = [1, 'x', ['a', 'b'], ('c', 'd'), {'x': 1, 'y': 2}]
+    lp = protect(l)
+    
+    t = (1, 'x', ['a', 'b'], ('c', 'd'), {'x': 1, 'y': 2})
+    tp = protect(t)
diff --git a/libs/pyqtgraph/pixmaps/__init__.py b/libs/pyqtgraph/pixmaps/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..c26e4a6b42ad174b5f6849f6671bab186cd32bb4
--- /dev/null
+++ b/libs/pyqtgraph/pixmaps/__init__.py
@@ -0,0 +1,26 @@
+"""
+Allows easy loading of pixmaps used in UI elements. 
+Provides support for frozen environments as well.
+"""
+
+import os, sys, pickle
+from ..functions import makeQImage
+from ..Qt import QtGui
+if sys.version_info[0] == 2:
+    from . import pixmapData_2 as pixmapData
+else:
+    from . import pixmapData_3 as pixmapData
+
+
+def getPixmap(name):
+    """
+    Return a QPixmap corresponding to the image file with the given name.
+    (eg. getPixmap('auto') loads pyqtgraph/pixmaps/auto.png)
+    """
+    key = name+'.png'
+    data = pixmapData.pixmapData[key]
+    if isinstance(data, basestring) or isinstance(data, bytes):
+        pixmapData.pixmapData[key] = pickle.loads(data)
+    arr = pixmapData.pixmapData[key]
+    return QtGui.QPixmap(makeQImage(arr, alpha=True))
+    
diff --git a/libs/pyqtgraph/pixmaps/auto.png b/libs/pyqtgraph/pixmaps/auto.png
new file mode 100644
index 0000000000000000000000000000000000000000..a27ff4f82b6e31f2819061a53ba72d4b322dc26d
Binary files /dev/null and b/libs/pyqtgraph/pixmaps/auto.png differ
diff --git a/libs/pyqtgraph/pixmaps/compile.py b/libs/pyqtgraph/pixmaps/compile.py
new file mode 100644
index 0000000000000000000000000000000000000000..fa0d2408538100bc47cfe60f798b690eb1af93f5
--- /dev/null
+++ b/libs/pyqtgraph/pixmaps/compile.py
@@ -0,0 +1,19 @@
+import numpy as np
+from PyQt4 import QtGui
+import os, pickle, sys
+
+path = os.path.abspath(os.path.split(__file__)[0])
+pixmaps = {}
+for f in os.listdir(path):
+    if not f.endswith('.png'):
+        continue
+    print(f)
+    img = QtGui.QImage(os.path.join(path, f))
+    ptr = img.bits()
+    ptr.setsize(img.byteCount())
+    arr = np.asarray(ptr).reshape(img.height(), img.width(), 4).transpose(1,0,2)
+    pixmaps[f] = pickle.dumps(arr)
+ver = sys.version_info[0]
+fh = open(os.path.join(path, 'pixmapData_%d.py' %ver), 'w')
+fh.write("import numpy as np; pixmapData=%s" % repr(pixmaps))
+    
diff --git a/libs/pyqtgraph/pixmaps/ctrl.png b/libs/pyqtgraph/pixmaps/ctrl.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8dc96e439da8ef33abf292bd9b808633646c26b
Binary files /dev/null and b/libs/pyqtgraph/pixmaps/ctrl.png differ
diff --git a/libs/pyqtgraph/pixmaps/default.png b/libs/pyqtgraph/pixmaps/default.png
new file mode 100644
index 0000000000000000000000000000000000000000..f12394214dadb66bd90e7c671d87a5810c1571a6
Binary files /dev/null and b/libs/pyqtgraph/pixmaps/default.png differ
diff --git a/libs/pyqtgraph/pixmaps/icons.svg b/libs/pyqtgraph/pixmaps/icons.svg
new file mode 100644
index 0000000000000000000000000000000000000000..cfdfeba4b6b0e9deeb455ca5a542357016cce23a
--- /dev/null
+++ b/libs/pyqtgraph/pixmaps/icons.svg
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="icons.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="290.39972"
+     inkscape:cy="606.05972"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer3"
+     showgrid="false"
+     inkscape:window-width="1400"
+     inkscape:window-height="1030"
+     inkscape:window-x="-3"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="Layer#1">
+    <g
+       style="display:inline"
+       id="g3764"
+       inkscape:export-filename="/home/luke/work/manis_lab/code/acq4/lib/util/pyqtgraph/graphicsItems/PlotItem/auto.png"
+       inkscape:export-xdpi="26.181818"
+       inkscape:export-ydpi="26.181818">
+      <rect
+         ry="18.687822"
+         y="400.81378"
+         x="108.08632"
+         height="100"
+         width="100"
+         id="rect2985"
+         style="fill:#000000;fill-opacity:1;stroke:#a9a9a9;stroke-width:10;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <text
+         transform="scale(1.0048002,0.99522278)"
+         sodipodi:linespacing="125%"
+         id="text3757"
+         y="490.5354"
+         x="118.68684"
+         style="font-size:108.36511993px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#e7e7e7;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial Bold"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold"
+           y="490.5354"
+           x="118.68684"
+           id="tspan3759"
+           sodipodi:role="line">A</tspan></text>
+    </g>
+    <g
+       id="g3777"
+       style="display:inline"
+       transform="translate(140,0)"
+       inkscape:export-filename="/home/luke/work/manis_lab/code/acq4/lib/util/pyqtgraph/graphicsItems/PlotItem/ctrl.png"
+       inkscape:export-xdpi="26.181818"
+       inkscape:export-ydpi="26.181818">
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:#a9a9a9;stroke-width:10;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         id="rect3779"
+         width="100"
+         height="100"
+         x="108.08632"
+         y="400.81378"
+         ry="18.687822" />
+      <path
+         style="fill:#e3e3e3;fill-opacity:1;stroke:none"
+         d="m 192.1403,484.47301 c 3.45636,-3.45635 3.45636,-9.02124 0,-12.47759 l -36.39994,-36.39995 c 1.29616,-5.58299 -0.2288,-11.68397 -4.57999,-16.03517 -3.03048,-3.03048 -6.90883,-4.69498 -10.87095,-4.98687 l -2.98378,2.98378 9.49382,9.49382 -2.62905,9.80681 -9.79638,2.61862 -9.49382,-9.49382 -2.97334,2.97334 c 0.29168,3.96216 1.94541,7.85036 4.97644,10.88138 4.35119,4.3512 10.45218,5.87615 16.03517,4.57999 l 36.39995,36.39995 c 3.45635,3.45635 9.02124,3.45635 12.47759,0 l 0.34428,-0.34429 z m -3.38021,-3.04636 c -2.09533,2.09533 -5.4893,2.10575 -7.58463,0.0104 -2.09533,-2.09532 -2.09533,-5.49972 -10e-6,-7.59505 2.09534,-2.09534 5.48931,-2.0849 7.58464,0.0104 2.09532,2.09532 2.09533,5.47887 0,7.5742 z"
+         id="path3793"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="translate(280,0)"
+       style="display:inline"
+       id="g3785"
+       inkscape:export-filename="/home/luke/work/manis_lab/code/acq4/lib/util/pyqtgraph/graphicsItems/PlotItem/lock.png"
+       inkscape:export-xdpi="26.181818"
+       inkscape:export-ydpi="26.181818">
+      <rect
+         ry="18.687822"
+         y="400.81378"
+         x="108.08632"
+         height="100"
+         width="100"
+         id="rect3787"
+         style="fill:#000000;fill-opacity:1;stroke:#a9a9a9;stroke-width:10;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <path
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#e6e6e6;fill-opacity:1;stroke:none;stroke-width:20;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+         d="m 158.08632,412.60531 c -13.62786,0 -24.7172,11.19602 -24.7172,24.87236 l 0,10.65958 -0.8689,0 c -3.12596,0 -5.63236,2.52191 -5.63236,5.64787 l 0,29.58927 c 0,3.12596 2.5064,5.64787 5.63236,5.64787 l 51.15669,0 c 3.12596,0 5.64787,-2.52191 5.64787,-5.64787 l 0,-29.58927 c 0,-3.12596 -2.52191,-5.64787 -5.64787,-5.64787 l -0.85339,0 0,-10.65958 c 0,-13.67634 -11.08933,-24.87236 -24.7172,-24.87236 z m 0,9.93032 c 8.25237,0 14.78688,6.54986 14.78688,14.94204 l 0,10.65958 -29.57376,0 0,-10.65958 c 0,-8.39218 6.53451,-14.94204 14.78688,-14.94204 z"
+         id="rect3830"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/libs/pyqtgraph/pixmaps/lock.png b/libs/pyqtgraph/pixmaps/lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f85dde05d29a80e9cba8d9d339f88d7f2a960e8
Binary files /dev/null and b/libs/pyqtgraph/pixmaps/lock.png differ
diff --git a/libs/pyqtgraph/pixmaps/pixmapData_2.py b/libs/pyqtgraph/pixmaps/pixmapData_2.py
new file mode 100644
index 0000000000000000000000000000000000000000..7813b6a6e24217482a6d27941133da3c6097fd73
--- /dev/null
+++ b/libs/pyqtgraph/pixmaps/pixmapData_2.py
@@ -0,0 +1 @@
+import numpy as np; pixmapData={'lock.png': "cnumpy.core.multiarray\n_reconstruct\np0\n(cnumpy\nndarray\np1\n(I0\ntp2\nS'b'\np3\ntp4\nRp5\n(I1\n(I32\nI32\nI4\ntp6\ncnumpy\ndtype\np7\n(S'u1'\np8\nI0\nI1\ntp9\nRp10\n(I3\nS'|'\np11\nNNNI-1\nI-1\nI0\ntp12\nbI00\nS'\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xad\\xad\\xad\\x19\\xa8\\xa8\\xa8\\x8d\\xa9\\xa9\\xa9\\xc1\\xa9\\xa9\\xa9\\xf1\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xf1\\xaa\\xaa\\xaa\\xc2\\xa9\\xa9\\xa9\\x8e\\xad\\xad\\xad\\x19\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xa8\\xa8\\xa8X\\xa9\\xa9\\xa9\\xed\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xed\\xa8\\xa8\\xa8X\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xaa\\xaa\\xaaW\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa6\\xa6\\xa6\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\xa6\\xa6\\xa6\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xaa\\xaa\\xaaW\\xff\\xff\\xff\\x00\\xaa\\xaa\\xaa\\x15\\xa9\\xa9\\xa9\\xeb\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x88\\x88\\x88\\xff)))\\xff\\x05\\x05\\x05\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x05\\x05\\x05\\xff)))\\xff\\x88\\x88\\x88\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xeb\\xaa\\xaa\\xaa\\x15\\xa9\\xa9\\xa9\\x88\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x88\\x88\\x88\\xff\\x03\\x03\\x03\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x03\\x03\\x03\\xff\\x88\\x88\\x88\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\x88\\xa9\\xa9\\xa9\\xbe\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff)))\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff)))\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xbe\\xa9\\xa9\\xa9\\xf1\\xa9\\xa9\\xa9\\xff\\xa6\\xa6\\xa6\\xff\\x05\\x05\\x05\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x05\\x05\\x05\\xff\\x16\\x16\\x16\\xff\\x16\\x16\\x16\\xff\\x16\\x16\\x16\\xff\\x16\\x16\\x16\\xff\\x16\\x16\\x16\\xff\\x16\\x16\\x16\\xff\\x16\\x16\\x16\\xff\\x16\\x16\\x16\\xff\\x0c\\x0c\\x0c\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x05\\x05\\x05\\xff\\xa6\\xa6\\xa6\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xf1\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff@@@\\xff\\xd2\\xd2\\xd2\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe1\\xe1\\xe1\\xff{{{\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x0e\\x0e\\x0e\\xff***\\xff+++\\xff+++\\xff\\xaf\\xaf\\xaf\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe2\\xe2\\xe2\\xff\\x10\\x10\\x10\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x1e\\x1e\\x1e\\xff\\x93\\x93\\x93\\xff\\xc6\\xc6\\xc6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\x1d\\x1d\\x1d\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xffaaa\\xff\\xdc\\xdc\\xdc\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\x1d\\x1d\\x1d\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\\\\\\\\\\\\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe2\\xe2\\xe2\\xff\\xbb\\xbb\\xbb\\xff\\x9f\\x9f\\x9f\\xff\\x9f\\x9f\\x9f\\xff\\x9f\\x9f\\x9f\\xff\\xd7\\xd7\\xd7\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\x1d\\x1d\\x1d\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x1c\\x1c\\x1c\\xff\\xda\\xda\\xda\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\x91\\x91\\x91\\xff\\x0f\\x0f\\x0f\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\xb4\\xb4\\xb4\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\x1d\\x1d\\x1d\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x87\\x87\\x87\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\x98\\x98\\x98\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\xb4\\xb4\\xb4\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\x1d\\x1d\\x1d\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\xba\\xba\\xba\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\x19\\x19\\x19\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\xb4\\xb4\\xb4\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\x1d\\x1d\\x1d\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x08\\x08\\x08\\xff\\xe2\\xe2\\xe2\\xff\\xe6\\xe6\\xe6\\xff\\xcc\\xcc\\xcc\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\xb4\\xb4\\xb4\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\x1d\\x1d\\x1d\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x08\\x08\\x08\\xff\\xe2\\xe2\\xe2\\xff\\xe6\\xe6\\xe6\\xff\\xcc\\xcc\\xcc\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\xb4\\xb4\\xb4\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\x1d\\x1d\\x1d\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\xba\\xba\\xba\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\x19\\x19\\x19\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\xb4\\xb4\\xb4\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\x1d\\x1d\\x1d\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x85\\x85\\x85\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\x98\\x98\\x98\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\xb4\\xb4\\xb4\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\x1d\\x1d\\x1d\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x19\\x19\\x19\\xff\\xd9\\xd9\\xd9\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\x91\\x91\\x91\\xff\\x0f\\x0f\\x0f\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\xb4\\xb4\\xb4\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\x1d\\x1d\\x1d\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xffZZZ\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe2\\xe2\\xe2\\xff\\xbc\\xbc\\xbc\\xff\\x9f\\x9f\\x9f\\xff\\x9f\\x9f\\x9f\\xff\\x9f\\x9f\\x9f\\xff\\xd7\\xd7\\xd7\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\x1d\\x1d\\x1d\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xffaaa\\xff\\xdc\\xdc\\xdc\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\x1d\\x1d\\x1d\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x1e\\x1e\\x1e\\xff\\x93\\x93\\x93\\xff\\xc6\\xc6\\xc6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\x1d\\x1d\\x1d\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x0e\\x0e\\x0e\\xff***\\xff+++\\xff+++\\xff\\xaf\\xaf\\xaf\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe2\\xe2\\xe2\\xff\\x10\\x10\\x10\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff@@@\\xff\\xd2\\xd2\\xd2\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe6\\xe6\\xe6\\xff\\xe1\\xe1\\xe1\\xff{{{\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xf1\\xa9\\xa9\\xa9\\xff\\xa6\\xa6\\xa6\\xff\\x05\\x05\\x05\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x05\\x05\\x05\\xff\\x16\\x16\\x16\\xff\\x16\\x16\\x16\\xff\\x16\\x16\\x16\\xff\\x16\\x16\\x16\\xff\\x16\\x16\\x16\\xff\\x16\\x16\\x16\\xff\\x16\\x16\\x16\\xff\\x16\\x16\\x16\\xff\\x0c\\x0c\\x0c\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x05\\x05\\x05\\xff\\xa6\\xa6\\xa6\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xf1\\xa9\\xa9\\xa9\\xbd\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff)))\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff)))\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xbd\\xa9\\xa9\\xa9\\x88\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x88\\x88\\x88\\xff\\x03\\x03\\x03\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x03\\x03\\x03\\xff\\x88\\x88\\x88\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\x88\\xaa\\xaa\\xaa\\x15\\xa9\\xa9\\xa9\\xeb\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x88\\x88\\x88\\xff)))\\xff\\x05\\x05\\x05\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x05\\x05\\x05\\xff)))\\xff\\x88\\x88\\x88\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xeb\\xaa\\xaa\\xaa\\x15\\xff\\xff\\xff\\x00\\xaa\\xaa\\xaaW\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa6\\xa6\\xa6\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\xa6\\xa6\\xa6\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xaa\\xaa\\xaaW\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xaa\\xaa\\xaaW\\xa9\\xa9\\xa9\\xeb\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xeb\\xaa\\xaa\\xaaW\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xaa\\xaa\\xaa\\x15\\xa9\\xa9\\xa9\\x88\\xa9\\xa9\\xa9\\xbd\\xa9\\xa9\\xa9\\xf1\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xf1\\xa9\\xa9\\xa9\\xbe\\xa9\\xa9\\xa9\\x88\\xaa\\xaa\\xaa\\x15\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00'\np13\ntp14\nb.", 'default.png': 'cnumpy.core.multiarray\n_reconstruct\np0\n(cnumpy\nndarray\np1\n(I0\ntp2\nS\'b\'\np3\ntp4\nRp5\n(I1\n(I16\nI16\nI4\ntp6\ncnumpy\ndtype\np7\n(S\'u1\'\np8\nI0\nI1\ntp9\nRp10\n(I3\nS\'|\'\np11\nNNNI-1\nI-1\nI0\ntp12\nbI00\nS\'\\x00\\x7f\\xa6\\x1b\\x0c\\x8a\\xad\\xdc\\r\\x91\\xb0\\xf3\\r\\x91\\xb0\\xf3\\r\\x91\\xb0\\xf4\\r\\x91\\xb1\\xf4\\r\\x90\\xb0\\xf4\\x05\\x85\\xa9\\xef\\x00\\x7f\\xa6<\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\x00\\x7f\\xa6!\\x1d\\x9c\\xb9\\xf5g\\xd9\\xf1\\xffi\\xd9\\xf3\\xffd\\xd1\\xee\\xff]\\xcb\\xeb\\xff@\\xbb\\xe3\\xff\\x16\\x9c\\xc2\\xf8\\x00\\x7f\\xa6\\xb4\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\x00\\x7f\\xa6U\\\'\\xac\\xc5\\xf9i\\xd9\\xf3\\xffc\\xd3\\xef\\xff\\\\\\xcf\\xeb\\xffP\\xc8\\xe6\\xff\\x17\\x9f\\xc4\\xfd\\x00\\x7f\\xa6\\xfc\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\x02\\x83\\xa8lH\\xc5\\xdd\\xfah\\xdc\\xf3\\xffc\\xd4\\xef\\xffV\\xce\\xe9\\xffN\\xcf\\xe7\\xff&\\xaa\\xca\\xfd\\x00\\x7f\\xa6\\xff\\x03\\x81\\xc7\\x01\\x04\\x8d\\xda\\x01\\t\\x94\\xd9\\x01\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\x00\\x7f\\xa6"$\\xa9\\xc4\\xf7g\\xdf\\xf5\\xfff\\xdb\\xf3\\xffU\\xcd\\xeb\\xff\\x16\\xb3\\xda\\xff.\\xc9\\xe1\\xff(\\xb2\\xd0\\xfe\\x01\\x7f\\xa6\\xff\\x04\\x84\\xc9\\x05\\t\\x94\\xd9\\x06\\x10\\x9c\\xd7\\x01\\x16\\xa2\\xd6\\x01\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\x02\\x83\\xa9\\x81T\\xd3\\xeb\\xffg\\xe5\\xf7\\xffe\\xda\\xf3\\xff!\\xaa\\xde\\xff\\x11\\x9d\\xc3\\xfe\\x11\\xba\\xd7\\xff \\xb9\\xd5\\xfe\\x00\\x7f\\xa6\\xff\\x16u\\x8d\\x03\\x14\\x84\\xae\\x05\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\x10\\x92\\xb4\\xc0d\\xde\\xf3\\xffg\\xe5\\xf7\\xff_\\xcc\\xef\\xff\\x0e\\x9c\\xd5\\xff\\rx\\x95\\xf6\\x0e\\x89\\xab\\xf4\\x18\\xb2\\xd1\\xfc\\x00\\x7f\\xa6\\xff\\xff\\xff\\xff\\x00\\x1a~\\x91\\x01\\x1d\\xa5\\xce\\x01\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x005\\xa9\\xc3\\xefq\\xec\\xf9\\xffg\\xe5\\xf7\\xff>\\xb7\\xe8\\xff\\x14\\x96\\xc8\\xfe\\x02}\\xa3\\xb1\\x00\\x7f\\xa6Q\\x03\\x82\\xa9\\xe8\\x00\\x7f\\xa6\\xe9\\xff\\xff\\xff\\x00\\x00\\x7f\\xa6\\x11\\x1c\\x98\\xb8\\x04%\\xb5\\xd3\\x01\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00D\\xad\\xc8\\xf3r\\xec\\xf9\\xffg\\xe5\\xf7\\xff:\\xb7\\xe8\\xff\\x19\\x90\\xc5\\xfe\\x03{\\xa0\\xa6\\xff\\xff\\xff\\x00\\x00\\x7f\\xa6*\\x00\\x7f\\xa6*\\xff\\xff\\xff\\x00\\x00\\x7f\\xa6\\x98\\x0f\\x8f\\xb1\\x13&\\xb5\\xd3\\x04.\\xc0\\xd1\\x01\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\x19\\x93\\xb7\\xc6i\\xdf\\xf4\\xffg\\xe5\\xf7\\xffT\\xc8\\xee\\xff\\x06\\x88\\xcd\\xff\\x08g\\x85\\xf7\\x00\\x7f\\xa6\\x15\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\x00\\x7f\\xa6\\x1b\\x01\\x80\\xa7\\xeb\\x1d\\xa3\\xca\\x16#\\xb2\\xd4\\n*\\xbb\\xd2\\x04.\\xbc\\xd7\\x01\\xff\\xff\\xff\\x00\\x01\\x81\\xa7\\x88Y\\xd1\\xee\\xffg\\xe5\\xf7\\xfff\\xd9\\xf3\\xff\\\'\\xa2\\xe2\\xff\\x05e\\x99\\xf9\\x06~\\xa5\\xf3\\x01\\x81\\xa8\\x9c\\x01\\x80\\xa8\\x9f\\x04\\x85\\xad\\xef\\x08\\x8f\\xb9\\x92\\x17\\xa4\\xd6*\\x1e\\xac\\xd5\\x1a$\\xb3\\xd3\\x0c\\x19\\xa7\\xd5\\x02\\xff\\xff\\xff\\x00\\x00\\x7f\\xa6+!\\xa3\\xc8\\xf5i\\xe0\\xf5\\xffe\\xd9\\xf3\\xff\\\\\\xca\\xee\\xff\\x1f\\x9c\\xe0\\xfa\\x03\\x84\\xca\\xd6\\x07\\x8b\\xc5\\xca\\x06\\x88\\xc1\\xb8\\x08\\x8e\\xd0l\\x0b\\x96\\xd8I\\x11\\x9e\\xd74\\x17\\xa5\\xd6  \\xab\\xd7\\x0b\\x17\\xa2\\xdc\\x01\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\x01\\x80\\xa8~?\\xb9\\xe0\\xf9h\\xda\\xf3\\xff_\\xcc\\xef\\xffV\\xc1\\xec\\xfd3\\xa7\\xe3\\xe3\\x1a\\x96\\xde\\xae\\x04\\x8b\\xdb\\x89\\x00\\x89\\xdao\\x05\\x8f\\xd9T\\x0b\\x96\\xd8<\\x11\\x9b\\xd7\\x1d\\x18\\x95\\xc9\\x0c\\x00\\x80\\xd5\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\x00\\x7f\\xa6\\x04\\x03\\x83\\xaa\\xcd5\\xa2\\xc9\\xf9[\\xc6\\xea\\xffU\\xc1\\xec\\xffH\\xb4\\xe8\\xf39\\xa8\\xe4\\xc5\\x0b\\x8f\\xdc\\x9f\\x00\\x89\\xda{\\x00\\x89\\xda_\\x07\\x87\\xc4I\\x05|\\xa5s\\x05m\\xa3\\x02\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\x00\\x7f\\xa6\\x06\\x01\\x7f\\xa6\\x89\\x12x\\x9e\\xf63\\x88\\xae\\xfe6\\x93\\xc3\\xfe4\\x9d\\xd6\\xdf\\x08\\x82\\xc7\\xb8\\x03k\\xa2\\xab\\x04k\\x97\\xa8\\x02w\\x9e\\xeb\\x00\\x7f\\xa6j\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\x00\\x7f\\xa67\\x00~\\xa5\\x95\\x03v\\x9c\\xd4\\x03h\\x8c\\xfa\\x02i\\x8e\\xf9\\x01x\\x9f\\xcc\\x00\\x7f\\xa6\\x92\\x00\\x7f\\xa63\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\'\np13\ntp14\nb.', 'ctrl.png': "cnumpy.core.multiarray\n_reconstruct\np0\n(cnumpy\nndarray\np1\n(I0\ntp2\nS'b'\np3\ntp4\nRp5\n(I1\n(I32\nI32\nI4\ntp6\ncnumpy\ndtype\np7\n(S'u1'\np8\nI0\nI1\ntp9\nRp10\n(I3\nS'|'\np11\nNNNI-1\nI-1\nI0\ntp12\nbI00\nS'\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xad\\xad\\xad\\x19\\xa8\\xa8\\xa8\\x8d\\xa9\\xa9\\xa9\\xc1\\xa9\\xa9\\xa9\\xf1\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xf1\\xaa\\xaa\\xaa\\xc2\\xa9\\xa9\\xa9\\x8e\\xad\\xad\\xad\\x19\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xa8\\xa8\\xa8X\\xa9\\xa9\\xa9\\xed\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xed\\xa8\\xa8\\xa8X\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xaa\\xaa\\xaaW\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa6\\xa6\\xa6\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\xa6\\xa6\\xa6\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xaa\\xaa\\xaaW\\xff\\xff\\xff\\x00\\xaa\\xaa\\xaa\\x15\\xa9\\xa9\\xa9\\xeb\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x88\\x88\\x88\\xff)))\\xff\\x05\\x05\\x05\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x05\\x05\\x05\\xff)))\\xff\\x88\\x88\\x88\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xeb\\xaa\\xaa\\xaa\\x15\\xa9\\xa9\\xa9\\x88\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x88\\x88\\x88\\xff\\x03\\x03\\x03\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x03\\x03\\x03\\xff\\x88\\x88\\x88\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\x88\\xa9\\xa9\\xa9\\xbe\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff)))\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff555\\xffPPP\\xff\\x13\\x13\\x13\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff)))\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xbe\\xa9\\xa9\\xa9\\xf1\\xa9\\xa9\\xa9\\xff\\xa6\\xa6\\xa6\\xff\\x05\\x05\\x05\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x01\\x01\\x01\\xff\\xb2\\xb2\\xb2\\xff\\xe3\\xe3\\xe3\\xff\\xd9\\xd9\\xd9\\xff]]]\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x05\\x05\\x05\\xff\\xa6\\xa6\\xa6\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xf1\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x13\\x13\\x13\\xff\\xbb\\xbb\\xbb\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xffFFF\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x13\\x13\\x13\\xff\\xbb\\xbb\\xbb\\xff\\xe3\\xe3\\xe3\\xff\\xc4\\xc4\\xc4\\xff\\x06\\x06\\x06\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff```\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff:::\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff666\\xff\\xaf\\xaf\\xaf\\xff\\x10\\x10\\x10\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9b\\x9b\\x9b\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff@@@\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xffSSS\\xff\\xe3\\xe3\\xe3\\xff\\xb7\\xb7\\xb7\\xff\\x10\\x10\\x10\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x04\\x04\\x04\\xff\\xd5\\xd5\\xd5\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xffXXX\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x17\\x17\\x17\\xff\\xdb\\xdb\\xdb\\xff\\xe3\\xe3\\xe3\\xff\\xb7\\xb7\\xb7\\xff[[[\\xff\\x97\\x97\\x97\\xff\\xd4\\xd4\\xd4\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xda\\xda\\xda\\xff;;;\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff```\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xda\\xda\\xda\\xff;;;\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xffHHH\\xff\\xc6\\xc6\\xc6\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xda\\xda\\xda\\xff;;;\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x07\\x07\\x07\\xff;;;\\xffAAA\\xff\\\\\\\\\\\\\\xff\\xdd\\xdd\\xdd\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xda\\xda\\xda\\xff;;;\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff@@@\\xff\\xdd\\xdd\\xdd\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xda\\xda\\xda\\xff;;;\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff@@@\\xff\\xdd\\xdd\\xdd\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xda\\xda\\xda\\xff;;;\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff@@@\\xff\\xdd\\xdd\\xdd\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xda\\xda\\xda\\xff;;;\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff@@@\\xff\\xdd\\xdd\\xdd\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xda\\xda\\xda\\xff;;;\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff@@@\\xff\\xdd\\xdd\\xdd\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xda\\xda\\xda\\xff;;;\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff@@@\\xff\\xdd\\xdd\\xdd\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xda\\xda\\xda\\xff;;;\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff@@@\\xff\\xdd\\xdd\\xdd\\xff\\xe3\\xe3\\xe3\\xff\\xe3\\xe3\\xe3\\xff\\xc7\\xc7\\xc7\\xffZZZ\\xff~~~\\xff\\xd9\\xd9\\xd9\\xff\\x10\\x10\\x10\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff@@@\\xff\\xdd\\xdd\\xdd\\xff\\xe3\\xe3\\xe3\\xffXXX\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\xb0\\xb0\\xb0\\xfffff\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff@@@\\xff\\xdd\\xdd\\xdd\\xffyyy\\xff\\x00\\x00\\x00\\xff\\x06\\x06\\x06\\xff\\xcd\\xcd\\xcd\\xfffff\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xf1\\xa9\\xa9\\xa9\\xff\\xa6\\xa6\\xa6\\xff\\x05\\x05\\x05\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff@@@\\xff\\xda\\xda\\xda\\xff\\xaf\\xaf\\xaf\\xff\\xcd\\xcd\\xcd\\xff\\xd7\\xd7\\xd7\\xff\\x10\\x10\\x10\\xff\\x00\\x00\\x00\\xff\\x05\\x05\\x05\\xff\\xa6\\xa6\\xa6\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xf1\\xa9\\xa9\\xa9\\xbd\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff)))\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x12\\x12\\x12\\xffiii\\xffccc\\xff\\x0e\\x0e\\x0e\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff)))\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xbd\\xa9\\xa9\\xa9\\x88\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x88\\x88\\x88\\xff\\x03\\x03\\x03\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x03\\x03\\x03\\xff\\x88\\x88\\x88\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\x88\\xaa\\xaa\\xaa\\x15\\xa9\\xa9\\xa9\\xeb\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x88\\x88\\x88\\xff)))\\xff\\x05\\x05\\x05\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x05\\x05\\x05\\xff)))\\xff\\x88\\x88\\x88\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xeb\\xaa\\xaa\\xaa\\x15\\xff\\xff\\xff\\x00\\xaa\\xaa\\xaaW\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa6\\xa6\\xa6\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\xa6\\xa6\\xa6\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xaa\\xaa\\xaaW\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xaa\\xaa\\xaaW\\xa9\\xa9\\xa9\\xeb\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xeb\\xaa\\xaa\\xaaW\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xaa\\xaa\\xaa\\x15\\xa9\\xa9\\xa9\\x88\\xa9\\xa9\\xa9\\xbd\\xa9\\xa9\\xa9\\xf1\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xf1\\xa9\\xa9\\xa9\\xbe\\xa9\\xa9\\xa9\\x88\\xaa\\xaa\\xaa\\x15\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00'\np13\ntp14\nb.", 'auto.png': "cnumpy.core.multiarray\n_reconstruct\np0\n(cnumpy\nndarray\np1\n(I0\ntp2\nS'b'\np3\ntp4\nRp5\n(I1\n(I32\nI32\nI4\ntp6\ncnumpy\ndtype\np7\n(S'u1'\np8\nI0\nI1\ntp9\nRp10\n(I3\nS'|'\np11\nNNNI-1\nI-1\nI0\ntp12\nbI00\nS'\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xad\\xad\\xad\\x19\\xa8\\xa8\\xa8\\x8d\\xa9\\xa9\\xa9\\xc1\\xa9\\xa9\\xa9\\xf1\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xf1\\xaa\\xaa\\xaa\\xc2\\xa9\\xa9\\xa9\\x8e\\xad\\xad\\xad\\x19\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xa8\\xa8\\xa8X\\xa9\\xa9\\xa9\\xed\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xed\\xa8\\xa8\\xa8X\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xaa\\xaa\\xaaW\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa6\\xa6\\xa6\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\xa6\\xa6\\xa6\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xaa\\xaa\\xaaW\\xff\\xff\\xff\\x00\\xaa\\xaa\\xaa\\x15\\xa9\\xa9\\xa9\\xeb\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x88\\x88\\x88\\xff)))\\xff\\x05\\x05\\x05\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x05\\x05\\x05\\xff)))\\xff\\x88\\x88\\x88\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xeb\\xaa\\xaa\\xaa\\x15\\xa9\\xa9\\xa9\\x88\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x88\\x88\\x88\\xff\\x03\\x03\\x03\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x19\\x19\\x19\\xff\\x03\\x03\\x03\\xff\\x88\\x88\\x88\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\x88\\xa9\\xa9\\xa9\\xbe\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff)))\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x04\\x04\\x04\\xffHHH\\xff\\xa4\\xa4\\xa4\\xff\\xe5\\xe5\\xe5\\xff\\x00\\x00\\x00\\xff)))\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xbe\\xa9\\xa9\\xa9\\xf1\\xa9\\xa9\\xa9\\xff\\xa6\\xa6\\xa6\\xff\\x05\\x05\\x05\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff   \\xffyyy\\xff\\xd1\\xd1\\xd1\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\x00\\x00\\x00\\xff\\x05\\x05\\x05\\xff\\xa6\\xa6\\xa6\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xf1\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x06\\x06\\x06\\xffPPP\\xff\\xab\\xab\\xab\\xff\\xe6\\xe6\\xe6\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff&&&\\xff\\x82\\x82\\x82\\xff\\xd6\\xd6\\xd6\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\t\\t\\t\\xffWWW\\xff\\xb2\\xb2\\xb2\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe5\\xe5\\xe5\\xff\\xa8\\xa8\\xa8\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff---\\xff\\x89\\x89\\x89\\xff\\xda\\xda\\xda\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xc1\\xc1\\xc1\\xfflll\\xff\\x18\\x18\\x18\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\r\\r\\r\\xff^^^\\xff\\xba\\xba\\xba\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xda\\xda\\xda\\xff...\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff555\\xff\\x90\\x90\\x90\\xff\\xde\\xde\\xde\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe2\\xe2\\xe2\\xff\\xe3\\xe3\\xe3\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xd2\\xd2\\xd2\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff;;;\\xff\\xc1\\xc1\\xc1\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xb7\\xb7\\xb7\\xffbbb\\xff\\x12\\x12\\x12\\xff\\xcb\\xcb\\xcb\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xd2\\xd2\\xd2\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xffmmm\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xcd\\xcd\\xcd\\xffyyy\\xff$$$\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\xcb\\xcb\\xcb\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xd2\\xd2\\xd2\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xffmmm\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe3\\xe3\\xe3\\xff\\x91\\x91\\x91\\xff<<<\\xff\\x01\\x01\\x01\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\xcb\\xcb\\xcb\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xd2\\xd2\\xd2\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xffmmm\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xc3\\xc3\\xc3\\xfflll\\xff\\x18\\x18\\x18\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\xcb\\xcb\\xcb\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xd2\\xd2\\xd2\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xffmmm\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe4\\xe4\\xe4\\xff\\xa6\\xa6\\xa6\\xffOOO\\xff\\x07\\x07\\x07\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\xcb\\xcb\\xcb\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xd2\\xd2\\xd2\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff555\\xff\\xb4\\xb4\\xb4\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xd9\\xd9\\xd9\\xff\\x8a\\x8a\\x8a\\xff333\\xff\\xcb\\xcb\\xcb\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xd2\\xd2\\xd2\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff+++\\xff\\x88\\x88\\x88\\xff\\xda\\xda\\xda\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xd2\\xd2\\xd2\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\n\\n\\n\\xff[[[\\xff\\xb8\\xb8\\xb8\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xdc\\xdc\\xdc\\xffAAA\\xff\\x02\\x02\\x02\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff...\\xff\\x8c\\x8c\\x8c\\xff\\xdc\\xdc\\xdc\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xcc\\xcc\\xcc\\xffsss\\xff\\x1a\\x1a\\x1a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x0c\\x0c\\x0c\\xff___\\xff\\xbc\\xbc\\xbc\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe5\\xe5\\xe5\\xff\\xa5\\xa5\\xa5\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff222\\xff\\x8f\\x8f\\x8f\\xff\\xde\\xde\\xde\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x9a\\x9a\\x9a\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x0e\\x0e\\x0e\\xffccc\\xff\\xc0\\xc0\\xc0\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x9a\\x9a\\x9a\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xf1\\xa9\\xa9\\xa9\\xff\\xa6\\xa6\\xa6\\xff\\x05\\x05\\x05\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff555\\xff\\x94\\x94\\x94\\xff\\xe0\\xe0\\xe0\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\xe7\\xe7\\xe7\\xff\\x00\\x00\\x00\\xff\\x05\\x05\\x05\\xff\\xa6\\xa6\\xa6\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xf1\\xa9\\xa9\\xa9\\xbd\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff)))\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x10\\x10\\x10\\xfffff\\xff\\xc4\\xc4\\xc4\\xff\\xe7\\xe7\\xe7\\xff\\x00\\x00\\x00\\xff)))\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xbd\\xa9\\xa9\\xa9\\x88\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x88\\x88\\x88\\xff\\x03\\x03\\x03\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff:::\\xff\\x03\\x03\\x03\\xff\\x88\\x88\\x88\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\x88\\xaa\\xaa\\xaa\\x15\\xa9\\xa9\\xa9\\xeb\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\x88\\x88\\x88\\xff)))\\xff\\x05\\x05\\x05\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x00\\x00\\x00\\xff\\x05\\x05\\x05\\xff)))\\xff\\x88\\x88\\x88\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xeb\\xaa\\xaa\\xaa\\x15\\xff\\xff\\xff\\x00\\xaa\\xaa\\xaaW\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa6\\xa6\\xa6\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\x9a\\x9a\\x9a\\xff\\xa6\\xa6\\xa6\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xaa\\xaa\\xaaW\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xaa\\xaa\\xaaW\\xa9\\xa9\\xa9\\xeb\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xeb\\xaa\\xaa\\xaaW\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xaa\\xaa\\xaa\\x15\\xa9\\xa9\\xa9\\x88\\xa9\\xa9\\xa9\\xbd\\xa9\\xa9\\xa9\\xf1\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xff\\xa9\\xa9\\xa9\\xf1\\xa9\\xa9\\xa9\\xbe\\xa9\\xa9\\xa9\\x88\\xaa\\xaa\\xaa\\x15\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\x00'\np13\ntp14\nb."}
\ No newline at end of file
diff --git a/libs/pyqtgraph/pixmaps/pixmapData_3.py b/libs/pyqtgraph/pixmaps/pixmapData_3.py
new file mode 100644
index 0000000000000000000000000000000000000000..bb5120291d995ae5b24f6b7761c4f496a229133e
--- /dev/null
+++ b/libs/pyqtgraph/pixmaps/pixmapData_3.py
@@ -0,0 +1 @@
+import numpy as np; pixmapData={'lock.png': b'\x80\x03cnumpy.core.multiarray\n_reconstruct\nq\x00cnumpy\nndarray\nq\x01K\x00\x85q\x02C\x01bq\x03\x87q\x04Rq\x05(K\x01K K K\x04\x87q\x06cnumpy\ndtype\nq\x07X\x02\x00\x00\x00u1q\x08K\x00K\x01\x87q\tRq\n(K\x03X\x01\x00\x00\x00|q\x0bNNNJ\xff\xff\xff\xffJ\xff\xff\xff\xffK\x00tq\x0cb\x89B\x00\x10\x00\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xad\xad\xad\x19\xa8\xa8\xa8\x8d\xa9\xa9\xa9\xc1\xa9\xa9\xa9\xf1\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xf1\xaa\xaa\xaa\xc2\xa9\xa9\xa9\x8e\xad\xad\xad\x19\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xa8\xa8\xa8X\xa9\xa9\xa9\xed\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xed\xa8\xa8\xa8X\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xaa\xaa\xaaW\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa6\xa6\xa6\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\xa6\xa6\xa6\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xaa\xaa\xaaW\xff\xff\xff\x00\xaa\xaa\xaa\x15\xa9\xa9\xa9\xeb\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x88\x88\x88\xff)))\xff\x05\x05\x05\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x05\x05\x05\xff)))\xff\x88\x88\x88\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xeb\xaa\xaa\xaa\x15\xa9\xa9\xa9\x88\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x88\x88\x88\xff\x03\x03\x03\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x03\x03\x03\xff\x88\x88\x88\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\x88\xa9\xa9\xa9\xbe\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff)))\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff)))\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xbe\xa9\xa9\xa9\xf1\xa9\xa9\xa9\xff\xa6\xa6\xa6\xff\x05\x05\x05\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x05\x05\x05\xff\x16\x16\x16\xff\x16\x16\x16\xff\x16\x16\x16\xff\x16\x16\x16\xff\x16\x16\x16\xff\x16\x16\x16\xff\x16\x16\x16\xff\x16\x16\x16\xff\x0c\x0c\x0c\xff\x00\x00\x00\xff\x00\x00\x00\xff\x05\x05\x05\xff\xa6\xa6\xa6\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xf1\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff@@@\xff\xd2\xd2\xd2\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe1\xe1\xe1\xff{{{\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x0e\x0e\x0e\xff***\xff+++\xff+++\xff\xaf\xaf\xaf\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe2\xe2\xe2\xff\x10\x10\x10\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x1e\x1e\x1e\xff\x93\x93\x93\xff\xc6\xc6\xc6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\x1d\x1d\x1d\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xffaaa\xff\xdc\xdc\xdc\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\x1d\x1d\x1d\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\\\\\\\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe2\xe2\xe2\xff\xbb\xbb\xbb\xff\x9f\x9f\x9f\xff\x9f\x9f\x9f\xff\x9f\x9f\x9f\xff\xd7\xd7\xd7\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\x1d\x1d\x1d\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x1c\x1c\x1c\xff\xda\xda\xda\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\x91\x91\x91\xff\x0f\x0f\x0f\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\xb4\xb4\xb4\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\x1d\x1d\x1d\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x87\x87\x87\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\x98\x98\x98\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\xb4\xb4\xb4\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\x1d\x1d\x1d\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\xba\xba\xba\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\x19\x19\x19\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\xb4\xb4\xb4\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\x1d\x1d\x1d\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x08\x08\x08\xff\xe2\xe2\xe2\xff\xe6\xe6\xe6\xff\xcc\xcc\xcc\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\xb4\xb4\xb4\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\x1d\x1d\x1d\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x08\x08\x08\xff\xe2\xe2\xe2\xff\xe6\xe6\xe6\xff\xcc\xcc\xcc\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\xb4\xb4\xb4\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\x1d\x1d\x1d\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\xba\xba\xba\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\x19\x19\x19\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\xb4\xb4\xb4\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\x1d\x1d\x1d\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x85\x85\x85\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\x98\x98\x98\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\xb4\xb4\xb4\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\x1d\x1d\x1d\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x19\x19\x19\xff\xd9\xd9\xd9\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\x91\x91\x91\xff\x0f\x0f\x0f\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\xb4\xb4\xb4\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\x1d\x1d\x1d\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xffZZZ\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe2\xe2\xe2\xff\xbc\xbc\xbc\xff\x9f\x9f\x9f\xff\x9f\x9f\x9f\xff\x9f\x9f\x9f\xff\xd7\xd7\xd7\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\x1d\x1d\x1d\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xffaaa\xff\xdc\xdc\xdc\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\x1d\x1d\x1d\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x1e\x1e\x1e\xff\x93\x93\x93\xff\xc6\xc6\xc6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\x1d\x1d\x1d\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x0e\x0e\x0e\xff***\xff+++\xff+++\xff\xaf\xaf\xaf\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe2\xe2\xe2\xff\x10\x10\x10\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff@@@\xff\xd2\xd2\xd2\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe6\xe6\xe6\xff\xe1\xe1\xe1\xff{{{\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xf1\xa9\xa9\xa9\xff\xa6\xa6\xa6\xff\x05\x05\x05\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x05\x05\x05\xff\x16\x16\x16\xff\x16\x16\x16\xff\x16\x16\x16\xff\x16\x16\x16\xff\x16\x16\x16\xff\x16\x16\x16\xff\x16\x16\x16\xff\x16\x16\x16\xff\x0c\x0c\x0c\xff\x00\x00\x00\xff\x00\x00\x00\xff\x05\x05\x05\xff\xa6\xa6\xa6\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xf1\xa9\xa9\xa9\xbd\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff)))\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff)))\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xbd\xa9\xa9\xa9\x88\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x88\x88\x88\xff\x03\x03\x03\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x03\x03\x03\xff\x88\x88\x88\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\x88\xaa\xaa\xaa\x15\xa9\xa9\xa9\xeb\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x88\x88\x88\xff)))\xff\x05\x05\x05\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x05\x05\x05\xff)))\xff\x88\x88\x88\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xeb\xaa\xaa\xaa\x15\xff\xff\xff\x00\xaa\xaa\xaaW\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa6\xa6\xa6\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\xa6\xa6\xa6\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xaa\xaa\xaaW\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xaa\xaa\xaaW\xa9\xa9\xa9\xeb\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xeb\xaa\xaa\xaaW\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xaa\xaa\xaa\x15\xa9\xa9\xa9\x88\xa9\xa9\xa9\xbd\xa9\xa9\xa9\xf1\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xf1\xa9\xa9\xa9\xbe\xa9\xa9\xa9\x88\xaa\xaa\xaa\x15\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00q\rtq\x0eb.', 'default.png': b'\x80\x03cnumpy.core.multiarray\n_reconstruct\nq\x00cnumpy\nndarray\nq\x01K\x00\x85q\x02C\x01bq\x03\x87q\x04Rq\x05(K\x01K\x10K\x10K\x04\x87q\x06cnumpy\ndtype\nq\x07X\x02\x00\x00\x00u1q\x08K\x00K\x01\x87q\tRq\n(K\x03X\x01\x00\x00\x00|q\x0bNNNJ\xff\xff\xff\xffJ\xff\xff\xff\xffK\x00tq\x0cb\x89B\x00\x04\x00\x00\x00\x7f\xa6\x1b\x0c\x8a\xad\xdc\r\x91\xb0\xf3\r\x91\xb0\xf3\r\x91\xb0\xf4\r\x91\xb1\xf4\r\x90\xb0\xf4\x05\x85\xa9\xef\x00\x7f\xa6<\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\x00\x7f\xa6!\x1d\x9c\xb9\xf5g\xd9\xf1\xffi\xd9\xf3\xffd\xd1\xee\xff]\xcb\xeb\xff@\xbb\xe3\xff\x16\x9c\xc2\xf8\x00\x7f\xa6\xb4\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\x00\x7f\xa6U\'\xac\xc5\xf9i\xd9\xf3\xffc\xd3\xef\xff\\\xcf\xeb\xffP\xc8\xe6\xff\x17\x9f\xc4\xfd\x00\x7f\xa6\xfc\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\x02\x83\xa8lH\xc5\xdd\xfah\xdc\xf3\xffc\xd4\xef\xffV\xce\xe9\xffN\xcf\xe7\xff&\xaa\xca\xfd\x00\x7f\xa6\xff\x03\x81\xc7\x01\x04\x8d\xda\x01\t\x94\xd9\x01\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\x00\x7f\xa6"$\xa9\xc4\xf7g\xdf\xf5\xfff\xdb\xf3\xffU\xcd\xeb\xff\x16\xb3\xda\xff.\xc9\xe1\xff(\xb2\xd0\xfe\x01\x7f\xa6\xff\x04\x84\xc9\x05\t\x94\xd9\x06\x10\x9c\xd7\x01\x16\xa2\xd6\x01\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\x02\x83\xa9\x81T\xd3\xeb\xffg\xe5\xf7\xffe\xda\xf3\xff!\xaa\xde\xff\x11\x9d\xc3\xfe\x11\xba\xd7\xff \xb9\xd5\xfe\x00\x7f\xa6\xff\x16u\x8d\x03\x14\x84\xae\x05\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\x10\x92\xb4\xc0d\xde\xf3\xffg\xe5\xf7\xff_\xcc\xef\xff\x0e\x9c\xd5\xff\rx\x95\xf6\x0e\x89\xab\xf4\x18\xb2\xd1\xfc\x00\x7f\xa6\xff\xff\xff\xff\x00\x1a~\x91\x01\x1d\xa5\xce\x01\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x005\xa9\xc3\xefq\xec\xf9\xffg\xe5\xf7\xff>\xb7\xe8\xff\x14\x96\xc8\xfe\x02}\xa3\xb1\x00\x7f\xa6Q\x03\x82\xa9\xe8\x00\x7f\xa6\xe9\xff\xff\xff\x00\x00\x7f\xa6\x11\x1c\x98\xb8\x04%\xb5\xd3\x01\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00D\xad\xc8\xf3r\xec\xf9\xffg\xe5\xf7\xff:\xb7\xe8\xff\x19\x90\xc5\xfe\x03{\xa0\xa6\xff\xff\xff\x00\x00\x7f\xa6*\x00\x7f\xa6*\xff\xff\xff\x00\x00\x7f\xa6\x98\x0f\x8f\xb1\x13&\xb5\xd3\x04.\xc0\xd1\x01\xff\xff\xff\x00\xff\xff\xff\x00\x19\x93\xb7\xc6i\xdf\xf4\xffg\xe5\xf7\xffT\xc8\xee\xff\x06\x88\xcd\xff\x08g\x85\xf7\x00\x7f\xa6\x15\xff\xff\xff\x00\xff\xff\xff\x00\x00\x7f\xa6\x1b\x01\x80\xa7\xeb\x1d\xa3\xca\x16#\xb2\xd4\n*\xbb\xd2\x04.\xbc\xd7\x01\xff\xff\xff\x00\x01\x81\xa7\x88Y\xd1\xee\xffg\xe5\xf7\xfff\xd9\xf3\xff\'\xa2\xe2\xff\x05e\x99\xf9\x06~\xa5\xf3\x01\x81\xa8\x9c\x01\x80\xa8\x9f\x04\x85\xad\xef\x08\x8f\xb9\x92\x17\xa4\xd6*\x1e\xac\xd5\x1a$\xb3\xd3\x0c\x19\xa7\xd5\x02\xff\xff\xff\x00\x00\x7f\xa6+!\xa3\xc8\xf5i\xe0\xf5\xffe\xd9\xf3\xff\\\xca\xee\xff\x1f\x9c\xe0\xfa\x03\x84\xca\xd6\x07\x8b\xc5\xca\x06\x88\xc1\xb8\x08\x8e\xd0l\x0b\x96\xd8I\x11\x9e\xd74\x17\xa5\xd6  \xab\xd7\x0b\x17\xa2\xdc\x01\xff\xff\xff\x00\xff\xff\xff\x00\x01\x80\xa8~?\xb9\xe0\xf9h\xda\xf3\xff_\xcc\xef\xffV\xc1\xec\xfd3\xa7\xe3\xe3\x1a\x96\xde\xae\x04\x8b\xdb\x89\x00\x89\xdao\x05\x8f\xd9T\x0b\x96\xd8<\x11\x9b\xd7\x1d\x18\x95\xc9\x0c\x00\x80\xd5\x00\xff\xff\xff\x00\xff\xff\xff\x00\x00\x7f\xa6\x04\x03\x83\xaa\xcd5\xa2\xc9\xf9[\xc6\xea\xffU\xc1\xec\xffH\xb4\xe8\xf39\xa8\xe4\xc5\x0b\x8f\xdc\x9f\x00\x89\xda{\x00\x89\xda_\x07\x87\xc4I\x05|\xa5s\x05m\xa3\x02\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\x00\x7f\xa6\x06\x01\x7f\xa6\x89\x12x\x9e\xf63\x88\xae\xfe6\x93\xc3\xfe4\x9d\xd6\xdf\x08\x82\xc7\xb8\x03k\xa2\xab\x04k\x97\xa8\x02w\x9e\xeb\x00\x7f\xa6j\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\x00\x7f\xa67\x00~\xa5\x95\x03v\x9c\xd4\x03h\x8c\xfa\x02i\x8e\xf9\x01x\x9f\xcc\x00\x7f\xa6\x92\x00\x7f\xa63\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00q\rtq\x0eb.', 'ctrl.png': b'\x80\x03cnumpy.core.multiarray\n_reconstruct\nq\x00cnumpy\nndarray\nq\x01K\x00\x85q\x02C\x01bq\x03\x87q\x04Rq\x05(K\x01K K K\x04\x87q\x06cnumpy\ndtype\nq\x07X\x02\x00\x00\x00u1q\x08K\x00K\x01\x87q\tRq\n(K\x03X\x01\x00\x00\x00|q\x0bNNNJ\xff\xff\xff\xffJ\xff\xff\xff\xffK\x00tq\x0cb\x89B\x00\x10\x00\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xad\xad\xad\x19\xa8\xa8\xa8\x8d\xa9\xa9\xa9\xc1\xa9\xa9\xa9\xf1\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xf1\xaa\xaa\xaa\xc2\xa9\xa9\xa9\x8e\xad\xad\xad\x19\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xa8\xa8\xa8X\xa9\xa9\xa9\xed\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xed\xa8\xa8\xa8X\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xaa\xaa\xaaW\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa6\xa6\xa6\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\xa6\xa6\xa6\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xaa\xaa\xaaW\xff\xff\xff\x00\xaa\xaa\xaa\x15\xa9\xa9\xa9\xeb\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x88\x88\x88\xff)))\xff\x05\x05\x05\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x05\x05\x05\xff)))\xff\x88\x88\x88\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xeb\xaa\xaa\xaa\x15\xa9\xa9\xa9\x88\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x88\x88\x88\xff\x03\x03\x03\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x03\x03\x03\xff\x88\x88\x88\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\x88\xa9\xa9\xa9\xbe\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff)))\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff555\xffPPP\xff\x13\x13\x13\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff)))\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xbe\xa9\xa9\xa9\xf1\xa9\xa9\xa9\xff\xa6\xa6\xa6\xff\x05\x05\x05\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x01\x01\x01\xff\xb2\xb2\xb2\xff\xe3\xe3\xe3\xff\xd9\xd9\xd9\xff]]]\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x05\x05\x05\xff\xa6\xa6\xa6\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xf1\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x13\x13\x13\xff\xbb\xbb\xbb\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xffFFF\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x13\x13\x13\xff\xbb\xbb\xbb\xff\xe3\xe3\xe3\xff\xc4\xc4\xc4\xff\x06\x06\x06\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff```\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff:::\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff666\xff\xaf\xaf\xaf\xff\x10\x10\x10\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9b\x9b\x9b\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff@@@\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xffSSS\xff\xe3\xe3\xe3\xff\xb7\xb7\xb7\xff\x10\x10\x10\xff\x00\x00\x00\xff\x00\x00\x00\xff\x04\x04\x04\xff\xd5\xd5\xd5\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xffXXX\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x17\x17\x17\xff\xdb\xdb\xdb\xff\xe3\xe3\xe3\xff\xb7\xb7\xb7\xff[[[\xff\x97\x97\x97\xff\xd4\xd4\xd4\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xda\xda\xda\xff;;;\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff```\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xda\xda\xda\xff;;;\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xffHHH\xff\xc6\xc6\xc6\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xda\xda\xda\xff;;;\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x07\x07\x07\xff;;;\xffAAA\xff\\\\\\\xff\xdd\xdd\xdd\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xda\xda\xda\xff;;;\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff@@@\xff\xdd\xdd\xdd\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xda\xda\xda\xff;;;\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff@@@\xff\xdd\xdd\xdd\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xda\xda\xda\xff;;;\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff@@@\xff\xdd\xdd\xdd\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xda\xda\xda\xff;;;\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff@@@\xff\xdd\xdd\xdd\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xda\xda\xda\xff;;;\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff@@@\xff\xdd\xdd\xdd\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xda\xda\xda\xff;;;\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff@@@\xff\xdd\xdd\xdd\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xda\xda\xda\xff;;;\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff@@@\xff\xdd\xdd\xdd\xff\xe3\xe3\xe3\xff\xe3\xe3\xe3\xff\xc7\xc7\xc7\xffZZZ\xff~~~\xff\xd9\xd9\xd9\xff\x10\x10\x10\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff@@@\xff\xdd\xdd\xdd\xff\xe3\xe3\xe3\xffXXX\xff\x00\x00\x00\xff\x00\x00\x00\xff\xb0\xb0\xb0\xfffff\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff@@@\xff\xdd\xdd\xdd\xffyyy\xff\x00\x00\x00\xff\x06\x06\x06\xff\xcd\xcd\xcd\xfffff\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xf1\xa9\xa9\xa9\xff\xa6\xa6\xa6\xff\x05\x05\x05\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff@@@\xff\xda\xda\xda\xff\xaf\xaf\xaf\xff\xcd\xcd\xcd\xff\xd7\xd7\xd7\xff\x10\x10\x10\xff\x00\x00\x00\xff\x05\x05\x05\xff\xa6\xa6\xa6\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xf1\xa9\xa9\xa9\xbd\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff)))\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x12\x12\x12\xffiii\xffccc\xff\x0e\x0e\x0e\xff\x00\x00\x00\xff\x00\x00\x00\xff)))\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xbd\xa9\xa9\xa9\x88\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x88\x88\x88\xff\x03\x03\x03\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x03\x03\x03\xff\x88\x88\x88\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\x88\xaa\xaa\xaa\x15\xa9\xa9\xa9\xeb\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x88\x88\x88\xff)))\xff\x05\x05\x05\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x05\x05\x05\xff)))\xff\x88\x88\x88\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xeb\xaa\xaa\xaa\x15\xff\xff\xff\x00\xaa\xaa\xaaW\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa6\xa6\xa6\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\xa6\xa6\xa6\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xaa\xaa\xaaW\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xaa\xaa\xaaW\xa9\xa9\xa9\xeb\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xeb\xaa\xaa\xaaW\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xaa\xaa\xaa\x15\xa9\xa9\xa9\x88\xa9\xa9\xa9\xbd\xa9\xa9\xa9\xf1\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xf1\xa9\xa9\xa9\xbe\xa9\xa9\xa9\x88\xaa\xaa\xaa\x15\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00q\rtq\x0eb.', 'auto.png': b'\x80\x03cnumpy.core.multiarray\n_reconstruct\nq\x00cnumpy\nndarray\nq\x01K\x00\x85q\x02C\x01bq\x03\x87q\x04Rq\x05(K\x01K K K\x04\x87q\x06cnumpy\ndtype\nq\x07X\x02\x00\x00\x00u1q\x08K\x00K\x01\x87q\tRq\n(K\x03X\x01\x00\x00\x00|q\x0bNNNJ\xff\xff\xff\xffJ\xff\xff\xff\xffK\x00tq\x0cb\x89B\x00\x10\x00\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xad\xad\xad\x19\xa8\xa8\xa8\x8d\xa9\xa9\xa9\xc1\xa9\xa9\xa9\xf1\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xf1\xaa\xaa\xaa\xc2\xa9\xa9\xa9\x8e\xad\xad\xad\x19\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xa8\xa8\xa8X\xa9\xa9\xa9\xed\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xed\xa8\xa8\xa8X\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xaa\xaa\xaaW\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa6\xa6\xa6\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\xa6\xa6\xa6\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xaa\xaa\xaaW\xff\xff\xff\x00\xaa\xaa\xaa\x15\xa9\xa9\xa9\xeb\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x88\x88\x88\xff)))\xff\x05\x05\x05\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x05\x05\x05\xff)))\xff\x88\x88\x88\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xeb\xaa\xaa\xaa\x15\xa9\xa9\xa9\x88\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x88\x88\x88\xff\x03\x03\x03\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x19\x19\x19\xff\x03\x03\x03\xff\x88\x88\x88\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\x88\xa9\xa9\xa9\xbe\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff)))\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x04\x04\x04\xffHHH\xff\xa4\xa4\xa4\xff\xe5\xe5\xe5\xff\x00\x00\x00\xff)))\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xbe\xa9\xa9\xa9\xf1\xa9\xa9\xa9\xff\xa6\xa6\xa6\xff\x05\x05\x05\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff   \xffyyy\xff\xd1\xd1\xd1\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\x00\x00\x00\xff\x05\x05\x05\xff\xa6\xa6\xa6\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xf1\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x06\x06\x06\xffPPP\xff\xab\xab\xab\xff\xe6\xe6\xe6\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff&&&\xff\x82\x82\x82\xff\xd6\xd6\xd6\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\t\t\t\xffWWW\xff\xb2\xb2\xb2\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe5\xe5\xe5\xff\xa8\xa8\xa8\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff---\xff\x89\x89\x89\xff\xda\xda\xda\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xc1\xc1\xc1\xfflll\xff\x18\x18\x18\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\r\r\r\xff^^^\xff\xba\xba\xba\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xda\xda\xda\xff...\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff555\xff\x90\x90\x90\xff\xde\xde\xde\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe2\xe2\xe2\xff\xe3\xe3\xe3\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xd2\xd2\xd2\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff;;;\xff\xc1\xc1\xc1\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xb7\xb7\xb7\xffbbb\xff\x12\x12\x12\xff\xcb\xcb\xcb\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xd2\xd2\xd2\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xffmmm\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xcd\xcd\xcd\xffyyy\xff$$$\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\xcb\xcb\xcb\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xd2\xd2\xd2\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xffmmm\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe3\xe3\xe3\xff\x91\x91\x91\xff<<<\xff\x01\x01\x01\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\xcb\xcb\xcb\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xd2\xd2\xd2\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xffmmm\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xc3\xc3\xc3\xfflll\xff\x18\x18\x18\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\xcb\xcb\xcb\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xd2\xd2\xd2\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xffmmm\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe4\xe4\xe4\xff\xa6\xa6\xa6\xffOOO\xff\x07\x07\x07\xff\x00\x00\x00\xff\x00\x00\x00\xff\xcb\xcb\xcb\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xd2\xd2\xd2\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff555\xff\xb4\xb4\xb4\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xd9\xd9\xd9\xff\x8a\x8a\x8a\xff333\xff\xcb\xcb\xcb\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xd2\xd2\xd2\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff+++\xff\x88\x88\x88\xff\xda\xda\xda\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xd2\xd2\xd2\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\n\n\n\xff[[[\xff\xb8\xb8\xb8\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xdc\xdc\xdc\xffAAA\xff\x02\x02\x02\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff...\xff\x8c\x8c\x8c\xff\xdc\xdc\xdc\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xcc\xcc\xcc\xffsss\xff\x1a\x1a\x1a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x0c\x0c\x0c\xff___\xff\xbc\xbc\xbc\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe5\xe5\xe5\xff\xa5\xa5\xa5\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff222\xff\x8f\x8f\x8f\xff\xde\xde\xde\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x9a\x9a\x9a\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x0e\x0e\x0e\xffccc\xff\xc0\xc0\xc0\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\x00\x00\x00\xff\x00\x00\x00\xff\x9a\x9a\x9a\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xf1\xa9\xa9\xa9\xff\xa6\xa6\xa6\xff\x05\x05\x05\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff555\xff\x94\x94\x94\xff\xe0\xe0\xe0\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\xe7\xe7\xe7\xff\x00\x00\x00\xff\x05\x05\x05\xff\xa6\xa6\xa6\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xf1\xa9\xa9\xa9\xbd\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff)))\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x10\x10\x10\xfffff\xff\xc4\xc4\xc4\xff\xe7\xe7\xe7\xff\x00\x00\x00\xff)))\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xbd\xa9\xa9\xa9\x88\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x88\x88\x88\xff\x03\x03\x03\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff:::\xff\x03\x03\x03\xff\x88\x88\x88\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\x88\xaa\xaa\xaa\x15\xa9\xa9\xa9\xeb\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\x88\x88\x88\xff)))\xff\x05\x05\x05\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x00\x00\x00\xff\x05\x05\x05\xff)))\xff\x88\x88\x88\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xeb\xaa\xaa\xaa\x15\xff\xff\xff\x00\xaa\xaa\xaaW\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa6\xa6\xa6\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\x9a\x9a\x9a\xff\xa6\xa6\xa6\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xaa\xaa\xaaW\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xaa\xaa\xaaW\xa9\xa9\xa9\xeb\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xeb\xaa\xaa\xaaW\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00\xaa\xaa\xaa\x15\xa9\xa9\xa9\x88\xa9\xa9\xa9\xbd\xa9\xa9\xa9\xf1\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xff\xa9\xa9\xa9\xf1\xa9\xa9\xa9\xbe\xa9\xa9\xa9\x88\xaa\xaa\xaa\x15\xff\xff\xff\x00\xff\xff\xff\x00\xff\xff\xff\x00q\rtq\x0eb.'}
\ No newline at end of file
diff --git a/libs/pyqtgraph/ptime.py b/libs/pyqtgraph/ptime.py
new file mode 100644
index 0000000000000000000000000000000000000000..1de8282fb45e48dfe178a9b562a916064a780a9c
--- /dev/null
+++ b/libs/pyqtgraph/ptime.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+"""
+ptime.py -  Precision time function made os-independent (should have been taken care of by python)
+Copyright 2010  Luke Campagnola
+Distributed under MIT/X11 license. See license.txt for more infomation.
+"""
+
+
+import sys
+import time as systime
+START_TIME = None
+time = None
+
+def winTime():
+    """Return the current time in seconds with high precision (windows version, use Manager.time() to stay platform independent)."""
+    return systime.clock() + START_TIME
+    #return systime.time()
+
+def unixTime():
+    """Return the current time in seconds with high precision (unix version, use Manager.time() to stay platform independent)."""
+    return systime.time()
+
+if sys.platform.startswith('win'):
+    cstart = systime.clock()  ### Required to start the clock in windows
+    START_TIME = systime.time() - cstart
+    
+    time = winTime
+else:
+    time = unixTime
+
diff --git a/libs/pyqtgraph/python2_3.py b/libs/pyqtgraph/python2_3.py
new file mode 100644
index 0000000000000000000000000000000000000000..b1c46f2654dc5b2e42b67b7b5c5c55a88f54b9b3
--- /dev/null
+++ b/libs/pyqtgraph/python2_3.py
@@ -0,0 +1,60 @@
+"""
+Helper functions that smooth out the differences between python 2 and 3.
+"""
+import sys
+
+def asUnicode(x):
+    if sys.version_info[0] == 2:
+        if isinstance(x, unicode):
+            return x
+        elif isinstance(x, str):
+            return x.decode('UTF-8')
+        else:
+            return unicode(x)
+    else:
+        return str(x)
+        
+def cmpToKey(mycmp):
+    'Convert a cmp= function into a key= function'
+    class K(object):
+        def __init__(self, obj, *args):
+            self.obj = obj
+        def __lt__(self, other):
+            return mycmp(self.obj, other.obj) < 0
+        def __gt__(self, other):
+            return mycmp(self.obj, other.obj) > 0
+        def __eq__(self, other):
+            return mycmp(self.obj, other.obj) == 0
+        def __le__(self, other):
+            return mycmp(self.obj, other.obj) <= 0
+        def __ge__(self, other):
+            return mycmp(self.obj, other.obj) >= 0
+        def __ne__(self, other):
+            return mycmp(self.obj, other.obj) != 0
+    return K
+
+def sortList(l, cmpFunc):
+    if sys.version_info[0] == 2:
+        l.sort(cmpFunc)
+    else:
+        l.sort(key=cmpToKey(cmpFunc))
+
+if sys.version_info[0] == 3:
+    import builtins
+    builtins.basestring = str
+    #builtins.asUnicode = asUnicode
+    #builtins.sortList = sortList
+    basestring = str
+    def cmp(a,b):
+        if a>b:
+            return 1
+        elif b > a:
+            return -1
+        else:
+            return 0
+    builtins.cmp = cmp
+    builtins.xrange = range
+#else:    ## don't use __builtin__  -- this confuses things like pyshell and ActiveState's lazy import recipe
+    #import __builtin__
+    #__builtin__.asUnicode = asUnicode
+    #__builtin__.sortList = sortList
diff --git a/libs/pyqtgraph/reload.py b/libs/pyqtgraph/reload.py
new file mode 100644
index 0000000000000000000000000000000000000000..ccf83913b89f17972340b9555283e2526313fec6
--- /dev/null
+++ b/libs/pyqtgraph/reload.py
@@ -0,0 +1,516 @@
+# -*- coding: utf-8 -*-
+"""
+Magic Reload Library
+Luke Campagnola   2010
+
+Python reload function that actually works (the way you expect it to)
+ - No re-importing necessary
+ - Modules can be reloaded in any order
+ - Replaces functions and methods with their updated code
+ - Changes instances to use updated classes
+ - Automatically decides which modules to update by comparing file modification times
+ 
+Does NOT:
+ - re-initialize exting instances, even if __init__ changes
+ - update references to any module-level objects
+   ie, this does not reload correctly:
+       from module import someObject
+       print someObject
+   ..but you can use this instead: (this works even for the builtin reload)
+       import module
+       print module.someObject
+"""
+
+
+import inspect, os, sys, gc, traceback
+try:
+    import __builtin__ as builtins
+except ImportError:
+    import builtins
+from .debug import printExc
+
+def reloadAll(prefix=None, debug=False):
+    """Automatically reload everything whose __file__ begins with prefix.
+    - Skips reload if the file has not been updated (if .pyc is newer than .py)
+    - if prefix is None, checks all loaded modules
+    """
+    failed = []
+    changed = []
+    for modName, mod in list(sys.modules.items()):  ## don't use iteritems; size may change during reload
+        if not inspect.ismodule(mod):
+            continue
+        if modName == '__main__':
+            continue
+        
+        ## Ignore if the file name does not start with prefix
+        if not hasattr(mod, '__file__') or os.path.splitext(mod.__file__)[1] not in ['.py', '.pyc']:
+            continue
+        if prefix is not None and mod.__file__[:len(prefix)] != prefix:
+            continue
+        
+        ## ignore if the .pyc is newer than the .py (or if there is no pyc or py)
+        py = os.path.splitext(mod.__file__)[0] + '.py'
+        pyc = py + 'c'
+        if py not in changed and os.path.isfile(pyc) and os.path.isfile(py) and os.stat(pyc).st_mtime >= os.stat(py).st_mtime:
+            #if debug:
+                #print "Ignoring module %s; unchanged" % str(mod)
+            continue
+        changed.append(py)  ## keep track of which modules have changed to insure that duplicate-import modules get reloaded.
+        
+        try:
+            reload(mod, debug=debug)
+        except:
+            printExc("Error while reloading module %s, skipping\n" % mod)
+            failed.append(mod.__name__)
+        
+    if len(failed) > 0:
+        raise Exception("Some modules failed to reload: %s" % ', '.join(failed))
+
+def reload(module, debug=False, lists=False, dicts=False):
+    """Replacement for the builtin reload function:
+    - Reloads the module as usual
+    - Updates all old functions and class methods to use the new code
+    - Updates all instances of each modified class to use the new class
+    - Can update lists and dicts, but this is disabled by default
+    - Requires that class and function names have not changed
+    """
+    if debug:
+        print("Reloading %s" % str(module))
+        
+    ## make a copy of the old module dictionary, reload, then grab the new module dictionary for comparison
+    oldDict = module.__dict__.copy()
+    builtins.reload(module)
+    newDict = module.__dict__
+    
+    ## Allow modules access to the old dictionary after they reload
+    if hasattr(module, '__reload__'):
+        module.__reload__(oldDict)
+    
+    ## compare old and new elements from each dict; update where appropriate
+    for k in oldDict:
+        old = oldDict[k]
+        new = newDict.get(k, None)
+        if old is new or new is None:
+            continue
+        
+        if inspect.isclass(old):
+            if debug:
+                print("  Updating class %s.%s (0x%x -> 0x%x)" % (module.__name__, k, id(old), id(new)))
+            updateClass(old, new, debug)
+                    
+        elif inspect.isfunction(old):
+            depth = updateFunction(old, new, debug)
+            if debug:
+                extra = ""
+                if depth > 0:
+                    extra = " (and %d previous versions)" % depth
+                print("  Updating function %s.%s%s" % (module.__name__, k, extra))
+        elif lists and isinstance(old, list):
+            l = old.len()
+            old.extend(new)
+            for i in range(l):
+                old.pop(0)
+        elif dicts and isinstance(old, dict):
+            old.update(new)
+            for k in old:
+                if k not in new:
+                    del old[k]
+        
+
+
+## For functions:
+##  1) update the code and defaults to new versions.
+##  2) keep a reference to the previous version so ALL versions get updated for every reload
+def updateFunction(old, new, debug, depth=0, visited=None):
+    #if debug and depth > 0:
+        #print "    -> also updating previous version", old, " -> ", new
+        
+    old.__code__ = new.__code__
+    old.__defaults__ = new.__defaults__
+    
+    if visited is None:
+        visited = []
+    if old in visited:
+        return
+    visited.append(old)
+    
+    ## finally, update any previous versions still hanging around..
+    if hasattr(old, '__previous_reload_version__'):
+        maxDepth = updateFunction(old.__previous_reload_version__, new, debug, depth=depth+1, visited=visited)
+    else:
+        maxDepth = depth
+        
+    ## We need to keep a pointer to the previous version so we remember to update BOTH
+    ## when the next reload comes around.
+    if depth == 0:
+        new.__previous_reload_version__ = old
+    return maxDepth
+
+
+
+## For classes:
+##  1) find all instances of the old class and set instance.__class__ to the new class
+##  2) update all old class methods to use code from the new class methods
+def updateClass(old, new, debug):
+
+    ## Track town all instances and subclasses of old
+    refs = gc.get_referrers(old)
+    for ref in refs:
+        try:
+            if isinstance(ref, old) and ref.__class__ is old:
+                ref.__class__ = new
+                if debug:
+                    print("    Changed class for %s" % safeStr(ref))
+            elif inspect.isclass(ref) and issubclass(ref, old) and old in ref.__bases__:
+                ind = ref.__bases__.index(old)
+                
+                ## Does not work:
+                #ref.__bases__ = ref.__bases__[:ind] + (new,) + ref.__bases__[ind+1:]
+                ## reason: Even though we change the code on methods, they remain bound
+                ## to their old classes (changing im_class is not allowed). Instead,
+                ## we have to update the __bases__ such that this class will be allowed
+                ## as an argument to older methods.
+                
+                ## This seems to work. Is there any reason not to?
+                ## Note that every time we reload, the class hierarchy becomes more complex.
+                ## (and I presume this may slow things down?)
+                ref.__bases__ = ref.__bases__[:ind] + (new,old) + ref.__bases__[ind+1:]
+                if debug:
+                    print("    Changed superclass for %s" % safeStr(ref))
+            #else:
+                #if debug:
+                    #print "    Ignoring reference", type(ref)
+        except:
+            print("Error updating reference (%s) for class change (%s -> %s)" % (safeStr(ref), safeStr(old), safeStr(new)))
+            raise
+        
+    ## update all class methods to use new code.
+    ## Generally this is not needed since instances already know about the new class, 
+    ## but it fixes a few specific cases (pyqt signals, for one)
+    for attr in dir(old):
+        oa = getattr(old, attr)
+        if inspect.ismethod(oa):
+            try:
+                na = getattr(new, attr)
+            except AttributeError:
+                if debug:
+                    print("    Skipping method update for %s; new class does not have this attribute" % attr)
+                continue
+                
+            if hasattr(oa, 'im_func') and hasattr(na, 'im_func') and oa.__func__ is not na.__func__:
+                depth = updateFunction(oa.__func__, na.__func__, debug)
+                #oa.im_class = new  ## bind old method to new class  ## not allowed
+                if debug:
+                    extra = ""
+                    if depth > 0:
+                        extra = " (and %d previous versions)" % depth
+                    print("    Updating method %s%s" % (attr, extra))
+                
+    ## And copy in new functions that didn't exist previously
+    for attr in dir(new):
+        if not hasattr(old, attr):
+            if debug:
+                print("    Adding missing attribute %s" % attr)
+            setattr(old, attr, getattr(new, attr))
+            
+    ## finally, update any previous versions still hanging around..
+    if hasattr(old, '__previous_reload_version__'):
+        updateClass(old.__previous_reload_version__, new, debug)
+
+
+## It is possible to build classes for which str(obj) just causes an exception.
+## Avoid thusly:
+def safeStr(obj):
+    try:
+        s = str(obj)
+    except:
+        try:
+            s = repr(obj)
+        except:
+            s = "<instance of %s at 0x%x>" % (safeStr(type(obj)), id(obj))
+    return s
+
+
+
+
+
+## Tests:
+#  write modules to disk, import, then re-write and run again
+if __name__ == '__main__':
+    doQtTest = True
+    try:
+        from PyQt4 import QtCore
+        if not hasattr(QtCore, 'Signal'):
+            QtCore.Signal = QtCore.pyqtSignal
+        #app = QtGui.QApplication([])
+        class Btn(QtCore.QObject):
+            sig = QtCore.Signal()
+            def emit(self):
+                self.sig.emit()
+        btn = Btn()
+    except:
+        raise
+        print("Error; skipping Qt tests")
+        doQtTest = False
+
+
+
+    import os
+    if not os.path.isdir('test1'):
+        os.mkdir('test1')
+    open('test1/__init__.py', 'w')
+    modFile1 = "test1/test1.py"
+    modCode1 = """
+import sys
+class A(object):
+    def __init__(self, msg):
+        object.__init__(self)
+        self.msg = msg
+    def fn(self, pfx = ""):
+        print(pfx+"A class: %%s %%s" %% (str(self.__class__), str(id(self.__class__))))
+        print(pfx+"  %%s: %d" %% self.msg)
+
+class B(A):
+    def fn(self, pfx=""):
+        print(pfx+"B class:", self.__class__, id(self.__class__))
+        print(pfx+"  %%s: %d" %% self.msg)
+        print(pfx+"  calling superclass.. (%%s)" %% id(A) )
+        A.fn(self, "  ")
+"""
+
+    modFile2 = "test2.py"
+    modCode2 = """
+from test1.test1 import A
+from test1.test1 import B
+
+a1 = A("ax1")
+b1 = B("bx1")
+class C(A):
+    def __init__(self, msg):
+        #print "| C init:"
+        #print "|   C.__bases__ = ", map(id, C.__bases__)
+        #print "|   A:", id(A)
+        #print "|   A.__init__ = ", id(A.__init__.im_func), id(A.__init__.im_func.__code__), id(A.__init__.im_class)
+        A.__init__(self, msg + "(init from C)")
+        
+def fn():
+    print("fn: %s")
+""" 
+
+    open(modFile1, 'w').write(modCode1%(1,1))
+    open(modFile2, 'w').write(modCode2%"message 1")
+    import test1.test1 as test1
+    import test2
+    print("Test 1 originals:")
+    A1 = test1.A
+    B1 = test1.B
+    a1 = test1.A("a1")
+    b1 = test1.B("b1")
+    a1.fn()
+    b1.fn()
+    #print "function IDs  a1 bound method: %d a1 func: %d  a1 class: %d  b1 func: %d  b1 class: %d" % (id(a1.fn), id(a1.fn.im_func), id(a1.fn.im_class), id(b1.fn.im_func), id(b1.fn.im_class))
+
+
+    from test2 import fn, C
+    
+    if doQtTest:
+        print("Button test before:")
+        btn.sig.connect(fn)
+        btn.sig.connect(a1.fn)
+        btn.emit()
+        #btn.sig.emit()
+        print("")
+    
+    #print "a1.fn referrers:", sys.getrefcount(a1.fn.im_func), gc.get_referrers(a1.fn.im_func)
+    
+    
+    print("Test2 before reload:")
+    
+    fn()
+    oldfn = fn
+    test2.a1.fn()
+    test2.b1.fn()
+    c1 = test2.C('c1')
+    c1.fn()
+    
+    os.remove(modFile1+'c')
+    open(modFile1, 'w').write(modCode1%(2,2))
+    print("\n----RELOAD test1-----\n")
+    reloadAll(os.path.abspath(__file__)[:10], debug=True)
+    
+    
+    print("Subclass test:")
+    c2 = test2.C('c2')
+    c2.fn()
+    
+    
+    os.remove(modFile2+'c')
+    open(modFile2, 'w').write(modCode2%"message 2")
+    print("\n----RELOAD test2-----\n")
+    reloadAll(os.path.abspath(__file__)[:10], debug=True)
+
+    if doQtTest:
+        print("Button test after:")
+        btn.emit()
+        #btn.sig.emit()
+
+    #print "a1.fn referrers:", sys.getrefcount(a1.fn.im_func), gc.get_referrers(a1.fn.im_func)
+
+    print("Test2 after reload:")
+    fn()
+    test2.a1.fn()
+    test2.b1.fn()
+    
+    print("\n==> Test 1 Old instances:")
+    a1.fn()
+    b1.fn()
+    c1.fn()
+    #print "function IDs  a1 bound method: %d a1 func: %d  a1 class: %d  b1 func: %d  b1 class: %d" % (id(a1.fn), id(a1.fn.im_func), id(a1.fn.im_class), id(b1.fn.im_func), id(b1.fn.im_class))
+
+    print("\n==> Test 1 New instances:")
+    a2 = test1.A("a2")
+    b2 = test1.B("b2")
+    a2.fn()
+    b2.fn()
+    c2 = test2.C('c2')
+    c2.fn()
+    #print "function IDs  a1 bound method: %d a1 func: %d  a1 class: %d  b1 func: %d  b1 class: %d" % (id(a1.fn), id(a1.fn.im_func), id(a1.fn.im_class), id(b1.fn.im_func), id(b1.fn.im_class))
+
+
+
+
+    os.remove(modFile1+'c')
+    os.remove(modFile2+'c')
+    open(modFile1, 'w').write(modCode1%(3,3))
+    open(modFile2, 'w').write(modCode2%"message 3")
+    
+    print("\n----RELOAD-----\n")
+    reloadAll(os.path.abspath(__file__)[:10], debug=True)
+
+    if doQtTest:
+        print("Button test after:")
+        btn.emit()
+        #btn.sig.emit()
+
+    #print "a1.fn referrers:", sys.getrefcount(a1.fn.im_func), gc.get_referrers(a1.fn.im_func)
+
+    print("Test2 after reload:")
+    fn()
+    test2.a1.fn()
+    test2.b1.fn()
+    
+    print("\n==> Test 1 Old instances:")
+    a1.fn()
+    b1.fn()
+    print("function IDs  a1 bound method: %d a1 func: %d  a1 class: %d  b1 func: %d  b1 class: %d" % (id(a1.fn), id(a1.fn.__func__), id(a1.fn.__self__.__class__), id(b1.fn.__func__), id(b1.fn.__self__.__class__)))
+
+    print("\n==> Test 1 New instances:")
+    a2 = test1.A("a2")
+    b2 = test1.B("b2")
+    a2.fn()
+    b2.fn()
+    print("function IDs  a1 bound method: %d a1 func: %d  a1 class: %d  b1 func: %d  b1 class: %d" % (id(a1.fn), id(a1.fn.__func__), id(a1.fn.__self__.__class__), id(b1.fn.__func__), id(b1.fn.__self__.__class__)))
+
+
+    os.remove(modFile1)
+    os.remove(modFile2)
+    os.remove(modFile1+'c')
+    os.remove(modFile2+'c')
+    os.system('rm -r test1')
+
+
+
+
+
+
+
+
+#
+#        Failure graveyard ahead:
+#
+
+
+"""Reload Importer:
+Hooks into import system to 
+1) keep a record of module dependencies as they are imported
+2) make sure modules are always reloaded in correct order
+3) update old classes and functions to use reloaded code"""
+
+#import imp, sys
+
+## python's import hook mechanism doesn't work since we need to be 
+## informed every time there is an import statement, not just for new imports
+#class ReloadImporter:
+    #def __init__(self):
+        #self.depth = 0
+        
+    #def find_module(self, name, path):
+        #print "  "*self.depth + "find: ", name, path
+        ##if name == 'PyQt4' and path is None:
+            ##print "PyQt4 -> PySide"
+            ##self.modData = imp.find_module('PySide')
+            ##return self
+        ##return None ## return none to allow the import to proceed normally; return self to intercept with load_module
+        #self.modData = imp.find_module(name, path)
+        #self.depth += 1
+        ##sys.path_importer_cache = {}
+        #return self
+        
+    #def load_module(self, name):
+        #mod =  imp.load_module(name, *self.modData)
+        #self.depth -= 1
+        #print "  "*self.depth + "load: ", name
+        #return mod
+
+#def pathHook(path):
+    #print "path hook:", path
+    #raise ImportError
+#sys.path_hooks.append(pathHook)
+
+#sys.meta_path.append(ReloadImporter())
+
+
+### replace __import__ with a wrapper that tracks module dependencies
+#modDeps = {}
+#reloadModule = None
+#origImport = __builtins__.__import__
+#def _import(name, globals=None, locals=None, fromlist=None, level=-1, stack=[]):
+    ### Note that stack behaves as a static variable.
+    ##print "  "*len(importStack) + "import %s" % args[0]
+    #stack.append(set())
+    #mod = origImport(name, globals, locals, fromlist, level)
+    #deps = stack.pop()
+    #if len(stack) > 0:
+        #stack[-1].add(mod)
+    #elif reloadModule is not None:     ## If this is the top level import AND we're inside a module reload
+        #modDeps[reloadModule].add(mod)
+            
+    #if mod in modDeps:
+        #modDeps[mod] |= deps
+    #else:
+        #modDeps[mod] = deps
+        
+    
+    #return mod
+    
+#__builtins__.__import__ = _import
+
+### replace 
+#origReload = __builtins__.reload
+#def _reload(mod):
+    #reloadModule = mod
+    #ret = origReload(mod)
+    #reloadModule = None
+    #return ret
+#__builtins__.reload = _reload
+
+
+#def reload(mod, visited=None):
+    #if visited is None:
+        #visited = set()
+    #if mod in visited:
+        #return
+    #visited.add(mod)
+    #for dep in modDeps.get(mod, []):
+        #reload(dep, visited)
+    #__builtins__.reload(mod)
diff --git a/libs/pyqtgraph/tests/test_exit_crash.py b/libs/pyqtgraph/tests/test_exit_crash.py
new file mode 100644
index 0000000000000000000000000000000000000000..69181f2167bb05e2d528e0f7bf183d476fa43dbb
--- /dev/null
+++ b/libs/pyqtgraph/tests/test_exit_crash.py
@@ -0,0 +1,38 @@
+import os, sys, subprocess, tempfile
+import pyqtgraph as pg
+
+
+code = """
+import sys
+sys.path.insert(0, '{path}')
+import pyqtgraph as pg
+app = pg.mkQApp()
+w = pg.{classname}({args})
+"""
+
+
+def test_exit_crash():
+    # For each Widget subclass, run a simple python script that creates an 
+    # instance and then shuts down. The intent is to check for segmentation 
+    # faults when each script exits.
+    tmp = tempfile.mktemp(".py")
+    path = os.path.dirname(pg.__file__)
+
+    initArgs = {
+        'CheckTable': "[]",
+        'ProgressDialog': '"msg"',
+        'VerticalLabel': '"msg"',
+    }
+
+    for name in dir(pg):
+        obj = getattr(pg, name)
+        if not isinstance(obj, type) or not issubclass(obj, pg.QtGui.QWidget):
+            continue
+        
+        print name
+        argstr = initArgs.get(name, "")
+        open(tmp, 'w').write(code.format(path=path, classname=name, args=argstr))
+        proc = subprocess.Popen([sys.executable, tmp])
+        assert proc.wait() == 0
+
+    os.remove(tmp)
diff --git a/libs/pyqtgraph/tests/test_functions.py b/libs/pyqtgraph/tests/test_functions.py
new file mode 100644
index 0000000000000000000000000000000000000000..4ef2daf0a9319177b4daf95cb54f2ff9abab554a
--- /dev/null
+++ b/libs/pyqtgraph/tests/test_functions.py
@@ -0,0 +1,116 @@
+import pyqtgraph as pg
+import numpy as np
+from numpy.testing import assert_array_almost_equal, assert_almost_equal
+import pytest
+
+np.random.seed(12345)
+
+def testSolve3D():
+    p1 = np.array([[0,0,0,1],
+                   [1,0,0,1],
+                   [0,1,0,1],
+                   [0,0,1,1]], dtype=float)
+    
+    # transform points through random matrix
+    tr = np.random.normal(size=(4, 4))
+    tr[3] = (0,0,0,1)
+    p2 = np.dot(tr, p1.T).T[:,:3]
+    
+    # solve to see if we can recover the transformation matrix.
+    tr2 = pg.solve3DTransform(p1, p2)
+    
+    assert_array_almost_equal(tr[:3], tr2[:3])
+
+
+def test_interpolateArray():
+    def interpolateArray(data, x):
+        result = pg.interpolateArray(data, x)
+        assert result.shape == x.shape[:-1] + data.shape[x.shape[-1]:]
+        return result
+    
+    data = np.array([[ 1.,   2.,   4.  ],
+                     [ 10.,  20.,  40. ],
+                     [ 100., 200., 400.]])
+    
+    # test various x shapes
+    interpolateArray(data, np.ones((1,)))
+    interpolateArray(data, np.ones((2,)))
+    interpolateArray(data, np.ones((1, 1)))
+    interpolateArray(data, np.ones((1, 2)))
+    interpolateArray(data, np.ones((5, 1)))
+    interpolateArray(data, np.ones((5, 2)))
+    interpolateArray(data, np.ones((5, 5, 1)))
+    interpolateArray(data, np.ones((5, 5, 2)))
+    with pytest.raises(TypeError):
+        interpolateArray(data, np.ones((3,)))
+    with pytest.raises(TypeError):
+        interpolateArray(data, np.ones((1, 3,)))
+    with pytest.raises(TypeError):
+        interpolateArray(data, np.ones((5, 5, 3,)))
+    
+    
+    x = np.array([[  0.3,   0.6],
+                  [  1. ,   1. ],
+                  [  0.5,   1. ],
+                  [  0.5,   2.5],
+                  [ 10. ,  10. ]])
+    
+    result = interpolateArray(data, x)
+    #import scipy.ndimage
+    #spresult = scipy.ndimage.map_coordinates(data, x.T, order=1)
+    spresult = np.array([  5.92,  20.  ,  11.  ,   0.  ,   0.  ])  # generated with the above line
+    
+    assert_array_almost_equal(result, spresult)
+    
+    # test mapping when x.shape[-1] < data.ndim
+    x = np.array([[  0.3,   0],
+                  [  0.3,   1],
+                  [  0.3,   2]])
+    r1 = interpolateArray(data, x)
+    x = np.array([0.3])  # should broadcast across axis 1
+    r2 = interpolateArray(data, x)
+    
+    assert_array_almost_equal(r1, r2)
+    
+    
+    # test mapping 2D array of locations
+    x = np.array([[[0.5, 0.5], [0.5, 1.0], [0.5, 1.5]],
+                  [[1.5, 0.5], [1.5, 1.0], [1.5, 1.5]]])
+    
+    r1 = interpolateArray(data, x)
+    #r2 = scipy.ndimage.map_coordinates(data, x.transpose(2,0,1), order=1)
+    r2 = np.array([[   8.25,   11.  ,   16.5 ],  # generated with the above line
+                   [  82.5 ,  110.  ,  165.  ]])
+
+    assert_array_almost_equal(r1, r2)
+    
+    
+    # test interpolate where data.ndim > x.shape[1]
+    
+    data = np.array([[[1, 2, 3], [4, 5, 6]], [[7, 8, 9], [10, 11, 12]]]) # 2x2x3
+    x = np.array([[1, 1], [0, 0.5], [5, 5]])
+    
+    r1 = interpolateArray(data, x)
+    assert np.all(r1[0] == data[1, 1])
+    assert np.all(r1[1] == 0.5 * (data[0, 0] + data[0, 1]))
+    assert np.all(r1[2] == 0)
+    
+    
+def test_subArray():
+    a = np.array([0, 0, 111, 112, 113, 0, 121, 122, 123, 0, 0, 0, 211, 212, 213, 0, 221, 222, 223, 0, 0, 0, 0])
+    b = pg.subArray(a, offset=2, shape=(2,2,3), stride=(10,4,1))
+    c = np.array([[[111,112,113], [121,122,123]], [[211,212,213], [221,222,223]]])
+    assert np.all(b == c)
+    
+    # operate over first axis; broadcast over the rest
+    aa = np.vstack([a, a/100.]).T
+    cc = np.empty(c.shape + (2,))
+    cc[..., 0] = c
+    cc[..., 1] = c / 100.
+    bb = pg.subArray(aa, offset=2, shape=(2,2,3), stride=(10,4,1))
+    assert np.all(bb == cc)
+    
+    
+    
+if __name__ == '__main__':
+    test_interpolateArray()
\ No newline at end of file
diff --git a/libs/pyqtgraph/tests/test_qt.py b/libs/pyqtgraph/tests/test_qt.py
new file mode 100644
index 0000000000000000000000000000000000000000..729bf695a20b0bfcf2dda285179ec7bc6ea28d2b
--- /dev/null
+++ b/libs/pyqtgraph/tests/test_qt.py
@@ -0,0 +1,23 @@
+import pyqtgraph as pg
+import gc, os
+
+app = pg.mkQApp()
+
+def test_isQObjectAlive():
+    o1 = pg.QtCore.QObject()
+    o2 = pg.QtCore.QObject()
+    o2.setParent(o1)
+    del o1
+    gc.collect()
+    assert not pg.Qt.isQObjectAlive(o2)
+
+
+def test_loadUiType():
+    path = os.path.dirname(__file__)
+    formClass, baseClass = pg.Qt.loadUiType(os.path.join(path, 'uictest.ui'))
+    w = baseClass()
+    ui = formClass()
+    ui.setupUi(w)
+    w.show()
+    app.processEvents()
+
diff --git a/libs/pyqtgraph/tests/test_ref_cycles.py b/libs/pyqtgraph/tests/test_ref_cycles.py
new file mode 100644
index 0000000000000000000000000000000000000000..0284852ce0c72d02856b1ab7f3603e19a41ab68e
--- /dev/null
+++ b/libs/pyqtgraph/tests/test_ref_cycles.py
@@ -0,0 +1,77 @@
+"""
+Test for unwanted reference cycles
+
+"""
+import pyqtgraph as pg
+import numpy as np
+import gc, weakref
+app = pg.mkQApp()
+
+def assert_alldead(refs):
+    for ref in refs:
+        assert ref() is None
+
+def qObjectTree(root):
+    """Return root and its entire tree of qobject children"""
+    childs = [root]
+    for ch in pg.QtCore.QObject.children(root):
+        childs += qObjectTree(ch)
+    return childs
+
+def mkrefs(*objs):
+    """Return a list of weakrefs to each object in *objs.
+    QObject instances are expanded to include all child objects.
+    """
+    allObjs = {}
+    for obj in objs:
+        if isinstance(obj, pg.QtCore.QObject):
+            obj = qObjectTree(obj)
+        else:
+            obj = [obj]
+        for o in obj:
+            allObjs[id(o)] = o
+            
+    return map(weakref.ref, allObjs.values())
+
+def test_PlotWidget():
+    def mkobjs(*args, **kwds):
+        w = pg.PlotWidget(*args, **kwds)
+        data = pg.np.array([1,5,2,4,3])
+        c = w.plot(data, name='stuff')
+        w.addLegend()
+        
+        # test that connections do not keep objects alive
+        w.plotItem.vb.sigRangeChanged.connect(mkrefs)
+        app.focusChanged.connect(w.plotItem.vb.invertY)
+        
+        # return weakrefs to a bunch of objects that should die when the scope exits.
+        return mkrefs(w, c, data, w.plotItem, w.plotItem.vb, w.plotItem.getMenu(), w.plotItem.getAxis('left'))
+    
+    for i in range(5):
+        assert_alldead(mkobjs())
+    
+def test_ImageView():
+    def mkobjs():
+        iv = pg.ImageView()
+        data = np.zeros((10,10,5))
+        iv.setImage(data)
+        
+        return mkrefs(iv, iv.imageItem, iv.view, iv.ui.histogram, data)
+    
+    for i in range(5):
+        assert_alldead(mkobjs())
+
+def test_GraphicsWindow():
+    def mkobjs():
+        w = pg.GraphicsWindow()
+        p1 = w.addPlot()
+        v1 = w.addViewBox()
+        return mkrefs(w, p1, v1)
+    
+    for i in range(5):
+        assert_alldead(mkobjs())
+
+    
+    
+if __name__ == '__main__':
+    ot = test_PlotItem()
diff --git a/libs/pyqtgraph/tests/test_srttransform3d.py b/libs/pyqtgraph/tests/test_srttransform3d.py
new file mode 100644
index 0000000000000000000000000000000000000000..88aa1581a9c70a4bbda002d35e7af3ced6804f30
--- /dev/null
+++ b/libs/pyqtgraph/tests/test_srttransform3d.py
@@ -0,0 +1,39 @@
+import pyqtgraph as pg
+from pyqtgraph.Qt import QtCore, QtGui
+import numpy as np
+from numpy.testing import assert_array_almost_equal, assert_almost_equal
+
+testPoints = np.array([
+                       [0, 0, 0],
+                       [1, 0, 0],
+                       [0, 1, 0],
+                       [0, 0, 1],
+                       [-1, -1, 0],
+                       [0, -1, -1]])
+
+
+def testMatrix():
+    """
+    SRTTransform3D => Transform3D => SRTTransform3D
+    """
+    tr = pg.SRTTransform3D()
+    tr.setRotate(45, (0, 0, 1))
+    tr.setScale(0.2, 0.4, 1)
+    tr.setTranslate(10, 20, 40)
+    assert tr.getRotation() == (45, QtGui.QVector3D(0, 0, 1))
+    assert tr.getScale() == QtGui.QVector3D(0.2, 0.4, 1)
+    assert tr.getTranslation() == QtGui.QVector3D(10, 20, 40)
+
+    tr2 = pg.Transform3D(tr)
+    assert np.all(tr.matrix() == tr2.matrix())
+    
+    # This is the most important test:
+    # The transition from Transform3D to SRTTransform3D is a tricky one.
+    tr3 = pg.SRTTransform3D(tr2)
+    assert_array_almost_equal(tr.matrix(), tr3.matrix())
+    assert_almost_equal(tr3.getRotation()[0], tr.getRotation()[0])
+    assert_array_almost_equal(tr3.getRotation()[1], tr.getRotation()[1])
+    assert_array_almost_equal(tr3.getScale(), tr.getScale())
+    assert_array_almost_equal(tr3.getTranslation(), tr.getTranslation())
+
+
diff --git a/libs/pyqtgraph/tests/test_stability.py b/libs/pyqtgraph/tests/test_stability.py
new file mode 100644
index 0000000000000000000000000000000000000000..a64e30e4b2982f7fb54c1122d41d6f7f00a6d5a7
--- /dev/null
+++ b/libs/pyqtgraph/tests/test_stability.py
@@ -0,0 +1,160 @@
+"""
+PyQt/PySide stress test:
+
+Create lots of random widgets and graphics items, connect them together randomly,
+the tear them down repeatedly. 
+
+The purpose of this is to attempt to generate segmentation faults.
+"""
+from PyQt4.QtTest import QTest
+import pyqtgraph as pg
+from random import seed, randint
+import sys, gc, weakref
+
+app = pg.mkQApp()
+
+seed(12345)
+
+widgetTypes = [
+    pg.PlotWidget, 
+    pg.ImageView, 
+    pg.GraphicsView, 
+    pg.QtGui.QWidget,
+    pg.QtGui.QTreeWidget, 
+    pg.QtGui.QPushButton,
+    ]
+
+itemTypes = [
+    pg.PlotCurveItem, 
+    pg.ImageItem, 
+    pg.PlotDataItem, 
+    pg.ViewBox,
+    pg.QtGui.QGraphicsRectItem
+    ]
+
+widgets = []
+items = []
+allWidgets = weakref.WeakSet()
+
+
+def crashtest():
+    global allWidgets
+    try:
+        gc.disable()
+        actions = [
+                createWidget,
+                #setParent,
+                forgetWidget,
+                showWidget,
+                processEvents,
+                #raiseException,
+                #addReference,
+                ]
+
+        thread = WorkThread()
+        thread.start()
+
+        while True:
+            try:
+                action = randItem(actions)
+                action()
+                print('[%d widgets alive, %d zombie]' % (len(allWidgets), len(allWidgets) - len(widgets)))
+            except KeyboardInterrupt:
+                print("Caught interrupt; send another to exit.")
+                try:
+                    for i in range(100):
+                        QTest.qWait(100)
+                except KeyboardInterrupt:
+                    thread.terminate()
+                    break
+            except:
+                sys.excepthook(*sys.exc_info())
+    finally:
+        gc.enable()
+
+
+
+class WorkThread(pg.QtCore.QThread):
+    '''Intended to give the gc an opportunity to run from a non-gui thread.'''
+    def run(self):
+        i = 0
+        while True:
+            i += 1
+            if (i % 1000000) == 0:
+                print('--worker--')
+            
+
+def randItem(items):
+    return items[randint(0, len(items)-1)]
+
+def p(msg):
+    print(msg)
+    sys.stdout.flush()
+
+def createWidget():
+    p('create widget')
+    global widgets, allWidgets
+    if len(widgets) > 50:
+        return
+    widget = randItem(widgetTypes)()
+    widget.setWindowTitle(widget.__class__.__name__)
+    widgets.append(widget)
+    allWidgets.add(widget)
+    p("    %s" % widget)
+    return widget
+
+def setParent():
+    p('set parent')
+    global widgets
+    if len(widgets) < 2:
+        return
+    child = parent = None
+    while child is parent:
+        child = randItem(widgets)
+        parent = randItem(widgets)
+    p("    %s parent of %s" % (parent, child))
+    child.setParent(parent)
+
+def forgetWidget():
+    p('forget widget')
+    global widgets
+    if len(widgets) < 1:
+        return
+    widget = randItem(widgets)
+    p('    %s' % widget)
+    widgets.remove(widget)
+
+def showWidget():
+    p('show widget')
+    global widgets
+    if len(widgets) < 1:
+        return
+    widget = randItem(widgets)
+    p('    %s' % widget)
+    widget.show()
+
+def processEvents():
+    p('process events')
+    QTest.qWait(25)
+
+class TstException(Exception):
+    pass
+
+def raiseException():
+    p('raise exception')
+    raise TstException("A test exception")
+
+def addReference():
+    p('add reference')
+    global widgets
+    if len(widgets) < 1:
+        return
+    obj1 = randItem(widgets)
+    obj2 = randItem(widgets)
+    p('    %s -> %s' % (obj1, obj2))    
+    obj1._testref = obj2
+    
+
+        
+if __name__ == '__main__':
+    test_stability()
\ No newline at end of file
diff --git a/libs/pyqtgraph/tests/uictest.ui b/libs/pyqtgraph/tests/uictest.ui
new file mode 100644
index 0000000000000000000000000000000000000000..25d14f2b523d3e6eea1523ef9ae91138fef24cd7
--- /dev/null
+++ b/libs/pyqtgraph/tests/uictest.ui
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <widget class="PlotWidget" name="widget" native="true">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>10</y>
+     <width>120</width>
+     <height>80</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="ImageView" name="widget_2" native="true">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>110</y>
+     <width>120</width>
+     <height>80</height>
+    </rect>
+   </property>
+  </widget>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>PlotWidget</class>
+   <extends>QWidget</extends>
+   <header>pyqtgraph</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>ImageView</class>
+   <extends>QWidget</extends>
+   <header>pyqtgraph</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/libs/pyqtgraph/units.py b/libs/pyqtgraph/units.py
new file mode 100644
index 0000000000000000000000000000000000000000..6b7f309928d8e28383f8ff03b2fdcab5e791b885
--- /dev/null
+++ b/libs/pyqtgraph/units.py
@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+## Very simple unit support:
+##  - creates variable names like 'mV' and 'kHz'
+##  - the value assigned to the variable corresponds to the scale prefix
+##    (mV = 0.001)
+##  - the actual units are purely cosmetic for making code clearer:
+##  
+##    x = 20*pA    is identical to    x = 20*1e-12
+
+## No unicode variable names (μ,Ω) allowed until python 3
+
+SI_PREFIXES = 'yzafpnum kMGTPEZY'
+UNITS = 'm,s,g,W,J,V,A,F,T,Hz,Ohm,S,N,C,px,b,B'.split(',')
+allUnits = {}
+
+def addUnit(p, n):
+    g = globals()
+    v = 1000**n
+    for u in UNITS:
+        g[p+u] = v
+        allUnits[p+u] = v
+    
+for p in SI_PREFIXES:
+    if p ==  ' ':
+        p = ''
+        n = 0
+    elif p == 'u':
+        n = -2
+    else:
+        n = SI_PREFIXES.index(p) - 8
+
+    addUnit(p, n)
+
+cm = 0.01
+
+
+
+
+
+
+def evalUnits(unitStr):
+    """
+    Evaluate a unit string into ([numerators,...], [denominators,...])
+    Examples:
+        N m/s^2   =>  ([N, m], [s, s])
+        A*s / V   =>  ([A, s], [V,])
+    """
+    pass
+    
+def formatUnits(units):
+    """
+    Format a unit specification ([numerators,...], [denominators,...])
+    into a string (this is the inverse of evalUnits)
+    """
+    pass
+    
+def simplify(units):
+    """
+    Cancel units that appear in both numerator and denominator, then attempt to replace 
+    groups of units with single units where possible (ie, J/s => W)
+    """
+    pass
+    
+    
\ No newline at end of file
diff --git a/libs/pyqtgraph/util/__init__.py b/libs/pyqtgraph/util/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/libs/pyqtgraph/util/colorama/LICENSE.txt b/libs/pyqtgraph/util/colorama/LICENSE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5f567799f395f33acd05abbc5d409dd126ce0dc8
--- /dev/null
+++ b/libs/pyqtgraph/util/colorama/LICENSE.txt
@@ -0,0 +1,28 @@
+Copyright (c) 2010 Jonathan Hartley
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holders, nor those of its contributors
+  may be used to endorse or promote products derived from this software without
+  specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/libs/pyqtgraph/util/colorama/README.txt b/libs/pyqtgraph/util/colorama/README.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8910ba5bb529f17414de6455eb1cb1ba722cafa5
--- /dev/null
+++ b/libs/pyqtgraph/util/colorama/README.txt
@@ -0,0 +1,304 @@
+Download and docs:
+    http://pypi.python.org/pypi/colorama
+Development:
+    http://code.google.com/p/colorama
+Discussion group:
+     https://groups.google.com/forum/#!forum/python-colorama
+
+Description
+===========
+
+Makes ANSI escape character sequences for producing colored terminal text and
+cursor positioning work under MS Windows.
+
+ANSI escape character sequences have long been used to produce colored terminal
+text and cursor positioning on Unix and Macs. Colorama makes this work on
+Windows, too, by wrapping stdout, stripping ANSI sequences it finds (which
+otherwise show up as gobbledygook in your output), and converting them into the
+appropriate win32 calls to modify the state of the terminal. On other platforms,
+Colorama does nothing.
+
+Colorama also provides some shortcuts to help generate ANSI sequences
+but works fine in conjunction with any other ANSI sequence generation library,
+such as Termcolor (http://pypi.python.org/pypi/termcolor.)
+
+This has the upshot of providing a simple cross-platform API for printing
+colored terminal text from Python, and has the happy side-effect that existing
+applications or libraries which use ANSI sequences to produce colored output on
+Linux or Macs can now also work on Windows, simply by calling
+``colorama.init()``.
+
+An alternative approach is to install 'ansi.sys' on Windows machines, which
+provides the same behaviour for all applications running in terminals. Colorama
+is intended for situations where that isn't easy (e.g. maybe your app doesn't
+have an installer.)
+
+Demo scripts in the source code repository prints some colored text using
+ANSI sequences. Compare their output under Gnome-terminal's built in ANSI
+handling, versus on Windows Command-Prompt using Colorama:
+
+.. image:: http://colorama.googlecode.com/hg/screenshots/ubuntu-demo.png
+    :width: 661
+    :height: 357
+    :alt: ANSI sequences on Ubuntu under gnome-terminal.
+
+.. image:: http://colorama.googlecode.com/hg/screenshots/windows-demo.png
+    :width: 668
+    :height: 325
+    :alt: Same ANSI sequences on Windows, using Colorama.
+
+These screengrabs show that Colorama on Windows does not support ANSI 'dim
+text': it looks the same as 'normal text'.
+
+
+License
+=======
+
+Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file.
+
+
+Dependencies
+============
+
+None, other than Python. Tested on Python 2.5.5, 2.6.5, 2.7, 3.1.2, and 3.2
+
+Usage
+=====
+
+Initialisation
+--------------
+
+Applications should initialise Colorama using::
+
+    from colorama import init
+    init()
+
+If you are on Windows, the call to ``init()`` will start filtering ANSI escape
+sequences out of any text sent to stdout or stderr, and will replace them with
+equivalent Win32 calls.
+
+Calling ``init()`` has no effect on other platforms (unless you request other
+optional functionality, see keyword args below.) The intention is that
+applications can call ``init()`` unconditionally on all platforms, after which
+ANSI output should just work.
+
+To stop using colorama before your program exits, simply call ``deinit()``.
+This will restore stdout and stderr to their original values, so that Colorama
+is disabled. To start using Colorama again, call ``reinit()``, which wraps
+stdout and stderr again, but is cheaper to call than doing ``init()`` all over
+again.
+
+
+Colored Output
+--------------
+
+Cross-platform printing of colored text can then be done using Colorama's
+constant shorthand for ANSI escape sequences::
+
+    from colorama import Fore, Back, Style
+    print(Fore.RED + 'some red text')
+    print(Back.GREEN + 'and with a green background')
+    print(Style.DIM + 'and in dim text')
+    print(Fore.RESET + Back.RESET + Style.RESET_ALL)
+    print('back to normal now')
+
+or simply by manually printing ANSI sequences from your own code::
+
+    print('/033[31m' + 'some red text')
+    print('/033[30m' # and reset to default color)
+
+or Colorama can be used happily in conjunction with existing ANSI libraries
+such as Termcolor::
+
+    from colorama import init
+    from termcolor import colored
+
+    # use Colorama to make Termcolor work on Windows too
+    init()
+
+    # then use Termcolor for all colored text output
+    print(colored('Hello, World!', 'green', 'on_red'))
+
+Available formatting constants are::
+
+    Fore: BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE, RESET.
+    Back: BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE, RESET.
+    Style: DIM, NORMAL, BRIGHT, RESET_ALL
+
+Style.RESET_ALL resets foreground, background and brightness. Colorama will
+perform this reset automatically on program exit.
+
+
+Cursor Positioning
+------------------
+
+ANSI codes to reposition the cursor are supported. See demos/demo06.py for
+an example of how to generate them.
+
+
+Init Keyword Args
+-----------------
+
+``init()`` accepts some kwargs to override default behaviour.
+
+init(autoreset=False):
+    If you find yourself repeatedly sending reset sequences to turn off color
+    changes at the end of every print, then ``init(autoreset=True)`` will
+    automate that::
+
+        from colorama import init
+        init(autoreset=True)
+        print(Fore.RED + 'some red text')
+        print('automatically back to default color again')
+
+init(strip=None):
+    Pass ``True`` or ``False`` to override whether ansi codes should be
+    stripped from the output. The default behaviour is to strip if on Windows.
+
+init(convert=None):
+    Pass ``True`` or ``False`` to override whether to convert ansi codes in the
+    output into win32 calls. The default behaviour is to convert if on Windows
+    and output is to a tty (terminal).
+
+init(wrap=True):
+    On Windows, colorama works by replacing ``sys.stdout`` and ``sys.stderr``
+    with proxy objects, which override the .write() method to do their work. If
+    this wrapping causes you problems, then this can be disabled by passing
+    ``init(wrap=False)``. The default behaviour is to wrap if autoreset or
+    strip or convert are True.
+
+    When wrapping is disabled, colored printing on non-Windows platforms will
+    continue to work as normal. To do cross-platform colored output, you can
+    use Colorama's ``AnsiToWin32`` proxy directly::
+
+        import sys
+        from colorama import init, AnsiToWin32
+        init(wrap=False)
+        stream = AnsiToWin32(sys.stderr).stream
+
+        # Python 2
+        print >>stream, Fore.BLUE + 'blue text on stderr'
+
+        # Python 3
+        print(Fore.BLUE + 'blue text on stderr', file=stream)
+
+
+Status & Known Problems
+=======================
+
+I've personally only tested it on WinXP (CMD, Console2), Ubuntu
+(gnome-terminal, xterm), and OSX.
+
+Some presumably valid ANSI sequences aren't recognised (see details below)
+but to my knowledge nobody has yet complained about this. Puzzling.
+
+See outstanding issues and wishlist at:
+http://code.google.com/p/colorama/issues/list
+
+If anything doesn't work for you, or doesn't do what you expected or hoped for,
+I'd love to hear about it on that issues list, would be delighted by patches,
+and would be happy to grant commit access to anyone who submits a working patch
+or two.
+
+
+Recognised ANSI Sequences
+=========================
+
+ANSI sequences generally take the form:
+
+    ESC [ <param> ; <param> ... <command>
+
+Where <param> is an integer, and <command> is a single letter. Zero or more
+params are passed to a <command>. If no params are passed, it is generally
+synonymous with passing a single zero. No spaces exist in the sequence, they
+have just been inserted here to make it easy to read.
+
+The only ANSI sequences that colorama converts into win32 calls are::
+
+    ESC [ 0 m       # reset all (colors and brightness)
+    ESC [ 1 m       # bright
+    ESC [ 2 m       # dim (looks same as normal brightness)
+    ESC [ 22 m      # normal brightness
+
+    # FOREGROUND:
+    ESC [ 30 m      # black
+    ESC [ 31 m      # red
+    ESC [ 32 m      # green
+    ESC [ 33 m      # yellow
+    ESC [ 34 m      # blue
+    ESC [ 35 m      # magenta
+    ESC [ 36 m      # cyan
+    ESC [ 37 m      # white
+    ESC [ 39 m      # reset
+
+    # BACKGROUND
+    ESC [ 40 m      # black
+    ESC [ 41 m      # red
+    ESC [ 42 m      # green
+    ESC [ 43 m      # yellow
+    ESC [ 44 m      # blue
+    ESC [ 45 m      # magenta
+    ESC [ 46 m      # cyan
+    ESC [ 47 m      # white
+    ESC [ 49 m      # reset
+
+    # cursor positioning
+    ESC [ y;x H     # position cursor at x across, y down
+
+    # clear the screen
+    ESC [ mode J    # clear the screen. Only mode 2 (clear entire screen)
+                    # is supported. It should be easy to add other modes,
+                    # let me know if that would be useful.
+
+Multiple numeric params to the 'm' command can be combined into a single
+sequence, eg::
+
+    ESC [ 36 ; 45 ; 1 m     # bright cyan text on magenta background
+
+All other ANSI sequences of the form ``ESC [ <param> ; <param> ... <command>``
+are silently stripped from the output on Windows.
+
+Any other form of ANSI sequence, such as single-character codes or alternative
+initial characters, are not recognised nor stripped. It would be cool to add
+them though. Let me know if it would be useful for you, via the issues on
+google code.
+
+
+Development
+===========
+
+Help and fixes welcome! Ask Jonathan for commit rights, you'll get them.
+
+Running tests requires:
+
+- Michael Foord's 'mock' module to be installed.
+- Tests are written using the 2010 era updates to 'unittest', and require to
+  be run either using Python2.7 or greater, or else to have Michael Foord's
+  'unittest2' module installed.
+
+unittest2 test discovery doesn't work for colorama, so I use 'nose'::
+
+    nosetests -s
+
+The -s is required because 'nosetests' otherwise applies a proxy of its own to
+stdout, which confuses the unit tests.
+
+
+Contact
+=======
+
+Created by Jonathan Hartley, tartley@tartley.com
+
+
+Thanks
+======
+| Ben Hoyt, for a magnificent fix under 64-bit Windows.
+| Jesse@EmptySquare for submitting a fix for examples in the README.
+| User 'jamessp', an observant documentation fix for cursor positioning.
+| User 'vaal1239', Dave Mckee & Lackner Kristof for a tiny but much-needed Win7 fix.
+| Julien Stuyck, for wisely suggesting Python3 compatible updates to README.
+| Daniel Griffith for multiple fabulous patches.
+| Oscar Lesta for valuable fix to stop ANSI chars being sent to non-tty output.
+| Roger Binns, for many suggestions, valuable feedback, & bug reports.
+| Tim Golden for thought and much appreciated feedback on the initial idea.
+
diff --git a/libs/pyqtgraph/util/colorama/__init__.py b/libs/pyqtgraph/util/colorama/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/libs/pyqtgraph/util/colorama/win32.py b/libs/pyqtgraph/util/colorama/win32.py
new file mode 100644
index 0000000000000000000000000000000000000000..c86ce1806bff27ada15354bb65f8be6b14d8f9a5
--- /dev/null
+++ b/libs/pyqtgraph/util/colorama/win32.py
@@ -0,0 +1,137 @@
+# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file.
+
+# from winbase.h
+STDOUT = -11
+STDERR = -12
+
+try:
+    from ctypes import windll
+    from ctypes import wintypes
+except ImportError:
+    windll = None
+    SetConsoleTextAttribute = lambda *_: None
+else:
+    from ctypes import (
+        byref, Structure, c_char, c_short, c_int, c_uint32, c_ushort, c_void_p, POINTER
+    )
+
+    class CONSOLE_SCREEN_BUFFER_INFO(Structure):
+        """struct in wincon.h."""
+        _fields_ = [
+            ("dwSize", wintypes._COORD),
+            ("dwCursorPosition", wintypes._COORD),
+            ("wAttributes", wintypes.WORD),
+            ("srWindow", wintypes.SMALL_RECT),
+            ("dwMaximumWindowSize", wintypes._COORD),
+        ]
+        def __str__(self):
+            return '(%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d)' % (
+                self.dwSize.Y, self.dwSize.X
+                , self.dwCursorPosition.Y, self.dwCursorPosition.X
+                , self.wAttributes
+                , self.srWindow.Top, self.srWindow.Left, self.srWindow.Bottom, self.srWindow.Right
+                , self.dwMaximumWindowSize.Y, self.dwMaximumWindowSize.X
+            )
+
+    _GetStdHandle = windll.kernel32.GetStdHandle
+    _GetStdHandle.argtypes = [
+        wintypes.DWORD,
+    ]
+    _GetStdHandle.restype = wintypes.HANDLE
+
+    _GetConsoleScreenBufferInfo = windll.kernel32.GetConsoleScreenBufferInfo
+    _GetConsoleScreenBufferInfo.argtypes = [
+        wintypes.HANDLE,
+        c_void_p,
+        #POINTER(CONSOLE_SCREEN_BUFFER_INFO),
+    ]
+    _GetConsoleScreenBufferInfo.restype = wintypes.BOOL
+
+    _SetConsoleTextAttribute = windll.kernel32.SetConsoleTextAttribute
+    _SetConsoleTextAttribute.argtypes = [
+        wintypes.HANDLE,
+        wintypes.WORD,
+    ]
+    _SetConsoleTextAttribute.restype = wintypes.BOOL
+
+    _SetConsoleCursorPosition = windll.kernel32.SetConsoleCursorPosition
+    _SetConsoleCursorPosition.argtypes = [
+        wintypes.HANDLE,
+        c_int,
+        #wintypes._COORD,
+    ]
+    _SetConsoleCursorPosition.restype = wintypes.BOOL
+
+    _FillConsoleOutputCharacterA = windll.kernel32.FillConsoleOutputCharacterA
+    _FillConsoleOutputCharacterA.argtypes = [
+        wintypes.HANDLE,
+        c_char,
+        wintypes.DWORD,
+        wintypes._COORD,
+        POINTER(wintypes.DWORD),
+    ]
+    _FillConsoleOutputCharacterA.restype = wintypes.BOOL
+
+    _FillConsoleOutputAttribute = windll.kernel32.FillConsoleOutputAttribute
+    _FillConsoleOutputAttribute.argtypes = [
+        wintypes.HANDLE,
+        wintypes.WORD,
+        wintypes.DWORD,
+        c_int,
+        #wintypes._COORD,
+        POINTER(wintypes.DWORD),
+    ]
+    _FillConsoleOutputAttribute.restype = wintypes.BOOL
+
+    handles = {
+        STDOUT: _GetStdHandle(STDOUT),
+        STDERR: _GetStdHandle(STDERR),
+    }
+
+    def GetConsoleScreenBufferInfo(stream_id=STDOUT):
+        handle = handles[stream_id]
+        csbi = CONSOLE_SCREEN_BUFFER_INFO()
+        success = _GetConsoleScreenBufferInfo(
+            handle, byref(csbi))
+        return csbi
+
+    def SetConsoleTextAttribute(stream_id, attrs):
+        handle = handles[stream_id]
+        return _SetConsoleTextAttribute(handle, attrs)
+
+    def SetConsoleCursorPosition(stream_id, position):
+        position = wintypes._COORD(*position)
+        # If the position is out of range, do nothing.
+        if position.Y <= 0 or position.X <= 0:
+            return
+        # Adjust for Windows' SetConsoleCursorPosition:
+        #    1. being 0-based, while ANSI is 1-based.
+        #    2. expecting (x,y), while ANSI uses (y,x).
+        adjusted_position = wintypes._COORD(position.Y - 1, position.X - 1)
+        # Adjust for viewport's scroll position
+        sr = GetConsoleScreenBufferInfo(STDOUT).srWindow
+        adjusted_position.Y += sr.Top
+        adjusted_position.X += sr.Left
+        # Resume normal processing
+        handle = handles[stream_id]
+        return _SetConsoleCursorPosition(handle, adjusted_position)
+
+    def FillConsoleOutputCharacter(stream_id, char, length, start):
+        handle = handles[stream_id]
+        char = c_char(char)
+        length = wintypes.DWORD(length)
+        num_written = wintypes.DWORD(0)
+        # Note that this is hard-coded for ANSI (vs wide) bytes.
+        success = _FillConsoleOutputCharacterA(
+            handle, char, length, start, byref(num_written))
+        return num_written.value
+
+    def FillConsoleOutputAttribute(stream_id, attr, length, start):
+        ''' FillConsoleOutputAttribute( hConsole, csbi.wAttributes, dwConSize, coordScreen, &cCharsWritten )'''
+        handle = handles[stream_id]
+        attribute = wintypes.WORD(attr)
+        length = wintypes.DWORD(length)
+        num_written = wintypes.DWORD(0)
+        # Note that this is hard-coded for ANSI (vs wide) bytes.
+        return _FillConsoleOutputAttribute(
+            handle, attribute, length, start, byref(num_written))
diff --git a/libs/pyqtgraph/util/colorama/winterm.py b/libs/pyqtgraph/util/colorama/winterm.py
new file mode 100644
index 0000000000000000000000000000000000000000..9c1c8185fd81f37ad6a83ee4d2efa38313d2664e
--- /dev/null
+++ b/libs/pyqtgraph/util/colorama/winterm.py
@@ -0,0 +1,120 @@
+# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file.
+from . import win32
+
+
+# from wincon.h
+class WinColor(object):
+    BLACK   = 0
+    BLUE    = 1
+    GREEN   = 2
+    CYAN    = 3
+    RED     = 4
+    MAGENTA = 5
+    YELLOW  = 6
+    GREY    = 7
+
+# from wincon.h
+class WinStyle(object):
+    NORMAL = 0x00 # dim text, dim background
+    BRIGHT = 0x08 # bright text, dim background
+
+
+class WinTerm(object):
+
+    def __init__(self):
+        self._default = win32.GetConsoleScreenBufferInfo(win32.STDOUT).wAttributes
+        self.set_attrs(self._default)
+        self._default_fore = self._fore
+        self._default_back = self._back
+        self._default_style = self._style
+
+    def get_attrs(self):
+        return self._fore + self._back * 16 + self._style
+
+    def set_attrs(self, value):
+        self._fore = value & 7
+        self._back = (value >> 4) & 7
+        self._style = value & WinStyle.BRIGHT
+
+    def reset_all(self, on_stderr=None):
+        self.set_attrs(self._default)
+        self.set_console(attrs=self._default)
+
+    def fore(self, fore=None, on_stderr=False):
+        if fore is None:
+            fore = self._default_fore
+        self._fore = fore
+        self.set_console(on_stderr=on_stderr)
+
+    def back(self, back=None, on_stderr=False):
+        if back is None:
+            back = self._default_back
+        self._back = back
+        self.set_console(on_stderr=on_stderr)
+
+    def style(self, style=None, on_stderr=False):
+        if style is None:
+            style = self._default_style
+        self._style = style
+        self.set_console(on_stderr=on_stderr)
+
+    def set_console(self, attrs=None, on_stderr=False):
+        if attrs is None:
+            attrs = self.get_attrs()
+        handle = win32.STDOUT
+        if on_stderr:
+            handle = win32.STDERR
+        win32.SetConsoleTextAttribute(handle, attrs)
+
+    def get_position(self, handle):
+        position = win32.GetConsoleScreenBufferInfo(handle).dwCursorPosition
+        # Because Windows coordinates are 0-based,
+        # and win32.SetConsoleCursorPosition expects 1-based.
+        position.X += 1
+        position.Y += 1
+        return position
+    
+    def set_cursor_position(self, position=None, on_stderr=False):
+        if position is None:
+            #I'm not currently tracking the position, so there is no default.
+            #position = self.get_position()
+            return
+        handle = win32.STDOUT
+        if on_stderr:
+            handle = win32.STDERR
+        win32.SetConsoleCursorPosition(handle, position)
+
+    def cursor_up(self, num_rows=0, on_stderr=False):
+        if num_rows == 0:
+            return
+        handle = win32.STDOUT
+        if on_stderr:
+            handle = win32.STDERR
+        position = self.get_position(handle)
+        adjusted_position = (position.Y - num_rows, position.X)
+        self.set_cursor_position(adjusted_position, on_stderr)
+
+    def erase_data(self, mode=0, on_stderr=False):
+        # 0 (or None) should clear from the cursor to the end of the screen.
+        # 1 should clear from the cursor to the beginning of the screen.
+        # 2 should clear the entire screen. (And maybe move cursor to (1,1)?)
+        #
+        # At the moment, I only support mode 2. From looking at the API, it
+        #    should be possible to calculate a different number of bytes to clear,
+        #    and to do so relative to the cursor position.
+        if mode[0] not in (2,):
+            return
+        handle = win32.STDOUT
+        if on_stderr:
+            handle = win32.STDERR
+        # here's where we'll home the cursor
+        coord_screen = win32.COORD(0,0)
+        csbi = win32.GetConsoleScreenBufferInfo(handle)
+        # get the number of character cells in the current buffer
+        dw_con_size = csbi.dwSize.X * csbi.dwSize.Y
+        # fill the entire screen with blanks
+        win32.FillConsoleOutputCharacter(handle, ' ', dw_con_size, coord_screen)
+        # now set the buffer's attributes accordingly
+        win32.FillConsoleOutputAttribute(handle, self.get_attrs(), dw_con_size, coord_screen )
+        # put the cursor at (0, 0)
+        win32.SetConsoleCursorPosition(handle, (coord_screen.X, coord_screen.Y))
diff --git a/libs/pyqtgraph/util/cprint.py b/libs/pyqtgraph/util/cprint.py
new file mode 100644
index 0000000000000000000000000000000000000000..e88bfd1a54c108099493bece18ae7afc179584a1
--- /dev/null
+++ b/libs/pyqtgraph/util/cprint.py
@@ -0,0 +1,101 @@
+"""
+Cross-platform color text printing
+
+Based on colorama (see pyqtgraph/util/colorama/README.txt)
+"""
+import sys, re
+
+from .colorama.winterm import WinTerm, WinColor, WinStyle
+from .colorama.win32 import windll
+
+_WIN = sys.platform.startswith('win')
+if windll is not None:
+    winterm = WinTerm()
+else:
+    _WIN = False
+
+def winset(reset=False, fore=None, back=None, style=None, stderr=False):
+    if reset:
+        winterm.reset_all()
+    if fore is not None:
+        winterm.fore(fore, stderr)
+    if back is not None:
+        winterm.back(back, stderr)
+    if style is not None:
+        winterm.style(style, stderr)
+
+ANSI = {}
+WIN = {}
+for i,color in enumerate(['BLACK', 'RED', 'GREEN', 'YELLOW', 'BLUE', 'MAGENTA', 'CYAN', 'WHITE']):
+    globals()[color] = i
+    globals()['BR_' + color] = i + 8
+    globals()['BACK_' + color] = i + 40
+    ANSI[i] = "\033[%dm" % (30+i)
+    ANSI[i+8] = "\033[2;%dm" % (30+i)
+    ANSI[i+40] = "\033[%dm" % (40+i)
+    color = 'GREY' if color == 'WHITE' else color
+    WIN[i] = {'fore': getattr(WinColor, color), 'style': WinStyle.NORMAL}
+    WIN[i+8] = {'fore': getattr(WinColor, color), 'style': WinStyle.BRIGHT}
+    WIN[i+40] = {'back': getattr(WinColor, color)}
+
+RESET = -1
+ANSI[RESET] = "\033[0m"
+WIN[RESET] =  {'reset': True}
+
+
+def cprint(stream, *args, **kwds):
+    """
+    Print with color. Examples::
+
+        # colors are BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE
+        cprint('stdout', RED, 'This is in red. ', RESET, 'and this is normal\n')
+
+        # Adding BR_ before the color manes it bright
+        cprint('stdout', BR_GREEN, 'This is bright green.\n', RESET)
+
+        # Adding BACK_ changes background color
+        cprint('stderr', BACK_BLUE, WHITE, 'This is white-on-blue.', -1)
+
+        # Integers 0-7 for normal, 8-15 for bright, and 40-47 for background.
+        # -1 to reset.
+        cprint('stderr', 1, 'This is in red.', -1)
+
+    """
+    if isinstance(stream, basestring):
+        stream = kwds.get('stream', 'stdout')
+        err = stream == 'stderr'
+        stream = getattr(sys, stream)
+    else:
+        err = kwds.get('stderr', False)
+
+    if hasattr(stream, 'isatty') and stream.isatty():
+        if _WIN:
+            # convert to win32 calls
+            for arg in args:
+                if isinstance(arg, basestring):
+                    stream.write(arg)
+                else:
+                    kwds = WIN[arg]
+                    winset(stderr=err, **kwds)
+        else:
+            # convert to ANSI
+            for arg in args:
+                if isinstance(arg, basestring):
+                    stream.write(arg)
+                else:
+                    stream.write(ANSI[arg])
+    else:
+        # ignore colors
+        for arg in args:
+            if isinstance(arg, basestring):
+                stream.write(arg)
+
+def cout(*args):
+    """Shorthand for cprint('stdout', ...)"""
+    cprint('stdout', *args)
+
+def cerr(*args):
+    """Shorthand for cprint('stderr', ...)"""
+    cprint('stderr', *args)
+
+
diff --git a/libs/pyqtgraph/util/garbage_collector.py b/libs/pyqtgraph/util/garbage_collector.py
new file mode 100644
index 0000000000000000000000000000000000000000..979e66c50ed9f1633d0c4b80bacf53157487b2a1
--- /dev/null
+++ b/libs/pyqtgraph/util/garbage_collector.py
@@ -0,0 +1,50 @@
+import gc
+
+from ..Qt import QtCore
+
+class GarbageCollector(object):
+    '''
+    Disable automatic garbage collection and instead collect manually
+    on a timer.
+
+    This is done to ensure that garbage collection only happens in the GUI
+    thread, as otherwise Qt can crash.
+
+    Credit:  Erik Janssens
+    Source:  http://pydev.blogspot.com/2014/03/should-python-garbage-collector-be.html
+    '''
+
+    def __init__(self, interval=1.0, debug=False):
+        self.debug = debug
+        if debug:
+            gc.set_debug(gc.DEBUG_LEAK)
+
+        self.timer = QtCore.QTimer()
+        self.timer.timeout.connect(self.check)
+
+        self.threshold = gc.get_threshold()
+        gc.disable()
+        self.timer.start(interval * 1000)
+
+    def check(self):
+        #return self.debug_cycles() # uncomment to just debug cycles
+        l0, l1, l2 = gc.get_count()
+        if self.debug:
+            print('gc_check called:', l0, l1, l2)
+        if l0 > self.threshold[0]:
+            num = gc.collect(0)
+            if self.debug:
+                print('collecting gen 0, found: %d unreachable' % num)
+            if l1 > self.threshold[1]:
+                num = gc.collect(1)
+                if self.debug:
+                    print('collecting gen 1, found: %d unreachable' % num)
+                if l2 > self.threshold[2]:
+                    num = gc.collect(2)
+                    if self.debug:
+                        print('collecting gen 2, found: %d unreachable' % num)
+
+    def debug_cycles(self):
+        gc.collect()
+        for obj in gc.garbage:
+            print (obj, repr(obj), type(obj))
diff --git a/libs/pyqtgraph/util/lru_cache.py b/libs/pyqtgraph/util/lru_cache.py
new file mode 100644
index 0000000000000000000000000000000000000000..9c04abf37c5490bf3146c83c3a55e2b7124c6c7b
--- /dev/null
+++ b/libs/pyqtgraph/util/lru_cache.py
@@ -0,0 +1,121 @@
+import operator
+import sys
+import itertools
+
+
+_IS_PY3 = sys.version_info[0] == 3
+
+class LRUCache(object):
+    '''
+    This LRU cache should be reasonable for short collections (until around 100 items), as it does a
+    sort on the items if the collection would become too big (so, it is very fast for getting and
+    setting but when its size would become higher than the max size it does one sort based on the
+    internal time to decide which items should be removed -- which should be Ok if the resizeTo
+    isn't too close to the maxSize so that it becomes an operation that doesn't happen all the
+    time).
+    '''
+
+    def __init__(self, maxSize=100, resizeTo=70):
+        '''
+        ============== =========================================================
+        **Arguments:**
+        maxSize        (int) This is the maximum size of the cache. When some 
+                       item is added and the cache would become bigger than 
+                       this, it's resized to the value passed on resizeTo.
+        resizeTo       (int) When a resize operation happens, this is the size 
+                       of the final cache.
+        ============== =========================================================
+        '''
+        assert resizeTo < maxSize
+        self.maxSize = maxSize
+        self.resizeTo = resizeTo
+        self._counter = 0
+        self._dict = {}
+        if _IS_PY3:
+            self._nextTime = itertools.count(0).__next__
+        else:
+            self._nextTime = itertools.count(0).next
+
+    def __getitem__(self, key):
+        item = self._dict[key]
+        item[2] = self._nextTime()
+        return item[1]
+
+    def __len__(self):
+        return len(self._dict)
+
+    def __setitem__(self, key, value):
+        item = self._dict.get(key)
+        if item is None:
+            if len(self._dict) + 1 > self.maxSize:
+                self._resizeTo()
+            
+            item = [key, value, self._nextTime()]
+            self._dict[key] = item
+        else:
+            item[1] = value
+            item[2] = self._nextTime()
+            
+    def __delitem__(self, key):
+        del self._dict[key]
+        
+    def get(self, key, default=None):
+        try:
+            return self[key]
+        except KeyError:
+            return default
+        
+    def clear(self):
+        self._dict.clear()
+ 
+    if _IS_PY3:
+        def values(self):
+            return [i[1] for i in self._dict.values()]
+        
+        def keys(self):
+            return [x[0] for x in self._dict.values()]
+        
+        def _resizeTo(self):
+            ordered = sorted(self._dict.values(), key=operator.itemgetter(2))[:self.resizeTo]
+            for i in ordered:
+                del self._dict[i[0]]
+                
+        def iteritems(self, accessTime=False):
+            '''
+            :param bool accessTime:
+                If True sorts the returned items by the internal access time.
+            '''
+            if accessTime:
+                for x in sorted(self._dict.values(), key=operator.itemgetter(2)):
+                    yield x[0], x[1]
+            else:
+                for x in self._dict.items():
+                    yield x[0], x[1]
+                    
+    else:
+        def values(self):
+            return [i[1] for i in self._dict.itervalues()]
+        
+        def keys(self):
+            return [x[0] for x in self._dict.itervalues()]
+            
+        
+        def _resizeTo(self):
+            ordered = sorted(self._dict.itervalues(), key=operator.itemgetter(2))[:self.resizeTo]
+            for i in ordered:
+                del self._dict[i[0]]
+                
+        def iteritems(self, accessTime=False):
+            '''
+            ============= ======================================================
+            **Arguments**
+            accessTime    (bool) If True sorts the returned items by the 
+                          internal access time.
+            ============= ======================================================
+            '''
+            if accessTime:
+                for x in sorted(self._dict.itervalues(), key=operator.itemgetter(2)):
+                    yield x[0], x[1]
+            else:
+                for x in self._dict.iteritems():
+                    yield x[0], x[1]
diff --git a/libs/pyqtgraph/util/mutex.py b/libs/pyqtgraph/util/mutex.py
new file mode 100644
index 0000000000000000000000000000000000000000..4a193127fb81782028e542a41370ab8a66738c54
--- /dev/null
+++ b/libs/pyqtgraph/util/mutex.py
@@ -0,0 +1,94 @@
+# -*- coding: utf-8 -*-
+from ..Qt import QtCore
+import traceback
+
+class Mutex(QtCore.QMutex):
+    """
+    Subclass of QMutex that provides useful debugging information during
+    deadlocks--tracebacks are printed for both the code location that is 
+    attempting to lock the mutex as well as the location that has already
+    acquired the lock.
+    
+    Also provides __enter__ and __exit__ methods for use in "with" statements.
+    """    
+    def __init__(self, *args, **kargs):
+        if kargs.get('recursive', False):
+            args = (QtCore.QMutex.Recursive,)
+        QtCore.QMutex.__init__(self, *args)
+        self.l = QtCore.QMutex()  ## for serializing access to self.tb
+        self.tb = []
+        self.debug = True ## True to enable debugging functions
+
+    def tryLock(self, timeout=None, id=None):
+        if timeout is None:
+            locked = QtCore.QMutex.tryLock(self)
+        else:
+            locked = QtCore.QMutex.tryLock(self, timeout)
+
+        if self.debug and locked:
+            self.l.lock()
+            try:
+                if id is None:
+                    self.tb.append(''.join(traceback.format_stack()[:-1]))
+                else:
+                    self.tb.append("  " + str(id))
+                #print 'trylock', self, len(self.tb)
+            finally:
+                self.l.unlock()
+        return locked
+        
+    def lock(self, id=None):
+        c = 0
+        waitTime = 5000  # in ms
+        while True:
+            if self.tryLock(waitTime, id):
+                break
+            c += 1
+            if self.debug:
+                self.l.lock()
+                try:
+                    print("Waiting for mutex lock (%0.1f sec). Traceback follows:" 
+                          % (c*waitTime/1000.))
+                    traceback.print_stack()
+                    if len(self.tb) > 0:
+                        print("Mutex is currently locked from:\n")
+                        print(self.tb[-1])
+                    else:
+                        print("Mutex is currently locked from [???]")
+                finally:
+                    self.l.unlock()
+        #print 'lock', self, len(self.tb)
+
+    def unlock(self):
+        QtCore.QMutex.unlock(self)
+        if self.debug:
+            self.l.lock()
+            try:
+                #print 'unlock', self, len(self.tb)
+                if len(self.tb) > 0:
+                    self.tb.pop()
+                else:
+                    raise Exception("Attempt to unlock mutex before it has been locked")
+            finally:
+                self.l.unlock()
+
+    def depth(self):
+        self.l.lock()
+        n = len(self.tb)
+        self.l.unlock()
+        return n
+
+    def traceback(self):
+        self.l.lock()
+        try:
+            ret = self.tb[:]
+        finally:
+            self.l.unlock()
+        return ret
+
+    def __exit__(self, *args):
+        self.unlock()
+
+    def __enter__(self):
+        self.lock()
+        return self
\ No newline at end of file
diff --git a/libs/pyqtgraph/util/pil_fix.py b/libs/pyqtgraph/util/pil_fix.py
new file mode 100644
index 0000000000000000000000000000000000000000..da1c52b36cf15e4c125161909a60e2dfa888ecde
--- /dev/null
+++ b/libs/pyqtgraph/util/pil_fix.py
@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+"""
+Importing this module installs support for 16-bit images in PIL.
+This works by patching objects in the PIL namespace; no files are
+modified.
+"""
+
+from PIL import Image
+
+if Image.VERSION == '1.1.7':
+    Image._MODE_CONV["I;16"] = ('%su2' % Image._ENDIAN, None)
+    Image._fromarray_typemap[((1, 1), "<u2")] = ("I", "I;16")
+if Image.VERSION == '1.1.6':
+    Image._MODE_CONV["I;16"] = ('%su2' % Image._ENDIAN, None)
+    ## just a copy of fromarray() from Image.py with I;16 added in
+    def fromarray(obj, mode=None):
+        arr = obj.__array_interface__
+        shape = arr['shape']
+        ndim = len(shape)
+        try:
+            strides = arr['strides']
+        except KeyError:
+            strides = None
+        if mode is None:
+            typestr = arr['typestr']
+            if not (typestr[0] == '|' or typestr[0] == Image._ENDIAN or
+                    typestr[1:] not in ['u1', 'b1', 'i4', 'f4']):
+                raise TypeError("cannot handle data-type")
+            if typestr[0] == Image._ENDIAN:
+                typestr = typestr[1:3]
+            else:
+                typestr = typestr[:2]
+            if typestr == 'i4':
+                mode = 'I'
+            if typestr == 'u2':
+                mode = 'I;16'
+            elif typestr == 'f4':
+                mode = 'F'
+            elif typestr == 'b1':
+                mode = '1'
+            elif ndim == 2:
+                mode = 'L'
+            elif ndim == 3:
+                mode = 'RGB'
+            elif ndim == 4:
+                mode = 'RGBA'
+            else:
+                raise TypeError("Do not understand data.")
+        ndmax = 4
+        bad_dims=0
+        if mode in ['1','L','I','P','F']:
+            ndmax = 2
+        elif mode == 'RGB':
+            ndmax = 3
+        if ndim > ndmax:
+            raise ValueError("Too many dimensions.")
+
+        size = shape[:2][::-1]
+        if strides is not None:
+            obj = obj.tostring()
+
+        return frombuffer(mode, size, obj, "raw", mode, 0, 1)
+        
+    Image.fromarray=fromarray
\ No newline at end of file
diff --git a/libs/pyqtgraph/util/tests/test_lru_cache.py b/libs/pyqtgraph/util/tests/test_lru_cache.py
new file mode 100644
index 0000000000000000000000000000000000000000..c0cf9f8aaaada8a1168ca1be55208457903cd86b
--- /dev/null
+++ b/libs/pyqtgraph/util/tests/test_lru_cache.py
@@ -0,0 +1,50 @@
+from pyqtgraph.util.lru_cache import LRUCache
+
+def testLRU():
+    lru = LRUCache(2, 1)
+    # check twice
+    checkLru(lru)
+    checkLru(lru)
+
+def checkLru(lru):
+    lru[1] = 1
+    lru[2] = 2
+    lru[3] = 3
+
+    assert len(lru) == 2
+    assert set([2, 3]) == set(lru.keys())
+    assert set([2, 3]) == set(lru.values())
+
+    lru[2] = 2
+    assert set([2, 3]) == set(lru.values())
+    
+    lru[1] = 1
+    set([2, 1]) == set(lru.values())
+
+    #Iterates from the used in the last access to others based on access time.
+    assert [(2, 2), (1, 1)] == list(lru.iteritems(accessTime=True))
+    lru[2] = 2
+    assert [(1, 1), (2, 2)] == list(lru.iteritems(accessTime=True))
+
+    del lru[2]
+    assert [(1, 1), ] == list(lru.iteritems(accessTime=True))
+
+    lru[2] = 2
+    assert [(1, 1), (2, 2)] == list(lru.iteritems(accessTime=True))
+
+    _a = lru[1]
+    assert [(2, 2), (1, 1)] == list(lru.iteritems(accessTime=True))
+
+    _a = lru[2]
+    assert [(1, 1), (2, 2)] == list(lru.iteritems(accessTime=True))
+
+    assert lru.get(2) == 2
+    assert lru.get(3) == None
+    assert [(1, 1), (2, 2)] == list(lru.iteritems(accessTime=True))
+
+    lru.clear()
+    assert [] == list(lru.iteritems())
+
+
+if __name__ == '__main__':
+    testLRU()
diff --git a/libs/pyqtgraph/widgets/BusyCursor.py b/libs/pyqtgraph/widgets/BusyCursor.py
new file mode 100644
index 0000000000000000000000000000000000000000..d99fe589ffefcdf07b67046cee151f287f8402e8
--- /dev/null
+++ b/libs/pyqtgraph/widgets/BusyCursor.py
@@ -0,0 +1,24 @@
+from ..Qt import QtGui, QtCore
+
+__all__ = ['BusyCursor']
+
+class BusyCursor(object):
+    """Class for displaying a busy mouse cursor during long operations.
+    Usage::
+
+        with pyqtgraph.BusyCursor():
+            doLongOperation()
+
+    May be nested.
+    """
+    active = []
+
+    def __enter__(self):
+        QtGui.QApplication.setOverrideCursor(QtGui.QCursor(QtCore.Qt.WaitCursor))
+        BusyCursor.active.append(self)
+
+    def __exit__(self, *args):
+        BusyCursor.active.pop(-1)
+        if len(BusyCursor.active) == 0:
+            QtGui.QApplication.restoreOverrideCursor()
+        
\ No newline at end of file
diff --git a/libs/pyqtgraph/widgets/CheckTable.py b/libs/pyqtgraph/widgets/CheckTable.py
new file mode 100644
index 0000000000000000000000000000000000000000..2201512672816bf6549dea41f3abe1f2c9062972
--- /dev/null
+++ b/libs/pyqtgraph/widgets/CheckTable.py
@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+from ..Qt import QtGui, QtCore
+from . import VerticalLabel
+
+__all__ = ['CheckTable']
+
+class CheckTable(QtGui.QWidget):
+    
+    sigStateChanged = QtCore.Signal(object, object, object) # (row, col, state)
+    
+    def __init__(self, columns):
+        QtGui.QWidget.__init__(self)
+        self.layout = QtGui.QGridLayout()
+        self.layout.setSpacing(0)
+        self.setLayout(self.layout)
+        self.headers = []
+        self.columns = columns
+        col = 1
+        for c in columns:
+            label = VerticalLabel.VerticalLabel(c, orientation='vertical')
+            self.headers.append(label)
+            self.layout.addWidget(label, 0, col)
+            col += 1
+        
+        self.rowNames = []
+        self.rowWidgets = []
+        self.oldRows = {}  ## remember settings from removed rows; reapply if they reappear.
+        
+
+    def updateRows(self, rows):
+        for r in self.rowNames[:]:
+            if r not in rows:
+                self.removeRow(r)
+        for r in rows:
+            if r not in self.rowNames:
+                self.addRow(r)
+
+    def addRow(self, name):
+        label = QtGui.QLabel(name)
+        row = len(self.rowNames)+1
+        self.layout.addWidget(label, row, 0)
+        checks = []
+        col = 1
+        for c in self.columns:
+            check = QtGui.QCheckBox('')
+            check.col = c
+            check.row = name
+            self.layout.addWidget(check, row, col)
+            checks.append(check)
+            if name in self.oldRows:
+                check.setChecked(self.oldRows[name][col])
+            col += 1
+            #QtCore.QObject.connect(check, QtCore.SIGNAL('stateChanged(int)'), self.checkChanged)
+            check.stateChanged.connect(self.checkChanged)
+        self.rowNames.append(name)
+        self.rowWidgets.append([label] + checks)
+        
+    def removeRow(self, name):
+        row = self.rowNames.index(name)
+        self.oldRows[name] = self.saveState()['rows'][row]  ## save for later
+        self.rowNames.pop(row)
+        for w in self.rowWidgets[row]:
+            w.setParent(None)
+            #QtCore.QObject.disconnect(w, QtCore.SIGNAL('stateChanged(int)'), self.checkChanged)
+            if isinstance(w, QtGui.QCheckBox):
+                w.stateChanged.disconnect(self.checkChanged)
+        self.rowWidgets.pop(row)
+        for i in range(row, len(self.rowNames)):
+            widgets = self.rowWidgets[i]
+            for j in range(len(widgets)):
+                widgets[j].setParent(None)
+                self.layout.addWidget(widgets[j], i+1, j)
+
+    def checkChanged(self, state):
+        check = QtCore.QObject.sender(self)
+        #self.emit(QtCore.SIGNAL('stateChanged'), check.row, check.col, state)
+        self.sigStateChanged.emit(check.row, check.col, state)
+        
+    def saveState(self):
+        rows = []
+        for i in range(len(self.rowNames)):
+            row = [self.rowNames[i]] + [c.isChecked() for c in self.rowWidgets[i][1:]]
+            rows.append(row)
+        return {'cols': self.columns, 'rows': rows}
+        
+    def restoreState(self, state):
+        rows = [r[0] for r in state['rows']]
+        self.updateRows(rows)
+        for r in state['rows']:
+            rowNum = self.rowNames.index(r[0])
+            for i in range(1, len(r)):
+                self.rowWidgets[rowNum][i].setChecked(r[i])
+            
diff --git a/libs/pyqtgraph/widgets/ColorButton.py b/libs/pyqtgraph/widgets/ColorButton.py
new file mode 100644
index 0000000000000000000000000000000000000000..a0bb0c8eb1ccc521bd8241099f06ab420575ee4d
--- /dev/null
+++ b/libs/pyqtgraph/widgets/ColorButton.py
@@ -0,0 +1,91 @@
+# -*- coding: utf-8 -*-
+from ..Qt import QtGui, QtCore
+from .. import functions as functions
+
+__all__ = ['ColorButton']
+
+class ColorButton(QtGui.QPushButton):
+    """
+    **Bases:** QtGui.QPushButton
+    
+    Button displaying a color and allowing the user to select a new color.
+    
+    ====================== ============================================================
+    **Signals:**
+    sigColorChanging(self) emitted whenever a new color is picked in the color dialog
+    sigColorChanged(self)  emitted when the selected color is accepted (user clicks OK)
+    ====================== ============================================================
+    """
+    sigColorChanging = QtCore.Signal(object)  ## emitted whenever a new color is picked in the color dialog
+    sigColorChanged = QtCore.Signal(object)   ## emitted when the selected color is accepted (user clicks OK)
+    
+    def __init__(self, parent=None, color=(128,128,128)):
+        QtGui.QPushButton.__init__(self, parent)
+        self.setColor(color)
+        self.colorDialog = QtGui.QColorDialog()
+        self.colorDialog.setOption(QtGui.QColorDialog.ShowAlphaChannel, True)
+        self.colorDialog.setOption(QtGui.QColorDialog.DontUseNativeDialog, True)
+        self.colorDialog.currentColorChanged.connect(self.dialogColorChanged)
+        self.colorDialog.rejected.connect(self.colorRejected)
+        self.colorDialog.colorSelected.connect(self.colorSelected)
+        #QtCore.QObject.connect(self.colorDialog, QtCore.SIGNAL('currentColorChanged(const QColor&)'), self.currentColorChanged)
+        #QtCore.QObject.connect(self.colorDialog, QtCore.SIGNAL('rejected()'), self.currentColorRejected)
+        self.clicked.connect(self.selectColor)
+        self.setMinimumHeight(15)
+        self.setMinimumWidth(15)
+        
+    def paintEvent(self, ev):
+        QtGui.QPushButton.paintEvent(self, ev)
+        p = QtGui.QPainter(self)
+        rect = self.rect().adjusted(6, 6, -6, -6)
+        ## draw white base, then texture for indicating transparency, then actual color
+        p.setBrush(functions.mkBrush('w'))
+        p.drawRect(rect)
+        p.setBrush(QtGui.QBrush(QtCore.Qt.DiagCrossPattern))
+        p.drawRect(rect)
+        p.setBrush(functions.mkBrush(self._color))
+        p.drawRect(rect)
+        p.end()
+    
+    def setColor(self, color, finished=True):
+        """Sets the button's color and emits both sigColorChanged and sigColorChanging."""
+        self._color = functions.mkColor(color)
+        if finished:
+            self.sigColorChanged.emit(self)
+        else:
+            self.sigColorChanging.emit(self)
+        self.update()
+        
+    def selectColor(self):
+        self.origColor = self.color()
+        self.colorDialog.setCurrentColor(self.color())
+        self.colorDialog.open()
+        
+    def dialogColorChanged(self, color):
+        if color.isValid():
+            self.setColor(color, finished=False)
+            
+    def colorRejected(self):
+        self.setColor(self.origColor, finished=False)
+    
+    def colorSelected(self, color):
+        self.setColor(self._color, finished=True)
+    
+    def saveState(self):
+        return functions.colorTuple(self._color)
+        
+    def restoreState(self, state):
+        self.setColor(state)
+        
+    def color(self, mode='qcolor'):
+        color = functions.mkColor(self._color)
+        if mode == 'qcolor':
+            return color
+        elif mode == 'byte':
+            return (color.red(), color.green(), color.blue(), color.alpha())
+        elif mode == 'float':
+            return (color.red()/255., color.green()/255., color.blue()/255., color.alpha()/255.)
+
+    def widgetGroupInterface(self):
+        return (self.sigColorChanged, ColorButton.saveState, ColorButton.restoreState)
+    
diff --git a/libs/pyqtgraph/widgets/ColorMapWidget.py b/libs/pyqtgraph/widgets/ColorMapWidget.py
new file mode 100644
index 0000000000000000000000000000000000000000..f6e289608b7473d2550b2f85bb6239e1d0099c94
--- /dev/null
+++ b/libs/pyqtgraph/widgets/ColorMapWidget.py
@@ -0,0 +1,249 @@
+from ..Qt import QtGui, QtCore
+from .. import parametertree as ptree
+import numpy as np
+from ..pgcollections import OrderedDict
+from .. import functions as fn
+
+__all__ = ['ColorMapWidget']
+
+class ColorMapWidget(ptree.ParameterTree):
+    """
+    This class provides a widget allowing the user to customize color mapping
+    for multi-column data. Given a list of field names, the user may specify
+    multiple criteria for assigning colors to each record in a numpy record array.
+    Multiple criteria are evaluated and combined into a single color for each
+    record by user-defined compositing methods.
+    
+    For simpler color mapping using a single gradient editor, see 
+    :class:`GradientWidget <pyqtgraph.GradientWidget>`
+    """
+    sigColorMapChanged = QtCore.Signal(object)
+    
+    def __init__(self, parent=None):
+        ptree.ParameterTree.__init__(self, parent=parent, showHeader=False)
+        
+        self.params = ColorMapParameter()
+        self.setParameters(self.params)
+        self.params.sigTreeStateChanged.connect(self.mapChanged)
+        
+        ## wrap a couple methods 
+        self.setFields = self.params.setFields
+        self.map = self.params.map
+
+    def mapChanged(self):
+        self.sigColorMapChanged.emit(self)
+
+    def widgetGroupInterface(self):
+        return (self.sigColorMapChanged, self.saveState, self.restoreState)
+
+    def saveState(self):
+        return self.params.saveState()
+
+    def restoreState(self, state):
+        self.params.restoreState(state)
+        
+
+class ColorMapParameter(ptree.types.GroupParameter):
+    sigColorMapChanged = QtCore.Signal(object)
+    
+    def __init__(self):
+        self.fields = {}
+        ptree.types.GroupParameter.__init__(self, name='Color Map', addText='Add Mapping..', addList=[])
+        self.sigTreeStateChanged.connect(self.mapChanged)
+        
+    def mapChanged(self):
+        self.sigColorMapChanged.emit(self)
+        
+    def addNew(self, name):
+        mode = self.fields[name].get('mode', 'range')
+        if mode == 'range':
+            item = RangeColorMapItem(name, self.fields[name])
+        elif mode == 'enum':
+            item = EnumColorMapItem(name, self.fields[name])
+        self.addChild(item)
+        return item
+        
+    def fieldNames(self):
+        return self.fields.keys()
+    
+    def setFields(self, fields):
+        """
+        Set the list of fields to be used by the mapper. 
+        
+        The format of *fields* is::
+        
+            [ (fieldName, {options}), ... ]
+        
+        ============== ============================================================
+        Field Options:
+        mode           Either 'range' or 'enum' (default is range). For 'range', 
+                       The user may specify a gradient of colors to be applied 
+                       linearly across a specific range of values. For 'enum', 
+                       the user specifies a single color for each unique value
+                       (see *values* option).
+        units          String indicating the units of the data for this field.
+        values         List of unique values for which the user may assign a 
+                       color when mode=='enum'. Optionally may specify a dict 
+                       instead {value: name}.
+        ============== ============================================================
+        """
+        self.fields = OrderedDict(fields)
+        #self.fields = fields
+        #self.fields.sort()
+        names = self.fieldNames()
+        self.setAddList(names)
+        
+    def map(self, data, mode='byte'):
+        """
+        Return an array of colors corresponding to *data*. 
+        
+        ==============  =================================================================
+        **Arguments:**
+        data            A numpy record array where the fields in data.dtype match those
+                        defined by a prior call to setFields().
+        mode            Either 'byte' or 'float'. For 'byte', the method returns an array
+                        of dtype ubyte with values scaled 0-255. For 'float', colors are
+                        returned as 0.0-1.0 float values.
+        ==============  =================================================================
+        """
+        if isinstance(data, dict):
+            data = np.array([tuple(data.values())], dtype=[(k, float) for k in data.keys()])
+
+        colors = np.zeros((len(data),4))
+        for item in self.children():
+            if not item['Enabled']:
+                continue
+            chans = item.param('Channels..')
+            mask = np.empty((len(data), 4), dtype=bool)
+            for i,f in enumerate(['Red', 'Green', 'Blue', 'Alpha']):
+                mask[:,i] = chans[f]
+            
+            colors2 = item.map(data)
+            
+            op = item['Operation']
+            if op == 'Add':
+                colors[mask] = colors[mask] + colors2[mask]
+            elif op == 'Multiply':
+                colors[mask] *= colors2[mask]
+            elif op == 'Overlay':
+                a = colors2[:,3:4]
+                c3 = colors * (1-a) + colors2 * a
+                c3[:,3:4] = colors[:,3:4] + (1-colors[:,3:4]) * a
+                colors = c3
+            elif op == 'Set':
+                colors[mask] = colors2[mask]
+            
+                
+        colors = np.clip(colors, 0, 1)
+        if mode == 'byte':
+            colors = (colors * 255).astype(np.ubyte)
+        
+        return colors
+            
+    def saveState(self):
+        items = OrderedDict()
+        for item in self:
+            itemState = item.saveState(filter='user')
+            itemState['field'] = item.fieldName
+            items[item.name()] = itemState
+        state = {'fields': self.fields, 'items': items}
+        return state
+
+    def restoreState(self, state):
+        if 'fields' in state:
+            self.setFields(state['fields'])
+        for itemState in state['items']:
+            item = self.addNew(itemState['field'])
+            item.restoreState(itemState)
+        
+    
+class RangeColorMapItem(ptree.types.SimpleParameter):
+    mapType = 'range'
+    
+    def __init__(self, name, opts):
+        self.fieldName = name
+        units = opts.get('units', '')
+        ptree.types.SimpleParameter.__init__(self, 
+            name=name, autoIncrementName=True, type='colormap', removable=True, renamable=True, 
+            children=[
+                #dict(name="Field", type='list', value=name, values=fields),
+                dict(name='Min', type='float', value=0.0, suffix=units, siPrefix=True),
+                dict(name='Max', type='float', value=1.0, suffix=units, siPrefix=True),
+                dict(name='Operation', type='list', value='Overlay', values=['Overlay', 'Add', 'Multiply', 'Set']),
+                dict(name='Channels..', type='group', expanded=False, children=[
+                    dict(name='Red', type='bool', value=True),
+                    dict(name='Green', type='bool', value=True),
+                    dict(name='Blue', type='bool', value=True),
+                    dict(name='Alpha', type='bool', value=True),
+                    ]),
+                dict(name='Enabled', type='bool', value=True),
+                dict(name='NaN', type='color'),
+            ])
+    
+    def map(self, data):
+        data = data[self.fieldName]
+        
+        scaled = np.clip((data-self['Min']) / (self['Max']-self['Min']), 0, 1)
+        cmap = self.value()
+        colors = cmap.map(scaled, mode='float')
+        
+        mask = np.isnan(data) | np.isinf(data)
+        nanColor = self['NaN']
+        nanColor = (nanColor.red()/255., nanColor.green()/255., nanColor.blue()/255., nanColor.alpha()/255.)
+        colors[mask] = nanColor
+        
+        return colors        
+
+class EnumColorMapItem(ptree.types.GroupParameter):
+    mapType = 'enum'
+    
+    def __init__(self, name, opts):
+        self.fieldName = name
+        vals = opts.get('values', [])
+        if isinstance(vals, list):
+            vals = OrderedDict([(v,str(v)) for v in vals])
+        childs = [{'name': v, 'type': 'color'} for v in vals]
+        
+        childs = []
+        for val,vname in vals.items():
+            ch = ptree.Parameter.create(name=vname, type='color')
+            ch.maskValue = val
+            childs.append(ch)
+        
+        ptree.types.GroupParameter.__init__(self, 
+            name=name, autoIncrementName=True, removable=True, renamable=True, 
+            children=[
+                dict(name='Values', type='group', children=childs),
+                dict(name='Operation', type='list', value='Overlay', values=['Overlay', 'Add', 'Multiply', 'Set']),
+                dict(name='Channels..', type='group', expanded=False, children=[
+                    dict(name='Red', type='bool', value=True),
+                    dict(name='Green', type='bool', value=True),
+                    dict(name='Blue', type='bool', value=True),
+                    dict(name='Alpha', type='bool', value=True),
+                    ]),
+                dict(name='Enabled', type='bool', value=True),
+                dict(name='Default', type='color'),
+            ])
+    
+    def map(self, data):
+        data = data[self.fieldName]
+        colors = np.empty((len(data), 4))
+        default = np.array(fn.colorTuple(self['Default'])) / 255.
+        colors[:] = default
+        
+        for v in self.param('Values'):
+            mask = data == v.maskValue
+            c = np.array(fn.colorTuple(v.value())) / 255.
+            colors[mask] = c
+        #scaled = np.clip((data-self['Min']) / (self['Max']-self['Min']), 0, 1)
+        #cmap = self.value()
+        #colors = cmap.map(scaled, mode='float')
+        
+        #mask = np.isnan(data) | np.isinf(data)
+        #nanColor = self['NaN']
+        #nanColor = (nanColor.red()/255., nanColor.green()/255., nanColor.blue()/255., nanColor.alpha()/255.)
+        #colors[mask] = nanColor
+        
+        return colors
+
+
diff --git a/libs/pyqtgraph/widgets/ComboBox.py b/libs/pyqtgraph/widgets/ComboBox.py
new file mode 100644
index 0000000000000000000000000000000000000000..5cf6f9183f00f374018d62308baaf8841260c2fa
--- /dev/null
+++ b/libs/pyqtgraph/widgets/ComboBox.py
@@ -0,0 +1,217 @@
+from ..Qt import QtGui, QtCore
+from ..SignalProxy import SignalProxy
+import sys
+from ..pgcollections import OrderedDict
+from ..python2_3 import asUnicode
+
+class ComboBox(QtGui.QComboBox):
+    """Extends QComboBox to add extra functionality.
+
+    * Handles dict mappings -- user selects a text key, and the ComboBox indicates
+      the selected value.
+    * Requires item strings to be unique
+    * Remembers selected value if list is cleared and subsequently repopulated
+    * setItems() replaces the items in the ComboBox and blocks signals if the
+      value ultimately does not change.
+    """
+    
+    
+    def __init__(self, parent=None, items=None, default=None):
+        QtGui.QComboBox.__init__(self, parent)
+        self.currentIndexChanged.connect(self.indexChanged)
+        self._ignoreIndexChange = False
+        
+        #self.value = default
+        if 'darwin' in sys.platform: ## because MacOSX can show names that are wider than the comboBox
+            self.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToMinimumContentsLength)
+            #self.setMinimumContentsLength(10)
+        self._chosenText = None
+        self._items = OrderedDict()
+        
+        if items is not None:
+            self.setItems(items)
+            if default is not None:
+                self.setValue(default)
+    
+    def setValue(self, value):
+        """Set the selected item to the first one having the given value."""
+        text = None
+        for k,v in self._items.items():
+            if v == value:
+                text = k
+                break
+        if text is None:
+            raise ValueError(value)
+            
+        self.setText(text)
+
+    def setText(self, text):
+        """Set the selected item to the first one having the given text."""
+        ind = self.findText(text)
+        if ind == -1:
+            raise ValueError(text)
+        #self.value = value
+        self.setCurrentIndex(ind)
+       
+    def value(self):
+        """
+        If items were given as a list of strings, then return the currently 
+        selected text. If items were given as a dict, then return the value
+        corresponding to the currently selected key. If the combo list is empty,
+        return None.
+        """
+        if self.count() == 0:
+            return None
+        text = asUnicode(self.currentText())
+        return self._items[text]
+    
+    def ignoreIndexChange(func):
+        # Decorator that prevents updates to self._chosenText
+        def fn(self, *args, **kwds):
+            prev = self._ignoreIndexChange
+            self._ignoreIndexChange = True
+            try:
+                ret = func(self, *args, **kwds)
+            finally:
+                self._ignoreIndexChange = prev
+            return ret
+        return fn
+    
+    def blockIfUnchanged(func):
+        # decorator that blocks signal emission during complex operations
+        # and emits currentIndexChanged only if the value has actually
+        # changed at the end.
+        def fn(self, *args, **kwds):
+            prevVal = self.value()
+            blocked = self.signalsBlocked()
+            self.blockSignals(True)
+            try:
+                ret = func(self, *args, **kwds)
+            finally:
+                self.blockSignals(blocked)
+                
+            # only emit if the value has changed
+            if self.value() != prevVal:
+                self.currentIndexChanged.emit(self.currentIndex())
+                
+            return ret
+        return fn
+    
+    @ignoreIndexChange
+    @blockIfUnchanged
+    def setItems(self, items):
+        """
+        *items* may be a list or a dict. 
+        If a dict is given, then the keys are used to populate the combo box
+        and the values will be used for both value() and setValue().
+        """
+        prevVal = self.value()
+        
+        self.blockSignals(True)
+        try:
+            self.clear()
+            self.addItems(items)
+        finally:
+            self.blockSignals(False)
+            
+        # only emit if we were not able to re-set the original value
+        if self.value() != prevVal:
+            self.currentIndexChanged.emit(self.currentIndex())
+        
+    def items(self):
+        return self.items.copy()
+        
+    def updateList(self, items):
+        # for backward compatibility
+        return self.setItems(items)
+
+    def indexChanged(self, index):
+        # current index has changed; need to remember new 'chosen text'
+        if self._ignoreIndexChange:
+            return
+        self._chosenText = asUnicode(self.currentText())
+        
+    def setCurrentIndex(self, index):
+        QtGui.QComboBox.setCurrentIndex(self, index)
+        
+    def itemsChanged(self):
+        # try to set the value to the last one selected, if it is available.
+        if self._chosenText is not None:
+            try:
+                self.setText(self._chosenText)
+            except ValueError:
+                pass
+
+    @ignoreIndexChange
+    def insertItem(self, *args):
+        raise NotImplementedError()
+        #QtGui.QComboBox.insertItem(self, *args)
+        #self.itemsChanged()
+        
+    @ignoreIndexChange
+    def insertItems(self, *args):
+        raise NotImplementedError()
+        #QtGui.QComboBox.insertItems(self, *args)
+        #self.itemsChanged()
+    
+    @ignoreIndexChange
+    def addItem(self, *args, **kwds):
+        # Need to handle two different function signatures for QComboBox.addItem
+        try:
+            if isinstance(args[0], basestring):
+                text = args[0]
+                if len(args) == 2:
+                    value = args[1]
+                else:
+                    value = kwds.get('value', text)
+            else:
+                text = args[1]
+                if len(args) == 3:
+                    value = args[2]
+                else:
+                    value = kwds.get('value', text)
+        
+        except IndexError:
+            raise TypeError("First or second argument of addItem must be a string.")
+            
+        if text in self._items:
+            raise Exception('ComboBox already has item named "%s".' % text)
+        
+        self._items[text] = value
+        QtGui.QComboBox.addItem(self, *args)
+        self.itemsChanged()
+        
+    def setItemValue(self, name, value):
+        if name not in self._items:
+            self.addItem(name, value)
+        else:
+            self._items[name] = value
+        
+    @ignoreIndexChange
+    @blockIfUnchanged
+    def addItems(self, items):
+        if isinstance(items, list):
+            texts = items
+            items = dict([(x, x) for x in items])
+        elif isinstance(items, dict):
+            texts = list(items.keys())
+        else:
+            raise TypeError("items argument must be list or dict (got %s)." % type(items))
+        
+        for t in texts:
+            if t in self._items:
+                raise Exception('ComboBox already has item named "%s".' % t)
+                
+        
+        for k,v in items.items():
+            self._items[k] = v
+        QtGui.QComboBox.addItems(self, list(texts))
+        
+        self.itemsChanged()
+        
+    @ignoreIndexChange
+    def clear(self):
+        self._items = OrderedDict()
+        QtGui.QComboBox.clear(self)
+        self.itemsChanged()
+        
diff --git a/libs/pyqtgraph/widgets/DataFilterWidget.py b/libs/pyqtgraph/widgets/DataFilterWidget.py
new file mode 100644
index 0000000000000000000000000000000000000000..cae8be86adf49f64f1d8e520c2f5dfb565decbba
--- /dev/null
+++ b/libs/pyqtgraph/widgets/DataFilterWidget.py
@@ -0,0 +1,150 @@
+from ..Qt import QtGui, QtCore
+from .. import parametertree as ptree
+import numpy as np
+from ..pgcollections import OrderedDict
+from .. import functions as fn
+
+__all__ = ['DataFilterWidget']
+
+class DataFilterWidget(ptree.ParameterTree):
+    """
+    This class allows the user to filter multi-column data sets by specifying
+    multiple criteria
+    """
+    
+    sigFilterChanged = QtCore.Signal(object)
+    
+    def __init__(self):
+        ptree.ParameterTree.__init__(self, showHeader=False)
+        self.params = DataFilterParameter()
+        
+        self.setParameters(self.params)
+        self.params.sigTreeStateChanged.connect(self.filterChanged)
+        
+        self.setFields = self.params.setFields
+        self.filterData = self.params.filterData
+        self.describe = self.params.describe
+        
+    def filterChanged(self):
+        self.sigFilterChanged.emit(self)
+        
+    def parameters(self):
+        return self.params
+        
+        
+class DataFilterParameter(ptree.types.GroupParameter):
+    
+    sigFilterChanged = QtCore.Signal(object)
+    
+    def __init__(self):
+        self.fields = {}
+        ptree.types.GroupParameter.__init__(self, name='Data Filter', addText='Add filter..', addList=[])
+        self.sigTreeStateChanged.connect(self.filterChanged)
+    
+    def filterChanged(self):
+        self.sigFilterChanged.emit(self)
+        
+    def addNew(self, name):
+        mode = self.fields[name].get('mode', 'range')
+        if mode == 'range':
+            self.addChild(RangeFilterItem(name, self.fields[name]))
+        elif mode == 'enum':
+            self.addChild(EnumFilterItem(name, self.fields[name]))
+            
+            
+    def fieldNames(self):
+        return self.fields.keys()
+    
+    def setFields(self, fields):
+        self.fields = OrderedDict(fields)
+        names = self.fieldNames()
+        self.setAddList(names)
+    
+    def filterData(self, data):
+        if len(data) == 0:
+            return data
+        return data[self.generateMask(data)]
+    
+    def generateMask(self, data):
+        mask = np.ones(len(data), dtype=bool)
+        if len(data) == 0:
+            return mask
+        for fp in self:
+            if fp.value() is False:
+                continue
+            mask &= fp.generateMask(data, mask.copy())
+            #key, mn, mx = fp.fieldName, fp['Min'], fp['Max']
+            
+            #vals = data[key]
+            #mask &= (vals >= mn)
+            #mask &= (vals < mx)  ## Use inclusive minimum and non-inclusive maximum. This makes it easier to create non-overlapping selections
+        return mask
+    
+    def describe(self):
+        """Return a list of strings describing the currently enabled filters."""
+        desc = []
+        for fp in self:
+            if fp.value() is False:
+                continue
+            desc.append(fp.describe())
+        return desc
+
+class RangeFilterItem(ptree.types.SimpleParameter):
+    def __init__(self, name, opts):
+        self.fieldName = name
+        units = opts.get('units', '')
+        self.units = units
+        ptree.types.SimpleParameter.__init__(self, 
+            name=name, autoIncrementName=True, type='bool', value=True, removable=True, renamable=True, 
+            children=[
+                #dict(name="Field", type='list', value=name, values=fields),
+                dict(name='Min', type='float', value=0.0, suffix=units, siPrefix=True),
+                dict(name='Max', type='float', value=1.0, suffix=units, siPrefix=True),
+            ])
+            
+    def generateMask(self, data, mask):
+        vals = data[self.fieldName][mask]
+        mask[mask] = (vals >= self['Min']) & (vals < self['Max'])  ## Use inclusive minimum and non-inclusive maximum. This makes it easier to create non-overlapping selections
+        return mask
+    
+    def describe(self):
+        return "%s < %s < %s" % (fn.siFormat(self['Min'], suffix=self.units), self.fieldName, fn.siFormat(self['Max'], suffix=self.units))
+    
+class EnumFilterItem(ptree.types.SimpleParameter):
+    def __init__(self, name, opts):
+        self.fieldName = name
+        vals = opts.get('values', [])
+        childs = []
+        if isinstance(vals, list):
+            vals = OrderedDict([(v,str(v)) for v in vals])
+        for val,vname in vals.items():
+            ch = ptree.Parameter.create(name=vname, type='bool', value=True)
+            ch.maskValue = val
+            childs.append(ch)
+        ch = ptree.Parameter.create(name='(other)', type='bool', value=True)
+        ch.maskValue = '__other__'
+        childs.append(ch)
+            
+        ptree.types.SimpleParameter.__init__(self, 
+            name=name, autoIncrementName=True, type='bool', value=True, removable=True, renamable=True, 
+            children=childs)
+    
+    def generateMask(self, data, startMask):
+        vals = data[self.fieldName][startMask]
+        mask = np.ones(len(vals), dtype=bool)
+        otherMask = np.ones(len(vals), dtype=bool)
+        for c in self:
+            key = c.maskValue
+            if key == '__other__':
+                m = ~otherMask
+            else:
+                m = vals != key
+                otherMask &= m
+            if c.value() is False:
+                mask &= m
+        startMask[startMask] = mask
+        return startMask
+
+    def describe(self):
+        vals = [ch.name() for ch in self if ch.value() is True]
+        return "%s: %s" % (self.fieldName, ', '.join(vals))
\ No newline at end of file
diff --git a/libs/pyqtgraph/widgets/DataTreeWidget.py b/libs/pyqtgraph/widgets/DataTreeWidget.py
new file mode 100644
index 0000000000000000000000000000000000000000..29e603191a494b36d34fb1e15f74f203fa1a6901
--- /dev/null
+++ b/libs/pyqtgraph/widgets/DataTreeWidget.py
@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+from ..Qt import QtGui, QtCore
+from ..pgcollections import OrderedDict
+import types, traceback
+import numpy as np
+
+try:
+    import metaarray
+    HAVE_METAARRAY = True
+except:
+    HAVE_METAARRAY = False
+
+__all__ = ['DataTreeWidget']
+
+class DataTreeWidget(QtGui.QTreeWidget):
+    """
+    Widget for displaying hierarchical python data structures
+    (eg, nested dicts, lists, and arrays)
+    """
+    
+    
+    def __init__(self, parent=None, data=None):
+        QtGui.QTreeWidget.__init__(self, parent)
+        self.setVerticalScrollMode(self.ScrollPerPixel)
+        self.setData(data)
+        self.setColumnCount(3)
+        self.setHeaderLabels(['key / index', 'type', 'value'])
+        
+    def setData(self, data, hideRoot=False):
+        """data should be a dictionary."""
+        self.clear()
+        self.buildTree(data, self.invisibleRootItem(), hideRoot=hideRoot)
+        #node = self.mkNode('', data)
+        #while node.childCount() > 0:
+            #c = node.child(0)
+            #node.removeChild(c)
+            #self.invisibleRootItem().addChild(c)
+        self.expandToDepth(3)
+        self.resizeColumnToContents(0)
+        
+    def buildTree(self, data, parent, name='', hideRoot=False):
+        if hideRoot:
+            node = parent
+        else:
+            typeStr = type(data).__name__
+            if typeStr == 'instance':
+                typeStr += ": " + data.__class__.__name__
+            node = QtGui.QTreeWidgetItem([name, typeStr, ""])
+            parent.addChild(node)
+        
+        if isinstance(data, types.TracebackType):  ## convert traceback to a list of strings
+            data = list(map(str.strip, traceback.format_list(traceback.extract_tb(data))))
+        elif HAVE_METAARRAY and (hasattr(data, 'implements') and data.implements('MetaArray')):
+            data = {
+                'data': data.view(np.ndarray),
+                'meta': data.infoCopy()
+            }
+            
+        if isinstance(data, dict):
+            for k in data.keys():
+                self.buildTree(data[k], node, str(k))
+        elif isinstance(data, list) or isinstance(data, tuple):
+            for i in range(len(data)):
+                self.buildTree(data[i], node, str(i))
+        else:
+            node.setText(2, str(data))
+        
+        
+    #def mkNode(self, name, v):
+        #if type(v) is list and len(v) > 0 and isinstance(v[0], dict):
+            #inds = map(unicode, range(len(v)))
+            #v = OrderedDict(zip(inds, v))
+        #if isinstance(v, dict):
+            ##print "\nadd tree", k, v
+            #node = QtGui.QTreeWidgetItem([name])
+            #for k in v:
+                #newNode = self.mkNode(k, v[k])
+                #node.addChild(newNode)
+        #else:
+            ##print "\nadd value", k, str(v)
+            #node = QtGui.QTreeWidgetItem([unicode(name), unicode(v)])
+        #return node
+        
diff --git a/libs/pyqtgraph/widgets/FeedbackButton.py b/libs/pyqtgraph/widgets/FeedbackButton.py
new file mode 100644
index 0000000000000000000000000000000000000000..30114d4e6df78a43562322dbf4aa03afd4ea7c96
--- /dev/null
+++ b/libs/pyqtgraph/widgets/FeedbackButton.py
@@ -0,0 +1,163 @@
+# -*- coding: utf-8 -*-
+from ..Qt import QtCore, QtGui
+
+__all__ = ['FeedbackButton']
+
+class FeedbackButton(QtGui.QPushButton):
+    """
+    QPushButton which flashes success/failure indication for slow or asynchronous procedures.
+    """
+    
+    
+    ### For thread-safetyness
+    sigCallSuccess = QtCore.Signal(object, object, object)
+    sigCallFailure = QtCore.Signal(object, object, object)
+    sigCallProcess = QtCore.Signal(object, object, object)
+    sigReset = QtCore.Signal()
+    
+    def __init__(self, *args):
+        QtGui.QPushButton.__init__(self, *args)
+        self.origStyle = None
+        self.origText = self.text()
+        self.origStyle = self.styleSheet()
+        self.origTip = self.toolTip()
+        self.limitedTime = True
+        
+        
+        #self.textTimer = QtCore.QTimer()
+        #self.tipTimer = QtCore.QTimer()
+        #self.textTimer.timeout.connect(self.setText)
+        #self.tipTimer.timeout.connect(self.setToolTip)
+        
+        self.sigCallSuccess.connect(self.success)
+        self.sigCallFailure.connect(self.failure)
+        self.sigCallProcess.connect(self.processing)
+        self.sigReset.connect(self.reset)
+        
+
+    def feedback(self, success, message=None, tip="", limitedTime=True):
+        """Calls success() or failure(). If you want the message to be displayed until the user takes an action, set limitedTime to False. Then call self.reset() after the desired action.Threadsafe."""
+        if success:
+            self.success(message, tip, limitedTime=limitedTime)
+        else:
+            self.failure(message, tip, limitedTime=limitedTime)
+    
+    def success(self, message=None, tip="", limitedTime=True):
+        """Displays specified message on button and flashes button green to let user know action was successful. If you want the success to be displayed until the user takes an action, set limitedTime to False. Then call self.reset() after the desired action. Threadsafe."""
+        isGuiThread = QtCore.QThread.currentThread() == QtCore.QCoreApplication.instance().thread()
+        if isGuiThread:
+            self.setEnabled(True)
+            #print "success"
+            self.startBlink("#0F0", message, tip, limitedTime=limitedTime)
+        else:
+            self.sigCallSuccess.emit(message, tip, limitedTime)
+            
+    def failure(self, message=None, tip="", limitedTime=True):
+        """Displays specified message on button and flashes button red to let user know there was an error. If you want the error to be displayed until the user takes an action, set limitedTime to False. Then call self.reset() after the desired action. Threadsafe. """
+        isGuiThread = QtCore.QThread.currentThread() == QtCore.QCoreApplication.instance().thread()
+        if isGuiThread:
+            self.setEnabled(True)
+            #print "fail"
+            self.startBlink("#F00", message, tip, limitedTime=limitedTime)
+        else:
+            self.sigCallFailure.emit(message, tip, limitedTime)
+
+    def processing(self, message="Processing..", tip="", processEvents=True):
+        """Displays specified message on button to let user know the action is in progress. Threadsafe. """
+        isGuiThread = QtCore.QThread.currentThread() == QtCore.QCoreApplication.instance().thread()
+        if isGuiThread:
+            self.setEnabled(False)
+            self.setText(message, temporary=True)
+            self.setToolTip(tip, temporary=True)
+            if processEvents:
+                QtGui.QApplication.processEvents()
+        else:
+            self.sigCallProcess.emit(message, tip, processEvents)
+           
+                
+    def reset(self):
+        """Resets the button to its original text and style. Threadsafe."""
+        isGuiThread = QtCore.QThread.currentThread() == QtCore.QCoreApplication.instance().thread()
+        if isGuiThread:
+            self.limitedTime = True
+            self.setText()
+            self.setToolTip()
+            self.setStyleSheet()
+        else:
+            self.sigReset.emit()
+        
+    def startBlink(self, color, message=None, tip="", limitedTime=True):
+        #if self.origStyle is None:
+            #self.origStyle = self.styleSheet()
+            #self.origText = self.text()
+        self.setFixedHeight(self.height())
+        
+        if message is not None:
+            self.setText(message, temporary=True)
+        self.setToolTip(tip, temporary=True)
+        self.count = 0
+        #self.indStyle = "QPushButton {border: 2px solid %s; border-radius: 5px}" % color
+        self.indStyle = "QPushButton {background-color: %s}" % color
+        self.limitedTime = limitedTime
+        self.borderOn()
+        if limitedTime:
+            QtCore.QTimer.singleShot(2000, self.setText)
+            QtCore.QTimer.singleShot(10000, self.setToolTip)
+
+    def borderOn(self):
+        self.setStyleSheet(self.indStyle, temporary=True)
+        if self.limitedTime or self.count <=2:
+            QtCore.QTimer.singleShot(100, self.borderOff)
+        
+            
+    def borderOff(self):
+        self.setStyleSheet()
+        self.count += 1
+        if self.count >= 2:
+            if self.limitedTime:
+                return
+        QtCore.QTimer.singleShot(30, self.borderOn)
+        
+            
+    def setText(self, text=None, temporary=False):
+        if text is None:
+            text = self.origText
+        #print text
+        QtGui.QPushButton.setText(self, text)
+        if not temporary:
+            self.origText = text
+
+    def setToolTip(self, text=None, temporary=False):
+        if text is None:
+            text = self.origTip
+        QtGui.QPushButton.setToolTip(self, text)
+        if not temporary:
+            self.origTip = text
+
+    def setStyleSheet(self, style=None, temporary=False):
+        if style is None:
+            style = self.origStyle
+        QtGui.QPushButton.setStyleSheet(self, style)
+        if not temporary:
+            self.origStyle = style
+
+
+if __name__ == '__main__':
+    import time
+    app = QtGui.QApplication([])
+    win = QtGui.QMainWindow()
+    btn = FeedbackButton("Button")
+    fail = True
+    def click():
+        btn.processing("Hold on..")
+        time.sleep(2.0)
+        
+        global fail
+        fail = not fail
+        if fail:
+            btn.failure(message="FAIL.", tip="There was a failure. Get over it.")
+        else:
+            btn.success(message="Bueno!")
+    btn.clicked.connect(click)
+    win.setCentralWidget(btn)
+    win.show()
\ No newline at end of file
diff --git a/libs/pyqtgraph/widgets/FileDialog.py b/libs/pyqtgraph/widgets/FileDialog.py
new file mode 100644
index 0000000000000000000000000000000000000000..faa0994cf274ab9433074c8d2c5bf96c031b19bf
--- /dev/null
+++ b/libs/pyqtgraph/widgets/FileDialog.py
@@ -0,0 +1,14 @@
+from ..Qt import QtGui, QtCore
+import sys
+
+__all__ = ['FileDialog']
+
+class FileDialog(QtGui.QFileDialog):
+    ## Compatibility fix for OSX:
+    ## For some reason the native dialog doesn't show up when you set AcceptMode to AcceptSave on OS X, so we don't use the native dialog    
+    
+    def __init__(self, *args):
+        QtGui.QFileDialog.__init__(self, *args)
+        
+        if sys.platform == 'darwin': 
+            self.setOption(QtGui.QFileDialog.DontUseNativeDialog)
\ No newline at end of file
diff --git a/libs/pyqtgraph/widgets/GradientWidget.py b/libs/pyqtgraph/widgets/GradientWidget.py
new file mode 100644
index 0000000000000000000000000000000000000000..ce0cbeb92aed392da4ad8f0b8f39cff71d44d826
--- /dev/null
+++ b/libs/pyqtgraph/widgets/GradientWidget.py
@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+from ..Qt import QtGui, QtCore
+from .GraphicsView import GraphicsView
+from ..graphicsItems.GradientEditorItem import GradientEditorItem
+import weakref
+import numpy as np
+
+__all__ = ['GradientWidget']
+
+
+class GradientWidget(GraphicsView):
+    """
+    Widget displaying an editable color gradient. The user may add, move, recolor,
+    or remove colors from the gradient. Additionally, a context menu allows the 
+    user to select from pre-defined gradients.
+    """
+    sigGradientChanged = QtCore.Signal(object)
+    sigGradientChangeFinished = QtCore.Signal(object)
+    
+    def __init__(self, parent=None, orientation='bottom',  *args, **kargs):
+        """
+        The *orientation* argument may be 'bottom', 'top', 'left', or 'right' 
+        indicating whether the gradient is displayed horizontally (top, bottom)
+        or vertically (left, right) and on what side of the gradient the editable 
+        ticks will appear.
+        
+        All other arguments are passed to 
+        :func:`GradientEditorItem.__init__ <pyqtgraph.GradientEditorItem.__init__>`.
+        
+        Note: For convenience, this class wraps methods from 
+        :class:`GradientEditorItem <pyqtgraph.GradientEditorItem>`.
+        """
+        GraphicsView.__init__(self, parent, useOpenGL=False, background=None)
+        self.maxDim = 31
+        kargs['tickPen'] = 'k'
+        self.item = GradientEditorItem(*args, **kargs)
+        self.item.sigGradientChanged.connect(self.sigGradientChanged)
+        self.item.sigGradientChangeFinished.connect(self.sigGradientChangeFinished)
+        self.setCentralItem(self.item)
+        self.setOrientation(orientation)
+        self.setCacheMode(self.CacheNone)
+        self.setRenderHints(QtGui.QPainter.Antialiasing | QtGui.QPainter.TextAntialiasing)
+        self.setFrameStyle(QtGui.QFrame.NoFrame | QtGui.QFrame.Plain)
+        #self.setBackgroundRole(QtGui.QPalette.NoRole)
+        #self.setBackgroundBrush(QtGui.QBrush(QtCore.Qt.NoBrush))
+        #self.setAutoFillBackground(False)
+        #self.setAttribute(QtCore.Qt.WA_PaintOnScreen, False)
+        #self.setAttribute(QtCore.Qt.WA_OpaquePaintEvent, True)
+
+    def setOrientation(self, ort):
+        """Set the orientation of the widget. May be one of 'bottom', 'top', 
+        'left', or 'right'."""
+        self.item.setOrientation(ort)
+        self.orientation = ort
+        self.setMaxDim()
+        
+    def setMaxDim(self, mx=None):
+        if mx is None:
+            mx = self.maxDim
+        else:
+            self.maxDim = mx
+            
+        if self.orientation in ['bottom', 'top']:
+            self.setFixedHeight(mx)
+            self.setMaximumWidth(16777215)
+        else:
+            self.setFixedWidth(mx)
+            self.setMaximumHeight(16777215)
+        
+    def __getattr__(self, attr):
+        ### wrap methods from GradientEditorItem
+        return getattr(self.item, attr)
+
+
diff --git a/libs/pyqtgraph/widgets/GraphicsLayoutWidget.py b/libs/pyqtgraph/widgets/GraphicsLayoutWidget.py
new file mode 100644
index 0000000000000000000000000000000000000000..ec7b9e0d763d3f3512492812c3d4a1e0abf9ff52
--- /dev/null
+++ b/libs/pyqtgraph/widgets/GraphicsLayoutWidget.py
@@ -0,0 +1,30 @@
+from ..Qt import QtGui
+from ..graphicsItems.GraphicsLayout import GraphicsLayout
+from .GraphicsView import GraphicsView
+
+__all__ = ['GraphicsLayoutWidget']
+class GraphicsLayoutWidget(GraphicsView):
+    """
+    Convenience class consisting of a :class:`GraphicsView 
+    <pyqtgraph.GraphicsView>` with a single :class:`GraphicsLayout
+    <pyqtgraph.GraphicsLayout>` as its central item. 
+
+    This class wraps several methods from its internal GraphicsLayout:
+    :func:`nextRow <pyqtgraph.GraphicsLayout.nextRow>`
+    :func:`nextColumn <pyqtgraph.GraphicsLayout.nextColumn>`
+    :func:`addPlot <pyqtgraph.GraphicsLayout.addPlot>`
+    :func:`addViewBox <pyqtgraph.GraphicsLayout.addViewBox>`
+    :func:`addItem <pyqtgraph.GraphicsLayout.addItem>`
+    :func:`getItem <pyqtgraph.GraphicsLayout.getItem>`
+    :func:`addLabel <pyqtgraph.GraphicsLayout.addLabel>`
+    :func:`addLayout <pyqtgraph.GraphicsLayout.addLayout>`
+    :func:`removeItem <pyqtgraph.GraphicsLayout.removeItem>`
+    :func:`itemIndex <pyqtgraph.GraphicsLayout.itemIndex>`
+    :func:`clear <pyqtgraph.GraphicsLayout.clear>`
+    """
+    def __init__(self, parent=None, **kargs):
+        GraphicsView.__init__(self, parent)
+        self.ci = GraphicsLayout(**kargs)
+        for n in ['nextRow', 'nextCol', 'nextColumn', 'addPlot', 'addViewBox', 'addItem', 'getItem', 'addLayout', 'addLabel', 'removeItem', 'itemIndex', 'clear']:
+            setattr(self, n, getattr(self.ci, n))
+        self.setCentralItem(self.ci)
diff --git a/libs/pyqtgraph/widgets/GraphicsView.py b/libs/pyqtgraph/widgets/GraphicsView.py
new file mode 100644
index 0000000000000000000000000000000000000000..4062be94fa36ae6b9e3361ff6cea09fe43e5854c
--- /dev/null
+++ b/libs/pyqtgraph/widgets/GraphicsView.py
@@ -0,0 +1,399 @@
+# -*- coding: utf-8 -*-
+"""
+GraphicsView.py -   Extension of QGraphicsView
+Copyright 2010  Luke Campagnola
+Distributed under MIT/X11 license. See license.txt for more infomation.
+"""
+
+from ..Qt import QtCore, QtGui, USE_PYSIDE
+
+try:
+    from ..Qt import QtOpenGL
+    HAVE_OPENGL = True
+except ImportError:
+    HAVE_OPENGL = False
+
+from ..Point import Point
+import sys, os
+from .FileDialog import FileDialog
+from ..GraphicsScene import GraphicsScene
+import numpy as np
+from .. import functions as fn
+from .. import debug as debug
+from .. import getConfigOption
+
+__all__ = ['GraphicsView']
+
+class GraphicsView(QtGui.QGraphicsView):
+    """Re-implementation of QGraphicsView that removes scrollbars and allows unambiguous control of the 
+    viewed coordinate range. Also automatically creates a GraphicsScene and a central QGraphicsWidget
+    that is automatically scaled to the full view geometry.
+    
+    This widget is the basis for :class:`PlotWidget <pyqtgraph.PlotWidget>`, 
+    :class:`GraphicsLayoutWidget <pyqtgraph.GraphicsLayoutWidget>`, and the view widget in
+    :class:`ImageView <pyqtgraph.ImageView>`.
+    
+    By default, the view coordinate system matches the widget's pixel coordinates and 
+    automatically updates when the view is resized. This can be overridden by setting 
+    autoPixelRange=False. The exact visible range can be set with setRange().
+    
+    The view can be panned using the middle mouse button and scaled using the right mouse button if
+    enabled via enableMouse()  (but ordinarily, we use ViewBox for this functionality)."""
+    
+    sigDeviceRangeChanged = QtCore.Signal(object, object)
+    sigDeviceTransformChanged = QtCore.Signal(object)
+    sigMouseReleased = QtCore.Signal(object)
+    sigSceneMouseMoved = QtCore.Signal(object)
+    #sigRegionChanged = QtCore.Signal(object)
+    sigScaleChanged = QtCore.Signal(object)
+    lastFileDir = None
+    
+    def __init__(self, parent=None, useOpenGL=None, background='default'):
+        """
+        ==============  ============================================================
+        **Arguments:**
+        parent          Optional parent widget
+        useOpenGL       If True, the GraphicsView will use OpenGL to do all of its
+                        rendering. This can improve performance on some systems,
+                        but may also introduce bugs (the combination of 
+                        QGraphicsView and QGLWidget is still an 'experimental' 
+                        feature of Qt)
+        background      Set the background color of the GraphicsView. Accepts any
+                        single argument accepted by 
+                        :func:`mkColor <pyqtgraph.mkColor>`. By 
+                        default, the background color is determined using the
+                        'backgroundColor' configuration option (see 
+                        :func:`setConfigOption <pyqtgraph.setConfigOption>`.
+        ==============  ============================================================
+        """
+        
+        self.closed = False
+        
+        QtGui.QGraphicsView.__init__(self, parent)
+        
+        # This connects a cleanup function to QApplication.aboutToQuit. It is
+        # called from here because we have no good way to react when the
+        # QApplication is created by the user.
+        # See pyqtgraph.__init__.py
+        from .. import _connectCleanup
+        _connectCleanup()
+        
+        if useOpenGL is None:
+            useOpenGL = getConfigOption('useOpenGL')
+        
+        self.useOpenGL(useOpenGL)
+        
+        self.setCacheMode(self.CacheBackground)
+        
+        ## This might help, but it's probably dangerous in the general case..
+        #self.setOptimizationFlag(self.DontSavePainterState, True)
+        
+        self.setBackgroundRole(QtGui.QPalette.NoRole)
+        self.setBackground(background)
+        
+        self.setFocusPolicy(QtCore.Qt.StrongFocus)
+        self.setFrameShape(QtGui.QFrame.NoFrame)
+        self.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+        self.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+        self.setTransformationAnchor(QtGui.QGraphicsView.NoAnchor)
+        self.setResizeAnchor(QtGui.QGraphicsView.AnchorViewCenter)
+        self.setViewportUpdateMode(QtGui.QGraphicsView.MinimalViewportUpdate)
+        
+        
+        self.lockedViewports = []
+        self.lastMousePos = None
+        self.setMouseTracking(True)
+        self.aspectLocked = False
+        self.range = QtCore.QRectF(0, 0, 1, 1)
+        self.autoPixelRange = True
+        self.currentItem = None
+        self.clearMouse()
+        self.updateMatrix()
+        # GraphicsScene must have parent or expect crashes!
+        self.sceneObj = GraphicsScene(parent=self)
+        self.setScene(self.sceneObj)
+        
+        ## Workaround for PySide crash
+        ## This ensures that the scene will outlive the view.
+        if USE_PYSIDE:
+            self.sceneObj._view_ref_workaround = self
+        
+        ## by default we set up a central widget with a grid layout.
+        ## this can be replaced if needed.
+        self.centralWidget = None
+        self.setCentralItem(QtGui.QGraphicsWidget())
+        self.centralLayout = QtGui.QGraphicsGridLayout()
+        self.centralWidget.setLayout(self.centralLayout)
+        
+        self.mouseEnabled = False
+        self.scaleCenter = False  ## should scaling center around view center (True) or mouse click (False)
+        self.clickAccepted = False
+        
+    def setAntialiasing(self, aa):
+        """Enable or disable default antialiasing.
+        Note that this will only affect items that do not specify their own antialiasing options."""
+        if aa:
+            self.setRenderHints(self.renderHints() | QtGui.QPainter.Antialiasing)
+        else:
+            self.setRenderHints(self.renderHints() & ~QtGui.QPainter.Antialiasing)
+        
+    def setBackground(self, background):
+        """
+        Set the background color of the GraphicsView.
+        To use the defaults specified py pyqtgraph.setConfigOption, use background='default'.
+        To make the background transparent, use background=None.
+        """
+        self._background = background
+        if background == 'default':
+            background = getConfigOption('background')
+        brush = fn.mkBrush(background)
+        self.setBackgroundBrush(brush)
+    
+    def paintEvent(self, ev):
+        self.scene().prepareForPaint()
+        return QtGui.QGraphicsView.paintEvent(self, ev)
+    
+    def render(self, *args, **kwds):
+        self.scene().prepareForPaint()
+        return QtGui.QGraphicsView.render(self, *args, **kwds)
+        
+    
+    def close(self):
+        self.centralWidget = None
+        self.scene().clear()
+        self.currentItem = None
+        self.sceneObj = None
+        self.closed = True
+        self.setViewport(None)
+        
+    def useOpenGL(self, b=True):
+        if b:
+            if not HAVE_OPENGL:
+                raise Exception("Requested to use OpenGL with QGraphicsView, but QtOpenGL module is not available.")
+            v = QtOpenGL.QGLWidget()
+        else:
+            v = QtGui.QWidget()
+            
+        self.setViewport(v)
+            
+    def keyPressEvent(self, ev):
+        self.scene().keyPressEvent(ev)  ## bypass view, hand event directly to scene
+                                        ## (view likes to eat arrow key events)
+        
+        
+    def setCentralItem(self, item):
+        return self.setCentralWidget(item)
+        
+    def setCentralWidget(self, item):
+        """Sets a QGraphicsWidget to automatically fill the entire view (the item will be automatically
+        resize whenever the GraphicsView is resized)."""
+        if self.centralWidget is not None:
+            self.scene().removeItem(self.centralWidget)
+        self.centralWidget = item
+        if item is not None:
+            self.sceneObj.addItem(item)
+            self.resizeEvent(None)
+        
+    def addItem(self, *args):
+        return self.scene().addItem(*args)
+        
+    def removeItem(self, *args):
+        return self.scene().removeItem(*args)
+        
+    def enableMouse(self, b=True):
+        self.mouseEnabled = b
+        self.autoPixelRange = (not b)
+        
+    def clearMouse(self):
+        self.mouseTrail = []
+        self.lastButtonReleased = None
+    
+    def resizeEvent(self, ev):
+        if self.closed:
+            return
+        if self.autoPixelRange:
+            self.range = QtCore.QRectF(0, 0, self.size().width(), self.size().height())
+        GraphicsView.setRange(self, self.range, padding=0, disableAutoPixel=False)  ## we do this because some subclasses like to redefine setRange in an incompatible way.
+        self.updateMatrix()
+    
+    def updateMatrix(self, propagate=True):
+        self.setSceneRect(self.range)
+        if self.autoPixelRange:
+            self.resetTransform()
+        else:
+            if self.aspectLocked:
+                self.fitInView(self.range, QtCore.Qt.KeepAspectRatio)
+            else:
+                self.fitInView(self.range, QtCore.Qt.IgnoreAspectRatio)
+            
+        self.sigDeviceRangeChanged.emit(self, self.range)
+        self.sigDeviceTransformChanged.emit(self)
+        
+        if propagate:
+            for v in self.lockedViewports:
+                v.setXRange(self.range, padding=0)
+        
+    def viewRect(self):
+        """Return the boundaries of the view in scene coordinates"""
+        ## easier to just return self.range ?
+        r = QtCore.QRectF(self.rect())
+        return self.viewportTransform().inverted()[0].mapRect(r)
+
+    def visibleRange(self):
+        ## for backward compatibility
+        return self.viewRect()
+
+    def translate(self, dx, dy):
+        self.range.adjust(dx, dy, dx, dy)
+        self.updateMatrix()
+    
+    def scale(self, sx, sy, center=None):
+        scale = [sx, sy]
+        if self.aspectLocked:
+            scale[0] = scale[1]
+        
+        if self.scaleCenter:
+            center = None
+        if center is None:
+            center = self.range.center()
+            
+        w = self.range.width()  / scale[0]
+        h = self.range.height() / scale[1]
+        self.range = QtCore.QRectF(center.x() - (center.x()-self.range.left()) / scale[0], center.y() - (center.y()-self.range.top())  /scale[1], w, h)
+        
+        
+        self.updateMatrix()
+        self.sigScaleChanged.emit(self)
+
+    def setRange(self, newRect=None, padding=0.05, lockAspect=None, propagate=True, disableAutoPixel=True):
+        if disableAutoPixel:
+            self.autoPixelRange=False
+        if newRect is None:
+            newRect = self.visibleRange()
+            padding = 0
+        
+        padding = Point(padding)
+        newRect = QtCore.QRectF(newRect)
+        pw = newRect.width() * padding[0]
+        ph = newRect.height() * padding[1]
+        newRect = newRect.adjusted(-pw, -ph, pw, ph)
+        scaleChanged = False
+        if self.range.width() != newRect.width() or self.range.height() != newRect.height():
+            scaleChanged = True
+        self.range = newRect
+        #print "New Range:", self.range
+        if self.centralWidget is not None:
+            self.centralWidget.setGeometry(self.range)
+        self.updateMatrix(propagate)
+        if scaleChanged:
+            self.sigScaleChanged.emit(self)
+
+    def scaleToImage(self, image):
+        """Scales such that pixels in image are the same size as screen pixels. This may result in a significant performance increase."""
+        pxSize = image.pixelSize()
+        image.setPxMode(True)
+        try:
+            self.sigScaleChanged.disconnect(image.setScaledMode)
+        except (TypeError, RuntimeError):
+            pass
+        tl = image.sceneBoundingRect().topLeft()
+        w = self.size().width() * pxSize[0]
+        h = self.size().height() * pxSize[1]
+        range = QtCore.QRectF(tl.x(), tl.y(), w, h)
+        GraphicsView.setRange(self, range, padding=0)
+        self.sigScaleChanged.connect(image.setScaledMode)
+        
+        
+        
+    def lockXRange(self, v1):
+        if not v1 in self.lockedViewports:
+            self.lockedViewports.append(v1)
+        
+    def setXRange(self, r, padding=0.05):
+        r1 = QtCore.QRectF(self.range)
+        r1.setLeft(r.left())
+        r1.setRight(r.right())
+        GraphicsView.setRange(self, r1, padding=[padding, 0], propagate=False)
+        
+    def setYRange(self, r, padding=0.05):
+        r1 = QtCore.QRectF(self.range)
+        r1.setTop(r.top())
+        r1.setBottom(r.bottom())
+        GraphicsView.setRange(self, r1, padding=[0, padding], propagate=False)
+        
+    def wheelEvent(self, ev):
+        QtGui.QGraphicsView.wheelEvent(self, ev)
+        if not self.mouseEnabled:
+            return
+        sc = 1.001 ** ev.delta()
+        #self.scale *= sc
+        #self.updateMatrix()
+        self.scale(sc, sc)
+        
+    def setAspectLocked(self, s):
+        self.aspectLocked = s
+        
+    def leaveEvent(self, ev):
+        self.scene().leaveEvent(ev)  ## inform scene when mouse leaves
+        
+    def mousePressEvent(self, ev):
+        QtGui.QGraphicsView.mousePressEvent(self, ev)
+        
+
+        if not self.mouseEnabled:
+            return
+        self.lastMousePos = Point(ev.pos())
+        self.mousePressPos = ev.pos()
+        self.clickAccepted = ev.isAccepted()
+        if not self.clickAccepted:
+            self.scene().clearSelection()
+        return   ## Everything below disabled for now..
+        
+    def mouseReleaseEvent(self, ev):
+        QtGui.QGraphicsView.mouseReleaseEvent(self, ev)
+        if not self.mouseEnabled:
+            return 
+        self.sigMouseReleased.emit(ev)
+        self.lastButtonReleased = ev.button()
+        return   ## Everything below disabled for now..
+        
+    def mouseMoveEvent(self, ev):
+        if self.lastMousePos is None:
+            self.lastMousePos = Point(ev.pos())
+        delta = Point(ev.pos() - self.lastMousePos)
+        self.lastMousePos = Point(ev.pos())
+
+        QtGui.QGraphicsView.mouseMoveEvent(self, ev)
+        if not self.mouseEnabled:
+            return
+        self.sigSceneMouseMoved.emit(self.mapToScene(ev.pos()))
+            
+        if self.clickAccepted:  ## Ignore event if an item in the scene has already claimed it.
+            return
+        
+        if ev.buttons() == QtCore.Qt.RightButton:
+            delta = Point(np.clip(delta[0], -50, 50), np.clip(-delta[1], -50, 50))
+            scale = 1.01 ** delta
+            self.scale(scale[0], scale[1], center=self.mapToScene(self.mousePressPos))
+            self.sigDeviceRangeChanged.emit(self, self.range)
+
+        elif ev.buttons() in [QtCore.Qt.MidButton, QtCore.Qt.LeftButton]:  ## Allow panning by left or mid button.
+            px = self.pixelSize()
+            tr = -delta * px
+            
+            self.translate(tr[0], tr[1])
+            self.sigDeviceRangeChanged.emit(self, self.range)
+        
+    def pixelSize(self):
+        """Return vector with the length and width of one view pixel in scene coordinates"""
+        p0 = Point(0,0)
+        p1 = Point(1,1)
+        tr = self.transform().inverted()[0]
+        p01 = tr.map(p0)
+        p11 = tr.map(p1)
+        return Point(p11 - p01)
+        
+    def dragEnterEvent(self, ev):
+        ev.ignore()  ## not sure why, but for some reason this class likes to consume drag events
+        
+
diff --git a/libs/pyqtgraph/widgets/HistogramLUTWidget.py b/libs/pyqtgraph/widgets/HistogramLUTWidget.py
new file mode 100644
index 0000000000000000000000000000000000000000..9aec837c1ef3ea42f13dd04c97c6dca2ea127938
--- /dev/null
+++ b/libs/pyqtgraph/widgets/HistogramLUTWidget.py
@@ -0,0 +1,33 @@
+"""
+Widget displaying an image histogram along with gradient editor. Can be used to adjust the appearance of images.
+This is a wrapper around HistogramLUTItem
+"""
+
+from ..Qt import QtGui, QtCore
+from .GraphicsView import GraphicsView
+from ..graphicsItems.HistogramLUTItem import HistogramLUTItem
+
+__all__ = ['HistogramLUTWidget']
+
+
+class HistogramLUTWidget(GraphicsView):
+    
+    def __init__(self, parent=None,  *args, **kargs):
+        background = kargs.get('background', 'default')
+        GraphicsView.__init__(self, parent, useOpenGL=False, background=background)
+        self.item = HistogramLUTItem(*args, **kargs)
+        self.setCentralItem(self.item)
+        self.setSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding)
+        self.setMinimumWidth(95)
+        
+
+    def sizeHint(self):
+        return QtCore.QSize(115, 200)
+    
+    
+
+    def __getattr__(self, attr):
+        return getattr(self.item, attr)
+
+
+
diff --git a/libs/pyqtgraph/widgets/JoystickButton.py b/libs/pyqtgraph/widgets/JoystickButton.py
new file mode 100644
index 0000000000000000000000000000000000000000..6f73c8dcee2de495558bce7429e93559603c4927
--- /dev/null
+++ b/libs/pyqtgraph/widgets/JoystickButton.py
@@ -0,0 +1,95 @@
+from ..Qt import QtGui, QtCore
+
+
+__all__ = ['JoystickButton']
+
+class JoystickButton(QtGui.QPushButton):
+    sigStateChanged = QtCore.Signal(object, object)  ## self, state
+    
+    def __init__(self, parent=None):
+        QtGui.QPushButton.__init__(self, parent)
+        self.radius = 200
+        self.setCheckable(True)
+        self.state = None
+        self.setState(0,0)
+        self.setFixedWidth(50)
+        self.setFixedHeight(50)
+        
+        
+    def mousePressEvent(self, ev):
+        self.setChecked(True)
+        self.pressPos = ev.pos()
+        ev.accept()
+        
+    def mouseMoveEvent(self, ev):
+        dif = ev.pos()-self.pressPos
+        self.setState(dif.x(), -dif.y())
+        
+    def mouseReleaseEvent(self, ev):
+        self.setChecked(False)
+        self.setState(0,0)
+        
+    def wheelEvent(self, ev):
+        ev.accept()
+        
+        
+    def doubleClickEvent(self, ev):
+        ev.accept()
+        
+    def getState(self):
+        return self.state
+        
+    def setState(self, *xy):
+        xy = list(xy)
+        d = (xy[0]**2 + xy[1]**2)**0.5
+        nxy = [0,0]
+        for i in [0,1]:
+            if xy[i] == 0:
+                nxy[i] = 0
+            else:
+                nxy[i] = xy[i]/d
+        
+        if d > self.radius:
+            d = self.radius
+        d = (d/self.radius)**2
+        xy = [nxy[0]*d, nxy[1]*d]
+        
+        w2 = self.width()/2.
+        h2 = self.height()/2
+        self.spotPos = QtCore.QPoint(w2*(1+xy[0]), h2*(1-xy[1]))
+        self.update()
+        if self.state == xy:
+            return
+        self.state = xy
+        self.sigStateChanged.emit(self, self.state)
+        
+    def paintEvent(self, ev):
+        QtGui.QPushButton.paintEvent(self, ev)
+        p = QtGui.QPainter(self)
+        p.setBrush(QtGui.QBrush(QtGui.QColor(0,0,0)))
+        p.drawEllipse(self.spotPos.x()-3,self.spotPos.y()-3,6,6)
+        
+    def resizeEvent(self, ev):
+        self.setState(*self.state)
+        QtGui.QPushButton.resizeEvent(self, ev)
+        
+        
+        
+if __name__ == '__main__':
+    app = QtGui.QApplication([])
+    w = QtGui.QMainWindow()
+    b = JoystickButton()
+    w.setCentralWidget(b)
+    w.show()
+    w.resize(100, 100)
+    
+    def fn(b, s):
+        print("state changed:", s)
+        
+    b.sigStateChanged.connect(fn)
+        
+    ## Start Qt event loop unless running in interactive mode.
+    import sys
+    if sys.flags.interactive != 1:
+        app.exec_()
+        
\ No newline at end of file
diff --git a/libs/pyqtgraph/widgets/LayoutWidget.py b/libs/pyqtgraph/widgets/LayoutWidget.py
new file mode 100644
index 0000000000000000000000000000000000000000..65d04d3fb0db3b9ece40cfaa2fa41accdc7c361d
--- /dev/null
+++ b/libs/pyqtgraph/widgets/LayoutWidget.py
@@ -0,0 +1,101 @@
+from ..Qt import QtGui, QtCore
+
+__all__ = ['LayoutWidget']
+class LayoutWidget(QtGui.QWidget):
+    """
+    Convenience class used for laying out QWidgets in a grid.
+    (It's just a little less effort to use than QGridLayout)
+    """
+
+    def __init__(self, parent=None):
+        QtGui.QWidget.__init__(self, parent)
+        self.layout = QtGui.QGridLayout()
+        self.setLayout(self.layout)
+        self.items = {}
+        self.rows = {}
+        self.currentRow = 0
+        self.currentCol = 0
+    
+    def nextRow(self):
+        """Advance to next row for automatic widget placement"""
+        self.currentRow += 1
+        self.currentCol = 0
+        
+    def nextColumn(self, colspan=1):
+        """Advance to next column, while returning the current column number 
+        (generally only for internal use--called by addWidget)"""
+        self.currentCol += colspan
+        return self.currentCol-colspan
+        
+    def nextCol(self, *args, **kargs):
+        """Alias of nextColumn"""
+        return self.nextColumn(*args, **kargs)
+        
+        
+    def addLabel(self, text=' ', row=None, col=None, rowspan=1, colspan=1, **kargs):
+        """
+        Create a QLabel with *text* and place it in the next available cell (or in the cell specified)
+        All extra keyword arguments are passed to QLabel().
+        Returns the created widget.
+        """
+        text = QtGui.QLabel(text, **kargs)
+        self.addItem(text, row, col, rowspan, colspan)
+        return text
+        
+    def addLayout(self, row=None, col=None, rowspan=1, colspan=1, **kargs):
+        """
+        Create an empty LayoutWidget and place it in the next available cell (or in the cell specified)
+        All extra keyword arguments are passed to :func:`LayoutWidget.__init__ <pyqtgraph.LayoutWidget.__init__>`
+        Returns the created widget.
+        """
+        layout = LayoutWidget(**kargs)
+        self.addItem(layout, row, col, rowspan, colspan)
+        return layout
+        
+    def addWidget(self, item, row=None, col=None, rowspan=1, colspan=1):
+        """
+        Add a widget to the layout and place it in the next available cell (or in the cell specified).
+        """
+        if row == 'next':
+            self.nextRow()
+            row = self.currentRow
+        elif row is None:
+            row = self.currentRow
+            
+        
+        if col is None:
+            col = self.nextCol(colspan)
+            
+        if row not in self.rows:
+            self.rows[row] = {}
+        self.rows[row][col] = item
+        self.items[item] = (row, col)
+        
+        self.layout.addWidget(item, row, col, rowspan, colspan)
+
+    def getWidget(self, row, col):
+        """Return the widget in (*row*, *col*)"""
+        return self.row[row][col]
+
+    #def itemIndex(self, item):
+        #for i in range(self.layout.count()):
+            #if self.layout.itemAt(i).graphicsItem() is item:
+                #return i
+        #raise Exception("Could not determine index of item " + str(item))
+    
+    #def removeItem(self, item):
+        #"""Remove *item* from the layout."""
+        #ind = self.itemIndex(item)
+        #self.layout.removeAt(ind)
+        #self.scene().removeItem(item)
+        #r,c = self.items[item]
+        #del self.items[item]
+        #del self.rows[r][c]
+        #self.update()
+    
+    #def clear(self):
+        #items = []
+        #for i in list(self.items.keys()):
+            #self.removeItem(i)
+
+
diff --git a/libs/pyqtgraph/widgets/MatplotlibWidget.py b/libs/pyqtgraph/widgets/MatplotlibWidget.py
new file mode 100644
index 0000000000000000000000000000000000000000..3de063fc08544a50cc81d1571e232bafb7cc970f
--- /dev/null
+++ b/libs/pyqtgraph/widgets/MatplotlibWidget.py
@@ -0,0 +1,46 @@
+from ..Qt import QtGui, QtCore, USE_PYSIDE, USE_PYQT5
+import matplotlib
+
+if not USE_PYQT5:
+    if USE_PYSIDE:
+        matplotlib.rcParams['backend.qt4']='PySide'
+
+    from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas
+    from matplotlib.backends.backend_qt4agg import NavigationToolbar2QTAgg as NavigationToolbar
+else:
+    from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
+    from matplotlib.backends.backend_qt5agg import NavigationToolbar2QT as NavigationToolbar
+
+from matplotlib.figure import Figure
+
+class MatplotlibWidget(QtGui.QWidget):
+    """
+    Implements a Matplotlib figure inside a QWidget.
+    Use getFigure() and redraw() to interact with matplotlib.
+    
+    Example::
+    
+        mw = MatplotlibWidget()
+        subplot = mw.getFigure().add_subplot(111)
+        subplot.plot(x,y)
+        mw.draw()
+    """
+    
+    def __init__(self, size=(5.0, 4.0), dpi=100):
+        QtGui.QWidget.__init__(self)
+        self.fig = Figure(size, dpi=dpi)
+        self.canvas = FigureCanvas(self.fig)
+        self.canvas.setParent(self)
+        self.toolbar = NavigationToolbar(self.canvas, self)
+        
+        self.vbox = QtGui.QVBoxLayout()
+        self.vbox.addWidget(self.toolbar)
+        self.vbox.addWidget(self.canvas)
+        
+        self.setLayout(self.vbox)
+
+    def getFigure(self):
+        return self.fig
+        
+    def draw(self):
+        self.canvas.draw()
diff --git a/libs/pyqtgraph/widgets/MultiPlotWidget.py b/libs/pyqtgraph/widgets/MultiPlotWidget.py
new file mode 100644
index 0000000000000000000000000000000000000000..d1f56034ecbb6b7aea28fc995810ed812a4ea4c5
--- /dev/null
+++ b/libs/pyqtgraph/widgets/MultiPlotWidget.py
@@ -0,0 +1,78 @@
+# -*- coding: utf-8 -*-
+"""
+MultiPlotWidget.py -  Convenience class--GraphicsView widget displaying a MultiPlotItem
+Copyright 2010  Luke Campagnola
+Distributed under MIT/X11 license. See license.txt for more infomation.
+"""
+from ..Qt import QtCore
+from .GraphicsView import GraphicsView
+from ..graphicsItems import MultiPlotItem as MultiPlotItem
+
+__all__ = ['MultiPlotWidget']
+class MultiPlotWidget(GraphicsView):
+    """Widget implementing a graphicsView with a single MultiPlotItem inside."""
+    def __init__(self, parent=None):
+        self.minPlotHeight = 50
+        self.mPlotItem = MultiPlotItem.MultiPlotItem()
+        GraphicsView.__init__(self, parent)
+        self.enableMouse(False)
+        self.setCentralItem(self.mPlotItem)
+        ## Explicitly wrap methods from mPlotItem
+        #for m in ['setData']:
+            #setattr(self, m, getattr(self.mPlotItem, m))
+        self.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
+        self.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
+                
+    def __getattr__(self, attr):  ## implicitly wrap methods from plotItem
+        if hasattr(self.mPlotItem, attr):
+            m = getattr(self.mPlotItem, attr)
+            if hasattr(m, '__call__'):
+                return m
+        raise AttributeError(attr)
+
+    def setMinimumPlotHeight(self, min):
+        """Set the minimum height for each sub-plot displayed. 
+        
+        If the total height of all plots is greater than the height of the 
+        widget, then a scroll bar will appear to provide access to the entire
+        set of plots.
+        
+        Added in version 0.9.9
+        """
+        self.minPlotHeight = min
+        self.resizeEvent(None)
+
+    def widgetGroupInterface(self):
+        return (None, MultiPlotWidget.saveState, MultiPlotWidget.restoreState)
+
+    def saveState(self):
+        return {}
+        #return self.plotItem.saveState()
+        
+    def restoreState(self, state):
+        pass
+        #return self.plotItem.restoreState(state)
+
+    def close(self):
+        self.mPlotItem.close()
+        self.mPlotItem = None
+        self.setParent(None)
+        GraphicsView.close(self)
+
+    def setRange(self, *args, **kwds):
+        GraphicsView.setRange(self, *args, **kwds)
+        if self.centralWidget is not None:
+            r = self.range
+            minHeight = len(self.mPlotItem.plots) * self.minPlotHeight
+            if r.height() < minHeight:
+                r.setHeight(minHeight)
+                r.setWidth(r.width() - self.verticalScrollBar().width())
+            self.centralWidget.setGeometry(r)
+
+    def resizeEvent(self, ev):
+        if self.closed:
+            return
+        if self.autoPixelRange:
+            self.range = QtCore.QRectF(0, 0, self.size().width(), self.size().height())
+        MultiPlotWidget.setRange(self, self.range, padding=0, disableAutoPixel=False)  ## we do this because some subclasses like to redefine setRange in an incompatible way.
+        self.updateMatrix()
diff --git a/libs/pyqtgraph/widgets/PathButton.py b/libs/pyqtgraph/widgets/PathButton.py
new file mode 100644
index 0000000000000000000000000000000000000000..52c60e2013cd90fc55c57cfec02eb39ae79d7a74
--- /dev/null
+++ b/libs/pyqtgraph/widgets/PathButton.py
@@ -0,0 +1,50 @@
+from ..Qt import QtGui, QtCore
+from .. import functions as fn
+
+__all__ = ['PathButton']
+
+
+class PathButton(QtGui.QPushButton):
+    """Simple PushButton extension which paints a QPainterPath on its face"""
+    def __init__(self, parent=None, path=None, pen='default', brush=None, size=(30,30)):
+        QtGui.QPushButton.__init__(self, parent)
+        self.path = None
+        if pen == 'default':
+            pen = 'k'
+        self.setPen(pen)
+        self.setBrush(brush)
+        if path is not None:
+            self.setPath(path)
+        if size is not None:
+            self.setFixedWidth(size[0])
+            self.setFixedHeight(size[1])
+            
+            
+    def setBrush(self, brush):
+        self.brush = fn.mkBrush(brush)
+        
+    def setPen(self, *args, **kwargs):
+        self.pen = fn.mkPen(*args, **kwargs)
+        
+    def setPath(self, path):
+        self.path = path
+        self.update()
+        
+    def paintEvent(self, ev):
+        QtGui.QPushButton.paintEvent(self, ev)
+        margin = 7
+        geom = QtCore.QRectF(0, 0, self.width(), self.height()).adjusted(margin, margin, -margin, -margin)
+        rect = self.path.boundingRect()
+        scale = min(geom.width() / float(rect.width()), geom.height() / float(rect.height()))
+        
+        p = QtGui.QPainter(self)
+        p.setRenderHint(p.Antialiasing)
+        p.translate(geom.center())
+        p.scale(scale, scale)
+        p.translate(-rect.center())
+        p.setPen(self.pen)
+        p.setBrush(self.brush)
+        p.drawPath(self.path)
+        p.end()
+
+    
diff --git a/libs/pyqtgraph/widgets/PlotWidget.py b/libs/pyqtgraph/widgets/PlotWidget.py
new file mode 100644
index 0000000000000000000000000000000000000000..e27bce6083ebd923ac02d60ee8966b0e3573454d
--- /dev/null
+++ b/libs/pyqtgraph/widgets/PlotWidget.py
@@ -0,0 +1,99 @@
+# -*- coding: utf-8 -*-
+"""
+PlotWidget.py -  Convenience class--GraphicsView widget displaying a single PlotItem
+Copyright 2010  Luke Campagnola
+Distributed under MIT/X11 license. See license.txt for more infomation.
+"""
+
+from ..Qt import QtCore, QtGui
+from .GraphicsView import *
+from ..graphicsItems.PlotItem import *
+
+__all__ = ['PlotWidget']
+class PlotWidget(GraphicsView):
+    
+    # signals wrapped from PlotItem / ViewBox
+    sigRangeChanged = QtCore.Signal(object, object)
+    sigTransformChanged = QtCore.Signal(object)
+    
+    """
+    :class:`GraphicsView <pyqtgraph.GraphicsView>` widget with a single 
+    :class:`PlotItem <pyqtgraph.PlotItem>` inside.
+    
+    The following methods are wrapped directly from PlotItem: 
+    :func:`addItem <pyqtgraph.PlotItem.addItem>`, 
+    :func:`removeItem <pyqtgraph.PlotItem.removeItem>`, 
+    :func:`clear <pyqtgraph.PlotItem.clear>`, 
+    :func:`setXRange <pyqtgraph.ViewBox.setXRange>`,
+    :func:`setYRange <pyqtgraph.ViewBox.setYRange>`,
+    :func:`setRange <pyqtgraph.ViewBox.setRange>`,
+    :func:`autoRange <pyqtgraph.ViewBox.autoRange>`,
+    :func:`setXLink <pyqtgraph.ViewBox.setXLink>`,
+    :func:`setYLink <pyqtgraph.ViewBox.setYLink>`,
+    :func:`viewRect <pyqtgraph.ViewBox.viewRect>`,
+    :func:`setMouseEnabled <pyqtgraph.ViewBox.setMouseEnabled>`,
+    :func:`enableAutoRange <pyqtgraph.ViewBox.enableAutoRange>`,
+    :func:`disableAutoRange <pyqtgraph.ViewBox.disableAutoRange>`,
+    :func:`setAspectLocked <pyqtgraph.ViewBox.setAspectLocked>`,
+    :func:`setLimits <pyqtgraph.ViewBox.setLimits>`,
+    :func:`register <pyqtgraph.ViewBox.register>`,
+    :func:`unregister <pyqtgraph.ViewBox.unregister>`
+    
+    
+    For all 
+    other methods, use :func:`getPlotItem <pyqtgraph.PlotWidget.getPlotItem>`.
+    """
+    def __init__(self, parent=None, background='default', **kargs):
+        """When initializing PlotWidget, *parent* and *background* are passed to 
+        :func:`GraphicsWidget.__init__() <pyqtgraph.GraphicsWidget.__init__>`
+        and all others are passed
+        to :func:`PlotItem.__init__() <pyqtgraph.PlotItem.__init__>`."""
+        GraphicsView.__init__(self, parent, background=background)
+        self.setSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
+        self.enableMouse(False)
+        self.plotItem = PlotItem(**kargs)
+        self.setCentralItem(self.plotItem)
+        ## Explicitly wrap methods from plotItem
+        ## NOTE: If you change this list, update the documentation above as well.
+        for m in ['addItem', 'removeItem', 'autoRange', 'clear', 'setXRange', 
+                  'setYRange', 'setRange', 'setAspectLocked', 'setMouseEnabled', 
+                  'setXLink', 'setYLink', 'enableAutoRange', 'disableAutoRange', 
+                  'setLimits', 'register', 'unregister', 'viewRect']:
+            setattr(self, m, getattr(self.plotItem, m))
+        #QtCore.QObject.connect(self.plotItem, QtCore.SIGNAL('viewChanged'), self.viewChanged)
+        self.plotItem.sigRangeChanged.connect(self.viewRangeChanged)
+    
+    def close(self):
+        self.plotItem.close()
+        self.plotItem = None
+        #self.scene().clear()
+        #self.mPlotItem.close()
+        self.setParent(None)
+        GraphicsView.close(self)
+
+    def __getattr__(self, attr):  ## implicitly wrap methods from plotItem
+        if hasattr(self.plotItem, attr):
+            m = getattr(self.plotItem, attr)
+            if hasattr(m, '__call__'):
+                return m
+        raise NameError(attr)
+    
+    def viewRangeChanged(self, view, range):
+        #self.emit(QtCore.SIGNAL('viewChanged'), *args)
+        self.sigRangeChanged.emit(self, range)
+
+    def widgetGroupInterface(self):
+        return (None, PlotWidget.saveState, PlotWidget.restoreState)
+
+    def saveState(self):
+        return self.plotItem.saveState()
+        
+    def restoreState(self, state):
+        return self.plotItem.restoreState(state)
+        
+    def getPlotItem(self):
+        """Return the PlotItem contained within."""
+        return self.plotItem
+        
+        
+        
\ No newline at end of file
diff --git a/libs/pyqtgraph/widgets/ProgressDialog.py b/libs/pyqtgraph/widgets/ProgressDialog.py
new file mode 100644
index 0000000000000000000000000000000000000000..8c669be4b43eff2ea90ed70602a12b5db064f179
--- /dev/null
+++ b/libs/pyqtgraph/widgets/ProgressDialog.py
@@ -0,0 +1,112 @@
+# -*- coding: utf-8 -*-
+from ..Qt import QtGui, QtCore
+
+__all__ = ['ProgressDialog']
+class ProgressDialog(QtGui.QProgressDialog):
+    """
+    Extends QProgressDialog for use in 'with' statements.
+
+    Example::
+
+        with ProgressDialog("Processing..", minVal, maxVal) as dlg:
+            # do stuff
+            dlg.setValue(i)   ## could also use dlg += 1
+            if dlg.wasCanceled():
+                raise Exception("Processing canceled by user")
+    """
+    def __init__(self, labelText, minimum=0, maximum=100, cancelText='Cancel', parent=None, wait=250, busyCursor=False, disable=False):
+        """
+        ============== ================================================================
+        **Arguments:**
+        labelText      (required)
+        cancelText     Text to display on cancel button, or None to disable it.
+        minimum
+        maximum
+        parent       
+        wait           Length of time (im ms) to wait before displaying dialog
+        busyCursor     If True, show busy cursor until dialog finishes
+        disable        If True, the progress dialog will not be displayed
+                       and calls to wasCanceled() will always return False.
+                       If ProgressDialog is entered from a non-gui thread, it will
+                       always be disabled.
+        ============== ================================================================
+        """    
+        isGuiThread = QtCore.QThread.currentThread() == QtCore.QCoreApplication.instance().thread()
+        self.disabled = disable or (not isGuiThread)
+        if self.disabled:
+            return
+
+        noCancel = False
+        if cancelText is None:
+            cancelText = ''
+            noCancel = True
+            
+        self.busyCursor = busyCursor
+            
+        QtGui.QProgressDialog.__init__(self, labelText, cancelText, minimum, maximum, parent)
+        self.setMinimumDuration(wait)
+        self.setWindowModality(QtCore.Qt.WindowModal)
+        self.setValue(self.minimum())
+        if noCancel:
+            self.setCancelButton(None)
+        
+
+    def __enter__(self):
+        if self.disabled:
+            return self
+        if self.busyCursor:
+            QtGui.QApplication.setOverrideCursor(QtGui.QCursor(QtCore.Qt.WaitCursor))
+        return self
+
+    def __exit__(self, exType, exValue, exTrace):
+        if self.disabled:
+            return
+        if self.busyCursor:
+            QtGui.QApplication.restoreOverrideCursor()
+        self.setValue(self.maximum())
+        
+    def __iadd__(self, val):
+        """Use inplace-addition operator for easy incrementing."""
+        if self.disabled:
+            return self
+        self.setValue(self.value()+val)
+        return self
+
+
+    ## wrap all other functions to make sure they aren't being called from non-gui threads
+    
+    def setValue(self, val):
+        if self.disabled:
+            return
+        QtGui.QProgressDialog.setValue(self, val)
+        
+    def setLabelText(self, val):
+        if self.disabled:
+            return
+        QtGui.QProgressDialog.setLabelText(self, val)
+    
+    def setMaximum(self, val):
+        if self.disabled:
+            return
+        QtGui.QProgressDialog.setMaximum(self, val)
+
+    def setMinimum(self, val):
+        if self.disabled:
+            return
+        QtGui.QProgressDialog.setMinimum(self, val)
+        
+    def wasCanceled(self):
+        if self.disabled:
+            return False
+        return QtGui.QProgressDialog.wasCanceled(self)
+
+    def maximum(self):
+        if self.disabled:
+            return 0
+        return QtGui.QProgressDialog.maximum(self)
+
+    def minimum(self):
+        if self.disabled:
+            return 0
+        return QtGui.QProgressDialog.minimum(self)
+        
diff --git a/libs/pyqtgraph/widgets/RawImageWidget.py b/libs/pyqtgraph/widgets/RawImageWidget.py
new file mode 100644
index 0000000000000000000000000000000000000000..970b570b24c4112af8cb1e25b609b378728e5e23
--- /dev/null
+++ b/libs/pyqtgraph/widgets/RawImageWidget.py
@@ -0,0 +1,140 @@
+from ..Qt import QtCore, QtGui
+try:
+    from ..Qt import QtOpenGL
+    from OpenGL.GL import *
+    HAVE_OPENGL = True
+except ImportError:
+    HAVE_OPENGL = False
+
+from .. import functions as fn
+import numpy as np
+
+class RawImageWidget(QtGui.QWidget):
+    """
+    Widget optimized for very fast video display. 
+    Generally using an ImageItem inside GraphicsView is fast enough.
+    On some systems this may provide faster video. See the VideoSpeedTest example for benchmarking.
+    """
+    def __init__(self, parent=None, scaled=False):
+        """
+        Setting scaled=True will cause the entire image to be displayed within the boundaries of the widget. This also greatly reduces the speed at which it will draw frames.
+        """
+        QtGui.QWidget.__init__(self, parent=None)
+        self.setSizePolicy(QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Expanding))
+        self.scaled = scaled
+        self.opts = None
+        self.image = None
+    
+    def setImage(self, img, *args, **kargs):
+        """
+        img must be ndarray of shape (x,y), (x,y,3), or (x,y,4).
+        Extra arguments are sent to functions.makeARGB
+        """
+        self.opts = (img, args, kargs)
+        self.image = None
+        self.update()
+
+    def paintEvent(self, ev):
+        if self.opts is None:
+            return
+        if self.image is None:
+            argb, alpha = fn.makeARGB(self.opts[0], *self.opts[1], **self.opts[2])
+            self.image = fn.makeQImage(argb, alpha)
+            self.opts = ()
+        #if self.pixmap is None:
+            #self.pixmap = QtGui.QPixmap.fromImage(self.image)
+        p = QtGui.QPainter(self)
+        if self.scaled:
+            rect = self.rect()
+            ar = rect.width() / float(rect.height())
+            imar = self.image.width() / float(self.image.height())
+            if ar > imar:
+                rect.setWidth(int(rect.width() * imar/ar))
+            else:
+                rect.setHeight(int(rect.height() * ar/imar))
+                
+            p.drawImage(rect, self.image)
+        else:
+            p.drawImage(QtCore.QPointF(), self.image)
+        #p.drawPixmap(self.rect(), self.pixmap)
+        p.end()
+
+if HAVE_OPENGL:
+    class RawImageGLWidget(QtOpenGL.QGLWidget):
+        """
+        Similar to RawImageWidget, but uses a GL widget to do all drawing.
+        Perfomance varies between platforms; see examples/VideoSpeedTest for benchmarking.
+        """
+        def __init__(self, parent=None, scaled=False):
+            QtOpenGL.QGLWidget.__init__(self, parent=None)
+            self.scaled = scaled
+            self.image = None
+            self.uploaded = False
+            self.smooth = False
+            self.opts = None
+
+        def setImage(self, img, *args, **kargs):
+            """
+            img must be ndarray of shape (x,y), (x,y,3), or (x,y,4).
+            Extra arguments are sent to functions.makeARGB
+            """
+            self.opts = (img, args, kargs)
+            self.image = None
+            self.uploaded = False
+            self.update()
+
+        def initializeGL(self):
+            self.texture = glGenTextures(1)
+            
+        def uploadTexture(self):
+            glEnable(GL_TEXTURE_2D)
+            glBindTexture(GL_TEXTURE_2D, self.texture)
+            if self.smooth:
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR)
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR)
+            else:
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST)
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST)
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER)
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER)
+            #glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_BORDER)
+            shape = self.image.shape
+            
+            ### Test texture dimensions first
+            #glTexImage2D(GL_PROXY_TEXTURE_2D, 0, GL_RGBA, shape[0], shape[1], 0, GL_RGBA, GL_UNSIGNED_BYTE, None)
+            #if glGetTexLevelParameteriv(GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH) == 0:
+                #raise Exception("OpenGL failed to create 2D texture (%dx%d); too large for this hardware." % shape[:2])
+            
+            glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, shape[0], shape[1], 0, GL_RGBA, GL_UNSIGNED_BYTE, self.image.transpose((1,0,2)))
+            glDisable(GL_TEXTURE_2D)
+            
+        def paintGL(self):
+            if self.image is None:
+                if self.opts is None:
+                    return
+                img, args, kwds = self.opts
+                kwds['useRGBA'] = True
+                self.image, alpha = fn.makeARGB(img, *args, **kwds)
+            
+            if not self.uploaded:
+                self.uploadTexture()
+            
+            glViewport(0, 0, self.width(), self.height())
+            glEnable(GL_TEXTURE_2D)
+            glBindTexture(GL_TEXTURE_2D, self.texture)
+            glColor4f(1,1,1,1)
+
+            glBegin(GL_QUADS)
+            glTexCoord2f(0,0)
+            glVertex3f(-1,-1,0)
+            glTexCoord2f(1,0)
+            glVertex3f(1, -1, 0)
+            glTexCoord2f(1,1)
+            glVertex3f(1, 1, 0)
+            glTexCoord2f(0,1)
+            glVertex3f(-1, 1, 0)
+            glEnd()
+            glDisable(GL_TEXTURE_3D)
+            
+
+
diff --git a/libs/pyqtgraph/widgets/RemoteGraphicsView.py b/libs/pyqtgraph/widgets/RemoteGraphicsView.py
new file mode 100644
index 0000000000000000000000000000000000000000..75ce90b0d93d1685bc9f77c7e20e68474406285d
--- /dev/null
+++ b/libs/pyqtgraph/widgets/RemoteGraphicsView.py
@@ -0,0 +1,262 @@
+from ..Qt import QtGui, QtCore, USE_PYSIDE
+if not USE_PYSIDE:
+    import sip
+from .. import multiprocess as mp
+from .GraphicsView import GraphicsView
+from .. import CONFIG_OPTIONS
+import numpy as np
+import mmap, tempfile, ctypes, atexit, sys, random
+
+__all__ = ['RemoteGraphicsView']
+
+class RemoteGraphicsView(QtGui.QWidget):
+    """
+    Replacement for GraphicsView that does all scene management and rendering on a remote process,
+    while displaying on the local widget.
+    
+    GraphicsItems must be created by proxy to the remote process.
+    
+    """
+    def __init__(self, parent=None, *args, **kwds):
+        """
+        The keyword arguments 'useOpenGL' and 'backgound', if specified, are passed to the remote
+        GraphicsView.__init__(). All other keyword arguments are passed to multiprocess.QtProcess.__init__().
+        """
+        self._img = None
+        self._imgReq = None
+        self._sizeHint = (640,480)  ## no clue why this is needed, but it seems to be the default sizeHint for GraphicsView.
+                                    ## without it, the widget will not compete for space against another GraphicsView.
+        QtGui.QWidget.__init__(self)
+
+        # separate local keyword arguments from remote.
+        remoteKwds = {}
+        for kwd in ['useOpenGL', 'background']:
+            if kwd in kwds:
+                remoteKwds[kwd] = kwds.pop(kwd)
+
+        self._proc = mp.QtProcess(**kwds)
+        self.pg = self._proc._import('pyqtgraph')
+        self.pg.setConfigOptions(**CONFIG_OPTIONS)
+        rpgRemote = self._proc._import('pyqtgraph.widgets.RemoteGraphicsView')
+        self._view = rpgRemote.Renderer(*args, **remoteKwds)
+        self._view._setProxyOptions(deferGetattr=True)
+        
+        self.setFocusPolicy(QtCore.Qt.StrongFocus)
+        self.setSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
+        self.setMouseTracking(True)
+        self.shm = None
+        shmFileName = self._view.shmFileName()
+        if sys.platform.startswith('win'):
+            self.shmtag = shmFileName
+        else:
+            self.shmFile = open(shmFileName, 'r')
+        
+        self._view.sceneRendered.connect(mp.proxy(self.remoteSceneChanged)) #, callSync='off'))
+                                                                            ## Note: we need synchronous signals
+                                                                            ## even though there is no return value--
+                                                                            ## this informs the renderer that it is 
+                                                                            ## safe to begin rendering again. 
+        
+        for method in ['scene', 'setCentralItem']:
+            setattr(self, method, getattr(self._view, method))
+        
+    def resizeEvent(self, ev):
+        ret = QtGui.QWidget.resizeEvent(self, ev)
+        self._view.resize(self.size(), _callSync='off')
+        return ret
+        
+    def sizeHint(self):
+        return QtCore.QSize(*self._sizeHint)
+        
+    def remoteSceneChanged(self, data):
+        w, h, size, newfile = data
+        #self._sizeHint = (whint, hhint)
+        if self.shm is None or self.shm.size != size:
+            if self.shm is not None:
+                self.shm.close()
+            if sys.platform.startswith('win'):
+                self.shmtag = newfile   ## on windows, we create a new tag for every resize
+                self.shm = mmap.mmap(-1, size, self.shmtag) ## can't use tmpfile on windows because the file can only be opened once.
+            else:
+                self.shm = mmap.mmap(self.shmFile.fileno(), size, mmap.MAP_SHARED, mmap.PROT_READ)
+        self.shm.seek(0)
+        data = self.shm.read(w*h*4)
+        self._img = QtGui.QImage(data, w, h, QtGui.QImage.Format_ARGB32)
+        self._img.data = data  # data must be kept alive or PySide 1.2.1 (and probably earlier) will crash.
+        self.update()
+        
+    def paintEvent(self, ev):
+        if self._img is None:
+            return
+        p = QtGui.QPainter(self)
+        p.drawImage(self.rect(), self._img, QtCore.QRect(0, 0, self._img.width(), self._img.height()))
+        p.end()
+        
+    def mousePressEvent(self, ev):
+        self._view.mousePressEvent(int(ev.type()), ev.pos(), ev.globalPos(), int(ev.button()), int(ev.buttons()), int(ev.modifiers()), _callSync='off')
+        ev.accept()
+        return QtGui.QWidget.mousePressEvent(self, ev)
+
+    def mouseReleaseEvent(self, ev):
+        self._view.mouseReleaseEvent(int(ev.type()), ev.pos(), ev.globalPos(), int(ev.button()), int(ev.buttons()), int(ev.modifiers()), _callSync='off')
+        ev.accept()
+        return QtGui.QWidget.mouseReleaseEvent(self, ev)
+
+    def mouseMoveEvent(self, ev):
+        self._view.mouseMoveEvent(int(ev.type()), ev.pos(), ev.globalPos(), int(ev.button()), int(ev.buttons()), int(ev.modifiers()), _callSync='off')
+        ev.accept()
+        return QtGui.QWidget.mouseMoveEvent(self, ev)
+        
+    def wheelEvent(self, ev):
+        self._view.wheelEvent(ev.pos(), ev.globalPos(), ev.delta(), int(ev.buttons()), int(ev.modifiers()), int(ev.orientation()), _callSync='off')
+        ev.accept()
+        return QtGui.QWidget.wheelEvent(self, ev)
+    
+    def keyEvent(self, ev):
+        if self._view.keyEvent(int(ev.type()), int(ev.modifiers()), text, autorep, count):
+            ev.accept()
+        return QtGui.QWidget.keyEvent(self, ev)
+        
+    def enterEvent(self, ev):
+        self._view.enterEvent(int(ev.type()), _callSync='off')
+        return QtGui.QWidget.enterEvent(self, ev)
+        
+    def leaveEvent(self, ev):
+        self._view.leaveEvent(int(ev.type()), _callSync='off')
+        return QtGui.QWidget.leaveEvent(self, ev)
+        
+    def remoteProcess(self):
+        """Return the remote process handle. (see multiprocess.remoteproxy.RemoteEventHandler)"""
+        return self._proc
+
+    def close(self):
+        """Close the remote process. After this call, the widget will no longer be updated."""
+        self._proc.close()
+
+
+class Renderer(GraphicsView):
+    ## Created by the remote process to handle render requests
+    
+    sceneRendered = QtCore.Signal(object)
+    
+    def __init__(self, *args, **kwds):
+        ## Create shared memory for rendered image
+        #pg.dbg(namespace={'r': self})
+        if sys.platform.startswith('win'):
+            self.shmtag = "pyqtgraph_shmem_" + ''.join([chr((random.getrandbits(20)%25) + 97) for i in range(20)])
+            self.shm = mmap.mmap(-1, mmap.PAGESIZE, self.shmtag) # use anonymous mmap on windows
+        else:
+            self.shmFile = tempfile.NamedTemporaryFile(prefix='pyqtgraph_shmem_')
+            self.shmFile.write(b'\x00' * (mmap.PAGESIZE+1))
+            fd = self.shmFile.fileno()
+            self.shm = mmap.mmap(fd, mmap.PAGESIZE, mmap.MAP_SHARED, mmap.PROT_WRITE)
+        atexit.register(self.close)
+        
+        GraphicsView.__init__(self, *args, **kwds)
+        self.scene().changed.connect(self.update)
+        self.img = None
+        self.renderTimer = QtCore.QTimer()
+        self.renderTimer.timeout.connect(self.renderView)
+        self.renderTimer.start(16)
+        
+    def close(self):
+        self.shm.close()
+        if not sys.platform.startswith('win'):
+            self.shmFile.close()
+
+    def shmFileName(self):
+        if sys.platform.startswith('win'):
+            return self.shmtag
+        else:
+            return self.shmFile.name
+        
+    def update(self):
+        self.img = None
+        return GraphicsView.update(self)
+        
+    def resize(self, size):
+        oldSize = self.size()
+        GraphicsView.resize(self, size)
+        self.resizeEvent(QtGui.QResizeEvent(size, oldSize))
+        self.update()
+        
+    def renderView(self):
+        if self.img is None:
+            ## make sure shm is large enough and get its address
+            if self.width() == 0 or self.height() == 0:
+                return
+            size = self.width() * self.height() * 4
+            if size > self.shm.size():
+                if sys.platform.startswith('win'):
+                    ## windows says "WindowsError: [Error 87] the parameter is incorrect" if we try to resize the mmap
+                    self.shm.close()
+                    ## it also says (sometimes) 'access is denied' if we try to reuse the tag.
+                    self.shmtag = "pyqtgraph_shmem_" + ''.join([chr((random.getrandbits(20)%25) + 97) for i in range(20)])
+                    self.shm = mmap.mmap(-1, size, self.shmtag)
+                else:
+                    self.shm.resize(size)
+            
+            ## render the scene directly to shared memory
+            if USE_PYSIDE:
+                ch = ctypes.c_char.from_buffer(self.shm, 0)
+                #ch = ctypes.c_char_p(address)
+                self.img = QtGui.QImage(ch, self.width(), self.height(), QtGui.QImage.Format_ARGB32)
+            else:
+                address = ctypes.addressof(ctypes.c_char.from_buffer(self.shm, 0))
+
+                # different versions of pyqt have different requirements here..
+                try:
+                    self.img = QtGui.QImage(sip.voidptr(address), self.width(), self.height(), QtGui.QImage.Format_ARGB32)
+                except TypeError:
+                    try:
+                        self.img = QtGui.QImage(memoryview(buffer(self.shm)), self.width(), self.height(), QtGui.QImage.Format_ARGB32)
+                    except TypeError:
+                        # Works on PyQt 4.9.6
+                        self.img = QtGui.QImage(address, self.width(), self.height(), QtGui.QImage.Format_ARGB32)
+            self.img.fill(0xffffffff)
+            p = QtGui.QPainter(self.img)
+            self.render(p, self.viewRect(), self.rect())
+            p.end()
+            self.sceneRendered.emit((self.width(), self.height(), self.shm.size(), self.shmFileName()))
+
+    def mousePressEvent(self, typ, pos, gpos, btn, btns, mods):
+        typ = QtCore.QEvent.Type(typ)
+        btn = QtCore.Qt.MouseButton(btn)
+        btns = QtCore.Qt.MouseButtons(btns)
+        mods = QtCore.Qt.KeyboardModifiers(mods)
+        return GraphicsView.mousePressEvent(self, QtGui.QMouseEvent(typ, pos, gpos, btn, btns, mods))
+
+    def mouseMoveEvent(self, typ, pos, gpos, btn, btns, mods):
+        typ = QtCore.QEvent.Type(typ)
+        btn = QtCore.Qt.MouseButton(btn)
+        btns = QtCore.Qt.MouseButtons(btns)
+        mods = QtCore.Qt.KeyboardModifiers(mods)
+        return GraphicsView.mouseMoveEvent(self, QtGui.QMouseEvent(typ, pos, gpos, btn, btns, mods))
+
+    def mouseReleaseEvent(self, typ, pos, gpos, btn, btns, mods):
+        typ = QtCore.QEvent.Type(typ)
+        btn = QtCore.Qt.MouseButton(btn)
+        btns = QtCore.Qt.MouseButtons(btns)
+        mods = QtCore.Qt.KeyboardModifiers(mods)
+        return GraphicsView.mouseReleaseEvent(self, QtGui.QMouseEvent(typ, pos, gpos, btn, btns, mods))
+
+    def wheelEvent(self, pos, gpos, d, btns, mods, ori):
+        btns = QtCore.Qt.MouseButtons(btns)
+        mods = QtCore.Qt.KeyboardModifiers(mods)
+        ori = (None, QtCore.Qt.Horizontal, QtCore.Qt.Vertical)[ori]
+        return GraphicsView.wheelEvent(self, QtGui.QWheelEvent(pos, gpos, d, btns, mods, ori))
+
+    def keyEvent(self, typ, mods, text, autorep, count):
+        typ = QtCore.QEvent.Type(typ)
+        mods = QtCore.Qt.KeyboardModifiers(mods)
+        GraphicsView.keyEvent(self, QtGui.QKeyEvent(typ, mods, text, autorep, count))
+        return ev.accepted()
+        
+    def enterEvent(self, typ):
+        ev = QtCore.QEvent(QtCore.QEvent.Type(typ))
+        return GraphicsView.enterEvent(self, ev)
+
+    def leaveEvent(self, typ):
+        ev = QtCore.QEvent(QtCore.QEvent.Type(typ))
+        return GraphicsView.leaveEvent(self, ev)
+
diff --git a/libs/pyqtgraph/widgets/ScatterPlotWidget.py b/libs/pyqtgraph/widgets/ScatterPlotWidget.py
new file mode 100644
index 0000000000000000000000000000000000000000..cca40e65592aa88cdeb616faaa88ea20fa766151
--- /dev/null
+++ b/libs/pyqtgraph/widgets/ScatterPlotWidget.py
@@ -0,0 +1,218 @@
+from ..Qt import QtGui, QtCore
+from .PlotWidget import PlotWidget
+from .DataFilterWidget import DataFilterParameter
+from .ColorMapWidget import ColorMapParameter
+from .. import parametertree as ptree
+from .. import functions as fn
+from .. import getConfigOption
+from ..graphicsItems.TextItem import TextItem
+import numpy as np
+from ..pgcollections import OrderedDict
+
+__all__ = ['ScatterPlotWidget']
+
+class ScatterPlotWidget(QtGui.QSplitter):
+    """
+    This is a high-level widget for exploring relationships in tabular data.
+        
+    Given a multi-column record array, the widget displays a scatter plot of a
+    specific subset of the data. Includes controls for selecting the columns to
+    plot, filtering data, and determining symbol color and shape.
+    
+    The widget consists of four components:
+    
+    1) A list of column names from which the user may select 1 or 2 columns
+       to plot. If one column is selected, the data for that column will be
+       plotted in a histogram-like manner by using :func:`pseudoScatter()
+       <pyqtgraph.pseudoScatter>`. If two columns are selected, then the
+       scatter plot will be generated with x determined by the first column
+       that was selected and y by the second.
+    2) A DataFilter that allows the user to select a subset of the data by 
+       specifying multiple selection criteria.
+    3) A ColorMap that allows the user to determine how points are colored by
+       specifying multiple criteria.
+    4) A PlotWidget for displaying the data.
+    """
+    def __init__(self, parent=None):
+        QtGui.QSplitter.__init__(self, QtCore.Qt.Horizontal)
+        self.ctrlPanel = QtGui.QSplitter(QtCore.Qt.Vertical)
+        self.addWidget(self.ctrlPanel)
+        self.fieldList = QtGui.QListWidget()
+        self.fieldList.setSelectionMode(self.fieldList.ExtendedSelection)
+        self.ptree = ptree.ParameterTree(showHeader=False)
+        self.filter = DataFilterParameter()
+        self.colorMap = ColorMapParameter()
+        self.params = ptree.Parameter.create(name='params', type='group', children=[self.filter, self.colorMap])
+        self.ptree.setParameters(self.params, showTop=False)
+        
+        self.plot = PlotWidget()
+        self.ctrlPanel.addWidget(self.fieldList)
+        self.ctrlPanel.addWidget(self.ptree)
+        self.addWidget(self.plot)
+        
+        bg = fn.mkColor(getConfigOption('background'))
+        bg.setAlpha(150)
+        self.filterText = TextItem(border=getConfigOption('foreground'), color=bg)
+        self.filterText.setPos(60,20)
+        self.filterText.setParentItem(self.plot.plotItem)
+        
+        self.data = None
+        self.mouseOverField = None
+        self.scatterPlot = None
+        self.style = dict(pen=None, symbol='o')
+        
+        self.fieldList.itemSelectionChanged.connect(self.fieldSelectionChanged)
+        self.filter.sigFilterChanged.connect(self.filterChanged)
+        self.colorMap.sigColorMapChanged.connect(self.updatePlot)
+    
+    def setFields(self, fields, mouseOverField=None):
+        """
+        Set the list of field names/units to be processed.
+        
+        The format of *fields* is the same as used by 
+        :func:`ColorMapWidget.setFields <pyqtgraph.widgets.ColorMapWidget.ColorMapParameter.setFields>`
+        """
+        self.fields = OrderedDict(fields)
+        self.mouseOverField = mouseOverField
+        self.fieldList.clear()
+        for f,opts in fields:
+            item = QtGui.QListWidgetItem(f)
+            item.opts = opts
+            item = self.fieldList.addItem(item)
+        self.filter.setFields(fields)
+        self.colorMap.setFields(fields)
+        
+    def setData(self, data):
+        """
+        Set the data to be processed and displayed. 
+        Argument must be a numpy record array.
+        """
+        self.data = data
+        self.filtered = None
+        self.updatePlot()
+        
+    def fieldSelectionChanged(self):
+        sel = self.fieldList.selectedItems()
+        if len(sel) > 2:
+            self.fieldList.blockSignals(True)
+            try:
+                for item in sel[1:-1]:
+                    item.setSelected(False)
+            finally:
+                self.fieldList.blockSignals(False)
+                
+        self.updatePlot()
+        
+    def filterChanged(self, f):
+        self.filtered = None
+        self.updatePlot()
+        desc = self.filter.describe()
+        if len(desc) == 0:
+            self.filterText.setVisible(False)
+        else:
+            self.filterText.setText('\n'.join(desc))
+            self.filterText.setVisible(True)
+            
+        
+    def updatePlot(self):
+        self.plot.clear()
+        if self.data is None:
+            return
+        
+        if self.filtered is None:
+            self.filtered = self.filter.filterData(self.data)
+        data = self.filtered
+        if len(data) == 0:
+            return
+        
+        colors = np.array([fn.mkBrush(*x) for x in self.colorMap.map(data)])
+        
+        style = self.style.copy()
+        
+        ## Look up selected columns and units
+        sel = list([str(item.text()) for item in self.fieldList.selectedItems()])
+        units = list([item.opts.get('units', '') for item in self.fieldList.selectedItems()])
+        if len(sel) == 0:
+            self.plot.setTitle('')
+            return
+        
+
+        if len(sel) == 1:
+            self.plot.setLabels(left=('N', ''), bottom=(sel[0], units[0]), title='')
+            if len(data) == 0:
+                return
+            #x = data[sel[0]]
+            #y = None
+            xy = [data[sel[0]], None]
+        elif len(sel) == 2:
+            self.plot.setLabels(left=(sel[1],units[1]), bottom=(sel[0],units[0]))
+            if len(data) == 0:
+                return
+            
+            xy = [data[sel[0]], data[sel[1]]]
+            #xydata = []
+            #for ax in [0,1]:
+                #d = data[sel[ax]]
+                ### scatter catecorical values just a bit so they show up better in the scatter plot.
+                ##if sel[ax] in ['MorphologyBSMean', 'MorphologyTDMean', 'FIType']:
+                    ##d += np.random.normal(size=len(cells), scale=0.1)
+                    
+                #xydata.append(d)
+            #x,y = xydata
+
+        ## convert enum-type fields to float, set axis labels
+        enum = [False, False]
+        for i in [0,1]:
+            axis = self.plot.getAxis(['bottom', 'left'][i])
+            if xy[i] is not None and (self.fields[sel[i]].get('mode', None) == 'enum' or xy[i].dtype.kind in ('S', 'O')):
+                vals = self.fields[sel[i]].get('values', list(set(xy[i])))
+                xy[i] = np.array([vals.index(x) if x in vals else len(vals) for x in xy[i]], dtype=float)
+                axis.setTicks([list(enumerate(vals))])
+                enum[i] = True
+            else:
+                axis.setTicks(None)  # reset to automatic ticking
+        
+        ## mask out any nan values
+        mask = np.ones(len(xy[0]), dtype=bool)
+        if xy[0].dtype.kind == 'f':
+            mask &= ~np.isnan(xy[0])
+        if xy[1] is not None and xy[1].dtype.kind == 'f':
+            mask &= ~np.isnan(xy[1])
+        
+        xy[0] = xy[0][mask]
+        style['symbolBrush'] = colors[mask]
+
+        ## Scatter y-values for a histogram-like appearance
+        if xy[1] is None:
+            ## column scatter plot
+            xy[1] = fn.pseudoScatter(xy[0])
+        else:
+            ## beeswarm plots
+            xy[1] = xy[1][mask]
+            for ax in [0,1]:
+                if not enum[ax]:
+                    continue
+                imax = int(xy[ax].max()) if len(xy[ax]) > 0 else 0
+                for i in range(imax+1):
+                    keymask = xy[ax] == i
+                    scatter = fn.pseudoScatter(xy[1-ax][keymask], bidir=True)
+                    if len(scatter) == 0:
+                        continue
+                    smax = np.abs(scatter).max()
+                    if smax != 0:
+                        scatter *= 0.2 / smax
+                    xy[ax][keymask] += scatter
+        
+        if self.scatterPlot is not None:
+            try:
+                self.scatterPlot.sigPointsClicked.disconnect(self.plotClicked)
+            except:
+                pass
+        self.scatterPlot = self.plot.plot(xy[0], xy[1], data=data[mask], **style)
+        self.scatterPlot.sigPointsClicked.connect(self.plotClicked)
+        
+        
+    def plotClicked(self, plot, points):
+        pass
+
+
diff --git a/libs/pyqtgraph/widgets/SpinBox.py b/libs/pyqtgraph/widgets/SpinBox.py
new file mode 100644
index 0000000000000000000000000000000000000000..4710140511a74571011d43f7e3985c05d4098627
--- /dev/null
+++ b/libs/pyqtgraph/widgets/SpinBox.py
@@ -0,0 +1,518 @@
+# -*- coding: utf-8 -*-
+from ..Qt import QtGui, QtCore
+from ..python2_3 import asUnicode
+from ..SignalProxy import SignalProxy
+
+from .. import functions as fn
+from math import log
+from decimal import Decimal as D  ## Use decimal to avoid accumulating floating-point errors
+from decimal import *
+import weakref
+
+__all__ = ['SpinBox']
+class SpinBox(QtGui.QAbstractSpinBox):
+    """
+    **Bases:** QtGui.QAbstractSpinBox
+    
+    QSpinBox widget on steroids. Allows selection of numerical value, with extra features:
+    
+    - SI prefix notation (eg, automatically display "300 mV" instead of "0.003 V")
+    - Float values with linear and decimal stepping (1-9, 10-90, 100-900, etc.)
+    - Option for unbounded values
+    - Delayed signals (allows multiple rapid changes with only one change signal)
+    
+    =============================  ==============================================
+    **Signals:**
+    valueChanged(value)            Same as QSpinBox; emitted every time the value 
+                                   has changed.
+    sigValueChanged(self)          Emitted when value has changed, but also combines
+                                   multiple rapid changes into one signal (eg, 
+                                   when rolling the mouse wheel).
+    sigValueChanging(self, value)  Emitted immediately for all value changes.
+    =============================  ==============================================
+    """
+    
+    ## There's a PyQt bug that leaks a reference to the 
+    ## QLineEdit returned from QAbstractSpinBox.lineEdit()
+    ## This makes it possible to crash the entire program 
+    ## by making accesses to the LineEdit after the spinBox has been deleted.
+    ## I have no idea how to get around this..
+    
+    
+    valueChanged = QtCore.Signal(object)     # (value)  for compatibility with QSpinBox
+    sigValueChanged = QtCore.Signal(object)  # (self)
+    sigValueChanging = QtCore.Signal(object, object)  # (self, value)  sent immediately; no delay.
+    
+    def __init__(self, parent=None, value=0.0, **kwargs):
+        """
+        ============== ========================================================================
+        **Arguments:**
+        parent         Sets the parent widget for this SpinBox (optional). Default is None.
+        value          (float/int) initial value. Default is 0.0.
+        bounds         (min,max) Minimum and maximum values allowed in the SpinBox. 
+                       Either may be None to leave the value unbounded. By default, values are unbounded.
+        suffix         (str) suffix (units) to display after the numerical value. By default, suffix is an empty str.
+        siPrefix       (bool) If True, then an SI prefix is automatically prepended
+                       to the units and the value is scaled accordingly. For example,
+                       if value=0.003 and suffix='V', then the SpinBox will display
+                       "300 mV" (but a call to SpinBox.value will still return 0.003). Default is False.
+        step           (float) The size of a single step. This is used when clicking the up/
+                       down arrows, when rolling the mouse wheel, or when pressing 
+                       keyboard arrows while the widget has keyboard focus. Note that
+                       the interpretation of this value is different when specifying
+                       the 'dec' argument. Default is 0.01.
+        dec            (bool) If True, then the step value will be adjusted to match 
+                       the current size of the variable (for example, a value of 15
+                       might step in increments of 1 whereas a value of 1500 would
+                       step in increments of 100). In this case, the 'step' argument
+                       is interpreted *relative* to the current value. The most common
+                       'step' values when dec=True are 0.1, 0.2, 0.5, and 1.0. Default is False.
+        minStep        (float) When dec=True, this specifies the minimum allowable step size.
+        int            (bool) if True, the value is forced to integer type. Default is False
+        decimals       (int) Number of decimal values to display. Default is 2. 
+        ============== ========================================================================
+        """
+        QtGui.QAbstractSpinBox.__init__(self, parent)
+        self.lastValEmitted = None
+        self.lastText = ''
+        self.textValid = True  ## If false, we draw a red border
+        self.setMinimumWidth(0)
+        self.setMaximumHeight(20)
+        self.setSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred)
+        self.opts = {
+            'bounds': [None, None],
+            
+            ## Log scaling options   #### Log mode is no longer supported.
+            #'step': 0.1,
+            #'minStep': 0.001,
+            #'log': True,
+            #'dec': False,
+            
+            ## decimal scaling option - example
+            #'step': 0.1,    
+            #'minStep': .001,    
+            #'log': False,
+            #'dec': True,
+           
+            ## normal arithmetic step
+            'step': D('0.01'),  ## if 'dec' is false, the spinBox steps by 'step' every time
+                                ## if 'dec' is True, the step size is relative to the value
+                                ## 'step' needs to be an integral divisor of ten, ie 'step'*n=10 for some integer value of n (but only if dec is True)
+            'log': False,
+            'dec': False,   ## if true, does decimal stepping. ie from 1-10 it steps by 'step', from 10 to 100 it steps by 10*'step', etc. 
+                            ## if true, minStep must be set in order to cross zero.
+            
+            
+            'int': False, ## Set True to force value to be integer
+            
+            'suffix': '',
+            'siPrefix': False,   ## Set to True to display numbers with SI prefix (ie, 100pA instead of 1e-10A)
+            
+            'delay': 0.3, ## delay sending wheel update signals for 300ms
+            
+            'delayUntilEditFinished': True,   ## do not send signals until text editing has finished
+            
+            ## for compatibility with QDoubleSpinBox and QSpinBox
+            'decimals': 2,
+            
+        }
+        
+        self.decOpts = ['step', 'minStep']
+        
+        self.val = D(asUnicode(value))  ## Value is precise decimal. Ordinary math not allowed.
+        self.updateText()
+        self.skipValidate = False
+        self.setCorrectionMode(self.CorrectToPreviousValue)
+        self.setKeyboardTracking(False)
+        self.setOpts(**kwargs)
+        
+        
+        self.editingFinished.connect(self.editingFinishedEvent)
+        self.proxy = SignalProxy(self.sigValueChanging, slot=self.delayedChange, delay=self.opts['delay'])
+        
+    def event(self, ev):
+        ret = QtGui.QAbstractSpinBox.event(self, ev)
+        if ev.type() == QtCore.QEvent.KeyPress and ev.key() == QtCore.Qt.Key_Return:
+            ret = True  ## For some reason, spinbox pretends to ignore return key press
+        return ret
+        
+    ##lots of config options, just gonna stuff 'em all in here rather than do the get/set crap.
+    def setOpts(self, **opts):
+        """
+        Changes the behavior of the SpinBox. Accepts most of the arguments 
+        allowed in :func:`__init__ <pyqtgraph.SpinBox.__init__>`.
+        
+        """
+        #print opts
+        for k in opts:
+            if k == 'bounds':
+                #print opts[k]
+                self.setMinimum(opts[k][0], update=False)
+                self.setMaximum(opts[k][1], update=False)
+                #for i in [0,1]:
+                    #if opts[k][i] is None:
+                        #self.opts[k][i] = None
+                    #else:
+                        #self.opts[k][i] = D(unicode(opts[k][i]))
+            elif k in ['step', 'minStep']:
+                self.opts[k] = D(asUnicode(opts[k]))
+            elif k == 'value':
+                pass   ## don't set value until bounds have been set
+            else:
+                self.opts[k] = opts[k]
+        if 'value' in opts:
+            self.setValue(opts['value'])
+            
+        ## If bounds have changed, update value to match
+        if 'bounds' in opts and 'value' not in opts:
+            self.setValue()   
+            
+        ## sanity checks:
+        if self.opts['int']:
+            if 'step' in opts:
+                step = opts['step']
+                ## not necessary..
+                #if int(step) != step:
+                    #raise Exception('Integer SpinBox must have integer step size.')
+            else:
+                self.opts['step'] = int(self.opts['step'])
+            
+            if 'minStep' in opts:
+                step = opts['minStep']
+                if int(step) != step:
+                    raise Exception('Integer SpinBox must have integer minStep size.')
+            else:
+                ms = int(self.opts.get('minStep', 1))
+                if ms < 1:
+                    ms = 1
+                self.opts['minStep'] = ms
+        
+        if 'delay' in opts:
+            self.proxy.setDelay(opts['delay'])
+        
+        self.updateText()
+
+
+
+    def setMaximum(self, m, update=True):
+        """Set the maximum allowed value (or None for no limit)"""
+        if m is not None:
+            m = D(asUnicode(m))
+        self.opts['bounds'][1] = m
+        if update:
+            self.setValue()
+    
+    def setMinimum(self, m, update=True):
+        """Set the minimum allowed value (or None for no limit)"""
+        if m is not None:
+            m = D(asUnicode(m))
+        self.opts['bounds'][0] = m
+        if update:
+            self.setValue()
+        
+    def setPrefix(self, p):
+        self.setOpts(prefix=p)
+    
+    def setRange(self, r0, r1):
+        self.setOpts(bounds = [r0,r1])
+        
+    def setProperty(self, prop, val):
+        ## for QSpinBox compatibility
+        if prop == 'value':
+            #if type(val) is QtCore.QVariant:
+                #val = val.toDouble()[0]
+            self.setValue(val)
+        else:
+            print("Warning: SpinBox.setProperty('%s', ..) not supported." % prop)
+
+    def setSuffix(self, suf):
+        self.setOpts(suffix=suf)
+
+    def setSingleStep(self, step):
+        self.setOpts(step=step)
+        
+    def setDecimals(self, decimals):
+        self.setOpts(decimals=decimals)
+        
+    def selectNumber(self):
+        """
+        Select the numerical portion of the text to allow quick editing by the user.
+        """
+        le = self.lineEdit()
+        text = asUnicode(le.text())
+        if self.opts['suffix'] == '':
+            le.setSelection(0, len(text))
+        else:
+            try:
+                index = text.index(' ')
+            except ValueError:
+                return
+            le.setSelection(0, index)
+
+    def value(self):
+        """
+        Return the value of this SpinBox.
+        
+        """
+        if self.opts['int']:
+            return int(self.val)
+        else:
+            return float(self.val)
+
+    def setValue(self, value=None, update=True, delaySignal=False):
+        """
+        Set the value of this spin. 
+        If the value is out of bounds, it will be clipped to the nearest boundary.
+        If the spin is integer type, the value will be coerced to int.
+        Returns the actual value set.
+        
+        If value is None, then the current value is used (this is for resetting
+        the value after bounds, etc. have changed)
+        """
+        
+        if value is None:
+            value = self.value()
+        
+        bounds = self.opts['bounds']
+        if bounds[0] is not None and value < bounds[0]:
+            value = bounds[0]
+        if bounds[1] is not None and value > bounds[1]:
+            value = bounds[1]
+
+        if self.opts['int']:
+            value = int(value)
+
+        value = D(asUnicode(value))
+        if value == self.val:
+            return
+        prev = self.val
+        
+        self.val = value
+        if update:
+            self.updateText(prev=prev)
+            
+        self.sigValueChanging.emit(self, float(self.val))  ## change will be emitted in 300ms if there are no subsequent changes.
+        if not delaySignal:
+            self.emitChanged()
+        
+        return value
+
+    
+    def emitChanged(self):
+        self.lastValEmitted = self.val
+        self.valueChanged.emit(float(self.val))
+        self.sigValueChanged.emit(self)
+    
+    def delayedChange(self):
+        try:
+            if self.val != self.lastValEmitted:
+                self.emitChanged()
+        except RuntimeError:
+            pass  ## This can happen if we try to handle a delayed signal after someone else has already deleted the underlying C++ object.
+    
+    def widgetGroupInterface(self):
+        return (self.valueChanged, SpinBox.value, SpinBox.setValue)
+    
+    def sizeHint(self):
+        return QtCore.QSize(120, 0)
+    
+    
+    def stepEnabled(self):
+        return self.StepUpEnabled | self.StepDownEnabled        
+    
+    #def fixup(self, *args):
+        #print "fixup:", args
+    
+    def stepBy(self, n):
+        n = D(int(n))   ## n must be integral number of steps.
+        s = [D(-1), D(1)][n >= 0]  ## determine sign of step
+        val = self.val
+        
+        for i in range(int(abs(n))):
+            
+            if self.opts['log']:
+                raise Exception("Log mode no longer supported.")
+            #    step = abs(val) * self.opts['step']
+            #    if 'minStep' in self.opts:
+            #        step = max(step, self.opts['minStep'])
+            #    val += step * s
+            if self.opts['dec']:
+                if val == 0:
+                    step = self.opts['minStep']
+                    exp = None
+                else:
+                    vs = [D(-1), D(1)][val >= 0]
+                    #exp = D(int(abs(val*(D('1.01')**(s*vs))).log10()))
+                    fudge = D('1.01')**(s*vs) ## fudge factor. at some places, the step size depends on the step sign.
+                    exp = abs(val * fudge).log10().quantize(1, ROUND_FLOOR)
+                    step = self.opts['step'] * D(10)**exp
+                if 'minStep' in self.opts:
+                    step = max(step, self.opts['minStep'])
+                val += s * step
+                #print "Exp:", exp, "step", step, "val", val
+            else:
+                val += s*self.opts['step']
+                
+            if 'minStep' in self.opts and abs(val) < self.opts['minStep']:
+                val = D(0)
+        self.setValue(val, delaySignal=True)  ## note all steps (arrow buttons, wheel, up/down keys..) emit delayed signals only.
+        
+
+    def valueInRange(self, value):
+        bounds = self.opts['bounds']
+        if bounds[0] is not None and value < bounds[0]:
+            return False
+        if bounds[1] is not None and value > bounds[1]:
+            return False
+        if self.opts.get('int', False):
+            if int(value) != value:
+                return False
+        return True
+        
+
+    def updateText(self, prev=None):
+        #print "Update text."
+        self.skipValidate = True
+        if self.opts['siPrefix']:
+            if self.val == 0 and prev is not None:
+                (s, p) = fn.siScale(prev)
+                txt = "0.0 %s%s" % (p, self.opts['suffix'])
+            else:
+                txt = fn.siFormat(float(self.val), suffix=self.opts['suffix'])
+        else:
+            txt = '%g%s' % (self.val , self.opts['suffix'])
+        self.lineEdit().setText(txt)
+        self.lastText = txt
+        self.skipValidate = False
+        
+    def validate(self, strn, pos):
+        if self.skipValidate:
+            #print "skip validate"
+            #self.textValid = False
+            ret = QtGui.QValidator.Acceptable
+        else:
+            try:
+                ## first make sure we didn't mess with the suffix
+                suff = self.opts.get('suffix', '')
+                if len(suff) > 0 and asUnicode(strn)[-len(suff):] != suff:
+                    #print '"%s" != "%s"' % (unicode(strn)[-len(suff):], suff)
+                    ret = QtGui.QValidator.Invalid
+                    
+                ## next see if we actually have an interpretable value
+                else:
+                    val = self.interpret()
+                    if val is False:
+                        #print "can't interpret"
+                        #self.setStyleSheet('SpinBox {border: 2px solid #C55;}')
+                        #self.textValid = False
+                        ret = QtGui.QValidator.Intermediate
+                    else:
+                        if self.valueInRange(val):
+                            if not self.opts['delayUntilEditFinished']:
+                                self.setValue(val, update=False)
+                            #print "  OK:", self.val
+                            #self.setStyleSheet('')
+                            #self.textValid = True
+                            
+                            ret = QtGui.QValidator.Acceptable
+                        else:
+                            ret = QtGui.QValidator.Intermediate
+                        
+            except:
+                #print "  BAD"
+                #import sys
+                #sys.excepthook(*sys.exc_info())
+                #self.textValid = False
+                #self.setStyleSheet('SpinBox {border: 2px solid #C55;}')
+                ret = QtGui.QValidator.Intermediate
+            
+        ## draw / clear border
+        if ret == QtGui.QValidator.Intermediate:
+            self.textValid = False
+        elif ret == QtGui.QValidator.Acceptable:
+            self.textValid = True
+        ## note: if text is invalid, we don't change the textValid flag 
+        ## since the text will be forced to its previous state anyway
+        self.update()
+        
+        ## support 2 different pyqt APIs. Bleh.
+        if hasattr(QtCore, 'QString'):
+            return (ret, pos)
+        else:
+            return (ret, strn, pos)
+        
+    def paintEvent(self, ev):
+        QtGui.QAbstractSpinBox.paintEvent(self, ev)
+        
+        ## draw red border if text is invalid
+        if not self.textValid:
+            p = QtGui.QPainter(self)
+            p.setRenderHint(p.Antialiasing)
+            p.setPen(fn.mkPen((200,50,50), width=2))
+            p.drawRoundedRect(self.rect().adjusted(2, 2, -2, -2), 4, 4)
+            p.end()
+
+
+    def interpret(self):
+        """Return value of text. Return False if text is invalid, raise exception if text is intermediate"""
+        strn = self.lineEdit().text()
+        suf = self.opts['suffix']
+        if len(suf) > 0:
+            if strn[-len(suf):] != suf:
+                return False
+            #raise Exception("Units are invalid.")
+            strn = strn[:-len(suf)]
+        try:
+            val = fn.siEval(strn)
+        except:
+            #sys.excepthook(*sys.exc_info())
+            #print "invalid"
+            return False
+        #print val
+        return val
+        
+    #def interpretText(self, strn=None):
+        #print "Interpret:", strn
+        #if strn is None:
+            #strn = self.lineEdit().text()
+        #self.setValue(siEval(strn), update=False)
+        ##QtGui.QAbstractSpinBox.interpretText(self)
+        
+        
+    def editingFinishedEvent(self):
+        """Edit has finished; set value."""
+        #print "Edit finished."
+        if asUnicode(self.lineEdit().text()) == self.lastText:
+            #print "no text change."
+            return
+        try:
+            val = self.interpret()
+        except:
+            return
+        
+        if val is False:
+            #print "value invalid:", str(self.lineEdit().text())
+            return
+        if val == self.val:
+            #print "no value change:", val, self.val
+            return
+        self.setValue(val, delaySignal=False)  ## allow text update so that values are reformatted pretty-like
+        
+    #def textChanged(self):
+        #print "Text changed."
+        
+        
+### Drop-in replacement for SpinBox; just for crash-testing
+#class SpinBox(QtGui.QDoubleSpinBox):
+    #valueChanged = QtCore.Signal(object)     # (value)  for compatibility with QSpinBox
+    #sigValueChanged = QtCore.Signal(object)  # (self)
+    #sigValueChanging = QtCore.Signal(object)  # (value)
+    #def __init__(self, parent=None, *args, **kargs):
+        #QtGui.QSpinBox.__init__(self, parent)
+    
+    #def  __getattr__(self, attr):
+        #return lambda *args, **kargs: None
+        
+    #def widgetGroupInterface(self):
+        #return (self.valueChanged, SpinBox.value, SpinBox.setValue)
+    
diff --git a/libs/pyqtgraph/widgets/TableWidget.py b/libs/pyqtgraph/widgets/TableWidget.py
new file mode 100644
index 0000000000000000000000000000000000000000..69085a208993e98bc3a6b40e1538200148141676
--- /dev/null
+++ b/libs/pyqtgraph/widgets/TableWidget.py
@@ -0,0 +1,504 @@
+# -*- coding: utf-8 -*-
+from ..Qt import QtGui, QtCore
+from ..python2_3 import asUnicode
+
+import numpy as np
+try:
+    import metaarray
+    HAVE_METAARRAY = True
+except ImportError:
+    HAVE_METAARRAY = False
+
+
+__all__ = ['TableWidget']
+
+
+def _defersort(fn):
+    def defersort(self, *args, **kwds):
+        # may be called recursively; only the first call needs to block sorting
+        setSorting = False
+        if self._sorting is None:
+            self._sorting = self.isSortingEnabled()
+            setSorting = True
+            self.setSortingEnabled(False)
+        try:
+            return fn(self, *args, **kwds)
+        finally:
+            if setSorting:
+                self.setSortingEnabled(self._sorting)
+                self._sorting = None
+                
+    return defersort
+
+
+class TableWidget(QtGui.QTableWidget):
+    """Extends QTableWidget with some useful functions for automatic data handling
+    and copy / export context menu. Can automatically format and display a variety
+    of data types (see :func:`setData() <pyqtgraph.TableWidget.setData>` for more
+    information.
+    """
+    
+    def __init__(self, *args, **kwds):
+        """
+        All positional arguments are passed to QTableWidget.__init__().
+        
+        ===================== =================================================
+        **Keyword Arguments**
+        editable              (bool) If True, cells in the table can be edited
+                              by the user. Default is False.
+        sortable              (bool) If True, the table may be soted by
+                              clicking on column headers. Note that this also
+                              causes rows to appear initially shuffled until
+                              a sort column is selected. Default is True.
+                              *(added in version 0.9.9)*
+        ===================== =================================================
+        """
+        
+        QtGui.QTableWidget.__init__(self, *args)
+        
+        self.itemClass = TableWidgetItem
+        
+        self.setVerticalScrollMode(self.ScrollPerPixel)
+        self.setSelectionMode(QtGui.QAbstractItemView.ContiguousSelection)
+        self.setSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
+        self.clear()
+        
+        kwds.setdefault('sortable', True)
+        kwds.setdefault('editable', False)
+        self.setEditable(kwds.pop('editable'))
+        self.setSortingEnabled(kwds.pop('sortable'))
+        
+        if len(kwds) > 0:
+            raise TypeError("Invalid keyword arguments '%s'" % kwds.keys())
+        
+        self._sorting = None  # used when temporarily disabling sorting
+        
+        self._formats = {None: None} # stores per-column formats and entire table format
+        self.sortModes = {} # stores per-column sort mode
+        
+        self.itemChanged.connect(self.handleItemChanged)
+        
+        self.contextMenu = QtGui.QMenu()
+        self.contextMenu.addAction('Copy Selection').triggered.connect(self.copySel)
+        self.contextMenu.addAction('Copy All').triggered.connect(self.copyAll)
+        self.contextMenu.addAction('Save Selection').triggered.connect(self.saveSel)
+        self.contextMenu.addAction('Save All').triggered.connect(self.saveAll)
+        
+    def clear(self):
+        """Clear all contents from the table."""
+        QtGui.QTableWidget.clear(self)
+        self.verticalHeadersSet = False
+        self.horizontalHeadersSet = False
+        self.items = []
+        self.setRowCount(0)
+        self.setColumnCount(0)
+        self.sortModes = {}
+        
+    def setData(self, data):
+        """Set the data displayed in the table.
+        Allowed formats are:
+        
+        * numpy arrays
+        * numpy record arrays 
+        * metaarrays
+        * list-of-lists  [[1,2,3], [4,5,6]]
+        * dict-of-lists  {'x': [1,2,3], 'y': [4,5,6]}
+        * list-of-dicts  [{'x': 1, 'y': 4}, {'x': 2, 'y': 5}, ...]
+        """
+        self.clear()
+        self.appendData(data)
+        self.resizeColumnsToContents()
+        
+    @_defersort
+    def appendData(self, data):
+        """
+        Add new rows to the table.
+        
+        See :func:`setData() <pyqtgraph.TableWidget.setData>` for accepted
+        data types.
+        """
+        startRow = self.rowCount()
+        
+        fn0, header0 = self.iteratorFn(data)
+        if fn0 is None:
+            self.clear()
+            return
+        it0 = fn0(data)
+        try:
+            first = next(it0)
+        except StopIteration:
+            return
+        fn1, header1 = self.iteratorFn(first)
+        if fn1 is None:
+            self.clear()
+            return
+        
+        firstVals = [x for x in fn1(first)]
+        self.setColumnCount(len(firstVals))
+        
+        if not self.verticalHeadersSet and header0 is not None:
+            labels = [self.verticalHeaderItem(i).text() for i in range(self.rowCount())]
+            self.setRowCount(startRow + len(header0))
+            self.setVerticalHeaderLabels(labels + header0)
+            self.verticalHeadersSet = True
+        if not self.horizontalHeadersSet and header1 is not None:
+            self.setHorizontalHeaderLabels(header1)
+            self.horizontalHeadersSet = True
+        
+        i = startRow
+        self.setRow(i, firstVals)
+        for row in it0:
+            i += 1
+            self.setRow(i, [x for x in fn1(row)])
+            
+        if self._sorting and self.horizontalHeader().sortIndicatorSection() >= self.columnCount():
+            self.sortByColumn(0, QtCore.Qt.AscendingOrder)
+    
+    def setEditable(self, editable=True):
+        self.editable = editable
+        for item in self.items:
+            item.setEditable(editable)
+    
+    def setFormat(self, format, column=None):
+        """
+        Specify the default text formatting for the entire table, or for a
+        single column if *column* is specified.
+        
+        If a string is specified, it is used as a format string for converting
+        float values (and all other types are converted using str). If a 
+        function is specified, it will be called with the item as its only
+        argument and must return a string. Setting format = None causes the 
+        default formatter to be used instead.
+        
+        Added in version 0.9.9.
+        
+        """
+        if format is not None and not isinstance(format, basestring) and not callable(format):
+            raise ValueError("Format argument must string, callable, or None. (got %s)" % format)
+        
+        self._formats[column] = format
+        
+        
+        if column is None:
+            # update format of all items that do not have a column format 
+            # specified
+            for c in range(self.columnCount()):
+                if self._formats.get(c, None) is None:
+                    for r in range(self.rowCount()):
+                        item = self.item(r, c)
+                        if item is None:
+                            continue
+                        item.setFormat(format)
+        else:
+            # set all items in the column to use this format, or the default 
+            # table format if None was specified.
+            if format is None:
+                format = self._formats[None]
+            for r in range(self.rowCount()):
+                item = self.item(r, column)
+                if item is None:
+                    continue
+                item.setFormat(format)
+        
+    
+    def iteratorFn(self, data):
+        ## Return 1) a function that will provide an iterator for data and 2) a list of header strings
+        if isinstance(data, list) or isinstance(data, tuple):
+            return lambda d: d.__iter__(), None
+        elif isinstance(data, dict):
+            return lambda d: iter(d.values()), list(map(asUnicode, data.keys()))
+        elif HAVE_METAARRAY and (hasattr(data, 'implements') and data.implements('MetaArray')):
+            if data.axisHasColumns(0):
+                header = [asUnicode(data.columnName(0, i)) for i in range(data.shape[0])]
+            elif data.axisHasValues(0):
+                header = list(map(asUnicode, data.xvals(0)))
+            else:
+                header = None
+            return self.iterFirstAxis, header
+        elif isinstance(data, np.ndarray):
+            return self.iterFirstAxis, None
+        elif isinstance(data, np.void):
+            return self.iterate, list(map(asUnicode, data.dtype.names))
+        elif data is None:
+            return (None,None)
+        else:
+            msg = "Don't know how to iterate over data type: {!s}".format(type(data))
+            raise TypeError(msg)
+        
+    def iterFirstAxis(self, data):
+        for i in range(data.shape[0]):
+            yield data[i]
+            
+    def iterate(self, data):
+        # for numpy.void, which can be iterated but mysteriously 
+        # has no __iter__ (??)
+        for x in data:
+            yield x
+        
+    def appendRow(self, data):
+        self.appendData([data])
+        
+    @_defersort
+    def addRow(self, vals):
+        row = self.rowCount()
+        self.setRowCount(row + 1)
+        self.setRow(row, vals)
+        
+    @_defersort
+    def setRow(self, row, vals):
+        if row > self.rowCount() - 1:
+            self.setRowCount(row + 1)
+        for col in range(len(vals)):
+            val = vals[col]
+            item = self.itemClass(val, row)
+            item.setEditable(self.editable)
+            sortMode = self.sortModes.get(col, None)
+            if sortMode is not None:
+                item.setSortMode(sortMode)
+            format = self._formats.get(col, self._formats[None])
+            item.setFormat(format)
+            self.items.append(item)
+            self.setItem(row, col, item)
+            item.setValue(val)  # Required--the text-change callback is invoked
+                                # when we call setItem.
+
+    def setSortMode(self, column, mode):
+        """
+        Set the mode used to sort *column*.
+        
+        ============== ========================================================
+        **Sort Modes**
+        value          Compares item.value if available; falls back to text
+                       comparison.
+        text           Compares item.text()
+        index          Compares by the order in which items were inserted.
+        ============== ========================================================
+        
+        Added in version 0.9.9
+        """
+        for r in range(self.rowCount()):
+            item = self.item(r, column)
+            if hasattr(item, 'setSortMode'):
+                item.setSortMode(mode)
+        self.sortModes[column] = mode
+        
+    def sizeHint(self):
+        # based on http://stackoverflow.com/a/7195443/54056
+        width = sum(self.columnWidth(i) for i in range(self.columnCount()))
+        width += self.verticalHeader().sizeHint().width()
+        width += self.verticalScrollBar().sizeHint().width()
+        width += self.frameWidth() * 2
+        height = sum(self.rowHeight(i) for i in range(self.rowCount()))
+        height += self.verticalHeader().sizeHint().height()
+        height += self.horizontalScrollBar().sizeHint().height()
+        return QtCore.QSize(width, height)
+         
+    def serialize(self, useSelection=False):
+        """Convert entire table (or just selected area) into tab-separated text values"""
+        if useSelection:
+            selection = self.selectedRanges()[0]
+            rows = list(range(selection.topRow(),
+                              selection.bottomRow() + 1))
+            columns = list(range(selection.leftColumn(),
+                                 selection.rightColumn() + 1))        
+        else:
+            rows = list(range(self.rowCount()))
+            columns = list(range(self.columnCount()))
+
+        data = []
+        if self.horizontalHeadersSet:
+            row = []
+            if self.verticalHeadersSet:
+                row.append(asUnicode(''))
+            
+            for c in columns:
+                row.append(asUnicode(self.horizontalHeaderItem(c).text()))
+            data.append(row)
+        
+        for r in rows:
+            row = []
+            if self.verticalHeadersSet:
+                row.append(asUnicode(self.verticalHeaderItem(r).text()))
+            for c in columns:
+                item = self.item(r, c)
+                if item is not None:
+                    row.append(asUnicode(item.value))
+                else:
+                    row.append(asUnicode(''))
+            data.append(row)
+            
+        s = ''
+        for row in data:
+            s += ('\t'.join(row) + '\n')
+        return s
+
+    def copySel(self):
+        """Copy selected data to clipboard."""
+        QtGui.QApplication.clipboard().setText(self.serialize(useSelection=True))
+
+    def copyAll(self):
+        """Copy all data to clipboard."""
+        QtGui.QApplication.clipboard().setText(self.serialize(useSelection=False))
+
+    def saveSel(self):
+        """Save selected data to file."""
+        self.save(self.serialize(useSelection=True))
+
+    def saveAll(self):
+        """Save all data to file."""
+        self.save(self.serialize(useSelection=False))
+
+    def save(self, data):
+        fileName = QtGui.QFileDialog.getSaveFileName(self, "Save As..", "", "Tab-separated values (*.tsv)")
+        if fileName == '':
+            return
+        open(fileName, 'w').write(data)
+
+    def contextMenuEvent(self, ev):
+        self.contextMenu.popup(ev.globalPos())
+        
+    def keyPressEvent(self, ev):
+        if ev.text() == 'c' and ev.modifiers() == QtCore.Qt.ControlModifier:
+            ev.accept()
+            self.copy()
+        else:
+            ev.ignore()
+
+    def handleItemChanged(self, item):
+        item.itemChanged()
+
+
+class TableWidgetItem(QtGui.QTableWidgetItem):
+    def __init__(self, val, index, format=None):
+        QtGui.QTableWidgetItem.__init__(self, '')
+        self._blockValueChange = False
+        self._format = None
+        self._defaultFormat = '%0.3g'
+        self.sortMode = 'value'
+        self.index = index
+        flags = QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled
+        self.setFlags(flags)
+        self.setValue(val)
+        self.setFormat(format)
+        
+    def setEditable(self, editable):
+        """
+        Set whether this item is user-editable.
+        """
+        if editable:
+            self.setFlags(self.flags() | QtCore.Qt.ItemIsEditable)
+        else:
+            self.setFlags(self.flags() & ~QtCore.Qt.ItemIsEditable)
+            
+    def setSortMode(self, mode):
+        """
+        Set the mode used to sort this item against others in its column.
+        
+        ============== ========================================================
+        **Sort Modes**
+        value          Compares item.value if available; falls back to text
+                       comparison.
+        text           Compares item.text()
+        index          Compares by the order in which items were inserted.
+        ============== ========================================================
+        """
+        modes = ('value', 'text', 'index', None)
+        if mode not in modes:
+            raise ValueError('Sort mode must be one of %s' % str(modes))
+        self.sortMode = mode
+        
+    def setFormat(self, fmt):
+        """Define the conversion from item value to displayed text. 
+        
+        If a string is specified, it is used as a format string for converting
+        float values (and all other types are converted using str). If a 
+        function is specified, it will be called with the item as its only
+        argument and must return a string.
+        
+        Added in version 0.9.9.
+        """
+        if fmt is not None and not isinstance(fmt, basestring) and not callable(fmt):
+            raise ValueError("Format argument must string, callable, or None. (got %s)" % fmt)
+        self._format = fmt
+        self._updateText()
+        
+    def _updateText(self):
+        self._blockValueChange = True
+        try:
+            self._text = self.format()
+            self.setText(self._text)
+        finally:
+            self._blockValueChange = False
+
+    def setValue(self, value):
+        self.value = value
+        self._updateText()
+
+    def itemChanged(self):
+        """Called when the data of this item has changed."""
+        if self.text() != self._text:
+            self.textChanged()
+
+    def textChanged(self):
+        """Called when this item's text has changed for any reason."""
+        self._text = self.text()
+
+        if self._blockValueChange:
+            # text change was result of value or format change; do not
+            # propagate.
+            return
+        
+        try:
+
+            self.value = type(self.value)(self.text())
+        except ValueError:
+            self.value = str(self.text())
+
+    def format(self):
+        if callable(self._format):
+            return self._format(self)
+        if isinstance(self.value, (float, np.floating)):
+            if self._format is None:
+                return self._defaultFormat % self.value
+            else:
+                return self._format % self.value
+        else:
+            return asUnicode(self.value)
+
+    def __lt__(self, other):
+        if self.sortMode == 'index' and hasattr(other, 'index'):
+            return self.index < other.index
+        if self.sortMode == 'value' and hasattr(other, 'value'):
+            return self.value < other.value
+        else:
+            return self.text() < other.text()
+
+
+if __name__ == '__main__':
+    app = QtGui.QApplication([])
+    win = QtGui.QMainWindow()
+    t = TableWidget()
+    win.setCentralWidget(t)
+    win.resize(800,600)
+    win.show()
+    
+    ll = [[1,2,3,4,5]] * 20
+    ld = [{'x': 1, 'y': 2, 'z': 3}] * 20
+    dl = {'x': list(range(20)), 'y': list(range(20)), 'z': list(range(20))}
+    
+    a = np.ones((20, 5))
+    ra = np.ones((20,), dtype=[('x', int), ('y', int), ('z', int)])
+    
+    t.setData(ll)
+    
+    if HAVE_METAARRAY:
+        ma = metaarray.MetaArray(np.ones((20, 3)), info=[
+            {'values': np.linspace(1, 5, 20)}, 
+            {'cols': [
+                {'name': 'x'},
+                {'name': 'y'},
+                {'name': 'z'},
+            ]}
+        ])
+        t.setData(ma)
+    
diff --git a/libs/pyqtgraph/widgets/TreeWidget.py b/libs/pyqtgraph/widgets/TreeWidget.py
new file mode 100644
index 0000000000000000000000000000000000000000..ec2c35cf5be9e05f7320600cc280b5a75ef23be6
--- /dev/null
+++ b/libs/pyqtgraph/widgets/TreeWidget.py
@@ -0,0 +1,284 @@
+# -*- coding: utf-8 -*-
+from ..Qt import QtGui, QtCore
+from weakref import *
+
+__all__ = ['TreeWidget', 'TreeWidgetItem']
+class TreeWidget(QtGui.QTreeWidget):
+    """Extends QTreeWidget to allow internal drag/drop with widgets in the tree.
+    Also maintains the expanded state of subtrees as they are moved.
+    This class demonstrates the absurd lengths one must go to to make drag/drop work."""
+    
+    sigItemMoved = QtCore.Signal(object, object, object) # (item, parent, index)
+    
+    def __init__(self, parent=None):
+        QtGui.QTreeWidget.__init__(self, parent)
+        #self.itemWidgets = WeakKeyDictionary()
+        self.setAcceptDrops(True)
+        self.setDragEnabled(True)
+        self.setEditTriggers(QtGui.QAbstractItemView.EditKeyPressed|QtGui.QAbstractItemView.SelectedClicked)
+        self.placeholders = []
+        self.childNestingLimit = None
+
+    def setItemWidget(self, item, col, wid):
+        """
+        Overrides QTreeWidget.setItemWidget such that widgets are added inside an invisible wrapper widget.
+        This makes it possible to move the item in and out of the tree without its widgets being automatically deleted.
+        """
+        w = QtGui.QWidget()  ## foster parent / surrogate child widget
+        l = QtGui.QVBoxLayout()
+        l.setContentsMargins(0,0,0,0)
+        w.setLayout(l)
+        w.setSizePolicy(wid.sizePolicy())
+        w.setMinimumHeight(wid.minimumHeight())
+        w.setMinimumWidth(wid.minimumWidth())
+        l.addWidget(wid)
+        w.realChild = wid
+        self.placeholders.append(w)
+        QtGui.QTreeWidget.setItemWidget(self, item, col, w)
+
+    def itemWidget(self, item, col):
+        w = QtGui.QTreeWidget.itemWidget(self, item, col)
+        if w is not None:
+            w = w.realChild
+        return w
+
+    def dropMimeData(self, parent, index, data, action):
+        item = self.currentItem()
+        p = parent
+        #print "drop", item, "->", parent, index
+        while True:
+            if p is None:
+                break
+            if p is item:
+                return False
+                #raise Exception("Can not move item into itself.")
+            p = p.parent()
+        
+        if not self.itemMoving(item, parent, index):
+            return False
+        
+        currentParent = item.parent()
+        if currentParent is None:
+            currentParent = self.invisibleRootItem()
+        if parent is None:
+            parent = self.invisibleRootItem()
+            
+        if currentParent is parent and index > parent.indexOfChild(item):
+            index -= 1
+            
+        self.prepareMove(item)
+            
+        currentParent.removeChild(item)
+        #print "  insert child to index", index
+        parent.insertChild(index, item)  ## index will not be correct
+        self.setCurrentItem(item)
+        
+        self.recoverMove(item)
+        #self.emit(QtCore.SIGNAL('itemMoved'), item, parent, index)
+        self.sigItemMoved.emit(item, parent, index)
+        return True
+
+    def itemMoving(self, item, parent, index):
+        """Called when item has been dropped elsewhere in the tree.
+        Return True to accept the move, False to reject."""
+        return True
+        
+    def prepareMove(self, item):
+        item.__widgets = []
+        item.__expanded = item.isExpanded()
+        for i in range(self.columnCount()):
+            w = self.itemWidget(item, i)
+            item.__widgets.append(w)
+            if w is None:
+                continue
+            w.setParent(None)
+        for i in range(item.childCount()):
+            self.prepareMove(item.child(i))
+        
+    def recoverMove(self, item):
+        for i in range(self.columnCount()):
+            w = item.__widgets[i]
+            if w is None:
+                continue
+            self.setItemWidget(item, i, w)
+        for i in range(item.childCount()):
+            self.recoverMove(item.child(i))
+        
+        item.setExpanded(False)  ## Items do not re-expand correctly unless they are collapsed first.
+        QtGui.QApplication.instance().processEvents()
+        item.setExpanded(item.__expanded)
+        
+    def collapseTree(self, item):
+        item.setExpanded(False)
+        for i in range(item.childCount()):
+            self.collapseTree(item.child(i))
+            
+    def removeTopLevelItem(self, item):
+        for i in range(self.topLevelItemCount()):
+            if self.topLevelItem(i) is item:
+                self.takeTopLevelItem(i)
+                return
+        raise Exception("Item '%s' not in top-level items." % str(item))
+    
+    def listAllItems(self, item=None):
+        items = []
+        if item != None:
+            items.append(item)
+        else:
+            item = self.invisibleRootItem()
+        
+        for cindex in range(item.childCount()):
+            foundItems = self.listAllItems(item=item.child(cindex))
+            for f in foundItems:
+                items.append(f)
+        return items
+            
+    def dropEvent(self, ev):
+        QtGui.QTreeWidget.dropEvent(self, ev)
+        self.updateDropFlags()
+
+    
+    def updateDropFlags(self):
+        ### intended to put a limit on how deep nests of children can go.
+        ### self.childNestingLimit is upheld when moving items without children, but if the item being moved has children/grandchildren, the children/grandchildren
+        ### can end up over the childNestingLimit. 
+        if self.childNestingLimit == None:
+            pass # enable drops in all items (but only if there are drops that aren't enabled? for performance...)
+        else:
+            items = self.listAllItems()
+            for item in items:
+                parentCount = 0
+                p = item.parent()
+                while p is not None:
+                    parentCount += 1
+                    p = p.parent()
+                if parentCount >= self.childNestingLimit:
+                    item.setFlags(item.flags() & (~QtCore.Qt.ItemIsDropEnabled))
+                else:
+                    item.setFlags(item.flags() | QtCore.Qt.ItemIsDropEnabled)
+
+    @staticmethod
+    def informTreeWidgetChange(item):
+        if hasattr(item, 'treeWidgetChanged'):
+            item.treeWidgetChanged()
+        else:
+            for i in xrange(item.childCount()):
+                TreeWidget.informTreeWidgetChange(item.child(i))
+        
+        
+    def addTopLevelItem(self, item):
+        QtGui.QTreeWidget.addTopLevelItem(self, item)
+        self.informTreeWidgetChange(item)
+
+    def addTopLevelItems(self, items):
+        QtGui.QTreeWidget.addTopLevelItems(self, items)
+        for item in items:
+            self.informTreeWidgetChange(item)
+            
+    def insertTopLevelItem(self, index, item):
+        QtGui.QTreeWidget.insertTopLevelItem(self, index, item)
+        self.informTreeWidgetChange(item)
+
+    def insertTopLevelItems(self, index, items):
+        QtGui.QTreeWidget.insertTopLevelItems(self, index, items)
+        for item in items:
+            self.informTreeWidgetChange(item)
+            
+    def takeTopLevelItem(self, index):
+        item = self.topLevelItem(index)
+        if item is not None:
+            self.prepareMove(item)
+        item = QtGui.QTreeWidget.takeTopLevelItem(self, index)
+        self.prepareMove(item)
+        self.informTreeWidgetChange(item)
+        return item
+
+    def topLevelItems(self):
+        return map(self.topLevelItem, xrange(self.topLevelItemCount()))
+        
+    def clear(self):
+        items = self.topLevelItems()
+        for item in items:
+            self.prepareMove(item)
+        QtGui.QTreeWidget.clear(self)
+        
+        ## Why do we want to do this? It causes RuntimeErrors. 
+        #for item in items:
+            #self.informTreeWidgetChange(item)
+        
+            
+class TreeWidgetItem(QtGui.QTreeWidgetItem):
+    """
+    TreeWidgetItem that keeps track of its own widgets.
+    Widgets may be added to columns before the item is added to a tree.
+    """
+    def __init__(self, *args):
+        QtGui.QTreeWidgetItem.__init__(self, *args)
+        self._widgets = {}  # col: widget
+        self._tree = None
+        
+        
+    def setChecked(self, column, checked):
+        self.setCheckState(column, QtCore.Qt.Checked if checked else QtCore.Qt.Unchecked)
+        
+    def setWidget(self, column, widget):
+        if column in self._widgets:
+            self.removeWidget(column)
+        self._widgets[column] = widget
+        tree = self.treeWidget()
+        if tree is None:
+            return
+        else:
+            tree.setItemWidget(self, column, widget)
+            
+    def removeWidget(self, column):
+        del self._widgets[column]
+        tree = self.treeWidget()
+        if tree is None:
+            return
+        tree.removeItemWidget(self, column)
+            
+    def treeWidgetChanged(self):
+        tree = self.treeWidget()
+        if self._tree is tree:
+            return
+        self._tree = self.treeWidget()
+        if tree is None:
+            return
+        for col, widget in self._widgets.items():
+            tree.setItemWidget(self, col, widget)
+            
+    def addChild(self, child):
+        QtGui.QTreeWidgetItem.addChild(self, child)
+        TreeWidget.informTreeWidgetChange(child)
+            
+    def addChildren(self, childs):
+        QtGui.QTreeWidgetItem.addChildren(self, childs)
+        for child in childs:
+            TreeWidget.informTreeWidgetChange(child)
+
+    def insertChild(self, index, child):
+        QtGui.QTreeWidgetItem.insertChild(self, index, child)
+        TreeWidget.informTreeWidgetChange(child)
+    
+    def insertChildren(self, index, childs):
+        QtGui.QTreeWidgetItem.addChildren(self, index, childs)
+        for child in childs:
+            TreeWidget.informTreeWidgetChange(child)
+    
+    def removeChild(self, child):
+        QtGui.QTreeWidgetItem.removeChild(self, child)
+        TreeWidget.informTreeWidgetChange(child)
+            
+    def takeChild(self, index):
+        child = QtGui.QTreeWidgetItem.takeChild(self, index)
+        TreeWidget.informTreeWidgetChange(child)
+        return child
+    
+    def takeChildren(self):
+        childs = QtGui.QTreeWidgetItem.takeChildren(self)
+        for child in childs:
+            TreeWidget.informTreeWidgetChange(child)
+        return childs
+        
+        
diff --git a/libs/pyqtgraph/widgets/ValueLabel.py b/libs/pyqtgraph/widgets/ValueLabel.py
new file mode 100644
index 0000000000000000000000000000000000000000..4e5b3011d2600b7efdcfa644154b21ceaeefbb4a
--- /dev/null
+++ b/libs/pyqtgraph/widgets/ValueLabel.py
@@ -0,0 +1,73 @@
+from ..Qt import QtCore, QtGui
+from ..ptime import time
+from .. import functions as fn
+from functools import reduce
+
+__all__ = ['ValueLabel']
+
+class ValueLabel(QtGui.QLabel):
+    """
+    QLabel specifically for displaying numerical values.
+    Extends QLabel adding some extra functionality:
+
+    - displaying units with si prefix
+    - built-in exponential averaging 
+    """
+    
+    def __init__(self, parent=None, suffix='', siPrefix=False, averageTime=0, formatStr=None):
+        """
+        ==============      ==================================================================================
+        **Arguments:**
+        suffix              (str or None) The suffix to place after the value
+        siPrefix            (bool) Whether to add an SI prefix to the units and display a scaled value
+        averageTime         (float) The length of time in seconds to average values. If this value
+                            is 0, then no averaging is performed. As this value increases
+                            the display value will appear to change more slowly and smoothly.
+        formatStr           (str) Optionally, provide a format string to use when displaying text. The text
+                            will be generated by calling formatStr.format(value=, avgValue=, suffix=)
+                            (see Python documentation on str.format)
+                            This option is not compatible with siPrefix
+        ==============      ==================================================================================
+        """
+        QtGui.QLabel.__init__(self, parent)
+        self.values = []
+        self.averageTime = averageTime ## no averaging by default
+        self.suffix = suffix
+        self.siPrefix = siPrefix
+        if formatStr is None:
+            formatStr = '{avgValue:0.2g} {suffix}'
+        self.formatStr = formatStr
+    
+    def setValue(self, value):
+        now = time()
+        self.values.append((now, value))
+        cutoff = now - self.averageTime
+        while len(self.values) > 0 and self.values[0][0] < cutoff:
+            self.values.pop(0)
+        self.update()
+        
+    def setFormatStr(self, text):
+        self.formatStr = text
+        self.update()
+        
+    def setAverageTime(self, t):
+        self.averageTime = t
+        
+    def averageValue(self):
+        return reduce(lambda a,b: a+b, [v[1] for v in self.values]) / float(len(self.values))
+        
+        
+    def paintEvent(self, ev):
+        self.setText(self.generateText())
+        return QtGui.QLabel.paintEvent(self, ev)
+        
+    def generateText(self):
+        if len(self.values) == 0:
+            return ''
+        avg = self.averageValue()
+        val = self.values[-1][1]
+        if self.siPrefix:
+            return fn.siFormat(avg, suffix=self.suffix)
+        else:
+            return self.formatStr.format(value=val, avgValue=avg, suffix=self.suffix)
+            
diff --git a/libs/pyqtgraph/widgets/VerticalLabel.py b/libs/pyqtgraph/widgets/VerticalLabel.py
new file mode 100644
index 0000000000000000000000000000000000000000..c8cc80bdd8ef5df6cd7b58b1f2d1b57778cc860c
--- /dev/null
+++ b/libs/pyqtgraph/widgets/VerticalLabel.py
@@ -0,0 +1,99 @@
+# -*- coding: utf-8 -*-
+from ..Qt import QtGui, QtCore
+
+__all__ = ['VerticalLabel']
+#class VerticalLabel(QtGui.QLabel):
+    #def paintEvent(self, ev):
+        #p = QtGui.QPainter(self)
+        #p.rotate(-90)
+        #self.hint = p.drawText(QtCore.QRect(-self.height(), 0, self.height(), self.width()), QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter, self.text())
+        #p.end()
+        #self.setMinimumWidth(self.hint.height())
+        #self.setMinimumHeight(self.hint.width())
+
+    #def sizeHint(self):
+        #if hasattr(self, 'hint'):
+            #return QtCore.QSize(self.hint.height(), self.hint.width())
+        #else:
+            #return QtCore.QSize(16, 50)
+
+class VerticalLabel(QtGui.QLabel):
+    def __init__(self, text, orientation='vertical', forceWidth=True):
+        QtGui.QLabel.__init__(self, text)
+        self.forceWidth = forceWidth
+        self.orientation = None
+        self.setOrientation(orientation)
+        
+    def setOrientation(self, o):
+        if self.orientation == o:
+            return
+        self.orientation = o
+        self.update()
+        self.updateGeometry()
+        
+    def paintEvent(self, ev):
+        p = QtGui.QPainter(self)
+        #p.setBrush(QtGui.QBrush(QtGui.QColor(100, 100, 200)))
+        #p.setPen(QtGui.QPen(QtGui.QColor(50, 50, 100)))
+        #p.drawRect(self.rect().adjusted(0, 0, -1, -1))
+        
+        #p.setPen(QtGui.QPen(QtGui.QColor(255, 255, 255)))
+        
+        if self.orientation == 'vertical':
+            p.rotate(-90)
+            rgn = QtCore.QRect(-self.height(), 0, self.height(), self.width())
+        else:
+            rgn = self.contentsRect()
+        align = self.alignment()
+        #align  = QtCore.Qt.AlignTop|QtCore.Qt.AlignHCenter
+            
+        self.hint = p.drawText(rgn, align, self.text())
+        p.end()
+        
+        if self.orientation == 'vertical':
+            self.setMaximumWidth(self.hint.height())
+            self.setMinimumWidth(0)
+            self.setMaximumHeight(16777215)
+            if self.forceWidth:
+                self.setMinimumHeight(self.hint.width())
+            else:
+                self.setMinimumHeight(0)
+        else:
+            self.setMaximumHeight(self.hint.height())
+            self.setMinimumHeight(0)
+            self.setMaximumWidth(16777215)
+            if self.forceWidth:
+                self.setMinimumWidth(self.hint.width())
+            else:
+                self.setMinimumWidth(0)
+
+    def sizeHint(self):
+        if self.orientation == 'vertical':
+            if hasattr(self, 'hint'):
+                return QtCore.QSize(self.hint.height(), self.hint.width())
+            else:
+                return QtCore.QSize(19, 50)
+        else:
+            if hasattr(self, 'hint'):
+                return QtCore.QSize(self.hint.width(), self.hint.height())
+            else:
+                return QtCore.QSize(50, 19)
+
+
+if __name__ == '__main__':
+    app = QtGui.QApplication([])
+    win = QtGui.QMainWindow()
+    w = QtGui.QWidget()
+    l = QtGui.QGridLayout()
+    w.setLayout(l)
+    
+    l1 = VerticalLabel("text 1", orientation='horizontal')
+    l2 = VerticalLabel("text 2")
+    l3 = VerticalLabel("text 3")
+    l4 = VerticalLabel("text 4", orientation='horizontal')
+    l.addWidget(l1, 0, 0)
+    l.addWidget(l2, 1, 1)
+    l.addWidget(l3, 2, 2)
+    l.addWidget(l4, 3, 3)
+    win.setCentralWidget(w)
+    win.show()
\ No newline at end of file
diff --git a/libs/pyqtgraph/widgets/__init__.py b/libs/pyqtgraph/widgets/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..a81fe391a1bcad485c49355982891482cc33ba73
--- /dev/null
+++ b/libs/pyqtgraph/widgets/__init__.py
@@ -0,0 +1,21 @@
+## just import everything from sub-modules
+
+#import os
+
+#d = os.path.split(__file__)[0]
+#files = []
+#for f in os.listdir(d):
+    #if os.path.isdir(os.path.join(d, f)):
+        #files.append(f)
+    #elif f[-3:] == '.py' and f != '__init__.py':
+        #files.append(f[:-3])
+    
+#for modName in files:
+    #mod = __import__(modName, globals(), locals(), fromlist=['*'])
+    #if hasattr(mod, '__all__'):
+        #names = mod.__all__
+    #else:
+        #names = [n for n in dir(mod) if n[0] != '_']
+    #for k in names:
+        #print modName, k
+        #globals()[k] = getattr(mod, k)
diff --git a/libs/pyqtgraph/widgets/tests/test_combobox.py b/libs/pyqtgraph/widgets/tests/test_combobox.py
new file mode 100644
index 0000000000000000000000000000000000000000..f511331c10c90de81f9fce691e5d6f4b17de9c21
--- /dev/null
+++ b/libs/pyqtgraph/widgets/tests/test_combobox.py
@@ -0,0 +1,44 @@
+import pyqtgraph as pg
+pg.mkQApp()
+
+def test_combobox():
+    cb = pg.ComboBox()
+    items = {'a': 1, 'b': 2, 'c': 3}
+    cb.setItems(items)
+    cb.setValue(2)
+    assert str(cb.currentText()) == 'b'
+    assert cb.value() == 2
+    
+    # Clear item list; value should be None
+    cb.clear()
+    assert cb.value() == None
+    
+    # Reset item list; value should be set automatically
+    cb.setItems(items)
+    assert cb.value() == 2
+    
+    # Clear item list; repopulate with same names and new values
+    items = {'a': 4, 'b': 5, 'c': 6}
+    cb.clear()
+    cb.setItems(items)
+    assert cb.value() == 5
+    
+    # Set list instead of dict
+    cb.setItems(list(items.keys()))
+    assert str(cb.currentText()) == 'b'
+    
+    cb.setValue('c')
+    assert cb.value() == str(cb.currentText())
+    assert cb.value() == 'c'
+    
+    cb.setItemValue('c', 7)
+    assert cb.value() == 7
+    
+    
+if __name__ == '__main__':
+    cb = pg.ComboBox()
+    cb.show()
+    cb.setItems({'': None, 'a': 1, 'b': 2, 'c': 3})
+    def fn(ind):
+        print("New value: %s" % cb.value())
+    cb.currentIndexChanged.connect(fn)
\ No newline at end of file
diff --git a/libs/pyqtgraph/widgets/tests/test_tablewidget.py b/libs/pyqtgraph/widgets/tests/test_tablewidget.py
new file mode 100644
index 0000000000000000000000000000000000000000..11416430fea5a7ac4fc66d8c860f2b34f49bdf54
--- /dev/null
+++ b/libs/pyqtgraph/widgets/tests/test_tablewidget.py
@@ -0,0 +1,128 @@
+import pyqtgraph as pg
+import numpy as np
+from pyqtgraph.pgcollections import OrderedDict
+
+app = pg.mkQApp()
+
+
+listOfTuples = [('text_%d' % i, i, i/9.) for i in range(12)]
+listOfLists = [list(row) for row in listOfTuples]
+plainArray = np.array(listOfLists, dtype=object)
+recordArray = np.array(listOfTuples, dtype=[('string', object), 
+                                            ('integer', int), 
+                                            ('floating', float)])
+dictOfLists = OrderedDict([(name, list(recordArray[name])) for name in recordArray.dtype.names])
+listOfDicts = [OrderedDict([(name, rec[name]) for name in recordArray.dtype.names]) for rec in recordArray]
+transposed = [[row[col] for row in listOfTuples] for col in range(len(listOfTuples[0]))]
+
+def assertTableData(table, data):
+    assert len(data) == table.rowCount()
+    rows = list(range(table.rowCount()))
+    columns = list(range(table.columnCount()))
+    for r in rows:
+        assert len(data[r]) == table.columnCount()
+        row = []
+        for c in columns:
+            item = table.item(r, c)
+            if item is not None:
+                row.append(item.value)
+            else:
+                row.append(None)
+        assert row == list(data[r])
+    
+
+def test_TableWidget():
+    w = pg.TableWidget(sortable=False)
+    
+    # Test all input data types
+    w.setData(listOfTuples)
+    assertTableData(w, listOfTuples)
+    
+    w.setData(listOfLists)
+    assertTableData(w, listOfTuples)
+    
+    w.setData(plainArray)
+    assertTableData(w, listOfTuples)
+    
+    w.setData(recordArray)
+    assertTableData(w, listOfTuples)
+    
+    w.setData(dictOfLists)
+    assertTableData(w, transposed)
+    
+    w.appendData(dictOfLists)
+    assertTableData(w, transposed * 2)
+        
+    w.setData(listOfDicts)
+    assertTableData(w, listOfTuples)
+    
+    w.appendData(listOfDicts)
+    assertTableData(w, listOfTuples * 2)
+
+    # Test sorting
+    w.setData(listOfTuples)
+    w.sortByColumn(0, pg.QtCore.Qt.AscendingOrder)
+    assertTableData(w, sorted(listOfTuples, key=lambda a: a[0]))
+    
+    w.sortByColumn(1, pg.QtCore.Qt.AscendingOrder)
+    assertTableData(w, sorted(listOfTuples, key=lambda a: a[1]))
+    
+    w.sortByColumn(2, pg.QtCore.Qt.AscendingOrder)
+    assertTableData(w, sorted(listOfTuples, key=lambda a: a[2]))
+    
+    w.setSortMode(1, 'text')
+    w.sortByColumn(1, pg.QtCore.Qt.AscendingOrder)
+    assertTableData(w, sorted(listOfTuples, key=lambda a: str(a[1])))
+
+    w.setSortMode(1, 'index')
+    w.sortByColumn(1, pg.QtCore.Qt.AscendingOrder)
+    assertTableData(w, listOfTuples)
+
+    # Test formatting
+    item = w.item(0, 2)
+    assert item.text() == ('%0.3g' % item.value)
+    
+    w.setFormat('%0.6f')
+    assert item.text() == ('%0.6f' % item.value)
+    
+    w.setFormat('X%0.7f', column=2)
+    assert isinstance(item.value, float)
+    assert item.text() == ('X%0.7f' % item.value)
+    
+    # test setting items that do not exist yet
+    w.setFormat('X%0.7f', column=3)
+    
+    # test append uses correct formatting
+    w.appendRow(('x', 10, 7.3))
+    item = w.item(w.rowCount()-1, 2)
+    assert isinstance(item.value, float)
+    assert item.text() == ('X%0.7f' % item.value)
+    
+    # test reset back to defaults
+    w.setFormat(None, column=2)
+    assert isinstance(item.value, float)
+    assert item.text() == ('%0.6f' % item.value)
+    
+    w.setFormat(None)
+    assert isinstance(item.value, float)
+    assert item.text() == ('%0.3g' % item.value)
+    
+    # test function formatter
+    def fmt(item):
+        if isinstance(item.value, float):
+            return "%d %f" % (item.index, item.value)
+        else:
+            return pg.asUnicode(item.value)
+    w.setFormat(fmt)
+    assert isinstance(item.value, float)
+    assert isinstance(item.index, int)
+    assert item.text() == ("%d %f" % (item.index, item.value))
+    
+
+
+if __name__ == '__main__':
+    w = pg.TableWidget(editable=True)
+    w.setData(listOfTuples)
+    w.resize(600, 600)
+    w.show()
+
diff --git a/libs/qimage2ndarray/LICENSE.txt b/libs/qimage2ndarray/LICENSE.txt
deleted file mode 100644
index 96d599dac8fc563eb78b9305e428df72944a6678..0000000000000000000000000000000000000000
--- a/libs/qimage2ndarray/LICENSE.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Copyright (c) 2009, Hans Meine <hans_meine@gmx.net>
-All rights reserved. 
- 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
- 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
- 
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the
-   distribution.
- 
-3. Neither the name of the University of Hamburg nor the names of its
-   contributors may be used to endorse or promote products derived
-   from this software without specific prior written permission.
- 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/libs/qimage2ndarray/__init__.py b/libs/qimage2ndarray/__init__.py
deleted file mode 100644
index 6e56e0e06dd75127d37a7b5918acf431b9824c32..0000000000000000000000000000000000000000
--- a/libs/qimage2ndarray/__init__.py
+++ /dev/null
@@ -1,403 +0,0 @@
-import sys as _sys
-import numpy as _np
-
-from .dynqt import QtGui as _qt
-
-from .dynqt import qt as _qt_driver
-if _qt_driver.name() == 'PythonQt':
-    from .qimageview import QImage2ndarray as _temp
-    _qimageview = _temp.qimageview
-else:
-    from .qimageview_python import qimageview as _qimageview
-
-__version__ = "1.5"
-
-if _sys.byteorder == 'little':
-    _bgra = (0, 1, 2, 3)
-else:
-    _bgra = (3, 2, 1, 0)
-
-_bgra_fields = {'b': (_np.uint8, _bgra[0], 'blue'),
-                'g': (_np.uint8, _bgra[1], 'green'),
-                'r': (_np.uint8, _bgra[2], 'red'),
-                'a': (_np.uint8, _bgra[3], 'alpha')}
-
-bgra_dtype = _np.dtype(_bgra_fields)
-"""Complex dtype offering the named fields 'r','g','b', and 'a' and
-corresponding long names, conforming to QImage_'s 32-bit memory layout."""
-
-try:
-    _basestring = basestring
-except NameError:
-    # 'basestring' undefined, must be Python 3
-    _basestring = str
-
-def _qimage_or_filename_view(qimage):
-    if isinstance(qimage, _basestring):
-        qimage = _qt.QImage(qimage)
-    return _qimageview(qimage)
-
-def raw_view(qimage):
-    """Returns raw 2D view of the given QImage_'s memory.  The result
-    will be a 2-dimensional numpy.ndarray with an appropriately sized
-    integral dtype.  (This function is not intented to be used
-    directly, but used internally by the other -- more convenient --
-    view creation functions.)
-
-    :param qimage: image whose memory shall be accessed via NumPy
-    :type qimage: QImage_
-    :rtype: numpy.ndarray_ with shape (height, width)"""
-    return _qimage_or_filename_view(qimage)
-
-
-def byte_view(qimage, byteorder = 'little'):
-    """Returns raw 3D view of the given QImage_'s memory.  This will
-    always be a 3-dimensional numpy.ndarray with dtype numpy.uint8.
-    
-    Note that for 32-bit images, the last dimension will be in the
-    [B,G,R,A] order (if little endian) due to QImage_'s memory layout
-    (the alpha channel will be present for Format_RGB32 images, too).
-
-    For 8-bit (indexed) images, the array will still be 3-dimensional,
-    i.e. shape will be (height, width, 1).
-
-    The order of channels in the last axis depends on the `byteorder`,
-    which defaults to 'little', i.e. BGRA order.  You may set the
-    argument `byteorder` to 'big' to get ARGB, or use None which means
-    sys.byteorder here, i.e. return native order for the machine the
-    code is running on.
-
-    For your convenience, `qimage` may also be a filename, see
-    `Loading and Saving Images`_ in the documentation.
-
-    :param qimage: image whose memory shall be accessed via NumPy
-    :type qimage: QImage_
-    :param byteorder: specify order of channels in last axis
-    :rtype: numpy.ndarray_ with shape (height, width, 1 or 4) and dtype uint8"""
-    raw = _qimage_or_filename_view(qimage)
-    result = raw.view(_np.uint8).reshape(raw.shape + (-1, ))
-    if byteorder and byteorder != _sys.byteorder:
-        result = result[...,::-1]
-    return result
-
-
-def rgb_view(qimage, byteorder = 'big'):
-    """Returns RGB view of a given 32-bit color QImage_'s memory.
-    Similarly to byte_view(), the result is a 3D numpy.uint8 array,
-    but reduced to the rgb dimensions (without alpha), and reordered
-    (using negative strides in the last dimension) to have the usual
-    [R,G,B] order.  The image must have 32 bit pixel size, i.e. be
-    RGB32, ARGB32, or ARGB32_Premultiplied.  (Note that in the latter
-    case, the values are of course premultiplied with alpha.)
-
-    The order of channels in the last axis depends on the `byteorder`,
-    which defaults to 'big', i.e. RGB order.  You may set the argument
-    `byteorder` to 'little' to get BGR, or use None which means
-    sys.byteorder here, i.e. return native order for the machine the
-    code is running on.
-
-    For your convenience, `qimage` may also be a filename, see
-    `Loading and Saving Images`_ in the documentation.
-
-    :param qimage: image whose memory shall be accessed via NumPy
-    :type qimage: QImage_ with 32-bit pixel type
-    :param byteorder: specify order of channels in last axis
-    :rtype: numpy.ndarray_ with shape (height, width, 3) and dtype uint8"""
-    if byteorder is None:
-        byteorder = _sys.byteorder
-    bytes = byte_view(qimage, byteorder)
-    if bytes.shape[2] != 4:
-        raise ValueError("For rgb_view, the image must have 32 bit pixel size (use RGB32, ARGB32, or ARGB32_Premultiplied)")
-
-    if byteorder == 'little':
-        return bytes[...,:3] # strip A off BGRA
-    else:
-        return bytes[...,1:] # strip A off ARGB
-
-
-def alpha_view(qimage):
-    """Returns alpha view of a given 32-bit color QImage_'s memory.
-    The result is a 2D numpy.uint8 array, equivalent to
-    byte_view(qimage)[...,3].  The image must have 32 bit pixel size,
-    i.e. be RGB32, ARGB32, or ARGB32_Premultiplied.  Note that it is
-    not enforced that the given qimage has a format that actually
-    *uses* the alpha channel -- for Format_RGB32, the alpha channel
-    usually contains 255 everywhere.
-
-    For your convenience, `qimage` may also be a filename, see
-    `Loading and Saving Images`_ in the documentation.
-
-    :param qimage: image whose memory shall be accessed via NumPy
-    :type qimage: QImage_ with 32-bit pixel type
-    :rtype: numpy.ndarray_ with shape (height, width) and dtype uint8"""
-    bytes = byte_view(qimage, byteorder = None)
-    if bytes.shape[2] != 4:
-        raise ValueError("For alpha_view, the image must have 32 bit pixel size (use RGB32, ARGB32, or ARGB32_Premultiplied)")
-    return bytes[...,_bgra[3]]
-
-
-def recarray_view(qimage):
-    """Returns recarray_ view of a given 32-bit color QImage_'s
-    memory.
-
-    The result is a 2D array with a complex record dtype, offering the
-    named fields 'r','g','b', and 'a' and corresponding long names.
-    Thus, each color components can be accessed either via string
-    indexing or via attribute lookup (through numpy.recarray_):
-
-    For your convenience, `qimage` may also be a filename, see
-    `Loading and Saving Images`_ in the documentation.
-
-    >>> from PyQt4.QtGui import QImage, qRgb
-    >>> qimg = QImage(320, 240, QImage.Format_ARGB32)
-    >>> qimg.fill(qRgb(12,34,56))
-    >>>
-    >>> import qimage2ndarray
-    >>> v = qimage2ndarray.recarray_view(qimg)
-    >>>
-    >>> red = v["r"]
-    >>> red[10,10]
-    12
-    >>> pixel = v[10,10]
-    >>> pixel["r"]
-    12
-    >>> (v.g == v["g"]).all()
-    True
-    >>> (v.alpha == 255).all()
-    True
-
-    :param qimage: image whose memory shall be accessed via NumPy
-    :type qimage: QImage_ with 32-bit pixel type
-    :rtype: numpy.ndarray_ with shape (height, width) and dtype :data:`bgra_dtype`"""
-    raw = _qimage_or_filename_view(qimage)
-    if raw.itemsize != 4:
-        raise ValueError("For rgb_view, the image must have 32 bit pixel size (use RGB32, ARGB32, or ARGB32_Premultiplied)")
-    return raw.view(bgra_dtype, _np.recarray)
-
-
-
-def _normalize255(array, normalize, clip = (0, 255)):
-    if normalize:
-        if normalize is True:
-            normalize = array.min(), array.max()
-            if clip == (0, 255):
-                clip = None
-        elif _np.isscalar(normalize):
-            normalize = (0, normalize)
-
-        nmin, nmax = normalize
-
-        if nmin:
-            array = array - nmin
-
-        if nmax != nmin:
-            scale = 255. / (nmax - nmin)
-            if scale != 1.0:
-                array = array * scale
-
-    if clip:
-        low, high = clip
-        _np.clip(array, low, high, array)
-
-    return array
-
-
-def gray2qimage(gray, normalize = False):
-    """Convert the 2D numpy array `gray` into a 8-bit, indexed QImage_
-    with a gray colormap.  The first dimension represents the vertical
-    image axis.
-
-    The parameter `normalize` can be used to normalize an image's
-    value range to 0..255:
-
-    `normalize` = (nmin, nmax):
-      scale & clip image values from nmin..nmax to 0..255
-
-    `normalize` = nmax:
-      lets nmin default to zero, i.e. scale & clip the range 0..nmax
-      to 0..255
-
-    `normalize` = True:
-      scale image values to 0..255 (same as passing (gray.min(),
-      gray.max()))
-
-    If the source array `gray` contains masked values, the result will
-    have only 255 shades of gray, and one color map entry will be used
-    to make the corresponding pixels transparent.
-
-    A full alpha channel cannot be supported with indexed images;
-    instead, use `array2qimage` to convert into a 32-bit QImage.
-
-    :param gray: image data which should be converted (copied) into a QImage_
-    :type gray: 2D or 3D numpy.ndarray_ or `numpy.ma.array <masked arrays>`_
-    :param normalize: normalization parameter (see above, default: no value changing)
-    :type normalize: bool, scalar, or pair
-    :rtype: QImage_ with RGB32 or ARGB32 format"""
-    if _np.ndim(gray) != 2:
-        raise ValueError("gray2QImage can only convert 2D arrays" +
-                         " (try using array2qimage)" if _np.ndim(gray) == 3 else "")
-
-    h, w = gray.shape
-    result = _qt.QImage(w, h, _qt.QImage.Format_Indexed8)
-
-    if not _np.ma.is_masked(gray):
-        for i in range(256):
-            result.setColor(i, _qt.qRgb(i,i,i))
-
-        _qimageview(result)[:] = _normalize255(gray, normalize)
-    else:
-        # map gray value 1 to gray value 0, in order to make room for
-        # transparent colormap entry:
-        result.setColor(0, _qt.qRgb(0,0,0))
-        for i in range(2, 256):
-            result.setColor(i-1, _qt.qRgb(i,i,i))
-
-        _qimageview(result)[:] = _normalize255(gray, normalize, clip = (1, 255)) - 1
-
-        result.setColor(255, 0)
-        _qimageview(result)[gray.mask] = 255
-
-    return result
-
-
-def array2qimage(array, normalize = False):
-    """Convert a 2D or 3D numpy array into a 32-bit QImage_.  The
-    first dimension represents the vertical image axis; the optional
-    third dimension is supposed to contain 1-4 channels:
-
-    ========= ===================
-    #channels interpretation
-    ========= ===================
-            1 scalar/gray
-            2 scalar/gray + alpha
-            3 RGB
-            4 RGB + alpha
-    ========= ===================
-
-    Scalar data will be converted into corresponding gray RGB triples;
-    if you want to convert to an (indexed) 8-bit image instead, use
-    `gray2qimage` (which cannot support an alpha channel though).
-
-    The parameter `normalize` can be used to normalize an image's
-    value range to 0..255:
-
-    `normalize` = (nmin, nmax):
-      scale & clip image values from nmin..nmax to 0..255
-
-    `normalize` = nmax:
-      lets nmin default to zero, i.e. scale & clip the range 0..nmax
-      to 0..255
-
-    `normalize` = True:
-      scale image values to 0..255 (same as passing (array.min(),
-      array.max()))
-
-    If `array` contains masked values, the corresponding pixels will
-    be transparent in the result.  Thus, the result will be of
-    QImage.Format_ARGB32 if the input already contains an alpha
-    channel (i.e. has shape (H,W,4)) or if there are masked pixels,
-    and QImage.Format_RGB32 otherwise.
-
-    :param array: image data which should be converted (copied) into a QImage_
-    :type array: 2D or 3D numpy.ndarray_ or `numpy.ma.array <masked arrays>`_
-    :param normalize: normalization parameter (see above, default: no value changing)
-    :type normalize: bool, scalar, or pair
-    :rtype: QImage_ with RGB32 or ARGB32 format"""
-    if _np.ndim(array) == 2:
-        array = array[...,None]
-    elif _np.ndim(array) != 3:
-        raise ValueError("array2qimage can only convert 2D or 3D arrays (got %d dimensions)" % _np.ndim(array))
-    if array.shape[2] not in (1, 2, 3, 4):
-        raise ValueError("array2qimage expects the last dimension to contain exactly one (scalar/gray), two (gray+alpha), three (R,G,B), or four (R,G,B,A) channels")
-
-    h, w, channels = array.shape
-
-    hasAlpha = _np.ma.is_masked(array) or channels in (2, 4)
-    fmt = _qt.QImage.Format_ARGB32 if hasAlpha else _qt.QImage.Format_RGB32
-
-    result = _qt.QImage(w, h, fmt)
-
-    array = _normalize255(array, normalize)
-
-    if channels >= 3:
-        rgb_view(result)[:] = array[...,:3]
-    else:
-        rgb_view(result)[:] = array[...,:1] # scalar data
-
-    alpha = alpha_view(result)
-
-    if channels in (2, 4):
-        alpha[:] = array[...,-1]
-    else:
-        alpha[:] = 255
-
-    if _np.ma.is_masked(array):
-        alpha[:]  *= _np.logical_not(_np.any(array.mask, axis = -1))
-
-    return result
-
-
-def imread(filename, masked = False):
-    """Convenience function that uses the QImage_ constructor to read an
-    image from the given file and return an `rgb_view` of the result.
-    This is intentionally similar to scipy.ndimage.imread (which uses
-    PIL), scipy.misc.imread, or matplotlib.pyplot.imread (using PIL
-    for non-PNGs).
-
-    For grayscale images, return 2D array (even if it comes from a 32-bit
-    representation; this is a consequence of the QImage API).
-
-    For images with an alpha channel, the resulting number of channels
-    will be 2 (grayscale+alpha) or 4 (RGB+alpha).  Alternatively, one may
-    pass `masked = True' in order to get `numpy.ma.array <masked
-    arrays>`_ back.  Note that only fully transparent pixels are masked
-    (and that masked arrays only support binary masks).  The value of
-    `masked` is ignored when the loaded image has no alpha channel
-    (i.e., one would not get a masked array in that case).
-
-    This function has been added in version 1.3.
-
-    """
-    qImage = _qt.QImage(filename)
-
-    isGray = qImage.isGrayscale()
-    if isGray and qImage.depth() == 8:
-        return byte_view(qImage)[...,0]
-
-    hasAlpha = qImage.hasAlphaChannel()
-
-    if hasAlpha:
-        targetFormat = _qt.QImage.Format_ARGB32
-    else:
-        targetFormat = _qt.QImage.Format_RGB32
-    if qImage.format() != targetFormat:
-        qImage = qImage.convertToFormat(targetFormat)
-
-    result = rgb_view(qImage)
-    if isGray:
-        result = result[...,0]
-    if hasAlpha:
-        if masked:
-            mask = (alpha_view(qImage) == 0)
-            if _np.ndim(result) == 3:
-                mask = _np.repeat(mask[...,None], 3, axis = 2)
-            result = _np.ma.masked_array(result, mask)
-        else:
-            result = _np.dstack((result, alpha_view(qImage)))
-    return result
-
-
-def imsave(filename, image, normalize = False, format = None, quality = -1):
-    """Convenience function that uses QImage.save to save an image to the
-    given file.  This is intentionally similar to scipy.misc.imsave.
-    However, it supports different optional arguments:
-
-    :param normalize: see :func:`array2qimage` (which is used internally)
-    :param format: image filetype (e.g. 'PNG'),  (default: check filename's suffix)
-    :param quality: see QImage.save (0 = small .. 100 = uncompressed, -1 = default compression)
-    :returns: boolean success, see QImage.save
-    
-    This function has been added in version 1.4.
-    """
-    qImage = array2qimage(image, normalize = normalize)
-    return qImage.save(filename, format, quality)
diff --git a/libs/qimage2ndarray/dynqt.py b/libs/qimage2ndarray/dynqt.py
deleted file mode 100644
index a4f1a18bce006d81d848dfd98d881901e3af5bda..0000000000000000000000000000000000000000
--- a/libs/qimage2ndarray/dynqt.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from .qt_driver import QtDriver
-
-qt = QtDriver()
-QtGui = qt.QtGui
diff --git a/libs/qimage2ndarray/qimageview_python.py b/libs/qimage2ndarray/qimageview_python.py
deleted file mode 100644
index 83efb2ddf0f9351992aef016f7ce1f4ac2eb83c9..0000000000000000000000000000000000000000
--- a/libs/qimage2ndarray/qimageview_python.py
+++ /dev/null
@@ -1,60 +0,0 @@
-import numpy as np
-from qimage2ndarray.dynqt import qt, QtGui
-
-def PyQt_data(image):
-    # PyQt4/PyQt5's QImage.bits() returns a sip.voidptr that supports
-    # conversion to string via asstring(size) or getting its base
-    # address via int(...):
-    return (int(image.bits()), False)
-
-def _re_buffer_address_match(buf_repr):
-    import re
-    _re_buffer_address = re.compile('<read-write buffer ptr 0x([0-9a-fA-F]*),')
-    global _re_buffer_address_match
-    _re_buffer_address_match = _re_buffer_address.match
-    return _re_buffer_address_match(buf_repr)
-
-def PySide_data(image):
-    # PySide's QImage.bits() returns a buffer object like this:
-    # <read-write buffer ptr 0x7fc3f4821600, size 76800 at 0x111269570>
-    ma = _re_buffer_address_match(repr(image.bits()))
-    assert ma, 'could not parse address from %r' % (image.bits(), )
-    return (int(ma.group(1), 16), False)
-
-getdata = dict(
-    PyQt4 = PyQt_data,
-    PyQt5 = PyQt_data,
-    PySide = PySide_data,
-)[qt.name()]
-
-
-def qimageview(image):
-    if not isinstance(image, QtGui.QImage):
-        raise TypeError("image argument must be a QImage instance")
-
-    shape = image.height(), image.width()
-    strides0 = image.bytesPerLine()
-
-    format = image.format()
-    if format == QtGui.QImage.Format_Indexed8:
-        dtype = "|u1"
-        strides1 = 1
-    elif format in (QtGui.QImage.Format_RGB32, QtGui.QImage.Format_ARGB32, QtGui.QImage.Format_ARGB32_Premultiplied):
-        dtype = "|u4"
-        strides1 = 4
-    elif format == QtGui.QImage.Format_Invalid:
-        raise ValueError("qimageview got invalid QImage")
-    else:
-        raise ValueError("qimageview can only handle 8- or 32-bit QImages")
-
-    image.__array_interface__ = {
-        'shape': shape,
-        'typestr': dtype,
-        'data': getdata(image),
-        'strides': (strides0, strides1),
-        'version': 3,
-    }
-
-    result = np.asarray(image)
-    del image.__array_interface__
-    return result
diff --git a/libs/qimage2ndarray/qt_driver.py b/libs/qimage2ndarray/qt_driver.py
deleted file mode 100644
index 483cd287af1976d6c665860fa84d3304ece7273d..0000000000000000000000000000000000000000
--- a/libs/qimage2ndarray/qt_driver.py
+++ /dev/null
@@ -1,125 +0,0 @@
-#  Copyright 2014-2014 Hans Meine <hans_meine@gmx.net>
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-"""This module contains a wrapper around three different Qt python bindings.
-It will dynamically decide which one to use:
-
-* First, the environment variable QT_DRIVER is checked
-  (may be one of 'PyQt5', 'PyQt4', 'PySide', 'PythonQt').
-* If unset, previously imported binding modules are detected (in sys.modules).
-* If no bindings are loaded, the environment variable QT_API is checked
-  (used by ETS and ipython, may be 'pyside' or 'pyqt').
-
-In order to have compatible behavior between the different bindings,
-PyQt4 (if used) is configured as follows::
-
-    sip.setapi("QString", 2)
-    sip.setapi("QVariant", 2)
-
-Furthermore, there is a 'getprop' function that solves the following
-problem: PythonQt exports Qt properties as Python properties *and*
-gives the precedence over getters with the same name.  Instead of
-calling getters with parentheses (which must not be used in PythonQt,
-but are required in PyQt and PySide), one may e.g. write
-`getprop(widget.width)`.
-"""
-
-import sys, os
-
-def getprop_PythonQt(prop):
-    """getprop(property_or_getter)
-
-    Used on getters that have the same name as a corresponding
-    property.  For PythonQt, this version will just return the
-    argument, which is assumed to be (the value of) a python property
-    through which PythonQt exposes Qt properties."""
-    return prop
-
-def getprop_other(getter):
-    """getprop(property_or_getter)
-
-    Used on getters that have the same name as a corresponding
-    property.  For Qt bindings other than PythonQt, this version will
-    return the result of calling the argument, which is assumed to be
-    a Qt getter function.  (With PythonQt, properties override getters
-    and no calling must be done.)"""
-    return getter()
-
-class QtDriver(object):
-    DRIVERS = ('PyQt5', 'PyQt4', 'PySide', 'PythonQt')
-    DEFAULT = 'PyQt4'
-    
-    @classmethod
-    def detect_qt(cls):
-        for drv in cls.DRIVERS:
-            if drv in sys.modules:
-                return drv
-        if '_PythonQt' in sys.modules:
-            return 'PythonQt'
-        return None
-
-    def name(self):
-        return self._drv
-
-    def getprop(self):
-        return getprop_PythonQt if self._drv == 'PythonQt' else getprop_other
-
-    def __init__(self, drv = os.environ.get('QT_DRIVER')):
-        """Supports QT_API (used by ETS and ipython)"""
-        if drv is None:
-            drv = self.detect_qt()
-        if drv is None:
-            drv = os.environ.get('QT_API')
-        if drv is None:
-            drv = self.DEFAULT
-        drv = {'pyside' : 'PySide', 'pyqt' : 'PyQt4', 'pyqt5' : 'PyQt5'}.get(drv, drv) # map ETS syntax
-        assert drv in self.DRIVERS
-        self._drv = drv
-
-    @staticmethod
-    def _initPyQt4():
-        """initialize PyQt4 to be compatible with PySide"""
-        if 'PyQt4.QtCore' in sys.modules:
-            # too late to configure API
-            pass
-        else:
-            import sip
-            sip.setapi("QString", 2)
-            sip.setapi("QVariant", 2)
-
-    @staticmethod
-    def requireCompatibleAPI():
-        """If PyQt4's API should be configured to be compatible with PySide's
-        (i.e. QString and QVariant should not be explicitly exported,
-        cf. documentation of sip.setapi()), call this function to check that
-        the PyQt4 was properly imported.  (It will always be configured this
-        way by this module, but it could have been imported before we got a
-        hand on doing so.)
-        """
-        if 'PyQt4.QtCore' in sys.modules:
-            import sip
-            for api in ('QVariant', 'QString'):
-                if sip.getapi(api) != 2:
-                    raise RuntimeError('%s API already set to V%d, but should be 2' % (api, sip.getapi(api)))
-            
-    def importMod(self, mod):
-        if self._drv == 'PyQt4':
-            self._initPyQt4()
-        qt = __import__('%s.%s' % (self._drv, mod))
-        return getattr(qt, mod)
-
-    def __getattr__(self, name):
-        if name.startswith('Qt'):
-            return self.importMod(name)
-        return super(QtDriver, self).__getattr__(name)
diff --git a/libs/qrangeslider-0.1.1/PKG-INFO b/libs/qrangeslider-0.1.1/PKG-INFO
deleted file mode 100644
index 5374908bfa8050c16057076ebc3c909efc4b6441..0000000000000000000000000000000000000000
--- a/libs/qrangeslider-0.1.1/PKG-INFO
+++ /dev/null
@@ -1,10 +0,0 @@
-Metadata-Version: 1.0
-Name: qrangeslider
-Version: 0.1.1
-Summary: The QRangeSlider class implements a horizontal PyQt range slider widget.
-Home-page: http://github.com/rsgalloway/qrangeslider
-Author: Ryan Galloway
-Author-email: ryan@rsgalloway.com
-License: UNKNOWN
-Description: UNKNOWN
-Platform: UNKNOWN
diff --git a/libs/qrangeslider-0.1.1/README b/libs/qrangeslider-0.1.1/README
deleted file mode 100644
index 8048e6bbc834e6f1fca94eccc5fb61b1c9bf0790..0000000000000000000000000000000000000000
--- a/libs/qrangeslider-0.1.1/README
+++ /dev/null
@@ -1,34 +0,0 @@
-QRangeSlider
-
-Thu Apr 28 00:08:07 PDT 2011
-
-
-1 Overview
-~~~~~~~~~~
-
-The QRangeSlider class implements a horizontal PyQt range slider widget.
-
-  * README	    	this file
-  * LICENSE	    	the license under which QRangeSlider is released
-  * qrangeslider.py	qrangeslider python module
-  * examples.py		some usage examples
-
-
-2 Installation
-~~~~~~~~~~~~~~
-
-  $ sudo easy_install qrangeslider
-
-or download the source and run
-
-  $ sudo python setup.py install
-
-
-3 Basic Usage
-~~~~~~~~~~~~~
-
-  >>> from qrangeslider import QRangeSlider
-  >>> app = QtGui.QApplication(sys.argv)
-  >>> slider = QRangeSlider()
-  >>> slider.show()
-  >>> app.exec_()
\ No newline at end of file
diff --git a/libs/qrangeslider-0.1.1/qrangeslider.py b/libs/qrangeslider-0.1.1/qrangeslider.py
deleted file mode 100644
index 1267a1a459b364bab0196f53979fa351ec40dff6..0000000000000000000000000000000000000000
--- a/libs/qrangeslider-0.1.1/qrangeslider.py
+++ /dev/null
@@ -1,521 +0,0 @@
-#!/usr/bin/env python
-# ---------------------------------------------------------------------------------------------
-# Copyright (c) 2011-2014, Ryan Galloway (ryan@rsgalloway.com)
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-#  - Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-#
-#  - Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#
-#  - Neither the name of the software nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# ---------------------------------------------------------------------------------------------
-# docs and latest version available for download at
-#   http://rsgalloway.github.com/qrangeslider
-# ---------------------------------------------------------------------------------------------
-
-__author__ = "Ryan Galloway <ryan@rsgalloway.com>"
-__version__ = "0.1.1"
-
-
-# ---------------------------------------------------------------------------------------------
-# SUMMARY
-# ---------------------------------------------------------------------------------------------
-"""The QRangeSlider class implements a horizontal range slider widget.
-
-"""
-
-# ---------------------------------------------------------------------------------------------
-# TODO
-# ---------------------------------------------------------------------------------------------
-
-"""
-  - smoother mouse move event handler
-  - support splits and joins
-  - verticle sliders
-  - ticks
-  
-"""
-
-# ---------------------------------------------------------------------------------------------
-# IMPORTS
-# ---------------------------------------------------------------------------------------------
-import os
-import sys
-
-from PyQt4 import QtCore
-from PyQt4 import QtGui
-from PyQt4 import uic
-
-try:
-    _fromUtf8 = QtCore.QString.fromUtf8
-except AttributeError:
-    _fromUtf8 = lambda s: s
-
-__all__ = ['QRangeSlider']
-
-DEFAULT_CSS = """
-QRangeSlider * {
-    border: 0px;
-    padding: 0px;
-}
-QRangeSlider #Head {
-    background: #222;
-}
-QRangeSlider #Span {
-    background: #393;
-}
-QRangeSlider #Span:active {
-    background: #282;
-}
-QRangeSlider #Tail {
-    background: #222;
-}
-QRangeSlider > QSplitter::handle {
-    background: #393;
-}
-QRangeSlider > QSplitter::handle:vertical {
-    height: 4px;
-}
-QRangeSlider > QSplitter::handle:pressed {
-    background: #ca5;
-}
-
-"""
-
-def scale(val, src, dst):
-    """
-    Scale the given value from the scale of src to the scale of dst.
-    """
-    return int(((val - src[0]) / float(src[1]-src[0])) * (dst[1]-dst[0]) + dst[0])
-
-class Ui_Form(object):
-    """default range slider form"""
-    
-    def setupUi(self, Form):
-        Form.setObjectName(_fromUtf8("QRangeSlider"))
-        Form.resize(300, 30)
-        Form.setStyleSheet(_fromUtf8(DEFAULT_CSS))
-        self.gridLayout = QtGui.QGridLayout(Form)
-        self.gridLayout.setMargin(0)
-        self.gridLayout.setSpacing(0)
-        self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
-        self._splitter = QtGui.QSplitter(Form)
-        self._splitter.setMinimumSize(QtCore.QSize(0, 0))
-        self._splitter.setMaximumSize(QtCore.QSize(16777215, 16777215))
-        self._splitter.setOrientation(QtCore.Qt.Horizontal)
-        self._splitter.setObjectName(_fromUtf8("splitter"))
-        self._head = QtGui.QGroupBox(self._splitter)
-        self._head.setTitle(_fromUtf8(""))
-        self._head.setObjectName(_fromUtf8("Head"))
-        self._handle = QtGui.QGroupBox(self._splitter)
-        self._handle.setTitle(_fromUtf8(""))
-        self._handle.setObjectName(_fromUtf8("Span"))
-        self._tail = QtGui.QGroupBox(self._splitter)
-        self._tail.setTitle(_fromUtf8(""))
-        self._tail.setObjectName(_fromUtf8("Tail"))
-        self.gridLayout.addWidget(self._splitter, 0, 0, 1, 1)
-
-        self.retranslateUi(Form)
-        QtCore.QMetaObject.connectSlotsByName(Form)
-
-    def retranslateUi(self, Form):
-        encoding = QtGui.QApplication.UnicodeUTF8
-        Form.setWindowTitle(QtGui.QApplication.translate("QRangeSlider", 
-                                                         "QRangeSlider",
-                                                         None, encoding))
-
-
-class Element(QtGui.QGroupBox):
-    
-    def __init__(self, parent, main):
-        super(Element, self).__init__(parent)
-        self.main = main
-        
-    def setStyleSheet(self, style):
-        """redirect style to parent groupbox"""
-        self.parent().setStyleSheet(style)
-
-    def textColor(self):
-        """text paint color"""
-        return getattr(self, '__textColor', QtGui.QColor(125, 125, 125))
-
-    def setTextColor(self, color):
-        """set the text paint color"""
-        if type(color) == tuple and len(color) == 3:
-            color = QtGui.QColor(color[0], color[1], color[2])
-        elif type(color) == int:
-            color = QtGui.QColor(color, color, color)
-        setattr(self, '__textColor', color)
-
-    def paintEvent(self, event):
-        """overrides paint event to handle text"""
-        qp = QtGui.QPainter()
-        qp.begin(self)
-        if self.main.drawValues():
-            self.drawText(event, qp)
-        qp.end()
-
-
-class Head(Element):
-    """area before the handle"""
-    
-    def __init__(self, parent, main):
-        super(Head, self).__init__(parent, main)
-
-    def drawText(self, event, qp):
-        qp.setPen(self.textColor())
-        qp.setFont(QtGui.QFont('Arial', 10))
-        qp.drawText(event.rect(), QtCore.Qt.AlignLeft, str(self.main.min()))
-
-
-class Tail(Element):
-    """area after the handle"""
-    
-    def __init__(self, parent, main):
-        super(Tail, self).__init__(parent, main)
-        
-    def drawText(self, event, qp):
-        qp.setPen(self.textColor())
-        qp.setFont(QtGui.QFont('Arial', 10))
-        qp.drawText(event.rect(), QtCore.Qt.AlignRight, str(self.main.max()))
-
-
-class Handle(Element):
-    """handle area"""
-    
-    def __init__(self, parent, main):
-        super(Handle, self).__init__(parent, main)
-        
-    def drawText(self, event, qp):
-        qp.setPen(self.textColor())
-        qp.setFont(QtGui.QFont('Arial', 10))
-        qp.drawText(event.rect(), QtCore.Qt.AlignLeft, str(self.main.start()))
-        qp.drawText(event.rect(), QtCore.Qt.AlignRight, str(self.main.end()))
-
-    def mouseMoveEvent(self, event):
-        event.accept()
-        mx = event.globalX()
-        _mx = getattr(self, '__mx', None)
-        
-        if not _mx:  
-            setattr(self, '__mx', mx)
-            dx = 0
-        else:
-            dx = mx - _mx
-
-        setattr(self, '__mx', mx)
-
-        if dx == 0:
-            event.ignore()
-            return
-        elif dx > 0:
-            dx = 1
-        elif dx < 0:
-            dx = -1
-        
-        s = self.main.start() + dx
-        e = self.main.end() + dx
-        if s >= self.main.min() and e <= self.main.max():
-            self.main.setRange(s, e)
-
-
-class QRangeSlider(QtGui.QWidget, Ui_Form):
-    """
-    The QRangeSlider class implements a horizontal range slider widget.
-
-    Inherits QWidget.
-
-    Methods
-
-        * __init__ (self, QWidget parent = None)
-        * bool drawValues (self)
-        * int end (self)
-        * (int, int) getRange (self)
-        * int max (self)
-        * int min (self)
-        * int start (self)
-        * setBackgroundStyle (self, QString styleSheet)
-        * setDrawValues (self, bool draw)
-        * setEnd (self, int end)
-        * setStart (self, int start)
-        * setRange (self, int start, int end)
-        * setSpanStyle (self, QString styleSheet)
-
-    Signals
-
-        * endValueChanged (int)
-        * maxValueChanged (int)
-        * minValueChanged (int)
-        * startValueChanged (int)
-
-    Customizing QRangeSlider
-
-    You can style the range slider as below:
-    ::
-        QRangeSlider * {
-            border: 0px;
-            padding: 0px;
-        }
-        QRangeSlider #Head {
-            background: #222;
-        }
-        QRangeSlider #Span {
-            background: #393;
-        }
-        QRangeSlider #Span:active {
-            background: #282;
-        }
-        QRangeSlider #Tail {
-            background: #222;
-        }
-
-    Styling the range slider handles follows QSplitter options:
-    ::
-        QRangeSlider > QSplitter::handle {
-            background: #393;
-        }
-        QRangeSlider > QSplitter::handle:vertical {
-            height: 4px;
-        }
-        QRangeSlider > QSplitter::handle:pressed {
-            background: #ca5;
-        }
-        
-    """
-    endValueChanged = QtCore.pyqtSignal(int)
-    maxValueChanged = QtCore.pyqtSignal(int)
-    minValueChanged = QtCore.pyqtSignal(int)
-    startValueChanged = QtCore.pyqtSignal(int)
-
-    # define splitter indices
-    _SPLIT_START = 1
-    _SPLIT_END = 2
-
-    # signals
-    minValueChanged = QtCore.pyqtSignal(int)
-    maxValueChanged = QtCore.pyqtSignal(int)
-    startValueChanged = QtCore.pyqtSignal(int)
-    endValueChanged = QtCore.pyqtSignal(int)
-
-    def __init__(self, parent=None):
-        """Create a new QRangeSlider instance.
-        
-            :param parent: QWidget parent
-            :return: New QRangeSlider instance.
-        
-        """
-        super(QRangeSlider, self).__init__(parent)
-        self.setupUi(self)
-        self.setMouseTracking(False)
-
-        #self._splitter.setChildrenCollapsible(False)
-        self._splitter.splitterMoved.connect(self._handleMoveSplitter)
-
-        # head layout
-        self._head_layout = QtGui.QHBoxLayout()
-        self._head_layout.setSpacing(0)
-        self._head_layout.setMargin(0)
-        self._head.setLayout(self._head_layout)
-        self.head = Head(self._head, main=self)
-        self._head_layout.addWidget(self.head)
-
-        # handle layout
-        self._handle_layout = QtGui.QHBoxLayout()
-        self._handle_layout.setSpacing(0)
-        self._handle_layout.setMargin(0)
-        self._handle.setLayout(self._handle_layout)
-        self.handle = Handle(self._handle, main=self)
-        self.handle.setTextColor((150, 255, 150))
-        self._handle_layout.addWidget(self.handle)
-
-        # tail layout
-        self._tail_layout = QtGui.QHBoxLayout()
-        self._tail_layout.setSpacing(0)
-        self._tail_layout.setMargin(0)
-        self._tail.setLayout(self._tail_layout)
-        self.tail = Tail(self._tail, main=self)
-        self._tail_layout.addWidget(self.tail)
-
-        # defaults
-        self.setMin(0)
-        self.setMax(99)
-        self.setStart(0)
-        self.setEnd(99)
-        self.setDrawValues(True)
-
-    def min(self):
-        """:return: minimum value"""
-        return getattr(self, '__min', None)
-
-    def max(self):
-        """:return: maximum value"""
-        return getattr(self, '__max', None)
-    
-    def setMin(self, value):
-        """sets minimum value"""
-        assert type(value) is int
-        setattr(self, '__min', value)
-        self.minValueChanged.emit(value)
-
-    def setMax(self, value):
-        """sets maximum value"""
-        assert type(value) is int
-        setattr(self, '__max', value)
-        self.maxValueChanged.emit(value)
-    
-    def start(self):
-        """:return: range slider start value"""
-        return getattr(self, '__start', None)
-
-    def end(self):
-        """:return: range slider end value"""
-        return getattr(self, '__end', None)
-
-    def _setStart(self, value):
-        """stores the start value only"""
-        setattr(self, '__start', value)
-        self.startValueChanged.emit(value)
-    
-    def setStart(self, value):
-        """sets the range slider start value"""
-        assert type(value) is int
-        v = self._valueToPos(value)
-        self._splitter.splitterMoved.disconnect()
-        self._splitter.moveSplitter(v, self._SPLIT_START)
-        self._splitter.splitterMoved.connect(self._handleMoveSplitter)
-        self._setStart(value)
-
-    def _setEnd(self, value):
-        """stores the end value only"""
-        setattr(self, '__end', value)
-        self.endValueChanged.emit(value)
-    
-    def setEnd(self, value):
-        """set the range slider end value"""
-        assert type(value) is int
-        v = self._valueToPos(value)
-        self._splitter.splitterMoved.disconnect()
-        self._splitter.moveSplitter(v, self._SPLIT_END)
-        self._splitter.splitterMoved.connect(self._handleMoveSplitter)
-        self._setEnd(value)
-
-    def drawValues(self):
-        """:return: True if slider values will be drawn"""
-        return getattr(self, '__drawValues', None)
-    
-    def setDrawValues(self, draw):
-        """sets draw values boolean to draw slider values"""
-        assert type(draw) is bool
-        setattr(self, '__drawValues', draw)
-
-    def getRange(self):
-        """:return: the start and end values as a tuple"""
-        return (self.start(), self.end())
-
-    def setRange(self, start, end):
-        """set the start and end values"""
-        self.setStart(start)
-        self.setEnd(end)
-        
-    def keyPressEvent(self, event):
-        """overrides key press event to move range left and right"""
-        key = event.key()
-        if key == QtCore.Qt.Key_Left:
-            s = self.start()-1
-            e = self.end()-1
-        elif key == QtCore.Qt.Key_Right:
-            s = self.start()+1
-            e = self.end()+1
-        else:
-            event.ignore()
-            return
-        event.accept()
-        if s >= self.min() and e <= self.max():
-            self.setRange(s, e)
-
-    def setBackgroundStyle(self, style):
-        """sets background style"""
-        self._tail.setStyleSheet(style)
-        self._head.setStyleSheet(style)
-
-    def setSpanStyle(self, style):
-        """sets range span handle style"""
-        self._handle.setStyleSheet(style)
-
-    def _valueToPos(self, value):
-        """converts slider value to local pixel x coord"""
-        return scale(value, (self.min(), self.max()), (0, self.width()))
-
-    def _posToValue(self, xpos):
-        """converts local pixel x coord to slider value"""
-        return scale(xpos, (0, self.width()), (self.min(), self.max()))
-
-    def _handleMoveSplitter(self, xpos, index):
-        """private method for handling moving splitter handles"""
-        hw = self._splitter.handleWidth()
-        
-        def _lockWidth(widget):
-            width = widget.size().width()
-            widget.setMinimumWidth(width)
-            widget.setMaximumWidth(width)
-            
-        def _unlockWidth(widget):
-            widget.setMinimumWidth(0)
-            widget.setMaximumWidth(16777215)
-        
-        v = self._posToValue(xpos)
-        
-        if index == self._SPLIT_START:
-            _lockWidth(self._tail)
-            if v >= self.end():
-                return
-            
-            offset = -20
-            w = xpos + offset
-            self._setStart(v)
-            
-        elif index == self._SPLIT_END:
-            _lockWidth(self._head)
-            if v <= self.start():
-                return
-            
-            offset = -40
-            w = self.width() - xpos + offset
-            self._setEnd(v)
-
-        _unlockWidth(self._tail)
-        _unlockWidth(self._head)
-        _unlockWidth(self._handle)
-
-
-#-------------------------------------------------------------------------------
-# MAIN
-#-------------------------------------------------------------------------------
-
-if __name__ == '__main__':
-    app = QtGui.QApplication(sys.argv)
-    rs = QRangeSlider()
-    rs.show()
-    rs.setRange(15, 35)
-    rs.setBackgroundStyle('background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #222, stop:1 #333);')
-    rs.handle.setStyleSheet('background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #282, stop:1 #393);')
-    app.exec_()
diff --git a/libs/qrangeslider-0.1.1/setup.py b/libs/qrangeslider-0.1.1/setup.py
deleted file mode 100644
index 76fd96a6274e1b39ae0bcd207f0d4dac5ca4d190..0000000000000000000000000000000000000000
--- a/libs/qrangeslider-0.1.1/setup.py
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-# 
-# Copyright (C) 2011-2014 Ryan Galloway (ryan@rsgalloway.com)
-#
-# This module is part of Shotman and is released under
-# the BSD License: http://www.opensource.org/licenses/bsd-license.php
-
-from distutils.core import setup
-from qrangeslider import __version__
-setup(name='qrangeslider',
-      version=__version__,
-      description='The QRangeSlider class implements a horizontal PyQt range slider widget.',
-      author='Ryan Galloway',
-      author_email='ryan@rsgalloway.com',
-      url='http://github.com/rsgalloway/qrangeslider',
-      py_modules=['qrangeslider']
-      )
diff --git a/qgis_add_ins.py b/qgis_add_ins.py
index 980ddc1a46918ddab3a0a6232a712104bfbafd8c..5f6df12755fb1a3ec5dc81bf1ebc5eb93ee036f1 100644
--- a/qgis_add_ins.py
+++ b/qgis_add_ins.py
@@ -3,6 +3,23 @@ from qgis.gui import *
 import qgis
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
+import six
+
+
+def add_QgsRasterLayer(iface, path, rgb):
+    if iface:
+
+        fi = QFileInfo(path)
+        layer = QgsRasterLayer(path, fi.baseName())
+        if not layer.isValid():
+            six.print_('Failed to load {}'.format(path))
+        else:
+            iface.addRasterLayer(path, fi.baseName())
+
+
+    s = ""
+
+
 
 class PointMapTool(QgsMapToolEmitPoint):
 
diff --git a/qimage2ndarray/LICENSE.txt b/qimage2ndarray/LICENSE.txt
deleted file mode 100644
index 96d599dac8fc563eb78b9305e428df72944a6678..0000000000000000000000000000000000000000
--- a/qimage2ndarray/LICENSE.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Copyright (c) 2009, Hans Meine <hans_meine@gmx.net>
-All rights reserved. 
- 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
- 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
- 
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the
-   distribution.
- 
-3. Neither the name of the University of Hamburg nor the names of its
-   contributors may be used to endorse or promote products derived
-   from this software without specific prior written permission.
- 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/qimage2ndarray/__init__.py b/qimage2ndarray/__init__.py
deleted file mode 100644
index 6e56e0e06dd75127d37a7b5918acf431b9824c32..0000000000000000000000000000000000000000
--- a/qimage2ndarray/__init__.py
+++ /dev/null
@@ -1,403 +0,0 @@
-import sys as _sys
-import numpy as _np
-
-from .dynqt import QtGui as _qt
-
-from .dynqt import qt as _qt_driver
-if _qt_driver.name() == 'PythonQt':
-    from .qimageview import QImage2ndarray as _temp
-    _qimageview = _temp.qimageview
-else:
-    from .qimageview_python import qimageview as _qimageview
-
-__version__ = "1.5"
-
-if _sys.byteorder == 'little':
-    _bgra = (0, 1, 2, 3)
-else:
-    _bgra = (3, 2, 1, 0)
-
-_bgra_fields = {'b': (_np.uint8, _bgra[0], 'blue'),
-                'g': (_np.uint8, _bgra[1], 'green'),
-                'r': (_np.uint8, _bgra[2], 'red'),
-                'a': (_np.uint8, _bgra[3], 'alpha')}
-
-bgra_dtype = _np.dtype(_bgra_fields)
-"""Complex dtype offering the named fields 'r','g','b', and 'a' and
-corresponding long names, conforming to QImage_'s 32-bit memory layout."""
-
-try:
-    _basestring = basestring
-except NameError:
-    # 'basestring' undefined, must be Python 3
-    _basestring = str
-
-def _qimage_or_filename_view(qimage):
-    if isinstance(qimage, _basestring):
-        qimage = _qt.QImage(qimage)
-    return _qimageview(qimage)
-
-def raw_view(qimage):
-    """Returns raw 2D view of the given QImage_'s memory.  The result
-    will be a 2-dimensional numpy.ndarray with an appropriately sized
-    integral dtype.  (This function is not intented to be used
-    directly, but used internally by the other -- more convenient --
-    view creation functions.)
-
-    :param qimage: image whose memory shall be accessed via NumPy
-    :type qimage: QImage_
-    :rtype: numpy.ndarray_ with shape (height, width)"""
-    return _qimage_or_filename_view(qimage)
-
-
-def byte_view(qimage, byteorder = 'little'):
-    """Returns raw 3D view of the given QImage_'s memory.  This will
-    always be a 3-dimensional numpy.ndarray with dtype numpy.uint8.
-    
-    Note that for 32-bit images, the last dimension will be in the
-    [B,G,R,A] order (if little endian) due to QImage_'s memory layout
-    (the alpha channel will be present for Format_RGB32 images, too).
-
-    For 8-bit (indexed) images, the array will still be 3-dimensional,
-    i.e. shape will be (height, width, 1).
-
-    The order of channels in the last axis depends on the `byteorder`,
-    which defaults to 'little', i.e. BGRA order.  You may set the
-    argument `byteorder` to 'big' to get ARGB, or use None which means
-    sys.byteorder here, i.e. return native order for the machine the
-    code is running on.
-
-    For your convenience, `qimage` may also be a filename, see
-    `Loading and Saving Images`_ in the documentation.
-
-    :param qimage: image whose memory shall be accessed via NumPy
-    :type qimage: QImage_
-    :param byteorder: specify order of channels in last axis
-    :rtype: numpy.ndarray_ with shape (height, width, 1 or 4) and dtype uint8"""
-    raw = _qimage_or_filename_view(qimage)
-    result = raw.view(_np.uint8).reshape(raw.shape + (-1, ))
-    if byteorder and byteorder != _sys.byteorder:
-        result = result[...,::-1]
-    return result
-
-
-def rgb_view(qimage, byteorder = 'big'):
-    """Returns RGB view of a given 32-bit color QImage_'s memory.
-    Similarly to byte_view(), the result is a 3D numpy.uint8 array,
-    but reduced to the rgb dimensions (without alpha), and reordered
-    (using negative strides in the last dimension) to have the usual
-    [R,G,B] order.  The image must have 32 bit pixel size, i.e. be
-    RGB32, ARGB32, or ARGB32_Premultiplied.  (Note that in the latter
-    case, the values are of course premultiplied with alpha.)
-
-    The order of channels in the last axis depends on the `byteorder`,
-    which defaults to 'big', i.e. RGB order.  You may set the argument
-    `byteorder` to 'little' to get BGR, or use None which means
-    sys.byteorder here, i.e. return native order for the machine the
-    code is running on.
-
-    For your convenience, `qimage` may also be a filename, see
-    `Loading and Saving Images`_ in the documentation.
-
-    :param qimage: image whose memory shall be accessed via NumPy
-    :type qimage: QImage_ with 32-bit pixel type
-    :param byteorder: specify order of channels in last axis
-    :rtype: numpy.ndarray_ with shape (height, width, 3) and dtype uint8"""
-    if byteorder is None:
-        byteorder = _sys.byteorder
-    bytes = byte_view(qimage, byteorder)
-    if bytes.shape[2] != 4:
-        raise ValueError("For rgb_view, the image must have 32 bit pixel size (use RGB32, ARGB32, or ARGB32_Premultiplied)")
-
-    if byteorder == 'little':
-        return bytes[...,:3] # strip A off BGRA
-    else:
-        return bytes[...,1:] # strip A off ARGB
-
-
-def alpha_view(qimage):
-    """Returns alpha view of a given 32-bit color QImage_'s memory.
-    The result is a 2D numpy.uint8 array, equivalent to
-    byte_view(qimage)[...,3].  The image must have 32 bit pixel size,
-    i.e. be RGB32, ARGB32, or ARGB32_Premultiplied.  Note that it is
-    not enforced that the given qimage has a format that actually
-    *uses* the alpha channel -- for Format_RGB32, the alpha channel
-    usually contains 255 everywhere.
-
-    For your convenience, `qimage` may also be a filename, see
-    `Loading and Saving Images`_ in the documentation.
-
-    :param qimage: image whose memory shall be accessed via NumPy
-    :type qimage: QImage_ with 32-bit pixel type
-    :rtype: numpy.ndarray_ with shape (height, width) and dtype uint8"""
-    bytes = byte_view(qimage, byteorder = None)
-    if bytes.shape[2] != 4:
-        raise ValueError("For alpha_view, the image must have 32 bit pixel size (use RGB32, ARGB32, or ARGB32_Premultiplied)")
-    return bytes[...,_bgra[3]]
-
-
-def recarray_view(qimage):
-    """Returns recarray_ view of a given 32-bit color QImage_'s
-    memory.
-
-    The result is a 2D array with a complex record dtype, offering the
-    named fields 'r','g','b', and 'a' and corresponding long names.
-    Thus, each color components can be accessed either via string
-    indexing or via attribute lookup (through numpy.recarray_):
-
-    For your convenience, `qimage` may also be a filename, see
-    `Loading and Saving Images`_ in the documentation.
-
-    >>> from PyQt4.QtGui import QImage, qRgb
-    >>> qimg = QImage(320, 240, QImage.Format_ARGB32)
-    >>> qimg.fill(qRgb(12,34,56))
-    >>>
-    >>> import qimage2ndarray
-    >>> v = qimage2ndarray.recarray_view(qimg)
-    >>>
-    >>> red = v["r"]
-    >>> red[10,10]
-    12
-    >>> pixel = v[10,10]
-    >>> pixel["r"]
-    12
-    >>> (v.g == v["g"]).all()
-    True
-    >>> (v.alpha == 255).all()
-    True
-
-    :param qimage: image whose memory shall be accessed via NumPy
-    :type qimage: QImage_ with 32-bit pixel type
-    :rtype: numpy.ndarray_ with shape (height, width) and dtype :data:`bgra_dtype`"""
-    raw = _qimage_or_filename_view(qimage)
-    if raw.itemsize != 4:
-        raise ValueError("For rgb_view, the image must have 32 bit pixel size (use RGB32, ARGB32, or ARGB32_Premultiplied)")
-    return raw.view(bgra_dtype, _np.recarray)
-
-
-
-def _normalize255(array, normalize, clip = (0, 255)):
-    if normalize:
-        if normalize is True:
-            normalize = array.min(), array.max()
-            if clip == (0, 255):
-                clip = None
-        elif _np.isscalar(normalize):
-            normalize = (0, normalize)
-
-        nmin, nmax = normalize
-
-        if nmin:
-            array = array - nmin
-
-        if nmax != nmin:
-            scale = 255. / (nmax - nmin)
-            if scale != 1.0:
-                array = array * scale
-
-    if clip:
-        low, high = clip
-        _np.clip(array, low, high, array)
-
-    return array
-
-
-def gray2qimage(gray, normalize = False):
-    """Convert the 2D numpy array `gray` into a 8-bit, indexed QImage_
-    with a gray colormap.  The first dimension represents the vertical
-    image axis.
-
-    The parameter `normalize` can be used to normalize an image's
-    value range to 0..255:
-
-    `normalize` = (nmin, nmax):
-      scale & clip image values from nmin..nmax to 0..255
-
-    `normalize` = nmax:
-      lets nmin default to zero, i.e. scale & clip the range 0..nmax
-      to 0..255
-
-    `normalize` = True:
-      scale image values to 0..255 (same as passing (gray.min(),
-      gray.max()))
-
-    If the source array `gray` contains masked values, the result will
-    have only 255 shades of gray, and one color map entry will be used
-    to make the corresponding pixels transparent.
-
-    A full alpha channel cannot be supported with indexed images;
-    instead, use `array2qimage` to convert into a 32-bit QImage.
-
-    :param gray: image data which should be converted (copied) into a QImage_
-    :type gray: 2D or 3D numpy.ndarray_ or `numpy.ma.array <masked arrays>`_
-    :param normalize: normalization parameter (see above, default: no value changing)
-    :type normalize: bool, scalar, or pair
-    :rtype: QImage_ with RGB32 or ARGB32 format"""
-    if _np.ndim(gray) != 2:
-        raise ValueError("gray2QImage can only convert 2D arrays" +
-                         " (try using array2qimage)" if _np.ndim(gray) == 3 else "")
-
-    h, w = gray.shape
-    result = _qt.QImage(w, h, _qt.QImage.Format_Indexed8)
-
-    if not _np.ma.is_masked(gray):
-        for i in range(256):
-            result.setColor(i, _qt.qRgb(i,i,i))
-
-        _qimageview(result)[:] = _normalize255(gray, normalize)
-    else:
-        # map gray value 1 to gray value 0, in order to make room for
-        # transparent colormap entry:
-        result.setColor(0, _qt.qRgb(0,0,0))
-        for i in range(2, 256):
-            result.setColor(i-1, _qt.qRgb(i,i,i))
-
-        _qimageview(result)[:] = _normalize255(gray, normalize, clip = (1, 255)) - 1
-
-        result.setColor(255, 0)
-        _qimageview(result)[gray.mask] = 255
-
-    return result
-
-
-def array2qimage(array, normalize = False):
-    """Convert a 2D or 3D numpy array into a 32-bit QImage_.  The
-    first dimension represents the vertical image axis; the optional
-    third dimension is supposed to contain 1-4 channels:
-
-    ========= ===================
-    #channels interpretation
-    ========= ===================
-            1 scalar/gray
-            2 scalar/gray + alpha
-            3 RGB
-            4 RGB + alpha
-    ========= ===================
-
-    Scalar data will be converted into corresponding gray RGB triples;
-    if you want to convert to an (indexed) 8-bit image instead, use
-    `gray2qimage` (which cannot support an alpha channel though).
-
-    The parameter `normalize` can be used to normalize an image's
-    value range to 0..255:
-
-    `normalize` = (nmin, nmax):
-      scale & clip image values from nmin..nmax to 0..255
-
-    `normalize` = nmax:
-      lets nmin default to zero, i.e. scale & clip the range 0..nmax
-      to 0..255
-
-    `normalize` = True:
-      scale image values to 0..255 (same as passing (array.min(),
-      array.max()))
-
-    If `array` contains masked values, the corresponding pixels will
-    be transparent in the result.  Thus, the result will be of
-    QImage.Format_ARGB32 if the input already contains an alpha
-    channel (i.e. has shape (H,W,4)) or if there are masked pixels,
-    and QImage.Format_RGB32 otherwise.
-
-    :param array: image data which should be converted (copied) into a QImage_
-    :type array: 2D or 3D numpy.ndarray_ or `numpy.ma.array <masked arrays>`_
-    :param normalize: normalization parameter (see above, default: no value changing)
-    :type normalize: bool, scalar, or pair
-    :rtype: QImage_ with RGB32 or ARGB32 format"""
-    if _np.ndim(array) == 2:
-        array = array[...,None]
-    elif _np.ndim(array) != 3:
-        raise ValueError("array2qimage can only convert 2D or 3D arrays (got %d dimensions)" % _np.ndim(array))
-    if array.shape[2] not in (1, 2, 3, 4):
-        raise ValueError("array2qimage expects the last dimension to contain exactly one (scalar/gray), two (gray+alpha), three (R,G,B), or four (R,G,B,A) channels")
-
-    h, w, channels = array.shape
-
-    hasAlpha = _np.ma.is_masked(array) or channels in (2, 4)
-    fmt = _qt.QImage.Format_ARGB32 if hasAlpha else _qt.QImage.Format_RGB32
-
-    result = _qt.QImage(w, h, fmt)
-
-    array = _normalize255(array, normalize)
-
-    if channels >= 3:
-        rgb_view(result)[:] = array[...,:3]
-    else:
-        rgb_view(result)[:] = array[...,:1] # scalar data
-
-    alpha = alpha_view(result)
-
-    if channels in (2, 4):
-        alpha[:] = array[...,-1]
-    else:
-        alpha[:] = 255
-
-    if _np.ma.is_masked(array):
-        alpha[:]  *= _np.logical_not(_np.any(array.mask, axis = -1))
-
-    return result
-
-
-def imread(filename, masked = False):
-    """Convenience function that uses the QImage_ constructor to read an
-    image from the given file and return an `rgb_view` of the result.
-    This is intentionally similar to scipy.ndimage.imread (which uses
-    PIL), scipy.misc.imread, or matplotlib.pyplot.imread (using PIL
-    for non-PNGs).
-
-    For grayscale images, return 2D array (even if it comes from a 32-bit
-    representation; this is a consequence of the QImage API).
-
-    For images with an alpha channel, the resulting number of channels
-    will be 2 (grayscale+alpha) or 4 (RGB+alpha).  Alternatively, one may
-    pass `masked = True' in order to get `numpy.ma.array <masked
-    arrays>`_ back.  Note that only fully transparent pixels are masked
-    (and that masked arrays only support binary masks).  The value of
-    `masked` is ignored when the loaded image has no alpha channel
-    (i.e., one would not get a masked array in that case).
-
-    This function has been added in version 1.3.
-
-    """
-    qImage = _qt.QImage(filename)
-
-    isGray = qImage.isGrayscale()
-    if isGray and qImage.depth() == 8:
-        return byte_view(qImage)[...,0]
-
-    hasAlpha = qImage.hasAlphaChannel()
-
-    if hasAlpha:
-        targetFormat = _qt.QImage.Format_ARGB32
-    else:
-        targetFormat = _qt.QImage.Format_RGB32
-    if qImage.format() != targetFormat:
-        qImage = qImage.convertToFormat(targetFormat)
-
-    result = rgb_view(qImage)
-    if isGray:
-        result = result[...,0]
-    if hasAlpha:
-        if masked:
-            mask = (alpha_view(qImage) == 0)
-            if _np.ndim(result) == 3:
-                mask = _np.repeat(mask[...,None], 3, axis = 2)
-            result = _np.ma.masked_array(result, mask)
-        else:
-            result = _np.dstack((result, alpha_view(qImage)))
-    return result
-
-
-def imsave(filename, image, normalize = False, format = None, quality = -1):
-    """Convenience function that uses QImage.save to save an image to the
-    given file.  This is intentionally similar to scipy.misc.imsave.
-    However, it supports different optional arguments:
-
-    :param normalize: see :func:`array2qimage` (which is used internally)
-    :param format: image filetype (e.g. 'PNG'),  (default: check filename's suffix)
-    :param quality: see QImage.save (0 = small .. 100 = uncompressed, -1 = default compression)
-    :returns: boolean success, see QImage.save
-    
-    This function has been added in version 1.4.
-    """
-    qImage = array2qimage(image, normalize = normalize)
-    return qImage.save(filename, format, quality)
diff --git a/qimage2ndarray/dynqt.py b/qimage2ndarray/dynqt.py
deleted file mode 100644
index a4f1a18bce006d81d848dfd98d881901e3af5bda..0000000000000000000000000000000000000000
--- a/qimage2ndarray/dynqt.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from .qt_driver import QtDriver
-
-qt = QtDriver()
-QtGui = qt.QtGui
diff --git a/qimage2ndarray/qimageview_python.py b/qimage2ndarray/qimageview_python.py
deleted file mode 100644
index 83efb2ddf0f9351992aef016f7ce1f4ac2eb83c9..0000000000000000000000000000000000000000
--- a/qimage2ndarray/qimageview_python.py
+++ /dev/null
@@ -1,60 +0,0 @@
-import numpy as np
-from qimage2ndarray.dynqt import qt, QtGui
-
-def PyQt_data(image):
-    # PyQt4/PyQt5's QImage.bits() returns a sip.voidptr that supports
-    # conversion to string via asstring(size) or getting its base
-    # address via int(...):
-    return (int(image.bits()), False)
-
-def _re_buffer_address_match(buf_repr):
-    import re
-    _re_buffer_address = re.compile('<read-write buffer ptr 0x([0-9a-fA-F]*),')
-    global _re_buffer_address_match
-    _re_buffer_address_match = _re_buffer_address.match
-    return _re_buffer_address_match(buf_repr)
-
-def PySide_data(image):
-    # PySide's QImage.bits() returns a buffer object like this:
-    # <read-write buffer ptr 0x7fc3f4821600, size 76800 at 0x111269570>
-    ma = _re_buffer_address_match(repr(image.bits()))
-    assert ma, 'could not parse address from %r' % (image.bits(), )
-    return (int(ma.group(1), 16), False)
-
-getdata = dict(
-    PyQt4 = PyQt_data,
-    PyQt5 = PyQt_data,
-    PySide = PySide_data,
-)[qt.name()]
-
-
-def qimageview(image):
-    if not isinstance(image, QtGui.QImage):
-        raise TypeError("image argument must be a QImage instance")
-
-    shape = image.height(), image.width()
-    strides0 = image.bytesPerLine()
-
-    format = image.format()
-    if format == QtGui.QImage.Format_Indexed8:
-        dtype = "|u1"
-        strides1 = 1
-    elif format in (QtGui.QImage.Format_RGB32, QtGui.QImage.Format_ARGB32, QtGui.QImage.Format_ARGB32_Premultiplied):
-        dtype = "|u4"
-        strides1 = 4
-    elif format == QtGui.QImage.Format_Invalid:
-        raise ValueError("qimageview got invalid QImage")
-    else:
-        raise ValueError("qimageview can only handle 8- or 32-bit QImages")
-
-    image.__array_interface__ = {
-        'shape': shape,
-        'typestr': dtype,
-        'data': getdata(image),
-        'strides': (strides0, strides1),
-        'version': 3,
-    }
-
-    result = np.asarray(image)
-    del image.__array_interface__
-    return result
diff --git a/qimage2ndarray/qt_driver.py b/qimage2ndarray/qt_driver.py
deleted file mode 100644
index 483cd287af1976d6c665860fa84d3304ece7273d..0000000000000000000000000000000000000000
--- a/qimage2ndarray/qt_driver.py
+++ /dev/null
@@ -1,125 +0,0 @@
-#  Copyright 2014-2014 Hans Meine <hans_meine@gmx.net>
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-"""This module contains a wrapper around three different Qt python bindings.
-It will dynamically decide which one to use:
-
-* First, the environment variable QT_DRIVER is checked
-  (may be one of 'PyQt5', 'PyQt4', 'PySide', 'PythonQt').
-* If unset, previously imported binding modules are detected (in sys.modules).
-* If no bindings are loaded, the environment variable QT_API is checked
-  (used by ETS and ipython, may be 'pyside' or 'pyqt').
-
-In order to have compatible behavior between the different bindings,
-PyQt4 (if used) is configured as follows::
-
-    sip.setapi("QString", 2)
-    sip.setapi("QVariant", 2)
-
-Furthermore, there is a 'getprop' function that solves the following
-problem: PythonQt exports Qt properties as Python properties *and*
-gives the precedence over getters with the same name.  Instead of
-calling getters with parentheses (which must not be used in PythonQt,
-but are required in PyQt and PySide), one may e.g. write
-`getprop(widget.width)`.
-"""
-
-import sys, os
-
-def getprop_PythonQt(prop):
-    """getprop(property_or_getter)
-
-    Used on getters that have the same name as a corresponding
-    property.  For PythonQt, this version will just return the
-    argument, which is assumed to be (the value of) a python property
-    through which PythonQt exposes Qt properties."""
-    return prop
-
-def getprop_other(getter):
-    """getprop(property_or_getter)
-
-    Used on getters that have the same name as a corresponding
-    property.  For Qt bindings other than PythonQt, this version will
-    return the result of calling the argument, which is assumed to be
-    a Qt getter function.  (With PythonQt, properties override getters
-    and no calling must be done.)"""
-    return getter()
-
-class QtDriver(object):
-    DRIVERS = ('PyQt5', 'PyQt4', 'PySide', 'PythonQt')
-    DEFAULT = 'PyQt4'
-    
-    @classmethod
-    def detect_qt(cls):
-        for drv in cls.DRIVERS:
-            if drv in sys.modules:
-                return drv
-        if '_PythonQt' in sys.modules:
-            return 'PythonQt'
-        return None
-
-    def name(self):
-        return self._drv
-
-    def getprop(self):
-        return getprop_PythonQt if self._drv == 'PythonQt' else getprop_other
-
-    def __init__(self, drv = os.environ.get('QT_DRIVER')):
-        """Supports QT_API (used by ETS and ipython)"""
-        if drv is None:
-            drv = self.detect_qt()
-        if drv is None:
-            drv = os.environ.get('QT_API')
-        if drv is None:
-            drv = self.DEFAULT
-        drv = {'pyside' : 'PySide', 'pyqt' : 'PyQt4', 'pyqt5' : 'PyQt5'}.get(drv, drv) # map ETS syntax
-        assert drv in self.DRIVERS
-        self._drv = drv
-
-    @staticmethod
-    def _initPyQt4():
-        """initialize PyQt4 to be compatible with PySide"""
-        if 'PyQt4.QtCore' in sys.modules:
-            # too late to configure API
-            pass
-        else:
-            import sip
-            sip.setapi("QString", 2)
-            sip.setapi("QVariant", 2)
-
-    @staticmethod
-    def requireCompatibleAPI():
-        """If PyQt4's API should be configured to be compatible with PySide's
-        (i.e. QString and QVariant should not be explicitly exported,
-        cf. documentation of sip.setapi()), call this function to check that
-        the PyQt4 was properly imported.  (It will always be configured this
-        way by this module, but it could have been imported before we got a
-        hand on doing so.)
-        """
-        if 'PyQt4.QtCore' in sys.modules:
-            import sip
-            for api in ('QVariant', 'QString'):
-                if sip.getapi(api) != 2:
-                    raise RuntimeError('%s API already set to V%d, but should be 2' % (api, sip.getapi(api)))
-            
-    def importMod(self, mod):
-        if self._drv == 'PyQt4':
-            self._initPyQt4()
-        qt = __import__('%s.%s' % (self._drv, mod))
-        return getattr(qt, mod)
-
-    def __getattr__(self, name):
-        if name.startswith('Qt'):
-            return self.importMod(name)
-        return super(QtDriver, self).__getattr__(name)
diff --git a/sensecarbon_tsv.py b/sensecarbon_tsv.py
index 703708a510dd4b0263a5ae7febfe110825f8b84d..ad3e3888af26fde0375d68aaf8ab0796149c0398 100644
--- a/sensecarbon_tsv.py
+++ b/sensecarbon_tsv.py
@@ -39,12 +39,10 @@ except:
     qgis_available = False
 
 import numpy as np
-import pickle
-
+import tsv_widgets
 import six
 import multiprocessing
 
-import imagechipviewsettings_widget
 
 #I don't know why but this is required to run this in QGIS
 
@@ -58,9 +56,9 @@ sys.path.append(pluginDir)
 sys.path.append(os.path.join(pluginDir, 'libs'))
 #sys.path.append(os.path.join(pluginDir, *['libs','qimage2ndarray']))
 sys.path.append(os.path.join(pluginDir, *['libs','qrangeslider-0.1.1']))
+sys.path.append(os.path.join(pluginDir, *['libs','pyqtgraph']))
 
-import qimage2ndarray
-import qrangeslider
+import pyqtgraph as pg
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
@@ -265,7 +263,8 @@ class BandView(object):
         assert type(sensor) is SensorConfiguration
         if sensor not in self.bandMappings.keys():
             #self.bandMappings[sensor] = ((0, 0, 5000), (1, 0, 5000), (2, 0, 5000))
-            x = imagechipviewsettings_widget.ImageChipViewSettings(sensor)
+            #x = imagechipviewsettings_widget.ImageChipViewSettings(sensor)
+            x = tsv_widgets.BandViewSettings(sensor)
             x.create()
             self.bandMappings[sensor] = x
 
@@ -359,6 +358,29 @@ class SensorConfiguration(object):
 
 
 
+class ImageChipLabel(QLabel):
+    def __init__(self, parent=None, iface=None, path=None, bands=None):
+        super(ImageChipLabel, self).__init__(parent)
+        self.path=path
+        self.iface=iface
+        self.bands=bands
+        self.setContextMenuPolicy(Qt.DefaultContextMenu)
+
+    def contextMenuEvent(self, event):
+        menu = QMenu()
+        #add general options
+        action = menu.addAction('Copy to clipboard')
+        action.triggered.connect(lambda : QApplication.clipboard().setPixmap(self.pixmap()))
+
+        #add QGIS specific options
+        if self.iface:
+            action = menu.addAction('Show image in QGIS')
+            action.triggered.connect(lambda : qgis_add_ins.add_QgsRasterLayer(self.iface, self.path, self.bands))
+
+        menu.exec_(event.globalPos())
+
+
+
 class TimeSeries(QObject):
     datumAdded = pyqtSignal(name='datumAdded')
 
@@ -397,8 +419,8 @@ class TimeSeries(QObject):
 
     _sep = ';'
 
-    @staticmethod
-    def loadFromFile(path):
+
+    def loadFromFile(self, path):
 
         images = []
         masks = []
@@ -414,11 +436,8 @@ class TimeSeries(QObject):
                 if len(parts) > 1:
                     masks.append(parts[1])
 
-        TS = TimeSeries()
-        TS.addFiles(images)
-        TS.addMasks(masks)
-
-        return TS
+        self.addFiles(images)
+        self.addMasks(masks)
 
 
     def saveToFile(self, path):
@@ -570,7 +589,7 @@ class TimeSeries(QObject):
 
             self.progress.emit(0,i+1,l)
 
-        self.progress.emit(0,0,l)
+        self.progress.emit(0,0,1)
         self.changed.emit()
 
     def addMask(self, pathMsk, raise_errors=True, mask_value=0, exclude_mask_value=True, _quiet=False):
@@ -620,8 +639,8 @@ class TimeSeries(QObject):
 
     def addFile(self, pathImg, pathMsk=None, _quiet=False):
 
-        print(pathImg)
-        print('Add image {}...'.format(pathImg))
+        six.print_(pathImg)
+        six.print_('Add image {}...'.format(pathImg))
 
         try:
             sensorAdded = False
@@ -665,7 +684,7 @@ class TimeSeries(QObject):
             self.progress.emit(0,i+1,l)
 
         self._sortTimeSeriesData()
-        self.progress.emit(0,0,l)
+        self.progress.emit(0,0,1)
         self.datumAdded.emit()
         self.changed.emit()
 
@@ -779,15 +798,16 @@ class TimeSeriesDatum(object):
 
         self.wavelength = None
         domains = dsImg.GetMetadataDomainList()
-        for domain in domains:
-            md = dsImg.GetMetadata_Dict(domain)
-            if 'wavelength' in md.keys():
-                wl = md['wavelength']
-                wl = re.split('[;,{}]', wl)
-                wl = [float(w) for w in wl]
-                assert len(wl) == self.nb
-                self.wavelength = wl
-                break
+        if domains:
+            for domain in domains:
+                md = dsImg.GetMetadata_Dict(domain)
+                if 'wavelength' in md.keys():
+                    wl = md['wavelength']
+                    wl = re.split('[;,{}]', wl)
+                    wl = [float(w) for w in wl]
+                    assert len(wl) == self.nb
+                    self.wavelength = wl
+                    break
 
         self.sensor = SensorConfiguration(self.nb, self.gt[1], self.gt[5], self.bandnames, self.wavelength)
 
@@ -1121,6 +1141,43 @@ class ImageChipBuffer(object):
     def getDataCube(self, TSD):
         return self.data.get(TSD)
 
+    def getChipArray(self, TSD, band_view, mode='rgb'):
+        assert mode in ['rgb', 'bgr']
+        bands = band_view.getBands(TSD.sensor)
+        band_ranges = band_view.getRanges(TSD.sensor)
+        nb = len(bands)
+        assert nb == 3 and nb == len(band_ranges)
+        assert TSD in self.data.keys(), 'Time Series Datum {} is not in buffer'.format(TSD.getDate())
+        chipData = self.data[TSD]
+        for b in bands:
+            assert b in chipData.keys()
+
+
+
+        nl, ns = chipData[bands[0]].shape
+
+        dtype= 'uint8'
+        array_data = np.ndarray((ns, nl, nb), dtype=dtype)
+
+        if mode == 'rgb':
+            ch_dst = [0,1,2]
+        elif mode == 'bgr':
+            # r -> dst channel 2
+            # g -> dst channel 1
+            # b -> dst channel 0
+            ch_dst = [2,1,0]
+        for i, i_dst in enumerate(ch_dst):
+
+            offset = band_ranges[i][0]
+            scale = 255./band_ranges[i][1]
+
+            res = pg.rescaleData(chipData[bands[i]], scale, offset, dtype='float')
+            np.clip(res, 0, 255, out=res)
+            array_data[:,:,i_dst] = res
+
+        return array_data
+
+
     def getChipRGB(self, TSD, band_view):
         bands = band_view.getBands(TSD.sensor)
         band_ranges = band_view.getRanges(TSD.sensor)
@@ -1176,6 +1233,8 @@ class ImageChipBuffer(object):
         return '\n'.join(info)
 
 
+list2str = lambda ll : '\n'.join([str(l) for l in ll])
+
 class SenseCarbon_TSV:
     """QGIS Plugin Implementation."""
 
@@ -1232,7 +1291,7 @@ class SenseCarbon_TSV:
         D.btn_addTSImages.clicked.connect(lambda :self.ua_addTSImages())
         D.btn_addTSMasks.clicked.connect(lambda :self.ua_addTSMasks())
         D.btn_removeTSD.clicked.connect(lambda : self.ua_removeTSD(None))
-        D.btn_removeTS.clicked.connect(self.ua_removeTS)
+        D.btn_removeTS.clicked.connect(self.ua_clear_TS)
 
         D.btn_loadTSFile.clicked.connect(self.ua_loadTSFile)
         D.btn_saveTSFile.clicked.connect(self.ua_saveTSFile)
@@ -1242,7 +1301,7 @@ class SenseCarbon_TSV:
         # Declare instance attributes
         self.actions = []
         #self.menu = self.tr(u'&EnMAP-Box')
-        # TODO: We are going to let the user set this up in a future iteration
+
         self.RectangleMapTool = None
         self.PointMapTool = None
         self.canvas_srs = osr.SpatialReference()
@@ -1267,6 +1326,7 @@ class SenseCarbon_TSV:
         s = ""
 
     def init_TimeSeries(self, TS=None):
+
         if TS is None:
             TS = TimeSeries()
         assert type(TS) is TimeSeries
@@ -1295,14 +1355,15 @@ class SenseCarbon_TSV:
             path = QFileDialog.getOpenFileName(self.dlg, 'Open Time Series file')
 
         if os.path.exists(path):
-            self.ua_removeTS()
-            TS = TimeSeries.loadFromFile(path)
-            self.init_TimeSeries(TS)
-            self.ua_datumAdded()
 
-            if len(self.BAND_VIEWS) == 0:
-                self.ua_addBandView([3, 2, 1])
-                self.ua_addBandView([4, 5, 3])
+
+            M = self.dlg.tableView_TimeSeries.model()
+            M.beginResetModel()
+            self.ua_clear_TS()
+            self.TS.loadFromFile(path)
+            M.endResetModel()
+
+            self.refreshBandViews()
 
         self.check_enabled()
 
@@ -1384,10 +1445,14 @@ class SenseCarbon_TSV:
 
     def ua_TSprogress(self, v_min, v, v_max):
         assert v_min <= v and v <= v_max
-        P = self.dlg.progressBar
-        if P.minimum() != v_min or P.maximum() != v_max:
-            P.setRange(v_min, v_max)
-        P.setValue(v)
+        if v_min < v_max:
+            P = self.dlg.progressBar
+            if P.minimum() != v_min or P.maximum() != v_max:
+                P.setRange(v_min, v_max)
+            else:
+                s = ""
+
+            P.setValue(v)
 
     def ua_datumAdded(self):
 
@@ -1443,8 +1508,8 @@ class SenseCarbon_TSV:
         enabled_flag=True,
         add_to_menu=True,
         add_to_toolbar=True,
-        status_tip=None,
-        whats_this=None,
+        status_tip="SenseCarbon Time Series Viewer - a tool to visualize a time series of remote sensing imagery",
+        whats_this="Open SenseCarbon Time Series Viewer",
         parent=None):
         """Add a toolbar icon to the toolbar.
 
@@ -1519,6 +1584,13 @@ class SenseCarbon_TSV:
             parent=self.iface.mainWindow())
 
 
+    def ua_addTSD_to_QGIS(self, TSD, bands):
+
+        s = ""
+
+        pass
+
+
     def unload(self):
         """Removes the plugin menu item and icon from QGIS GUI."""
         for action in self.actions:
@@ -1548,6 +1620,8 @@ class SenseCarbon_TSV:
         #get date INDEX that is closest to requested date
         if type(date) is str:
             date = np.datetime64(date)
+        if type(date) is not np.datetime64:
+            s = ""
         assert type(date) is np.datetime64, 'type is: '+str(type(date))
 
         i_doi = TSDs.index(sorted(TSDs, key=lambda TSD: abs(date - TSD.getDate()))[0])
@@ -1632,22 +1706,27 @@ class SenseCarbon_TSV:
                 info_label_text = '{}\n{}'.format(TSD.date, TSD.sensor.sensor_name)
                 textLabel = QLabel(info_label_text)
                 tt = [TSD.date,TSD.pathImg, TSD.pathMsk]
-                tt = '\n'.join(str(t) for t in tt)
-                textLabel.setToolTip(tt)
+                textLabel.setToolTip(list2str(tt))
                 self.ICP.addWidget(textLabel, 0, cnt_chips)
                 viewList = list()
                 j = 1
                 for view in self.BAND_VIEWS:
                     bands = view.getBands(TSD.sensor)
-                    imageLabel = QLabel()
-                    imageLabel.setFrameShape(QFrame.StyledPanel)
-                    imageLabel.setMinimumSize(size_x, size_y)
-                    imageLabel.setMaximumSize(size_x+1, size_y+1)
-                    imageLabel.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
+                    #imageLabel = QLabel()
+                    #imv = pg.GraphicsView()
+                    #imv = QGraphicsView(self.dlg.scrollArea_imageChip_content)
+                    #imv = MyGraphicsView(self.dlg.scrollArea_imageChip_content, iface=self.iface, path=TSD.pathImg, bands=bands)
+                    #imv = pg.ImageView(view=None)
+                    imgLabel = ImageChipLabel()
+                    imgLabel.setFrameShape(QFrame.StyledPanel)
+                    imgLabel.setMinimumSize(size_x, size_y)
+                    imgLabel.setMaximumSize(size_x, size_y)
+                    imgLabel.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
                     tt = [TSD.date, TSD.pathImg, 'RGB={}'.format(','.join([str(b) for b in bands]))]
-                    imageLabel.setToolTip(tt)
-                    viewList.append(imageLabel)
-                    self.ICP.addWidget(imageLabel, j, cnt_chips)
+                    imgLabel.setToolTip(list2str(tt))
+
+                    viewList.append(imgLabel)
+                    self.ICP.addWidget(imgLabel, j, cnt_chips)
                     j += 1
 
                 textLabel = QLabel(info_label_text)
@@ -1670,8 +1749,10 @@ class SenseCarbon_TSV:
         required_bands = dict()
         for j, view in enumerate(self.BAND_VIEWS):
                 for S in view.Sensors.keys():
-
-                    bands = set(view.getBands(S))
+                    bands = set()
+                    bands.update(view.getBands(S))
+                    if len(bands) != 3:
+                        s = ""
                     assert len(bands) == 3
                     if S not in required_bands.keys():
                         required_bands[S] = set()
@@ -1703,25 +1784,43 @@ class SenseCarbon_TSV:
 
         assert TSD in self.CHIPWIDGETS.keys()
 
-        for imageLabel, bandView in zip(self.CHIPWIDGETS[TSD], self.BAND_VIEWS):
-            imageLabel.clear()
+        for imgChipLabel, bandView in zip(self.CHIPWIDGETS[TSD], self.BAND_VIEWS):
+            #imgView.clear()
             #imageLabel.setScaledContents(True)
 
-            rgb = self.ImageChipBuffer.getChipRGB(TSD, bandView)
-            rgb2 = rgb.transpose([1,2,0]).copy('C')
-            qImg = qimage2ndarray.array2qimage(rgb2)
-            #img = QImage(rgb2.data, nl, ns, QImage.Format_RGB888)
+            #rgb = self.ImageChipBuffer.getChipRGB(TSD, bandView)
+            array = self.ImageChipBuffer.getChipArray(TSD, bandView, mode = 'bgr')
+            qimg = pg.makeQImage(array, copy=True, transpose=False)
 
-            pxMap = QPixmap.fromImage(qImg)
-            pxMap = pxMap.scaled(imageLabel.size(), Qt.KeepAspectRatio)
+            #rgb2 = rgb.transpose([1,2,0]).copy('C')
+            #qImg = qimage2ndarray.array2qimage(rgb2)
+            #img = QImage(rgb2.data, nl, ns, QImage.Format_RGB888)
 
-            imageLabel.setPixmap(pxMap)
+            pxMap = QPixmap.fromImage(qimg).scaled(imgChipLabel.size(), Qt.KeepAspectRatio)
+            imgChipLabel.setPixmap(pxMap)
+            imgChipLabel.update()
+            #imgView.setPixmap(pxMap)
             #imageLabel.update()
-            imageLabel.adjustSize()
+            #imgView.adjustSize()
+            #pxmap = QPixmap.fromImage(qimg)
+            #
+
+            """
+            pxmapitem = QGraphicsPixmapItem(pxmap)
+            if imgChipLabel.scene() is None:
+                imgChipLabel.setScene(QGraphicsScene())
+            else:
+                imgChipLabel.scene().clear()
+
+            scene = imgChipLabel.scene()
+            scene.addItem(pxmapitem)
+
+            imgChipLabel.fitInView(scene.sceneRect(), Qt.KeepAspectRatio)
+            """
 
-            s = ""
             pass
         self.ICP.layout().update()
+        self.dlg.scrollArea_imageChip_content.update()
         s = ""
 
         pass
@@ -1744,16 +1843,8 @@ class SenseCarbon_TSV:
             M.beginResetModel()
             self.TS.addFiles(files)
             M.endResetModel()
-
-
-            if len(self.BAND_VIEWS) == 0:
-                self.ua_addBandView([3, 2, 1])
-                self.ua_addBandView([4, 5, 3])
-
             self.refreshBandViews()
 
-
-
         self.check_enabled()
 
 
@@ -1779,6 +1870,12 @@ class SenseCarbon_TSV:
 
 
     def refreshBandViews(self):
+
+        if len(self.BAND_VIEWS) == 0 and len(self.TS) > 0:
+            self.ua_addBandView([3, 2, 1])
+            self.ua_addBandView([4, 5, 3])
+
+
         self.clearLayoutWidgets(self.BVP)
 
         for i, BV in enumerate(self.BAND_VIEWS):
@@ -1814,7 +1911,7 @@ class SenseCarbon_TSV:
         w.deleteLater()
         self.setViewNames()
 
-    def ua_removeTS(self):
+    def ua_clear_TS(self):
         #remove views
 
         M = self.dlg.tableView_TimeSeries.model()
@@ -1936,14 +2033,14 @@ def run_tests():
 
         if True:
             dirSrcLS = r'\\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT'
-            dirSrcRE = r'\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A'
+            dirSrcRE = r'\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A_VRTs'
             filesImgLS = file_search(dirSrcLS, '20*_BOA.vrt')
-            filesImgRE = file_search(dirSrcRE, '*_328202.tif', recursive=True)
+            filesImgRE = file_search(dirSrcRE, '*.vrt', recursive=True)
             #filesMsk = file_search(dirSrc, '2014*_Msk.vrt')
-            #S.ua_addTSImages(files=filesImg[0:1])
+            S.ua_addTSImages(files=filesImgLS[0:3])
             #S.ua_addTSImages(files=filesImgLS)
             #S.ua_addTSImages(files=filesImgRE)
-            S.ua_loadExampleTS()
+            #S.ua_loadExampleTS()
 
 
             #S.ua_addTSMasks(files=filesMsk)
@@ -1972,7 +2069,7 @@ def run_tests():
             filesImgLS = file_search(dirSrcLS, '2014*_BOA.vrt')
             filesMsk = file_search(dirSrcLS, '2014*_Msk.vrt')
             S.ua_addTSImages(files=filesImgLS)
-            #S.ua_addTSMasks(files=filesMsk)
+            S.ua_addTSMasks(files=filesMsk)
 
         #S.ua_addView(bands=[4,5,3])
 
diff --git a/testdata.txt b/testdata.txt
index c6a15aa571c7bfed3e14fa9e31a7baf8a05a233c..04588d6a95fc1cecb9fdad358d26f2a5fdc6fbf1 100644
--- a/testdata.txt
+++ b/testdata.txt
@@ -1,26 +1,26 @@
-#Time series definition file: 2016-02-16T14:00:25Z
+#Time series definition file: 2016-02-19T14:13:05Z
 #<image path>[;<mask path>]
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2012-04-07_LE72270652012098EDC00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2012-04-23_LE72270652012114EDC00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2012-05-09_LE72270652012130EDC00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2012-05-25_LE72270652012146EDC00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2012-06-10_LE72270652012162EDC00_BOA.vrt
-\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A\2135822_2012-06-12_RE2_3A_328202\2135822_2012-06-12_RE2_3A_328202.tif
+\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A_VRTs\re_2012-06-12.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2012-06-26_LE72270652012178EDC00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2012-07-12_LE72270652012194EDC00_BOA.vrt
-\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A\2135821_2012-07-24_RE1_3A_328202\2135821_2012-07-24_RE1_3A_328202.tif
-\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A\2135822_2012-07-25_RE2_3A_328202\2135822_2012-07-25_RE2_3A_328202.tif
+\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A_VRTs\re_2012-07-24.vrt
+\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A_VRTs\re_2012-07-25.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2012-07-28_LE72270652012210EDC00_BOA.vrt
-\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A\2135821_2012-08-05_RE3_3A_328202\2135821_2012-08-05_RE3_3A_328202.tif
+\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A_VRTs\re_2012-08-05.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2012-08-29_LE72270652012242CUB00_BOA.vrt
-\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A\2135822_2012-09-06_RE2_3A_328202\2135822_2012-09-06_RE2_3A_328202.tif
+\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A_VRTs\re_2012-09-06.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2012-09-14_LE72270652012258EDC00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2012-09-30_LE72270652012274CUB00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2012-10-16_LE72270652012290CUB00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2012-11-01_LE72270652012306CUB02_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2013-02-05_LE72270652013036CUB00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2013-05-12_LE72270652013132CUB00_BOA.vrt
-\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A\2135821_2013-05-18_RE4_3A_328202\2135821_2013-05-18_RE4_3A_328202.tif
+\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A_VRTs\re_2013-05-18.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2013-05-20_LC82270652013140LGN01_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2013-06-05_LC82270652013156LGN00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2013-06-21_LC82270652013172LGN00_BOA.vrt
@@ -48,31 +48,31 @@
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2014-05-23_LC82270652014143LGN00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2014-05-31_LE72270652014151CUB00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2014-06-08_LC82270652014159LGN00_BOA.vrt
-\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A\2135821_2014-06-12_RE3_3A_328202\2135821_2014-06-12_RE3_3A_328202.tif
+\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A_VRTs\re_2014-06-12.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2014-06-16_LE72270652014167CUB00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2014-06-24_LC82270652014175LGN00_BOA.vrt
-\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A\2135821_2014-06-25_RE2_3A_328202\2135821_2014-06-25_RE2_3A_328202.tif
+\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A_VRTs\re_2014-06-25.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2014-07-02_LE72270652014183CUB00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2014-07-10_LC82270652014191LGN00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2014-07-18_LE72270652014199CUB00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2014-07-26_LC82270652014207LGN00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2014-08-03_LE72270652014215CUB00_BOA.vrt
-\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A\2135821_2014-08-08_RE3_3A_328202\2135821_2014-08-08_RE3_3A_328202.tif
-\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A\2136022_2014-08-10_RE5_3A_328202\2136022_2014-08-10_RE5_3A_328202.tif
+\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A_VRTs\re_2014-08-08.vrt
+\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A_VRTs\re_2014-08-10.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2014-08-11_LC82270652014223LGN00_BOA.vrt
-\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A\2135822_2014-08-17_RE3_3A_328202\2135822_2014-08-17_RE3_3A_328202.tif
+\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A_VRTs\re_2014-08-17.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2014-08-19_LE72270652014231CUB00_BOA.vrt
-\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A\2135922_2014-08-20_RE1_3A_328202\2135922_2014-08-20_RE1_3A_328202.tif
-\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A\2135821_2014-08-23_RE4_3A_328202\2135821_2014-08-23_RE4_3A_328202.tif
-\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A\2135822_2014-08-25_RE1_3A_328202\2135822_2014-08-25_RE1_3A_328202.tif
-\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A\2135822_2014-08-26_RE2_3A_328202\2135822_2014-08-26_RE2_3A_328202.tif
+\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A_VRTs\re_2014-08-20.vrt
+\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A_VRTs\re_2014-08-23.vrt
+\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A_VRTs\re_2014-08-25.vrt
+\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A_VRTs\re_2014-08-26.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2014-08-27_LC82270652014239LGN00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2014-09-04_LE72270652014247CUB00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2014-09-12_LC82270652014255LGN00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2014-09-20_LE72270652014263CUB00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2014-09-28_LC82270652014271LGN00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2014-10-06_LE72270652014279CUB00_BOA.vrt
-\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A\2135821_2014-10-10_RE4_3A_328202\2135821_2014-10-10_RE4_3A_328202.tif
+\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A_VRTs\re_2014-10-10.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2014-10-14_LC82270652014287LGN00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2014-11-07_LE72270652014311CUB00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2014-11-15_LC82270652014319LGN00_BOA.vrt
@@ -92,23 +92,25 @@
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2015-05-26_LC82270652015146LGN00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2015-06-03_LE72270652015154CUB00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2015-06-11_LC82270652015162LGN00_BOA.vrt
+\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A_VRTs\re_2015-06-13.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2015-06-19_LE72270652015170CUB00_BOA.vrt
+\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A_VRTs\re_2015-06-19.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2015-06-27_LC82270652015178LGN00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2015-07-13_LC82270652015194LGN00_BOA.vrt
-\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A\2135822_2015-07-13_RE4_3A_328202\2135822_2015-07-13_RE4_3A_328202.tif
-\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A\2135821_2015-07-17_RE3_3A_328202\2135821_2015-07-17_RE3_3A_328202.tif
+\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A_VRTs\re_2015-07-13.vrt
+\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A_VRTs\re_2015-07-17.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2015-07-21_LE72270652015202CUB00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2015-07-29_LC82270652015210LGN00_BOA.vrt
-\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A\2135822_2015-07-30_RE2_3A_328202\2135822_2015-07-30_RE2_3A_328202.tif
-\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A\2135821_2015-08-04_RE2_3A_328202\2135821_2015-08-04_RE2_3A_328202.tif
+\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A_VRTs\re_2015-07-30.vrt
+\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A_VRTs\re_2015-08-04.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2015-08-06_LE72270652015218CUB00_BOA.vrt
-\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A\2135821_2015-08-10_RE4_3A_328202\2135821_2015-08-10_RE4_3A_328202.tif
+\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A_VRTs\re_2015-08-10.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2015-08-14_LC82270652015226LGN00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2015-08-22_LE72270652015234CUB00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2015-08-30_LC82270652015242LGN00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2015-09-07_LE72270652015250ASN00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2015-09-15_LC82270652015258LGN00_BOA.vrt
-\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A\2136022_2015-09-18_RE5_3A_328202\2136022_2015-09-18_RE5_3A_328202.tif
+\\141.20.140.91\SAN_RSDBrazil\RapidEye\3A_VRTs\re_2015-09-18.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2015-09-23_LE72270652015266ASN00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2015-10-01_LC82270652015274LGN00_BOA.vrt
 \\141.20.140.107\NAS_Processing\SenseCarbonProcessing\BJ_NOC\01_RasterData\02_CuttedVRT\2015-10-09_LE72270652015282ASN00_BOA.vrt
diff --git a/imagechipviewsettings_widget.py b/tsv_widgets.py
similarity index 54%
rename from imagechipviewsettings_widget.py
rename to tsv_widgets.py
index 3c4b97c7fc53d0c1e4923b60a840806d8037aff7..08468ad791a2580415b457abf08091545b85f938 100644
--- a/imagechipviewsettings_widget.py
+++ b/tsv_widgets.py
@@ -26,12 +26,18 @@ from PyQt4.QtGui import *
 
 import sys
 sys.path.append(os.path.dirname(__file__))
-FORM_CLASS, _ = uic.loadUiType(os.path.join(
-    os.path.dirname(__file__), 'imagechipviewsettings_widget_base.ui'), resource_suffix='')
 
 
+def loadFormClass(name_ui):
+    FORM_CLASS, _ = uic.loadUiType(os.path.join(
+        os.path.dirname(__file__), name_ui), resource_suffix='')
+    return FORM_CLASS
 
-class ImageChipViewSettings(QGroupBox, FORM_CLASS):
+
+FORM_CLASS_BANDVIEWSETTINGS = loadFormClass('bandviewsettings_widget_base.ui')
+FORM_CLASS_IMAGECHIPVIEWSETTINGS = loadFormClass('imagechipviewsettings_widget_base.ui')
+
+class ImageChipViewSettings(QGroupBox, FORM_CLASS_IMAGECHIPVIEWSETTINGS):
 
     #define signals
 
@@ -130,6 +136,102 @@ class ImageChipViewSettings(QGroupBox, FORM_CLASS):
         s = ""
 
 
+class BandViewSettings(QGroupBox, FORM_CLASS_BANDVIEWSETTINGS):
+
+    #define signals
+
+    removeView = pyqtSignal()
+
+    def __init__(self, SensorConfiguration, parent=None):
+        """Constructor."""
+        super(BandViewSettings, self).__init__(parent)
+        # Set up the user interface from Designer.
+        # After setupUI you can access any designer object by doing
+        # self.<objectname>, and you can use autoconnect slots - see
+        # http://qt-project.org/doc/qt-4.8/designer-using-a-ui-file.html
+        # #widgets-and-dialogs-with-auto-connect
+        self.setupUi(self)
+
+
+        self.SensorConfiguration = SensorConfiguration
+        self.setTitle(SensorConfiguration.sensor_name)
+
+        self.tb_range_min.setValidator(QDoubleValidator())
+        self.tb_range_max.setValidator(QDoubleValidator())
+
+        self._initBands(self.SensorConfiguration.band_names)
+
+    def ua_setMask(self, state):
+        raise NotImplementedError()
+        useMask = state != 0
+        for w in [self.bt_color, self.label_maskexpression, self.tb_maskexpression]:
+            w.setEnabled(useMask)
+
+    def ua_setMaskColor(self, color):
+        raise NotImplementedError()
+        if color is None:
+            color = QColorDialog.getColor()
+
+        if color is not None:
+            self.maskcolor = color
+            r = color.red()
+            g = color.green()
+            b = color.blue()
+            style = "background:rgb({},{},{})".format(r,g,b)
+            self.bt_color.setStyleSheet(style)
+            self.bt_color.update()
+
+    def getMaskColor(self):
+        raise NotImplementedError()
+        return (self.maskcolor.red(), self.maskcolor.green(), self.maskcolor.blue())
+
+    def useMaskValues(self):
+        return self.cb_useMask.isChecked()
+
+    def _initBands(self, band_names):
+        cb_R = self.cb_r
+        cb_G = self.cb_g
+        cb_B = self.cb_b
+
+        for i, bandname in enumerate(band_names):
+            cb_R.addItem(bandname, i+1)
+            cb_G.addItem(bandname, i+1)
+            cb_B.addItem(bandname, i+1)
+
+        if len(self.SensorConfiguration.band_names) >= 3:
+            cb_R.setCurrentIndex(2)
+            cb_G.setCurrentIndex(1)
+            cb_B.setCurrentIndex(0)
+
+
+    def setBands(self,bands):
+        assert len(bands) == 3
+        for b in bands:
+            assert type(b) is int and b > 0
+            assert b <= len(self.SensorConfiguration.band_names), 'TimeSeries is not initializes/has no bands to show'
+        self.cb_r.setCurrentIndex(bands[0]-1)
+        self.cb_g.setCurrentIndex(bands[1]-1)
+        self.cb_b.setCurrentIndex(bands[2]-1)
+
+        s = ""
+        pass
+
+    def getBands(self):
+        bands = [self.cb_r.currentIndex()+1, \
+                 self.cb_g.currentIndex()+1, \
+                 self.cb_b.currentIndex()+1]
+        return bands
+
+    def getRanges(self):
+        range = [float(self.tb_range_min.text()), float(self.tb_range_max.text())]
+        #provide a range for each channel
+        return (range, range, range)
+
+    def getSettings(self):
+
+        s = ""
+
+
 if __name__ == '__main__':
 
     import PyQt4.Qt
@@ -138,7 +240,9 @@ if __name__ == '__main__':
     W = QDialog()
     W.setLayout(QHBoxLayout())
     L = W.layout()
-    w = ImageChipViewSettings()
+    import sensecarbon_tsv
+    S = sensecarbon_tsv.SensorConfiguration(6,30,30)
+    w = BandViewSettings(S)
     L.addWidget(w)
     W.show()
     sys.exit(app.exec_())