Commit Graph

1627 Commits

Author SHA1 Message Date
Ogi Moore
95d62cec6a
Merge pull request #876 from Dschoni/Fix-deprecated-boolean-substract
Typecast Levels to be float
2019-05-23 22:26:21 -07:00
Ogi Moore
42e7c49984
Merge pull request #880 from j9ac9k/add-tox
[skip ci] Create tox configuration, update README accordingly.
2019-05-23 22:25:27 -07:00
Ogi Moore
bc59457748
Merge pull request #875 from Dschoni/develop
Fix numpy deprecation warning by typecasting multi-dimension indices to tuples.
2019-05-23 22:02:33 -07:00
Ogi Moore
58ae027197
Merge pull request #378 from ben-github/develop
Fix issue with Python3 and changes in how it handles zip.
2019-05-23 21:54:43 -07:00
Ogi Moore
4a76fff11a
Merge pull request #417 from termim/PlotDataItem_clear
In PlotDataItem.clear() use corresponding curve.clear() and scatter.clear()
2019-05-23 21:52:50 -07:00
2xB
e2b01ccf74 FIX: Correct deletion of matplotlib exporter window object (#868)
E.g. when opening the Matplotlib exporter multiple times, and one closes one instance, Python crashes.
This is caused by the Matplotlib QMainWindow listening to the closeEvent and deleting the only reference of
the window before it is closed properly.
2019-05-23 21:35:01 -07:00
HappyTreeBeard
8420fe984a Fixed bug in unit test where temp file remained open when os.unlink was called (#832) 2019-05-23 21:33:23 -07:00
Ogi
309f89d413 Create tox configuration, update README accordingly. 2019-05-22 22:07:30 -07:00
Kyle Sunden
20c74954a5
Merge pull request #830 from tacaswell/mnt_future_proof_text
MNT: future-proof the code a bit
2019-05-22 19:24:57 -05:00
2xB
cf3c294899 Fix Travis CI on 'develop' branch (#877)
* Removed unused code

There is no reason to keep old, unused code in a git repository

* Removed system_site_packages from Travis CI

system_site_packages are opposed to the used conda installation. They are both unnecessary and lead to Travis build errors.
2019-05-22 15:44:54 -07:00
Ogi Moore
9cb351feee
Implement azure ci (#865)
* [skip-ci] Initial Azure-Pipelines configuration.

The following configurations are tested

* macOS 10.13
* ubuntu 16.04
* Windows Server 2016

Under each operating system, the following Qt bindings are tested

* conda based pyqt4
* conda based pyside
* conda based pyside2 (5.6)
* conda based PyQt5 (5.9)
* pip basedd PyQt5 (5.12)
* pip based PySide2 (5.12)

For each configuration, it runs `python -m pytest --cov pyqtgraph -sv`

The only configuration that actually passes all tests is Ubuntu-pip-PyQt5
2019-05-22 15:24:21 -07:00
Ogi Moore
04927dd3cf
Merge pull request #764 from Billy4195/Update_install_doc
Update the installation document
2019-05-22 14:30:26 -07:00
Ogi Moore
f422dbd9ae
Merge pull request #866 from j9ac9k/fix-pyside2-qt.py-tests
Fix pyside2 qt.py tests
2019-05-22 14:16:11 -07:00
dschoni
bac8080b0c Typecast Levels to be float
This circumvents cases in which "levels" is a boolean array and therefore the substraction fails due to deprecation.
2019-05-21 14:14:10 +02:00
dschoni
7f93e8205f Found one more instance of the same warning in functions.py 2019-05-21 13:38:46 +02:00
dschoni
42fd5614d0 Fix deprecation warning of multi-dimension tuples 2019-05-21 13:38:34 +02:00
Ogi
afb665ec99 make use of shiboken2 directly for isValid method 2019-05-12 17:35:26 -07:00
Ogi
d873ee6b26 fixes ImportError on importing pysideuic 2019-05-12 17:31:12 -07:00
Ogi
aa50296b9f gc.collect() causes segfault on pyside2, test will pass on pyqt5 bindings (did not test pyqt4 or pyside1) 2019-05-12 17:30:40 -07:00
Luke Campagnola
51b3201564
Merge pull request #824 from ronpandolfi/develop
Fix for PySide2; QtCore.QPoint.__sub__ no longer works with tuples
2019-05-03 10:58:21 -07:00
Luke Campagnola
229f650adf
Merge pull request #837 from scseeman/color_map_widget_options
add option to set other field variables in ColorMapWidget
2019-03-08 12:55:23 -08:00
Luke Campagnola
41107e4caa
expand docstring 2019-03-08 12:46:10 -08:00
Luke Campagnola
894c9a4362
move default handling up to colormapparameter 2019-03-08 12:33:14 -08:00
ALLENINST\stephanies
bafe1b4b74 group all defaults into one argument 2019-03-08 12:00:21 -08:00
ALLENINST\stephanies
fb098e9cdc add option to set other field variables in ColorMapWidget 2019-03-06 12:42:22 -08:00
Thomas A Caswell
da1bf54ec8
MNT: use raw for regular expression 2019-02-14 16:41:54 -05:00
Thomas A Caswell
0649ff8f3c
MNT: do not use 'is not' on literal
py38 raises a SyntaxWarning on this
2019-02-14 16:41:06 -05:00
Thomas A Caswell
4fe90bb215
MNT: escape docstrings that have rst escaping in them 2019-02-14 16:39:45 -05:00
Thomas A Caswell
691da09eb0
MNT: do not use 'is' with literals, use ==
py3.8 gives a syntax warning on this
2019-02-14 16:36:02 -05:00
ronpandolfi
e2ca71a65c Fix for PySide2; QtCore.QPoint.__sub__ no longer works with tuples 2019-02-01 19:44:54 -08:00
Luke Campagnola
2e69b9c5e6 Add changelog entry and credit for previous PR 2018-11-09 07:18:36 -08:00
Luke Campagnola
753c291bcd
Merge pull request #446 from WFrsh/develop
Included matplotlib 2.0 colormaps
2018-11-09 07:08:39 -08:00
Luke Campagnola
fdc2e53025
Merge pull request #780 from campagnola/fix-axis-drag
Revert "Fixed AxisMouse drag issue"
2018-10-29 12:33:44 -07:00
Luke Campagnola
4285785985 Revert "Fixed AxisMouse drag issue"
The original change breaks mouse dragging directly on the axis

This reverts commit 9bfdda06a6.
2018-10-29 10:59:11 -07:00
Luke Campagnola
e5e103de6d
Merge pull request #768 from campagnola/changelog-update
changelog all caught up
2018-10-11 16:13:00 +03:00
Luke Campagnola
e62889d095
Merge pull request #763 from hhslepicka/fix_downsampling
FIX: Protection over downsampling calculation.
2018-10-11 16:09:23 +03:00
Luke Campagnola
96b0f8601c
Merge pull request #765 from epanepucci/develop
import python2_3 for basestring
2018-10-11 15:58:15 +03:00
Luke Campagnola
56ed52b718 changelog all caught up 2018-10-11 13:36:02 +01:00
Ezequiel (gac-esbmx) Panepucci
d550473ba7 import python2_3 for basestring 2018-10-09 09:37:04 +02:00
Billy Su
266b0d0b47 Update the installation document
* Add the method to directly install the latest commit or any branch
on the GitHub.
2018-10-08 10:59:05 +08:00
Hugo Slepicka
984eb5ed29 FIX: Protection over downsampling calculation. 2018-10-05 14:18:09 -07:00
Luke Campagnola
574c5f3a47
Merge pull request #565 from justengel/axis_mouse_drag
Fixed AxisItem mouse drag issue
2018-09-28 16:02:29 -07:00
Luke Campagnola
6b26245e50
Add explanatory comment 2018-09-28 16:02:14 -07:00
Luke Campagnola
efaf61f711
Merge pull request #541 from justengel/image_render_error
ImageItem render error if graph is too small.
2018-09-28 15:38:02 -07:00
Luke Campagnola
cce7a83e85
Merge pull request #530 from justengel/plot_item_update
Fixed issue where setData only updated opts if data is given
2018-09-28 15:35:27 -07:00
Luke Campagnola
a690ea41a0
Merge pull request #758 from campagnola/fix-osx-remote
Flush shared memory file before attempting to map
2018-09-11 08:54:15 -07:00
Luke Campagnola
839ad486f8 Flush shared memory file before attempting to map
This avoids the error "ValueError: mmap length is greater than file size"
on OSX. (see #730)
2018-09-11 07:14:28 -07:00
Luke Campagnola
9aaae8d5dc
Merge pull request #739 from campagnola/wheel-event-fix
Fix error in ViewBox wheelEvent when mouse has 2-axis wheel events
2018-07-30 11:46:43 -07:00
Luke Campagnola
f1b51027cc Fix error in ViewBox wheelEvent when mouse has 2-axis wheel events 2018-07-30 11:36:08 -07:00
Mikhail Terekhov
b13062f081 In PlotDataItem.clear() use corresponding curve.clear() and scatter.clear()
Otherwise when stepMode is True curve.setData([]) causes exception:
"len(X) must be len(Y)+1 ..."
2018-07-28 10:18:26 -04:00