ASCEE/pyqtgraph
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,017 Commits 2 Branches 22 Tags 13 MiB
14d5085636
Commit Graph

2017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
WFrsh
e3827f17f1 Included matplotlib 2.0 colormaps 
Included the four Perceptually Uniform Sequential colormaps from the matplotlib 2.0 release.
viridis, inferno, plasma, magma
 2017-02-17 21:48:15 +01:00
Pieter
b9aea3daf1 add warnings for remote exceptions 2017-02-16 12:40:21 +01:00
Luke Campagnola
dd5a8bf9d1 Merge pull request #436 from campagnola/fft-test 
Add unit test covering plotdataitem fft
 2017-02-05 23:29:41 -08:00
Luke Campagnola
f632b02985 Add unit test covering plotdataitem fft 2017-02-05 23:13:00 -08:00
Luke Campagnola
154b6bacb1 Merge pull request #429 from pijyoi/fixfftslice 
fix fft premature slicing away of 0 freq bin
 2017-02-03 02:25:05 -08:00
KIU Shueng Chuan
4553b55f73 python2 compat: don't assume true division 2017-01-20 09:09:18 +08:00
KIU Shueng Chuan
0a8d5b253a fix: freq coords need to take into account x-coords spacing 2017-01-18 09:02:53 +08:00
KIU Shueng Chuan
12f6bf916f fix fft premature slicing away of 0 freq bin 
also fixes:
- use rfft for better efficiency
- use rfftfreq to compute coords correctly
  - works for both odd/even lengths
- python3: integer division needed for numpy indexing
 2017-01-17 22:04:05 +08:00
Luke Campagnola
6cdad190ab Merge remote-tracking branch 'campagnola/develop' into datatree-arrays 2017-01-16 11:34:42 -08:00
Luke Campagnola
f26b4ec3c7 Merge pull request #425 from james1293/develop 
Removed unnecessary 'curve1' from 'global'
 2017-01-14 22:17:34 -08:00
Luke Campagnola
fab19b7ad4 Merge pull request #424 from colinba/develop 
Fix crash when running pyqtgraph with python -OO
 2017-01-14 11:27:19 -08:00
Luke Campagnola
504c35202a Merge pull request #410 from campagnola/spinbox-formatting 
Spinbox formatting
 2017-01-14 11:09:51 -08:00
Luke Campagnola
6e01f74990 Merge pull request #414 from campagnola/canvas-fixes 
Fix canvas classes for PyQt5 and PySide
 2017-01-14 11:09:02 -08:00
Luke Campagnola
7b20b33a06 Merge pull request #415 from campagnola/fix-getarrayregion 
Fix getarrayregion
 2017-01-14 11:08:38 -08:00
james1293
b131785b86 Removed unnecessary 'curve1' from 'global' 2017-01-06 23:21:31 -05:00
Colin Baumgarten
b420099bd5 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.
 2017-01-04 21:48:00 +01:00
Luke Campagnola
fe90f46bdd Merge pull request #408 from ales-erjavec/cleanup-qgraphics-scene-init 
Fix `cleanup` when the running qt application is not a QApplication
 2016-12-14 11:13:31 -08:00
Luke Campagnola
4e7773fa0b Add scipy to travis requirements--some unit tests require this 2016-12-14 11:02:40 -08:00
Luke Campagnola
183ca1f5d2 Merge pull request #413 from campagnola/pg-release-fixes 
Fixes to --publish option in pg-release script
 2016-12-14 10:49:36 -08:00
Luke Campagnola
870a61d2ae Merge pull request #416 from campagnola/fix-travis-ioerror 
Add print wrapper to work around interrupted system calls on travis
 2016-12-14 10:35:24 -08:00
Luke Campagnola
24b288a05a really actually fix 2016-12-14 10:19:01 -08:00
Luke Campagnola
8d85b87d71 py3 fix 2016-12-14 10:14:11 -08:00
Luke Campagnola
8fc98a6a0b Add print wrapper to work around interrupted system calls on travis 2016-12-14 10:07:16 -08:00
Luke Campagnola
f057c712af Merge branch 'develop' into ccf-viewer-fixes 2016-12-14 08:35:33 -08:00
Luke Campagnola
de0ee32a20 minor doc / test edits 2016-12-09 10:20:19 -08:00
Luke Campagnola
95de07b48a Merge remote-tracking branch 'lidstrom83/SpinBox_wrapping' into spinbox-formatting 2016-12-09 10:07:28 -08:00
Luke Campagnola
4aad24a52d Merge remote-tracking branch 'lidstrom83/Parameter_limits_fix' into spinbox-formatting 2016-12-09 09:54:39 -08:00
Luke Campagnola
cd7683b61d Fix unit tests 2016-12-08 10:14:18 -08:00
Luke Campagnola
e5a17edb4d Add spinbox 'regex' and 'evalFunc' options to complete user-formatting functionality 2016-12-08 10:12:45 -08:00
Luke Campagnola
f0e26d3add Limit lineedit height in parametertree to match spinbox style 2016-12-07 17:34:44 -08:00
Luke Campagnola
9823436273 Add spinbox option to limit height based on font size 2016-12-07 17:34:12 -08:00
Luke Campagnola
65e9052580 Fix parametertree sending bad options to spinbox 2016-12-06 22:56:55 -08:00
Luke Campagnola
6b798ffed8 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
 2016-12-06 22:29:22 -08:00
Luke Campagnola
5ddbb611d1 spinbox selects only numerical portion of text on focus-in 2016-11-30 09:18:09 -08:00
Luke Campagnola
c97c5f51e2 Add spinbox option for custom formatting 2016-11-30 09:16:56 -08:00
Luke Campagnola
e26fb1f9de Add first spinbox tests 2016-11-29 17:45:42 -08:00
Ales Erjavec
c4c31c3650 Fix cleanup when the running qt application is not a QApplication 2016-11-28 15:43:35 +01:00
Luke Campagnola
f612d845fc Fix canvas classes for PyQt5 and PySide 2016-11-10 18:24:47 -08:00
Karl Bedrich
2d754672a0 NEW show/hide gradient ticks 
NEW link gradientEditorItem to other gradients
 2016-11-10 17:01:15 +00:00
Luke Campagnola
09725dcb55 Fixes to --publish option in pg-release script 2016-11-07 17:57:23 -08:00
Luke Campagnola
4cdc3ac7e5 Merge tag 'pyqtgraph-0.10.0' into develop 2016-11-05 00:34:28 -07:00
Luke Campagnola
4a3fb81535 Merge pull request #383 from campagnola/release-0.10.0 
Release 0.10.0
 2016-11-04 23:01:47 -07:00
Luke Campagnola
1426e334e1 PyQtGraph release 0.10.0 2016-11-04 22:47:56 -07:00
Luke Campagnola
e21d06b4c4 add missing example template file 
add note about pyside bug affecting optics example
 2016-11-04 22:47:10 -07:00
Luke Campagnola
fcdc2a74ad Fix import error in MatplotlibWidget 2016-11-01 20:42:11 -07:00
Luke Campagnola
c58a177561 Relax image test requirements for Qt5 (there are some single-pixel shifts that 
we will nee new test images to cover)
 2016-11-01 18:28:48 -07:00
Luke Campagnola
04bbbc453a force pyqt4 install in travis (conda now defaults to pyqt5) 2016-11-01 15:25:54 -07:00
Luke Campagnola
453871564b Add sysinfo print on travis 2016-11-01 06:22:47 -07:00
Luke Campagnola
a0e4301b38 Fix VideoSpeedTest to disable RawImageGLWidget when openGL is unavailable 2016-10-26 09:26:01 -07:00
Luke Campagnola
15c58de5d6 py3 fix 2016-10-25 23:04:26 -07:00