Commit Graph

10 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
6a4a653989 Added InfiniteLine.setHoverPen 2014-05-10 14:19:27 -04:00
Luke Campagnola
2e3cfcbd6d Make setPen() methods more consistent throughout the package.
Merge remote-tracking branch 'termim/develop' into develop

Conflicts:
	pyqtgraph/graphicsItems/ROI.py
2014-03-01 09:37:59 -05:00
Mikhail Terekhov
953b9e4129 Make signature of the setPen method consistent 2014-02-28 16:16:13 -05:00
tommy3001
78d92b383f Aditional ":" added, minor list alignments 2014-02-12 21:25:31 +01:00
tommy3001
2a13994a2a Bugfix: Malformed tables.
All argument lists with `**Arguments:**`
2014-02-05 21:04:33 +01:00
tommy3001
92d7bbe18e In list tables "**Arguments**", "Arguments:" changed to **Arguments:** 2014-02-03 21:13:10 +01:00
Luke Campagnola
f630734453 Switching to relative imports to allow pyqtgraph to be imported under other names.
finished top-level files and graphicsItems
2013-12-22 02:08:39 -05:00
Luke Campagnola
af59296231 Reorganized directory structure to be more standard
Started new SVG exporter
Merged updates from ACQ4
2012-12-25 00:43:31 -05:00