Make Default colormap configurable (#825)

jenshnielsen · WilliamHPNielsen · commit 08013df9182a · 2017-11-03T16:04:57.000+01:00
* add colormap to json

* use config for colormap
diff --git a/qcodes/config/qcodesrc.json b/qcodes/config/qcodesrc.json
@@ -6,7 +6,8 @@
     "gui" :{
         "notebook": true,
         "plotlib": "all",
-        "pyqtmaxplots": 100
+        "pyqtmaxplots": 100,
+        "defaultcolormap": "hot"
     },
     "user": {}
 }
diff --git a/qcodes/config/qcodesrc_schema.json b/qcodes/config/qcodesrc_schema.json
@@ -46,6 +46,11 @@
                     "description": "Maximum number of PyQtPlots to automatically keep in memory",
                     "type": "integer",
                     "default": 100
+                },
+                "defaultcolormap":{
+                    "description": "Default colormap to use for Heatmaps with both Matplotlib and PyQtGraph",
+                    "type": "string",
+                    "default": "hot"
                 }
             },
             "required":[ "notebook", "plotlib", "pyqtmaxplots" ]
diff --git a/qcodes/plots/pyqtgraph.py b/qcodes/plots/pyqtgraph.py
@@ -212,10 +212,12 @@ def _draw_plot(self, subplot_object, y, x=None, color=None, width=None,
     def _line_data(self, x, y):
         return [self._clean_array(arg) for arg in [x, y] if arg is not None]
 
-    def _draw_image(self, subplot_object, z, x=None, y=None, cmap='hot',
+    def _draw_image(self, subplot_object, z, x=None, y=None, cmap=None,
                     zlabel=None,
                     zunit=None,
                     **kwargs):
+        if cmap is None:
+            cmap = qcodes.config['gui']['defaultcolormap']
         img = self.rpg.ImageItem()
         subplot_object.addItem(img)
 
diff --git a/qcodes/plots/qcmatplotlib.py b/qcodes/plots/qcmatplotlib.py
@@ -13,7 +13,7 @@
 from numpy.ma import masked_invalid, getmask
 
 from .base import BasePlot
-
+import qcodes.config
 
 class MatPlot(BasePlot):
     """
@@ -303,6 +303,8 @@ def _draw_pcolormesh(self, ax, z, x=None, y=None, subplot=1,
             # to check for them.
             return False
 
+        if 'cmap' not in kwargs:
+            kwargs['cmap'] = qcodes.config['gui']['defaultcolormap']
         if x is not None and y is not None:
             # If x and y are provided, modify the arrays such that they
             # correspond to grid corners instead of grid centers.
