Commit Graph

8 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
491aee0fe2 python3 fixes
cleaned up examples
2013-02-24 23:09:03 -05:00
Luke Campagnola
412e1d2ec8 doc updates
ViewBox: made padding more consistent for all auto-ranging methods, deprecated autoRange(item=) in favor of autoRange(items=)
2013-02-20 11:13:50 -05:00
Luke Campagnola
3de5719011 Merged testing code from Kratz
Numerous fixes for python 3 compatibility
2012-12-05 00:25:45 -05:00
Luke Campagnola
fc9b3dee4d Started Python3 compatibility changes 2012-05-11 18:05:41 -04:00
Luke Campagnola
fcf2c53c46 Example updates 2012-03-17 11:47:20 -04:00
Luke Campagnola
dc597ac584 fixes for pyside compatibility 2012-03-01 22:53:52 -05:00
Luke Campagnola
d4e8e2b883 Imported major changes from acq4 project. 2012-03-01 21:55:32 -05:00