merge pyqtgraph from dev

2012-12-26 18:54:12 -05:00 · 2012-12-26 18:54:12 -05:00 · 72f66f7531
commit 72f66f7531
parent 8899e8d858 45048467b3
327 changed files with 706 additions and 155 deletions
--- a/LICENSE.txt
+++ b/LICENSE.txt
@ -1,4 +1,4 @@
-Copyright (c) 2011  University of North Carolina at Chapel Hill
+Copyright (c) 2012  University of North Carolina at Chapel Hill
 Luke Campagnola    ('luke.campagnola@%s.com' % 'gmail')

 The MIT License
--- a/README.txt
+++ b/README.txt
@ -1,6 +1,6 @@
 PyQtGraph - A pure-Python graphics library for PyQt/PySide
-Copyright 2011 Luke Campagnola, University of North Carolina at Chapel Hill
-http://http://luke.campagnola.me/code/pyqtgraph
+Copyright 2012 Luke Campagnola, University of North Carolina at Chapel Hill
+http://www.pyqtgraph.org

 Authors:
    Luke Campagnola   ('luke.campagnola@%s.com' % 'gmail')
@ -9,30 +9,29 @@ Authors:

 Requirements:
    PyQt 4.7+ or PySide
-    python 2.7+ (no python 3 support yet)
+    python 2.6, 2.7, or 3.x
    numpy, scipy
-
+    For 3D graphics: pyopengl
    Known to run on Windows, Linux, and Mac.

 Support:
    Post at the mailing list / forum:
    https://groups.google.com/forum/?fromgroups#!forum/pyqtgraph

-Installation:
-    Pyqtgraph currently does not have (or really require) any installation 
-    scripts. All that is needed is for the pyqtgraph folder to be placed 
-    someplace importable. Most people will prefer to simply place this folder 
-    within a larger project folder. If you want to make pyqtgraph available 
-    system-wide, copy the folder to one of the directories listed in python's 
-    sys.path list.
+Installation Methods:
+    - To use with a specific project, simply copy the pyqtgraph subdirectory 
+      anywhere that is importable from your project 
+    - To install system-wide from source distribution:
+         $ python setup.py install
+    - For instalation packages, see the website (pyqtgraph.org)    

 Documentation:
-    There are many examples; run "python -m pyqtgraph.examples" for a menu
+    There are many examples; run "python -m pyqtgraph.examples" for a menu.
    Some (incomplete) documentation exists at this time.
    - Easiest place to get documentation is at 
-      http://http://luke.campagnola.me/code/pyqtgraph/documentation
+      http://www.pyqtgraph.org/documentation
    - If you acquired this code as a .tar.gz file from the website, then you can also look in 
-      pyqtgraph/documentation/html.
+      doc/html.
    - If you acquired this code via BZR, then you can build the documentation using sphinx.
      From the documentation directory, run:
          $ make html  
--- a/documentation/Makefile
+++ b/documentation/Makefile
--- a/documentation/listmissing.py
+++ b/documentation/listmissing.py
--- a/documentation/make.bat
+++ b/documentation/make.bat
--- a/documentation/source/3dgraphics.rst
+++ b/documentation/source/3dgraphics.rst
--- a/documentation/source/3dgraphics/glaxisitem.rst
+++ b/documentation/source/3dgraphics/glaxisitem.rst
--- a/documentation/source/3dgraphics/glgraphicsitem.rst
+++ b/documentation/source/3dgraphics/glgraphicsitem.rst
--- a/documentation/source/3dgraphics/glgriditem.rst
+++ b/documentation/source/3dgraphics/glgriditem.rst
--- a/documentation/source/3dgraphics/glimageitem.rst
+++ b/documentation/source/3dgraphics/glimageitem.rst
--- a/documentation/source/3dgraphics/glmeshitem.rst
+++ b/documentation/source/3dgraphics/glmeshitem.rst
--- a/documentation/source/3dgraphics/glscatterplotitem.rst
+++ b/documentation/source/3dgraphics/glscatterplotitem.rst
--- a/documentation/source/3dgraphics/glsurfaceplotitem.rst
+++ b/documentation/source/3dgraphics/glsurfaceplotitem.rst
--- a/documentation/source/3dgraphics/glviewwidget.rst
+++ b/documentation/source/3dgraphics/glviewwidget.rst
--- a/documentation/source/3dgraphics/glvolumeitem.rst
+++ b/documentation/source/3dgraphics/glvolumeitem.rst
--- a/documentation/source/3dgraphics/index.rst
+++ b/documentation/source/3dgraphics/index.rst
--- a/documentation/source/3dgraphics/meshdata.rst
+++ b/documentation/source/3dgraphics/meshdata.rst
--- a/documentation/source/apireference.rst
+++ b/documentation/source/apireference.rst
--- a/documentation/source/conf.py
+++ b/documentation/source/conf.py
--- a/documentation/source/functions.rst
+++ b/documentation/source/functions.rst
--- a/documentation/source/graphicsItems/arrowitem.rst
+++ b/documentation/source/graphicsItems/arrowitem.rst
--- a/documentation/source/graphicsItems/axisitem.rst
+++ b/documentation/source/graphicsItems/axisitem.rst
--- a/documentation/source/graphicsItems/buttonitem.rst
+++ b/documentation/source/graphicsItems/buttonitem.rst
--- a/documentation/source/graphicsItems/curvearrow.rst
+++ b/documentation/source/graphicsItems/curvearrow.rst
--- a/documentation/source/graphicsItems/curvepoint.rst
+++ b/documentation/source/graphicsItems/curvepoint.rst
--- a/documentation/source/graphicsItems/fillbetweenitem.rst
+++ b/documentation/source/graphicsItems/fillbetweenitem.rst
--- a/documentation/source/graphicsItems/gradienteditoritem.rst
+++ b/documentation/source/graphicsItems/gradienteditoritem.rst
--- a/documentation/source/graphicsItems/gradientlegend.rst
+++ b/documentation/source/graphicsItems/gradientlegend.rst
--- a/documentation/source/graphicsItems/graphicsitem.rst
+++ b/documentation/source/graphicsItems/graphicsitem.rst
--- a/documentation/source/graphicsItems/graphicslayout.rst
+++ b/documentation/source/graphicsItems/graphicslayout.rst
--- a/documentation/source/graphicsItems/graphicsobject.rst
+++ b/documentation/source/graphicsItems/graphicsobject.rst
--- a/documentation/source/graphicsItems/graphicswidget.rst
+++ b/documentation/source/graphicsItems/graphicswidget.rst
--- a/documentation/source/graphicsItems/graphicswidgetanchor.rst
+++ b/documentation/source/graphicsItems/graphicswidgetanchor.rst
--- a/documentation/source/graphicsItems/griditem.rst
+++ b/documentation/source/graphicsItems/griditem.rst
--- a/documentation/source/graphicsItems/histogramlutitem.rst
+++ b/documentation/source/graphicsItems/histogramlutitem.rst
--- a/documentation/source/graphicsItems/imageitem.rst
+++ b/documentation/source/graphicsItems/imageitem.rst
--- a/documentation/source/graphicsItems/index.rst
+++ b/documentation/source/graphicsItems/index.rst
--- a/documentation/source/graphicsItems/infiniteline.rst
+++ b/documentation/source/graphicsItems/infiniteline.rst
--- a/documentation/source/graphicsItems/isocurveitem.rst
+++ b/documentation/source/graphicsItems/isocurveitem.rst
--- a/documentation/source/graphicsItems/labelitem.rst
+++ b/documentation/source/graphicsItems/labelitem.rst
--- a/documentation/source/graphicsItems/legenditem.rst
+++ b/documentation/source/graphicsItems/legenditem.rst
--- a/documentation/source/graphicsItems/linearregionitem.rst
+++ b/documentation/source/graphicsItems/linearregionitem.rst
--- a/documentation/source/graphicsItems/make
+++ b/documentation/source/graphicsItems/make
--- a/documentation/source/graphicsItems/plotcurveitem.rst
+++ b/documentation/source/graphicsItems/plotcurveitem.rst
--- a/documentation/source/graphicsItems/plotdataitem.rst
+++ b/documentation/source/graphicsItems/plotdataitem.rst
--- a/documentation/source/graphicsItems/plotitem.rst
+++ b/documentation/source/graphicsItems/plotitem.rst
--- a/documentation/source/graphicsItems/roi.rst
+++ b/documentation/source/graphicsItems/roi.rst
--- a/documentation/source/graphicsItems/scalebar.rst
+++ b/documentation/source/graphicsItems/scalebar.rst
--- a/documentation/source/graphicsItems/scatterplotitem.rst
+++ b/documentation/source/graphicsItems/scatterplotitem.rst
--- a/documentation/source/graphicsItems/textitem.rst
+++ b/documentation/source/graphicsItems/textitem.rst
--- a/documentation/source/graphicsItems/uigraphicsitem.rst
+++ b/documentation/source/graphicsItems/uigraphicsitem.rst
--- a/documentation/source/graphicsItems/viewbox.rst
+++ b/documentation/source/graphicsItems/viewbox.rst
--- a/documentation/source/graphicsItems/vtickgroup.rst
+++ b/documentation/source/graphicsItems/vtickgroup.rst
--- a/documentation/source/graphicsscene/graphicsscene.rst
+++ b/documentation/source/graphicsscene/graphicsscene.rst
--- a/documentation/source/graphicsscene/hoverevent.rst
+++ b/documentation/source/graphicsscene/hoverevent.rst
--- a/documentation/source/graphicsscene/index.rst
+++ b/documentation/source/graphicsscene/index.rst
--- a/documentation/source/graphicsscene/mouseclickevent.rst
+++ b/documentation/source/graphicsscene/mouseclickevent.rst
--- a/documentation/source/graphicsscene/mousedragevent.rst
+++ b/documentation/source/graphicsscene/mousedragevent.rst
--- a/documentation/source/graphicswindow.rst
+++ b/documentation/source/graphicswindow.rst
--- a/documentation/source/how_to_use.rst
+++ b/documentation/source/how_to_use.rst
--- a/documentation/source/images.rst
+++ b/documentation/source/images.rst
--- a/documentation/source/images/plottingClasses.png
+++ b/documentation/source/images/plottingClasses.png
--- a/documentation/source/images/plottingClasses.svg
+++ b/documentation/source/images/plottingClasses.svg
--- a/documentation/source/index.rst
+++ b/documentation/source/index.rst
--- a/documentation/source/installation.rst
+++ b/documentation/source/installation.rst
--- a/documentation/source/internals.rst
+++ b/documentation/source/internals.rst
--- a/documentation/source/introduction.rst
+++ b/documentation/source/introduction.rst
--- a/documentation/source/mouse_interaction.rst
+++ b/documentation/source/mouse_interaction.rst
--- a/documentation/source/parametertree/apiref.rst
+++ b/documentation/source/parametertree/apiref.rst
--- a/documentation/source/parametertree/index.rst
+++ b/documentation/source/parametertree/index.rst
--- a/documentation/source/parametertree/parameter.rst
+++ b/documentation/source/parametertree/parameter.rst
--- a/documentation/source/parametertree/parameteritem.rst
+++ b/documentation/source/parametertree/parameteritem.rst
--- a/documentation/source/parametertree/parametertree.rst
+++ b/documentation/source/parametertree/parametertree.rst
--- a/documentation/source/parametertree/parametertypes.rst
+++ b/documentation/source/parametertree/parametertypes.rst
--- a/documentation/source/plotting.rst
+++ b/documentation/source/plotting.rst
--- a/documentation/source/prototyping.rst
+++ b/documentation/source/prototyping.rst
--- a/documentation/source/region_of_interest.rst
+++ b/documentation/source/region_of_interest.rst
--- a/documentation/source/style.rst
+++ b/documentation/source/style.rst
--- a/documentation/source/widgets/busycursor.rst
+++ b/documentation/source/widgets/busycursor.rst
--- a/documentation/source/widgets/checktable.rst
+++ b/documentation/source/widgets/checktable.rst
--- a/documentation/source/widgets/colorbutton.rst
+++ b/documentation/source/widgets/colorbutton.rst
--- a/documentation/source/widgets/combobox.rst
+++ b/documentation/source/widgets/combobox.rst
--- a/documentation/source/widgets/datatreewidget.rst
+++ b/documentation/source/widgets/datatreewidget.rst
--- a/documentation/source/widgets/dockarea.rst
+++ b/documentation/source/widgets/dockarea.rst
--- a/documentation/source/widgets/feedbackbutton.rst
+++ b/documentation/source/widgets/feedbackbutton.rst
--- a/documentation/source/widgets/filedialog.rst
+++ b/documentation/source/widgets/filedialog.rst
--- a/documentation/source/widgets/gradientwidget.rst
+++ b/documentation/source/widgets/gradientwidget.rst
--- a/documentation/source/widgets/graphicslayoutwidget.rst
+++ b/documentation/source/widgets/graphicslayoutwidget.rst
--- a/documentation/source/widgets/graphicsview.rst
+++ b/documentation/source/widgets/graphicsview.rst
--- a/documentation/source/widgets/histogramlutwidget.rst
+++ b/documentation/source/widgets/histogramlutwidget.rst
--- a/documentation/source/widgets/imageview.rst
+++ b/documentation/source/widgets/imageview.rst
--- a/documentation/source/widgets/index.rst
+++ b/documentation/source/widgets/index.rst
--- a/documentation/source/widgets/joystickbutton.rst
+++ b/documentation/source/widgets/joystickbutton.rst
--- a/documentation/source/widgets/layoutwidget.rst
+++ b/documentation/source/widgets/layoutwidget.rst
--- a/documentation/source/widgets/make
+++ b/documentation/source/widgets/make
--- a/documentation/source/widgets/matplotlibwidget.rst
+++ b/documentation/source/widgets/matplotlibwidget.rst
--- a/documentation/source/widgets/multiplotwidget.rst
+++ b/documentation/source/widgets/multiplotwidget.rst
--- a/documentation/source/widgets/parametertree.rst
+++ b/documentation/source/widgets/parametertree.rst
--- a/documentation/source/widgets/pathbutton.rst
+++ b/documentation/source/widgets/pathbutton.rst
--- a/documentation/source/widgets/plotwidget.rst
+++ b/documentation/source/widgets/plotwidget.rst
--- a/Show More
+++ b/Show More