make sure margins are floats and a list for easier yaml-saving

Author: newville

wxmplot/config.py

@@ -161,7 +161,7 @@
                   'legend_loc':  'best',
                   'legend_onaxis': 'on plot',
                   'linecolors': linecolors,
-                  'margins': (0.15, 0.05, 0.05, 0.15),
+                  'margins': [0.15, 0.05, 0.05, 0.15],
                   'mpl_legend': None,
                   'plot_type': 'lineplot',
                   'scatter_size': 30,
@@ -360,11 +360,10 @@ def get_config(self):
         to self.configdict
         """
         cnf = {}
-
         for attr in ('added_texts', 'auto_margins', 'axes_style', 'current_theme',
                      'data_deriv', 'data_expr', 'draggable_legend', 'facecolor',
                      'framecolor', 'gridcolor', 'hidewith_legend', 'legend_loc',
-                     'legend_onaxis', 'linecolors', 'margins', 'mpl_legend', 'ntrace',
+                     'legend_onaxis', 'linecolors', 'margins','ntrace',
                      'plot_type', 'scatter_mask', 'scatter_normalcolor',
                      'scatter_normaledge', 'scatter_selectcolor', 'scatter_selectedge',
                      'scatter_size', 'show_grid', 'show_legend', 'show_legend_frame',
@@ -393,11 +392,11 @@ def load_config(self, conf):
 
         self.ntrace = cnf.get('ntrace', 1)
 
-        self.set_theme(theme=cnf['current_theme'])
+        self.set_theme(theme=cnf.get('current_theme', 'dark' if DARK_THEME else 'light'))
         for attr in ('added_texts', 'auto_margins', 'axes_style', 'current_theme',
                      'data_deriv', 'data_expr', 'draggable_legend', 'facecolor',
                      'framecolor', 'gridcolor', 'hidewith_legend', 'legend_loc',
-                     'legend_onaxis', 'linecolors', 'margins', 'mpl_legend',
+                     'legend_onaxis', 'linecolors', 'margins',
                      'plot_type', 'scatter_mask', 'scatter_normalcolor',
                      'scatter_normaledge', 'scatter_selectcolor', 'scatter_selectedge',
                      'scatter_size', 'show_grid', 'show_legend', 'show_legend_frame',
@@ -408,6 +407,8 @@ def load_config(self, conf):
             if attr in cnf:
                 setattr(self, attr, cnf.get(attr))
 
+        self.canvas.draw()
+
     def reset_lines(self):
         self.lines = [None]*len(self.traces)
         self.dy    = [None]*len(self.traces)
@@ -541,7 +542,7 @@ def relabel(self, xlabel=None, ylabel=None, y2label=None, y3label=None,
     def set_margins(self, left=0.1, top=0.1, right=0.1, bottom=0.1,
                     delay_draw=False):
         "set margins"
-        self.margins = (left, top, right, bottom)
+        self.margins = [float(left), float(top), float(right), float(bottom)]
         if self.panel is not None:
             self.panel.gridspec.update(left=left, top=1-top,
                                        right=1-right, bottom=bottom)

wxmplot/plotpanel.py

@@ -882,7 +882,7 @@ def get_default_margins(self):
                 db = min(0.2, max(db, (y0 - oy0)))
             except ValueError:
                 pass
-        return (left + dl, top + dt, right + dr, bot + db)
+        return [float(left+dl), float(top+dt), float(right+dr), float(bot+db)]
 
     def autoset_margins(self):
         """auto-set margins  left, bottom, right, top