Commit Graph

1124 Commits

Author SHA1 Message Date
Luke Campagnola
1fe5976e19 Merge branch 'pyqt5' into develop
Conflicts:
	examples/parametertree.py
	pyqtgraph/Qt.py
	pyqtgraph/graphicsItems/FillBetweenItem.py
	pyqtgraph/graphicsItems/InfiniteLine.py
	pyqtgraph/imageview/ImageView.py
2015-02-28 11:46:41 -05:00
Luke Campagnola
52d7f2142c Fix line width in a few examples 2015-02-28 11:26:45 -05:00
Luke Campagnola
7e40b329e9 more examples working under pyqt5 2015-02-28 11:05:57 -05:00
Luke Campagnola
058dd183d3 Cleaned up example loader 2015-02-28 10:32:34 -05:00
Luke Campagnola
caa15d2005 Merge branch 'compassym-pyqt5' into pyqt5 2015-02-28 09:38:38 -05:00
Luke Campagnola
baefdd0880 Merge branch 'fix-interpolate' into develop 2015-02-16 11:39:01 -05:00
Luke Campagnola
4066c7c76e tests working 2015-02-16 11:23:52 -05:00
Luke Campagnola
accafcce36 WIP: adding new tests and fixing bugs in pg.interpolateArray 2015-02-16 11:04:58 -05:00
Luke Campagnola
1d7cbca64d minor cleanup 2015-02-04 08:13:56 -05:00
Luke Campagnola
e36d6af2c2 Fixed git version string generation on python3
Merge branch 'gitversion-fix' into develop
2015-02-04 08:12:18 -05:00
Luke Campagnola
9cce7a1da3 convert to string for py3 2015-02-04 08:06:56 -05:00
Luke Campagnola
d3c2ad874f Fix git version detection 2015-02-04 08:00:49 -05:00
compass
98f079d86a Add pyqt5 support for examples/__main__.py 2015-01-17 18:45:32 +08:00
compass
00092d99d4 Add pyqt5 support for MatplotlibWidget 2015-01-17 18:34:30 +08:00
compass
478a3b1aa4 Fix some bugs in PyQt5 2015-01-17 00:21:33 +08:00
Luke Campagnola
bea4f88335 update changelog 2014-12-24 15:44:47 -05:00
Luke Campagnola
70cfdb4bbe PyQtGraph release 0.9.10 2014-12-24 14:34:58 -05:00
Luke Campagnola
e8820667f0 setup correction 2014-12-24 12:06:40 -05:00
Luke Campagnola
9a15b55706 Correct setup to use new setuptools if it is available 2014-12-24 11:19:42 -05:00
Luke Campagnola
305dc7468e manifest corrections 2014-12-24 11:05:05 -05:00
Luke Campagnola
2357cb427f correction for setup version string detection 2014-12-24 11:00:00 -05:00
Luke Campagnola
8f638776b3 PyQtGraph release 0.9.9 2014-12-23 19:13:54 -05:00
Daniel Lidstrom
853256bd41 DockArea apoptose fix.
Fixes problem where docks can't be added to a non-temporary area once all of its docks have been closed.
2014-12-23 16:46:15 -07:00
Luke Campagnola
930c3a1c40 Add example data files to setup 2014-12-23 16:39:37 -05:00
Luke Campagnola
77906fc7a2 corrections to manifest
Add pure-python integrator to verlet chain example
2014-12-23 15:55:52 -05:00
Luke Campagnola
9a951318be Add example subpackages to setup.py 2014-12-22 18:29:09 -05:00
Luke Campagnola
f7a54ffd42 Release 0.9.9 2014-12-14 20:01:00 -05:00
Luke Campagnola
41fa2f64d3 Fixed GL picking bug 2014-12-04 21:24:09 -05:00
Luke Campagnola
f90565442c Correction in setup.py: do not raise exception if install location does not exist yet. 2014-12-01 16:39:41 -05:00
Luke Campagnola
87453a2e2a Merge branch 'crash-fixes' into develop 2014-11-26 21:30:40 -05:00
Luke Campagnola
f6ded808ef Fixed a few exit crashes, added unit tests to cover them 2014-11-26 21:25:17 -05:00
Luke Campagnola
2bf4a0eb7b Workaround for Qt bug: wrap setSpacing and setContentsMargins from
internal layout of GraphicsLayout.

http://stackoverflow.com/questions/27092164/margins-in-pyqtgraphs-graphicslayout/27105642#27105642
2014-11-24 13:09:59 -05:00
Luke Campagnola
7fa0ce9711 Merge branch 'flowchart-node-menus' into develop 2014-11-14 08:12:33 -05:00
Luke Campagnola
85d6c86c67 Test submenu creation in example 2014-11-14 08:06:18 -05:00
Luke Campagnola
ad10b06652 Correction for spinbox auto-selection without suffix 2014-11-14 07:46:10 -05:00
Luke Campagnola
2d78ce6f87 Fix attributeerror when using spinbox in parametertree 2014-11-14 07:42:17 -05:00
David Kaplan
2ac343ac37 fixed missing namespace. 2014-10-27 18:06:31 -07:00
Luke Campagnola
b5955faaa2 Merge remote-tracking branch 'jdreaver/develop' into develop 2014-10-25 16:05:26 -04:00
Luke Campagnola
021addcf0e Merge remote-tracking branch 'nicolaisi/ntj01' into develop 2014-10-25 14:24:15 -04:00
Luke Campagnola
b0d3dd7657 Merge branch 'scatterplot-fix' into develop 2014-10-25 13:04:32 -04:00
Luke Campagnola
6c6ba8454a Added unit tests 2014-10-25 13:01:10 -04:00
Luke Campagnola
cfb4384a3b Merge remote-tracking branch 'nicolaisi/brush' into scatterplot-fix 2014-10-25 12:58:51 -04:00
Luke Campagnola
64bf3f8313 Merge pull request #113 from jdreaver/viewbox-fix
Fix PySide error when ViewBox signal destroyed
2014-10-25 10:52:19 -04:00
John David Reaver
bcfbe9b4ec Fix PySide error when ViewBox signal destroyed
Fixes issue #107
2014-10-22 16:33:40 -07:00
David Kaplan
3091330420 Add recursive submenu support for node library. 2014-10-21 14:37:06 -07:00
Nicholas Tan Jerome
7356126c3d added "mask" key check on setPen as well
Signed-off-by: Nicholas Tan Jerome <nicholas.jerome@kit.edu>
2014-10-17 11:18:12 +02:00
Nicholas Tan Jerome
884df4934a fixed a keyerror when passing a list into setBrush
- https://groups.google.com/forum/#!topic/pyqtgraph/xVyCC2f7gVo

Signed-off-by: Nicholas Tan Jerome <nicholas.jerome@kit.edu>
2014-10-17 10:57:36 +02:00
Nicholas Tan Jerome
6cc0f5e33d fixed the Pen None property.
- https://groups.google.com/forum/#!topic/pyqtgraph/t6cl1CevlB0

Signed-off-by: Nicholas Tan Jerome <nicholas.jerome@kit.edu>
2014-10-16 12:23:32 +02:00
John David Reaver
8f273f53ab Fix memory leak in GLScatterPlotItem
Fixes #103. If a ScatterPlotItem was removed from a plot and added
again, glGenTetures was called again unneccesarily. Each time it is
called, it eats up a little more space.
2014-10-15 06:16:40 -07:00
Luke Campagnola
1aeb197b03 Merge pull request #102 from jdreaver/develop
Fix OpenGL shader/texture sharing on PySide
2014-10-14 21:47:04 -04:00