Minor pyqtgraph plotting improvements #27

AdriaanRol · 2016-02-09T09:35:44Z

In the spirit of keeping pull-requests small and quick I have decided to send a pull request for my changes to plotting.

I have focused only on 3D (heatmap) plotting

This pull request changes the following

Added clear() function to QtPlot
Added option to specify axis labels in **kwargs
Added option to specify title for a pyqtgraph window
changed colormaps to lowercase to be consistent with matplotlib convention
misc changes to docstrings to improve clarity on how input data should look
(Edit:) Added option that makes symbols use the same color when doing 1D-plots

Possible improvements (not planned on including in this PR)

All QtPlot **kwargs options are now added on a where needed basis, the proper way to do this would be to use the traces['config'] as the DRY place for these settings.

What is not in this pull request (but is still related)

Allow add() to specify to add to a row or column
Make multiple heatmaps that are plotted on the same subplot share the same colormap scale (and histogram object)
Line-cut widget for heatmaps along x or y axis (I think this would be a really cool addition)
tests for plotting (how do you test for graphical bugs, if someone has a good idea here please let me know).
redirecting colormaps to matplotlib colormaps if a cmap does not appear in our list of predefined colormaps

If this pull request is merged #23 can be closed.

…wrap

…tter in io

instead of complex and confusing DataSet constructor

Added some settings as discussed in #23. I would like all of these to come out of the trace['config'] but that requires some more drastic changes to the code.

In order to be consistent with matplotlib default as discussed in #23

…r parameters

…ocations

This is a small addition to 1D plotting

Param parse

Timestamped locations and overwrite protection

alexcjohnson · 2016-02-10T11:40:30Z

qcodes/plots/pyqtgraph.py

            kwargs['pen'] = self.rpg.mkPen(color, width=width)
+        # If a marker symbol is desired use the same color as the line
+        if any([('symbol' in key) for key in kwargs]):


I haven't played with symbols in pyqtgraph, but if I'm reading it right you must specify symbol in order to get symbols at all - is that right? And if so, why not just if 'symbol' in kwargs?

My tests indicate that if I specify one symbol property (such as symbolSize) it adds the symbols automatically with the default symbol.

Checking if any of these keywords occurs allows for the same behaviour as pyqtgraph while still overwriting the color of the symbol with our custom color cycle.

…gin/plotting

alexcjohnson · 2016-02-10T13:38:55Z

oookay, sorry about mucking up the commit history here, I'm still not sure why it 1) merged master in, and 2) decided to show all the commits it merged in (with their associated changed files) rather than just the one merge commit.

I also don't know why I can't seem to get symbols to show up at all in pyqtgraph on my computer... it keeps failing on a hilarious traceback that ends:

    |    File "/Library/Frameworks/Python.framework/Versions/3.5/lib/python3.5/site-packages/pyqtgraph/graphicsItems/ScatterPlotItem.py", line 764, in paint
    |      p.drawPixmapFragments(data['targetRect'].tolist(), data['sourceRect'].tolist(), atlas)
    |  TypeError: QPainter.drawPixmapFragments(list-of-QPainter.PixmapFragment, QPixmap, QPainter.PixmapFragmentHints hints=0): argument 2 has unexpected type 'list'

(well yes, if you say .tolist() I bet you'll get a list... what did it expect?)

despite this I think the changes are correct, can you check them out?

AdriaanRol · 2016-02-10T15:41:11Z

I just tested them, I get the following result for a simple 1D plot (all is working)

This is different from what I had before

My initial goal was to get rid of the markeredge completely but I think that this final result is even better 👍

Also thanks for fixing the 🐄

alexcjohnson · 2016-02-10T22:50:10Z

good. Still not sure what's wrong with my pyqtgraph installation but if it works for you, 💃 !

Minor pyqtgraph plotting improvements

* Fix: device annotator use left and right button to insert label and ano * Fix: add device annotator Fix: add tooltip explaining left and right click * Fix: make device annotator label and formatter configurable * Fix: use formatter in placeholder string * Fix: rename loop parameter * fix: make it possible to remove annotation/label * Fix: mark parameters red in device annotator if sweept

alexcjohnson and others added 16 commits February 1, 2016 10:57

simplify loop.run with kwargs

fe93539

Merge branch 'master' into location

640c1d2

add only_existing flag to get_data_manager

2b741d3

even wider widget and shorter name, so tracebacks are less likely to …

d831f3e

…wrap

support both slash directions and handle missing/empty directories be…

76ddfd7

…tter in io

ensure full traceback is queued in QcodesProcess

9434c76

new_data (with overwrite flag and default locations) and load_data

945a7a2

instead of complex and confusing DataSet constructor

Added more **kw options to plotting

bb69a6d

Added some settings as discussed in #23. I would like all of these to come out of the trace['config'] but that requires some more drastic changes to the code.

Added function to clear a pyqtgraph plot

7c94bce

Changed named colormaps to lowercase

a8fc672

In order to be consistent with matplotlib default as discussed in #23

input AND output parsing for params and functions, and val_mapping fo…

2a909d4

…r parameters

test input parsing low level

c901862

get parse_function out of tests and toymodel (but it still works)

d15a4d4

test (and fix) val_mapping

5b160d1

more notes about io + location

4cc20c4

optional name to pass in to location_provider to make more readable l…

bf8f0bc

…ocations

AdriaanRol added the enhancement label Feb 9, 2016

alexcjohnson and others added 7 commits February 9, 2016 13:37

comment about all the repetitious _SyncableCommand methods

067e7ce

Made symbol markers use the same color as the line

12b0ea4

This is a small addition to 1D plotting

a little more docs on val_mapping

c5c318b

a little more comment on val_mapping

db00d08

Merge pull request #25 from qdev-dk/param-parse

2f9d09c

Param parse

Merge branch 'master' into location

027edbe

Merge pull request #17 from qdev-dk/location

faa1a90

Timestamped locations and overwrite protection

alexcjohnson reviewed Feb 10, 2016
View reviewed changes

alexcjohnson added 3 commits February 10, 2016 13:41

Merge branch 'plotting' of https://github.com/qdev-dk/Qcodes into ori…

2ebe7a9

…gin/plotting

🐄

a5fc006

change default symbolPen

fb92de1

AdriaanRol added a commit that referenced this pull request Feb 11, 2016

Merge pull request #27 from qdev-dk/plotting

6fa554e

Minor pyqtgraph plotting improvements

AdriaanRol merged commit 6fa554e into master Feb 11, 2016

AdriaanRol deleted the plotting branch February 11, 2016 08:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Minor pyqtgraph plotting improvements #27

Minor pyqtgraph plotting improvements #27

AdriaanRol commented Feb 9, 2016

alexcjohnson Feb 10, 2016

AdriaanRol Feb 10, 2016

alexcjohnson Feb 10, 2016

alexcjohnson commented Feb 10, 2016

AdriaanRol commented Feb 10, 2016

alexcjohnson commented Feb 10, 2016

Minor pyqtgraph plotting improvements #27

Minor pyqtgraph plotting improvements #27

Conversation

AdriaanRol commented Feb 9, 2016

alexcjohnson Feb 10, 2016

Choose a reason for hiding this comment

AdriaanRol Feb 10, 2016

Choose a reason for hiding this comment

alexcjohnson Feb 10, 2016

Choose a reason for hiding this comment

alexcjohnson commented Feb 10, 2016

AdriaanRol commented Feb 10, 2016

alexcjohnson commented Feb 10, 2016