Commit Graph

1537 Commits

Author SHA1 Message Date
Luke Campagnola
7358664414 Merge branch 'Refactor' of https://github.com/Billy4195/pyqtgraph into Billy4195-Refactor 2018-06-07 19:06:44 -07:00
Luke Campagnola
f0b0f7cac0 Merge pull request #698 from polwel/issue-697 2018-06-07 17:53:38 -07:00
Luke Campagnola
c20022580d move panning code from mouse handler to pan() 2018-06-07 17:49:42 -07:00
Luke Campagnola
741e65c72e Merge branch 'panning' of https://github.com/dvj/pyqtgraph into dvj-panning 2018-06-05 15:25:52 -07:00
Luke Campagnola
01c349e14b
Merge pull request #698 from polwel/issue-697
Fix issue #697
2018-06-01 21:39:02 -07:00
Luke Campagnola
017e73957b
Merge pull request #700 from polwel/issue-699
Fix issue #699
2018-06-01 17:36:52 -07:00
Pol Welter
d35991ec37 Fix issue #699
Nan in image data not handled properly
2018-06-01 15:05:14 +02:00
Pol Welter
a48a3776be Fix issue #697 2018-06-01 10:31:47 +02:00
Luke Campagnola
70398f7098 PR 693: Fix color handling in GLLinePlotItem
Merge branch 'koltafrickenfer-develop' into develop
2018-05-31 10:39:27 -07:00
Luke Campagnola
8a5c66f25e Allow strings to specify color of GLLinePlot 2018-05-31 10:36:04 -07:00
Luke Campagnola
0a17c2eb60 Merge branch 'develop' of https://github.com/koltafrickenfer/pyqtgraph into koltafrickenfer-develop 2018-05-31 10:30:11 -07:00
Luke Campagnola
c582fab9c6
Merge pull request #696 from campagnola/scatter-stepmode
Fix error when using PlotDataItem with both stepMode and symbol
2018-05-31 09:13:01 -07:00
Luke Campagnola
7792000abb
Merge pull request #661 from Billy4195/improve_test
Improve test
2018-05-30 19:03:28 -07:00
Luke Campagnola
de9007d9c4 Fix error when using PlotDataItem with both stepMode and symbol 2018-05-30 18:54:31 -07:00
Luke Campagnola
6f0e8ebe3f
Merge pull request #695 from campagnola/version-update
Version string update
2018-05-30 18:48:12 -07:00
Luke Campagnola
349625c875 Update version string to 0.11.0.dev0 and handling in setup
Merge commit '1a3a0a70930b' into version-update
2018-05-30 08:53:32 -07:00
kolt mcbride
e5079bca32 this import seems to be missing, I couldn't set color with out it for some reason 2018-05-24 22:06:27 -07:00
Luke Campagnola
cfc9759502 update readme / install docs to mention PySide2 2018-05-24 17:16:38 -07:00
Luke Campagnola
0af4706024
Merge pull request #635 from campagnola/pyside2
WIP: PySide2 support
2018-05-24 17:14:11 -07:00
Luke Campagnola
69645895c9 flip template line endings 2018-05-24 08:54:31 -07:00
Luke Campagnola
cc81496197 update changelog 2018-05-24 08:48:50 -07:00
Luke Campagnola
86b2006d46 Fix transform3D for pyside2 2018-05-23 21:30:02 -07:00
Luke Campagnola
ebc805a45f workaround pyside bug #671 2018-05-23 21:12:16 -07:00
Luke Campagnola
66dcfc7c67 Merge branch 'develop' into pyside2 2018-05-22 15:22:54 -07:00
Luke Campagnola
8da208b914 flip pyside2 template line endings 2018-05-17 09:02:41 -07:00
Luke Campagnola
43d965e554
Merge pull request #690 from campagnola/py3-cleanup
Py3 cleanup
2018-05-17 08:44:56 -07:00
Luke Campagnola
0b0e601bd8
Merge pull request #689 from campagnola/viewbox-fix
ViewBox fix: don't call setRange with empty args
2018-05-16 08:36:51 -07:00
Luke Campagnola
c390c5cd98 fix lru_cache 2018-05-16 08:33:51 -07:00
Luke Campagnola
1f380c93c1 fix itervalues 2018-05-15 16:37:58 -07:00
Luke Campagnola
a86ab30578 fix iteritems 2018-05-15 16:37:20 -07:00
Luke Campagnola
cd2125cccb fixes #687 2018-05-15 14:24:52 -07:00
Luke Campagnola
3745cb1a2d
Merge pull request #685 from campagnola/data-filter-defaults
Data filter defaults
2018-05-09 11:07:55 -07:00
Luke Campagnola
a8610bfb43 Add option to set enum default values in DataFilterWidget 2018-05-09 10:57:42 -07:00
Luke Campagnola
4d26b4bb20 Fix py3 string handling in scatterplotwidget example 2018-05-09 10:56:01 -07:00
danielhrisca
1a3a0a7093 update version for new development 2018-05-08 10:02:06 +03:00
Luke Campagnola
e28b682222
Merge pull request #683 from campagnola/datafilter-updates
Allow data filter entries to be updated after they are created
2018-05-04 14:26:41 -07:00
Luke Campagnola
9460b746fa Allow data filter entries to be updated after they are created 2018-05-04 14:17:14 -07:00
Luke Campagnola
3ffd7dbb97
Merge pull request #682 from campagnola/qapp-fix
Fix: mkQApp returned None if a QApplication was already created elsewhere
2018-05-04 14:05:12 -07:00
Luke Campagnola
11463c5a0b Fix: mkQApp returned None if a QApplication was already created elsewhere 2018-05-04 11:42:37 -07:00
Luke Campagnola
120d49b0f3 Merge branch 'develop' of https://github.com/pyqtgraph/pyqtgraph into develop 2018-05-03 15:30:33 -07:00
Luke Campagnola
0fd0f08384 Doc updates for datafilterwidget 2018-05-03 15:30:19 -07:00
Luke Campagnola
0ead60e3c9
Merge pull request #677 from dkm/patch-1
typo fix in comment
2018-04-28 12:00:32 -07:00
Luke Campagnola
3ae54bf2c3
Merge pull request #679 from campagnola/overflow-fix
Fix overflow in Point.length()
2018-04-27 19:27:44 -07:00
Luke Campagnola
436fcccf82 Avoid overflow in Point.length by using trig functions or returning inf 2018-04-27 19:07:22 -07:00
Luke Campagnola
e8a999d8b1
Merge pull request #548 from acq4/reload-updates
Signal handling tools
2018-04-26 14:57:35 -07:00
Luke Campagnola
a1145b5cbf Fix pytest assertion rewrite conflicting with reload by giving temporary module a different name 2018-04-26 14:43:20 -07:00
Luke Campagnola
6e392c2e0e Fix disconnect test for pyside 2018-04-26 13:49:34 -07:00
Luke Campagnola
986ccb81f4 fix reload import 2018-04-26 13:28:51 -07:00
Luke Campagnola
60a48ed2e4 reload tests pass in python 3 2018-04-26 13:22:47 -07:00
Marc Poulhiès
b64294064f
typo fix in comment
trivial typo fix
2018-04-26 21:57:51 +02:00