Fix/wrapper plotting

.gitignore

@@ -53,6 +53,9 @@ coverage.xml
 *.mo
 *.pot
 
+# MAC OSX junk files
+.DS_Store
+
 # Django stuff:
 *.log
 

qcodes/__init__.py

@@ -34,6 +34,7 @@
               'try "from qcodes.plots.pyqtgraph import QtPlot" '
               'to see the full error')
 
+from qcodes.utils.wrappers import  do1d, do2d, do1dDiagonal, show_num, init
 # only import in name space if the gui is set to noebook
 # and there is multiprocessing
 if config['gui']['notebook'] and config['core']['legacy_mp']:

qcodes/data/io.py

@@ -91,7 +91,6 @@ def open(self, filename, mode, encoding=None):
             raise ValueError('mode {} not allowed in IO managers'.format(mode))
 
         filepath = self.to_path(filename)
-
         # make directories if needed
         dirpath = os.path.dirname(filepath)
         if not os.path.exists(dirpath):

qcodes/data/location.py

@@ -85,6 +85,7 @@ class FormatLocation:
 
     default_fmt = config['core']['default_fmt']
 
+
     def __init__(self, fmt=None, fmt_date=None, fmt_time=None,
                  fmt_counter=None, record=None):
         #TODO(giulioungaretti) this should be
@@ -95,7 +96,7 @@ def __init__(self, fmt=None, fmt_date=None, fmt_time=None,
         self.fmt_counter = fmt_counter or '{:03}'
         self.base_record = record
         self.formatter = SafeFormatter()
-
+        self.counter = 0
         for testval in (1, 23, 456, 7890):
             if self._findint(self.fmt_counter.format(testval)) != testval:
                 raise ValueError('fmt_counter must produce a correct integer '
@@ -163,7 +164,8 @@ def __call__(self, io, record=None):
             cnt = self._findint(f[len(head):])
             existing_count = max(existing_count, cnt)
 
-        format_record['counter'] = self.fmt_counter.format(existing_count + 1)
+        self.counter = existing_count +1
+        format_record['counter'] = self.fmt_counter.format(self.counter)
         location = self.formatter.format(loc_fmt, **format_record)
 
         return location

qcodes/instrument_drivers/ZI/ZIUHFLI.py

@@ -379,17 +379,28 @@ def get(self):
         # We add one second to account for latencies and random delays
         meas_time = segs*(params['scope_duration'].get()+deadtime)+1
         npts = params['scope_length'].get()
-
+        # one shot per trigger. This needs to be set every time
+        # a the scope is enabled as below using scope_runstop
+        # We should also test if scopeModule/mode and scopeModule/averager/weight
+        # needs to be set every time since we are creating a new scopemodule
+        # here
+        self._instrument.daq.setInt('/{}/scopes/0/single'.format(self._instrument.device), 1)
+        self._instrument.daq.sync()
         # Create a new scopeModule instance (TODO: Why a new instance?)
         scope = self._instrument.daq.scopeModule()
-
+        # TODO We are hard coding scope mode and avg weight here because the setting
+        # in the main driver references a different scope which will fail and give garbage data
+        # YOU cannot set other scope modes or weights at the moment
+        scope.set('scopeModule/mode', 1)
+        scope.set('scopeModule/averager/weight', 1)
         # Subscribe to the relevant... publisher?
         scope.subscribe('/{}/scopes/0/wave'.format(self._instrument.device))
 
         # Start the scope triggering/acquiring
         params['scope_runstop'].set('run')
 
         log.info('[*] Starting ZI scope acquisition.')
+
         # Start something... hauling data from the scopeModule?
         scope.execute()
 

qcodes/plots/pyqtgraph.py

@@ -4,6 +4,7 @@
 import numpy as np
 import pyqtgraph as pg
 import pyqtgraph.multiprocess as pgmp
+from pyqtgraph import QtGui # note that pyqtgraph still uses the old pyqt4 layout
 import warnings
 from collections import namedtuple
 
@@ -27,6 +28,10 @@ class QtPlot(BasePlot):
 
         figsize: (width, height) tuple in pixels to pass to GraphicsWindow
             default (1000, 600)
+        fig_x_pos: fraction of screen width to place the figure at
+            0 is all the way to the left and
+            1 is all the way to the right.
+            default None let qt decide.
         interval: period in seconds between update checks
             default 0.25
         theme: tuple of (foreground_color, background_color), where each is
@@ -39,7 +44,8 @@ class QtPlot(BasePlot):
     rpg = None
 
     def __init__(self, *args, figsize=(1000, 600), interval=0.25,
-                 window_title='', theme=((60, 60, 60), 'w'), show_window=True, remote=True, **kwargs):
+                 window_title='', theme=((60, 60, 60), 'w'), show_window=True, remote=True, fig_x_position=None,
+                 **kwargs):
         super().__init__(interval)
 
         if 'windowTitle' in kwargs.keys():
@@ -58,6 +64,10 @@ def __init__(self, *args, figsize=(1000, 600), interval=0.25,
         self.win = self.rpg.GraphicsWindow(title=window_title)
         self.win.setBackground(theme[1])
         self.win.resize(*figsize)
+        if fig_x_position:
+            _, _, width, height = QtGui.QDesktopWidget().screenGeometry().getCoords()
+            y_pos = self.win.y()
+            self.win.move(width * fig_x_position, y_pos)
         self.subplots = [self.add_subplot()]
 
         if args or kwargs:

qcodes/plots/qcmatplotlib.py

@@ -6,6 +6,7 @@
 
 import matplotlib.pyplot as plt
 from matplotlib.transforms import Bbox
+from matplotlib import cm
 import numpy as np
 from numpy.ma import masked_invalid, getmask
 
@@ -226,6 +227,14 @@ def _draw_pcolormesh(self, ax, z, x=None, y=None, subplot=1,
                 # if any entire array is masked, don't draw at all
                 # there's nothing to draw, and anyway it throws a warning
                 return False
+        if 'cmap' not in kwargs:
+            kwargs['cmap'] = cm.hot
+        if 'edgecolors' not in kwargs:
+            # Matplotlib pcolormesh per default are drawn as individual patches lined up next to each other
+            # due to rounding this produces visible gaps in some pdf viewers. To prevent this we draw each
+            # mesh with a visible edge (slightly overlapping) this assumes alpha=1 or it will produce artifacts
+            # at the overlaps
+            kwargs['edgecolors'] = 'face'
         pc = ax.pcolormesh(*args, **kwargs)
 
         if getattr(ax, 'qcodes_colorbar', None):

qcodes/tests/instrument_mocks.py

@@ -297,7 +297,7 @@ def __init__(self, name='dummy', gates=['dac1', 'dac2', 'dac3'], **kwargs):
             self.add_parameter(g,
                                parameter_class=ManualParameter,
                                initial_value=0,
-                               label='Gate {} (arb. units)'.format(g),
+                               label='Gate {} (arbUnit)'.format(g),
                                vals=Numbers(-800, 400))