Commit Graph

1617 Commits

Author SHA1 Message Date
Kenneth Lyons
5c3214105c Merge remote-tracking branch 'duguxy/py3-flowchart-sl' into py3-flowchart 2019-05-23 17:49:21 -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
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
Luke Campagnola
240889c460
Merge pull request #735 from campagnola/fix-exit-error
Fix exit error caused by callback invoked during Qt teardown
2018-07-26 09:37:47 -07:00
Luke Campagnola
6826e2615c Fix exit error caused by callback invoked during Qt teardown 2018-07-25 10:07:24 -07:00
Luke Campagnola
41d2bc03a0
Merge pull request #723 from klickverbot/scaled-ticks
AxisItem: Fix tick elision with self.scale set
2018-07-11 08:58:24 -07:00
David Nadlinger
fe7e1775da AxisItem: Fix tick elision with self.scale set
Previously, only the highest level ticks would be displayed
for e.g. scale = 1e3.
2018-07-11 15:31:29 +01:00
Luke Campagnola
a240766607
add pip/git install method to README 2018-07-10 16:14:59 -07:00
Luke Campagnola
ada79bffde
Merge pull request #718 from ales-erjavec/svg-export-exposed-rect
SVGExport: Initialize option.exposedRect for items that use it
2018-07-10 15:44:27 -07:00
Luke Campagnola
c3f612d6ca
Merge pull request #717 from campagnola/console-thread-exceptions
Make console handle exceptions from non-gui threads a little more carefully
2018-07-10 15:03:15 -07:00
Luke Campagnola
e99eb67677
Merge pull request #721 from campagnola/viewbox-wheel-fix
Viewbox wheel fix
2018-07-10 06:20:06 -07:00
Luke Campagnola
2884eef079 Add ViewBoxFeatures to example menu 2018-07-10 05:56:35 -07:00
Luke Campagnola
585390e16e fix: mouse wheel on viewbox leaves autorange unaffected if mouse is disabled for one axis 2018-07-10 05:23:53 -07:00
Luke Campagnola
809704ac45
Merge pull request #719 from campagnola/image-hover-example
Add image hover callback to imageAnalysis example
2018-07-07 12:17:11 -07:00