From 814ea0d5d77e375932ccb591b5e8434e8f4008e3 Mon Sep 17 00:00:00 2001 From: Pieter Eendebak Date: Thu, 12 Jan 2017 14:54:58 +0100 Subject: [PATCH 1/4] fix argument name --- qcodes/plots/pyqtgraph.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qcodes/plots/pyqtgraph.py b/qcodes/plots/pyqtgraph.py index a26c705d7fa7..1ffda72d2c44 100644 --- a/qcodes/plots/pyqtgraph.py +++ b/qcodes/plots/pyqtgraph.py @@ -39,7 +39,7 @@ class QtPlot(BasePlot): rpg = None def __init__(self, *args, figsize=(1000, 600), interval=0.25, - windowTitle='', theme=((60, 60, 60), 'w'), show_window=True, remote=True, **kwargs): + window_title='', theme=((60, 60, 60), 'w'), show_window=True, remote=True, **kwargs): super().__init__(interval) self.theme = theme @@ -50,7 +50,7 @@ def __init__(self, *args, figsize=(1000, 600), interval=0.25, else: # overrule the remote pyqtgraph class self.rpg = pg - self.win = self.rpg.GraphicsWindow(title=windowTitle) + self.win = self.rpg.GraphicsWindow(title=window_title) self.win.setBackground(theme[1]) self.win.resize(*figsize) self.subplots = [self.add_subplot()] From a9c705e8a0526a7cb02d56fd0029dd40e85f5a55 Mon Sep 17 00:00:00 2001 From: Pieter Eendebak Date: Thu, 12 Jan 2017 15:27:22 +0100 Subject: [PATCH 2/4] add setGeometry function --- qcodes/plots/pyqtgraph.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qcodes/plots/pyqtgraph.py b/qcodes/plots/pyqtgraph.py index 1ffda72d2c44..869722cbe7a8 100644 --- a/qcodes/plots/pyqtgraph.py +++ b/qcodes/plots/pyqtgraph.py @@ -408,3 +408,7 @@ def save(self, filename=None): filename = filename or default image = self.win.grab() image.save(filename, "PNG", 0) + + def setGeometry(self, x, y, w, h): + """ Set geometry of the plotting window """ + self.win.setGeometry(x, y, w, h) \ No newline at end of file From 7102d4e768dcdfd007f4190a39d43201379a67d6 Mon Sep 17 00:00:00 2001 From: Pieter Eendebak Date: Thu, 12 Jan 2017 15:28:01 +0100 Subject: [PATCH 3/4] autopep --- qcodes/plots/pyqtgraph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qcodes/plots/pyqtgraph.py b/qcodes/plots/pyqtgraph.py index 869722cbe7a8..50af11f4f0a2 100644 --- a/qcodes/plots/pyqtgraph.py +++ b/qcodes/plots/pyqtgraph.py @@ -411,4 +411,4 @@ def save(self, filename=None): def setGeometry(self, x, y, w, h): """ Set geometry of the plotting window """ - self.win.setGeometry(x, y, w, h) \ No newline at end of file + self.win.setGeometry(x, y, w, h) From 904cb40ed65b9da81a203f6937217f194520883e Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Fri, 13 Jan 2017 10:49:03 +0100 Subject: [PATCH 4/4] Fix: handle old windowTitle argument This avoids a wierd warning in case users have not updated their code. --- qcodes/plots/pyqtgraph.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/qcodes/plots/pyqtgraph.py b/qcodes/plots/pyqtgraph.py index 50af11f4f0a2..7e068d79aa14 100644 --- a/qcodes/plots/pyqtgraph.py +++ b/qcodes/plots/pyqtgraph.py @@ -42,6 +42,11 @@ def __init__(self, *args, figsize=(1000, 600), interval=0.25, window_title='', theme=((60, 60, 60), 'w'), show_window=True, remote=True, **kwargs): super().__init__(interval) + if 'windowTitle' in kwargs.keys(): + warnings.warn("windowTitle argument has been changed to window_title. Please update your call to QtPlot") + temp_wt = kwargs.pop('windowTitle') + if not window_title: + window_title = temp_wt self.theme = theme if remote: