Commit Graph

2045 Commits

Author SHA1 Message Date
Eric Dill
670d63cdf4 Merge pull request #327 from lidstrom83/InfLineLabel.setFormat_fix
Made InfLineLabel.setFormat actually set the format string.
2016-05-03 13:11:28 -04:00
lidstrom83
bb44a3387a Made InfLineLabel.setFormat actually set the format string. 2016-05-03 10:38:44 -06:00
Luke Campagnola
2ab52808d3 added simple roi tests (these do not check output) 2016-05-03 09:20:23 -07:00
Eric Dill
1acb8accbd Merge pull request #326 from rlegnain/develop
Added  "self.moving = False" in  InfLineLabel class
2016-05-03 11:06:29 -04:00
Legnain
b4b1aec162 Added "self.moving = False" in InfLineLabel class
Added  "self.moving = False" in  InfLineLabel class to solve the error message when clicking on the label.

    |  AttributeError: 'InfLineLabel' object has no attribute 'moving'
2016-05-03 04:54:21 -04:00
Luke Campagnola
c599635319 Merge pull request #305 from cboulay/MetArr_PrettierPrinting
MetaArray: PrettyInfo for all axes, not skipping last axis.
2016-04-24 14:30:09 -07:00
Chadwick Boulay
5a21d59538 A few small style changes to MetaArray.py 2016-04-24 13:38:19 -04:00
Chadwick Boulay
2eca4ed775 Set MetaArray._info after modifications during MetaArray.checkInfo().
Update MetaArray.prettyInfo() to print empty axes. Also fixed some spacing issues when number of elements had more digits in some axes than others (up to 5 digits).
2016-04-24 13:20:10 -04:00
Luke Campagnola
70626624ca Merge pull request #309 from ixjlyons/fix-issue257
Encode QPropertyAnimation property name if not passed as bytes.
2016-04-21 20:34:56 -07:00
Kenneth Lyons
9e4443cc68 More detailed comment. 2016-04-21 12:02:49 -07:00
Luke Campagnola
f49554d063 Merge pull request #304 from cboulay/osx_mremap
OSX RemoteGrahpics.py: Add shared mem file open and close to get around no mremap.
2016-04-21 00:35:31 -07:00
Luke Campagnola
6096926ea9 Merge pull request #281 from lionel-martin/colormap_positions
Fixing order of positions in colormap
2016-04-21 00:34:45 -07:00
Luke Campagnola
dffc2d4e3e Merge pull request #300 from ericdill/graphics-view-inheritance
MNT: Call close() up the inheritance chain
2016-04-21 00:33:27 -07:00
Eric Dill
d67d2c6d62 Merge pull request #308 from ixjlyons/fix-issue260
Fix opt name for SpinBox: range -> bounds.
2016-04-12 12:55:21 -04:00
Kenneth Lyons
9b450b297f Encode QPropertyAnimation property name if not passed as bytes. 2016-04-11 21:37:27 -07:00
Kenneth Lyons
3ec02d0662 Fix opt name for SpinBox: range -> bounds. 2016-04-11 21:05:21 -07:00
Luke Campagnola
63d12c1caa Merge pull request #287 from ales-erjavec/qt5-fix
Qt5 compatifility fixes
2016-04-04 13:06:32 -07:00
Luke Campagnola
eb625776c9 Merge branch 'meganbkratz-ImageViewWork' into develop 2016-04-02 23:28:33 -07:00
Luke Campagnola
0d2bd107b3 Use colormap with better perceptual contrast 2016-04-02 23:27:20 -07:00
Luke Campagnola
5e420fe100 Merge branch 'ImageViewWork' of https://github.com/meganbkratz/pyqtgraph into meganbkratz-ImageViewWork 2016-04-02 22:30:19 -07:00
Chadwick Boulay
a8d3aad97a Add darwin-specific shared mem file open and close in RemoteGraphicsView.py to account for lack of mremap on platform. 2016-03-29 18:24:16 -04:00
Eric Dill
90d6c9589c MNT: Call close on the mro for ImageView 2016-03-28 08:18:09 -04:00
Eric Dill
1a22ce3c04 MNT: Call close() up the inheritance chain 2016-03-28 08:14:24 -04:00
Luke Campagnola
0ac914fae7 Merge pull request #291 from lesauxvi/textitem
slight changes in TextItem
2016-03-27 23:13:28 -07:00
Eric Dill
fbff457168 Merge pull request #302 from WayneTimer/fix-color-error
fix a color name error
2016-03-27 13:40:52 -04:00
Timer
18024a0ca8 fix a color name error 2016-03-27 23:09:06 +08:00
Megan Kratz
0e679edcf3 some documentation improvements 2016-03-25 12:36:49 -04:00
lesauxvi
5cd9646fc8 CHANGELOG addition and slight modification of the setColor method 2016-03-23 08:00:34 +01:00
Eric Dill
856c5eaadf Merge pull request #282 from campagnola/image-testing
TST: Add image testing
2016-03-22 10:31:10 -04:00
lesauxvi
e1c652662d change in the setText method of TextItem 2016-03-18 13:48:50 +01:00
Luke Campagnola
c65ca6d243 Merge branch 'develop' into image-testing
Conflicts:
	pyqtgraph/tests/__init__.py
2016-03-17 22:29:06 -07:00
lesauxvi
fe115a9667 small change in a docstring 2016-02-29 16:55:00 +01:00
lesauxvi
b7efa546aa addition of a method setColor for TextItem 2016-02-29 16:48:47 +01:00
lesauxvi
865141ae49 slight changes in TextItem 2016-02-29 11:40:33 +01:00
Luke Campagnola
9d64b269d5 Merge pull request #286 from campagnola/infiniteline-tests
combined infiniteline updates
2016-02-28 21:00:09 -08:00
Luke Campagnola
36b3f11524 docstring update 2016-02-28 20:53:52 -08:00
Luke Campagnola
bb97f2e98d Switch text anchor when line crosses center of view 2016-02-28 20:52:07 -08:00
Luke Campagnola
ac14139c2d rename example 2016-02-28 18:54:55 -08:00
Luke Campagnola
b7bf6337d7 minor efficiency boost 2016-02-28 18:45:42 -08:00
Luke Campagnola
bd0e490821 cleanup: docs, default args 2016-02-28 12:26:05 -08:00
Luke Campagnola
e4bdc17112 Add qWait surrogate for PySide 2016-02-22 23:11:29 -08:00
Luke Campagnola
4e424b5773 Fixed label dragging for oblique lines 2016-02-22 22:12:36 -08:00
Ales Erjavec
dddd4f51e2 Remove import of PyQt5.Qt unified module
Avaid unnecessary import of QtMultimediaWidgets
(https://www.riverbankcomputing.com/pipermail/pyqt/2016-February/036875.html)
2016-02-22 11:50:26 +01:00
Ales Erjavec
167bcbb7aa Fix QGraphicsItem.scale monkey patch for Qt5
Preserve the QGraphicsItem.scale() -> float overload behaviour
2016-02-22 11:26:58 +01:00
Ales Erjavec
5388d52928 Fix QHeaderView.setResizeMode monkey patch for Qt5 shim
QHeaderView.setResizeMode/setSectionResizeMode has two
argument overload.
2016-02-22 11:13:38 +01:00
Luke Campagnola
7a0dfd768a Cleanup: add docstrings and setter methods to InfLineLabel, remove unused code 2016-02-22 00:23:36 -08:00
Luke Campagnola
a72fec51b1 Merge branch 'infline-labels' into infiniteline-tests
Conflicts:
	pyqtgraph/graphicsItems/InfiniteLine.py
2016-02-22 00:06:04 -08:00
Luke Campagnola
170592c294 update example 2016-02-21 23:28:24 -08:00
Luke Campagnola
f3a584b8b7 label correctly follows oblique lines 2016-02-21 23:18:01 -08:00
Luke Campagnola
069a5bfeea Labels can rotate with line 2016-02-21 00:17:17 -08:00