Permalink
Commits on Jan 15, 2017
  1. Merge pull request #425 from james1293/develop

    Removed unnecessary 'curve1' from 'global'
    campagnola committed on GitHub Jan 15, 2017
Commits on Jan 14, 2017
  1. Merge pull request #424 from colinba/develop

    Fix crash when running pyqtgraph with python -OO
    campagnola committed on GitHub Jan 14, 2017
  2. Merge pull request #410 from campagnola/spinbox-formatting

    Spinbox formatting
    campagnola committed on GitHub Jan 14, 2017
  3. Merge pull request #414 from campagnola/canvas-fixes

    Fix canvas classes for PyQt5 and PySide
    campagnola committed on GitHub Jan 14, 2017
  4. Merge pull request #415 from campagnola/fix-getarrayregion

    Fix getarrayregion
    campagnola committed on GitHub Jan 14, 2017
Commits on Jan 7, 2017
  1. Removed unnecessary 'curve1' from 'global'

    james1293 committed on GitHub Jan 7, 2017
Commits on Jan 4, 2017
  1. Fix crash when running pyqtgraph with python -OO

    Running pyqtgraph with python -OO gives the following crash
    
    colin@desktop:~$ python3 -OO -c 'import pyqtgraph'
    Traceback (most recent call last):
      File "<string>", line 1, in <module>
      File "/usr/local/lib/python3.5/dist-packages/pyqtgraph/__init__.py", line 216, in <module>
        from .graphicsItems.HistogramLUTItem import *
      File "/usr/local/lib/python3.5/dist-packages/pyqtgraph/graphicsItems/HistogramLUTItem.py", line 10, in <module>
        from .GradientEditorItem import *
      File "/usr/local/lib/python3.5/dist-packages/pyqtgraph/graphicsItems/GradientEditorItem.py", line 354, in <module>
        class GradientEditorItem(TickSliderItem):
      File "/usr/local/lib/python3.5/dist-packages/pyqtgraph/graphicsItems/GradientEditorItem.py", line 480, in GradientEditorItem
        @addGradientListToDocstring()
      File "/usr/local/lib/python3.5/dist-packages/pyqtgraph/graphicsItems/GradientEditorItem.py", line 30, in dec
        fn.__doc__ = fn.__doc__ + str(Gradients.keys()).strip('[').strip(']')
    TypeError: unsupported operand type(s) for +: 'NoneType' and 'str'
    
    The cause is the @addGradientListToDocstring() annotation in
    GradientEditorItem.py that cannot handle functions without docstrings as
    produced when using the python -OO option.
    
    Fix this by only adding the gradient list to the docstring if the docstring is
    not None.
    colinba committed Jan 4, 2017
Commits on Dec 14, 2016
  1. Merge pull request #408 from ales-erjavec/cleanup-qgraphics-scene-init

    Fix `cleanup` when the running qt application is not a QApplication
    campagnola committed on GitHub Dec 14, 2016
  2. Add scipy to travis requirements--some unit tests require this

    campagnola committed Dec 14, 2016
  3. Merge pull request #413 from campagnola/pg-release-fixes

    Fixes to --publish option in pg-release script
    campagnola committed on GitHub Dec 14, 2016
  4. Merge pull request #416 from campagnola/fix-travis-ioerror

    Add print wrapper to work around interrupted system calls on travis
    campagnola committed on GitHub Dec 14, 2016
  5. really actually fix

    campagnola committed Dec 14, 2016
  6. py3 fix

    campagnola committed Dec 14, 2016
Commits on Dec 9, 2016
  1. minor doc / test edits

    campagnola committed Dec 9, 2016
Commits on Dec 8, 2016
  1. Fix unit tests

    campagnola committed Dec 8, 2016
Commits on Dec 7, 2016
  1. Fix multiple spinbox problems:

     - fixed bug with exponents disappearing after edit
     - fixed parsing of values with junk after suffix
     - fixed red border
     - reverted default decimals to 6
     - make suffix editable (but show red border if it's wrong)
     - revert invalid text on focus lost
     - siPrefix without suffix is no longer allowed
     - let user set arbitrary format string
    campagnola committed Dec 7, 2016
Commits on Nov 30, 2016
  1. Add first spinbox tests

    campagnola committed Nov 30, 2016
Commits on Nov 28, 2016
  1. Fix `cleanup` when the running qt application is not a QApplication

    ales-erjavec committed Nov 28, 2016
Commits on Nov 11, 2016
Commits on Nov 8, 2016
  1. Fixes to --publish option in pg-release script

    campagnola committed Nov 8, 2016
Commits on Nov 5, 2016
  1. Merge tag 'pyqtgraph-0.10.0' into develop

    campagnola committed Nov 5, 2016
  2. Merge pull request #383 from campagnola/release-0.10.0

    Release 0.10.0
    campagnola committed on GitHub Nov 5, 2016
  3. PyQtGraph release 0.10.0

    campagnola committed Nov 5, 2016
  4. add missing example template file

    add note about pyside bug affecting optics example
    campagnola committed Nov 5, 2016
Commits on Nov 2, 2016
  1. Fix import error in MatplotlibWidget

    campagnola committed Nov 2, 2016