wxmplot 0.9.58__tar.gz → 0.9.59__tar.gz

{wxmplot-0.9.58/wxmplot.egg-info → wxmplot-0.9.59}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wxmplot
-Version: 0.9.58
+Version: 0.9.59
 Summary: wxPython plotting widgets using matplotlib
 Home-page: https://github.com/newville/wxmplot
 Author: Matthew Newville

wxmplot-0.9.59/examples/dump_config.py

@@ -0,0 +1,49 @@
+#!/usr/bin/python
+import numpy as np
+import wxmplot.interactive as wi
+import json
+
+x = np.linspace(0.0, 20.0, 201)
+disp = wi.plot(x, np.sin(x)/(x+1), ylabel='response',  xlabel='T (sec)')
+cnf = disp.panel.conf
+
+print("Line 1 ", cnf.get_mpline(0))
+
+
+out = cnf.get_config()
+
+#
+#
+# for attr in ('added_texts', 'auto_margins', 'axes_style',
+#              'data_deriv', 'data_expr', 'draggable_legend', 'facecolor',
+#              'framecolor', 'gridcolor', 'hidewith_legend', 'legend_loc',
+#              'legend_onaxis', 'linecolors', 'margins', 'mpl_legend', 'ntrace',
+#              'plot_type', 'scatter_mask', 'scatter_normalcolor',
+#              'scatter_normaledge', 'scatter_selectcolor', 'scatter_selectedge',
+#              'scatter_size', 'show_grid', 'show_legend', 'show_legend_frame',
+#              'textcolor', 'title', 'viewpad', 'with_data_process',
+#              'xlabel', 'xscale', 'y2label', 'ylabel', 'yscale', 'zoom_lims',
+#              'zoom_style'):
+#
+#     out[attr] = getattr(cnf, attr)
+#
+# ntrace = int(out['ntrace'])
+#
+# for attr in ('fills', 'traces'):
+#     val = getattr(cnf, attr)
+#     if attr == 'traces':
+#          val = cnf.get_traces()
+#     out[attr] = val[:ntrace+1]
+#
+#
+
+conf = {'axes_style': 'open',
+        'xlabel': 'New X',
+        'traces': [{'color': '#440044', 'style': 'solid',
+                    'linewidth': 3.5, 'zorder': 5, 'fill': False,
+                    'label': 'x111', 'drawstyle': 'default', 'alpha': 1,
+                    'markersize': 5, 'marker': '+', 'markercolor': 'black'}]}
+
+
+cnf.load_config(conf)
+disp.panel.canvas.draw()

{wxmplot-0.9.58 → wxmplot-0.9.59}/wxmplot/basepanel.py

@@ -18,6 +18,7 @@ from matplotlib.backends.backend_wx import RendererWx
 
 from .utils import Printer, MenuItem
 
+
 class BasePanel(wx.Panel):
     """
     wx.Panel component shared by PlotPanel and ImagePanel.
@@ -568,11 +569,20 @@ class BasePanel(wx.Panel):
             self.x_lastmove = event.xdata
         if event.ydata is not None:
             self.y_lastmove = event.ydata
-        x0     = min(x, ini_x)
-        ymax   = max(y, ini_y)
-        width  = abs(x-ini_x)
-        height = abs(y-ini_y)
-        y0     = self.canvas.figure.bbox.height - ymax
+
+        dpi_sf = 1.0
+        if wx.Platform != '__WXMSW__':
+            try:
+                dpi_sf = self.canvas.GetDPIScaleFactor()
+            except:
+                dpi_sf = 1.0
+
+        bheight = self.canvas.figure.bbox.height/dpi_sf
+        x0     = min(x, ini_x)/dpi_sf
+        ymax   = max(y, ini_y)/dpi_sf
+        width  = abs(x-ini_x)/dpi_sf
+        height = abs(y-ini_y)/dpi_sf
+        y0     = bheight - ymax
         limits = self.canvas.figure.axes[0].bbox.corners()
         if self.conf.zoom_style.startswith('x'):
             height = int(round(limits[3][1] - limits[0][1]))
@@ -635,7 +645,6 @@ class BasePanel(wx.Panel):
                     tlims[ax][2:] = [ymin, ymax]
                 elif self.conf.zoom_style.startswith('y'):
                     tlims[ax][:2] = [xmin, xmax]
-
             self.conf.zoom_lims.append(tlims)
             # now apply limits:
             self.set_viewlimits()

{wxmplot-0.9.58 → wxmplot-0.9.59}/wxmplot/config.py

@@ -37,17 +37,7 @@ StyleMap  = {}
 DrawStyleMap  = {}
 MarkerMap = {}
 
-default_config = dict(viewpad=2.5, title='', xscale='linear',
-                      yscale='linear', xlabel='', ylabel='', y2label='',
-                      plot_type='lineplot', scatter_size=30,
-                      scatter_normalcolor='blue',
-                      scatter_normaledge='blue', scatter_selectcolor='red',
-                      scatter_selectedge='red', auto_margins=True,
-                      legend_loc= 'best', legend_onaxis='on plot',
-                      draggable_legend=False, hidewith_legend=True,
-                      show_legend=False, show_legend_frame=False,
-                      axes_style='box', labelfont=9, legendfont=7,
-                      titlefont=10, theme='light')
+
 
 
 for k in ('default', 'steps-pre','steps-mid', 'steps-post'):
@@ -164,6 +154,43 @@ for tname in ('light', 'white-background', 'dark', 'matplotlib', 'ggplot',
         theme.update(matplotlib.style.library[tname])
     Themes[tname.lower()] = theme
 
+default_config = dict(auto_margins=True,
+                      axes_style='box',
+                      current_theme='light',
+                      data_deriv=False,
+                      data_expr=None,
+                      draggable_legend=False,
+                      hidewith_legend=True,
+                      legend_loc= 'best',
+                      legend_onaxis='on plot',
+                      linecolors=linecolors,
+                      margins=(0.15, 0.05, 0.05, 0.15),
+                      mpl_legend=None,
+                      plot_type='lineplot',
+                      scatter_size=30,
+                      scatter_mask=None,
+                      scatter_normalcolor='blue',
+                      scatter_normaledge='blue',
+                      scatter_selectcolor='red',
+                      scatter_selectedge='red',
+                      show_grid=True,
+                      show_legend=False,
+                      show_legend_frame=False,
+                      textcolor='#000000',
+                      title='',
+                      xscale='linear',
+                      yscale='linear',
+                      xlabel='',
+                      ylabel='',
+                      y2label='',
+                      viewpad=2.5,
+                      with_data_process=True,
+                      zoom_style='both x and y',
+                      labelfont=9,
+                      legendfont=7,
+                      titlefont=10)
+
+
 def ifnot_none(val, default):
     "return val if val is not None else default"
     return val if val is not None else default
@@ -175,7 +202,7 @@ class LineProps:
     to  make the matplotlib calls to set the Line2D properties
     """
     REPRFMT = """LineProps(color='{color:s}', style='{style:s}', linewidth={linewidth:.1f},
-          label='{label:s}', zorder={zorder:d}, drawstyle='{drawstyle:s}',
+          label='{label:s}', zorder={zorder:d}, drawstyle='{drawstyle:s}', alpha={alpha:3f},
           marker='{marker:s}', markersize={markersize:.1f}, markercolor={markercolor:s})"""
 
     def __init__(self, color='black', style='solid', drawstyle='default',
@@ -199,13 +226,13 @@ class LineProps:
 
     def __repr__(self):
         if self.zorder is None:
-            self.zorder = 33
+            self.zorder = 30
         return self.REPRFMT.format(**self.__dict__)
 
     def set(self, color=None, style=None, drawstyle=None, linewidth=None,
             marker=None, markersize=None, markercolor=None, zorder=None,
             label=None, fill=False, alpha=None):
-        self.color = ifnotNOne(color, self.color)
+        self.color = ifnot_none(color, self.color)
         self.style = style
         self.drawstyle  = drawstyle
         self.fill       = fill
@@ -217,6 +244,14 @@ class LineProps:
         self.zorder     = zorder
         self.alpha      = alpha
 
+    def asdict(self):
+        return dict(color=self.color, style=self.style,
+                    linewidth=self.linewidth, zorder=self.zorder,
+                    fill=self.fill, label=self.label, drawstyle=self.drawstyle,
+                    alpha=self.alpha, markersize=self.markersize,
+                    marker=self.marker, markercolor=self.markercolor)
+
+
 
 class PlotConfig:
     """Plot Configuration for Line Plots, holding most configuration data """
@@ -262,7 +297,7 @@ class PlotConfig:
         self.axes_style_choices = ['box', 'open']
         self.legend_onaxis_choices =  ['on plot', 'off plot']
 
-        self.configdict = default_config
+        self.configdict = {k: v for k, v in default_config.items()}
         if custom_config is not None:
             self.configdict.update(custom_config)
         self.themes = Themes
@@ -270,18 +305,12 @@ class PlotConfig:
         self.set_defaults()
 
     def set_defaults(self):
-        fontsize = {}
-        for key, val in self.configdict.items():
-            if 'font' in key:
-                fontsize[key] = val
-            else:
-                setattr(self, key, val)
-
         self.zoom_lims = []
         self.added_texts = []
         self.scatter_xdata = None
         self.scatter_ydata = None
         self.scatter_mask = None
+
         self.margins = None
         self.mpl_legend  = None
         self.axes_traces = {}
@@ -290,15 +319,19 @@ class PlotConfig:
         self.traces = []
         self.reset_lines()
 
-        f0 =  FontProperties()
-        self.labelfont = f0.copy()
-        self.titlefont = f0.copy()
-        self.legendfont = f0.copy()
-        self.legendfont.set_size(fontsize['legendfont'])
-        self.labelfont.set_size(fontsize['labelfont'])
-        self.titlefont.set_size(fontsize['titlefont'])
+        self.labelfont = FontProperties()
+        self.titlefont = FontProperties()
+        self.legendfont = FontProperties()
+
+        for key, val in self.configdict.items():
+            if 'font' in key:
+                thisfont = getattr(self, key, FontProperties())
+                thisfont.set_size(val)
+            else:
+                setattr(self, key, val)
         self.set_theme()
 
+
     def set_theme(self, theme=None):
         if theme in self.themes:
             self.current_theme = theme
@@ -320,25 +353,73 @@ class PlotConfig:
         self.reset_trace_properties()
         self.set_axes_style()
 
-    def get_current_config(self):
-        """save dict of current configuration options to self.configdict
+    def get_config(self):
+        """save json-ifiable dict of current configuration options
+        to self.configdict
         """
         cnf = {}
-        for key in self.configdict:
-            if hasattr(self, key):
-                val = getattr(self, key)
-                if key in ('legendfont', 'labelfont', 'titlefont'):
-                    val = val.get_size()
-                elif key == 'linecolors':
-                    val = [trace.color for trace in self.traces[:10]]
-                cnf[key] = val
+        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',
+                     'plot_type', 'scatter_mask', 'scatter_normalcolor',
+                     'scatter_normaledge', 'scatter_selectcolor', 'scatter_selectedge',
+                     'scatter_size', 'show_grid', 'show_legend', 'show_legend_frame',
+                     'textcolor', 'title', 'viewpad', 'with_data_process',
+                     'xlabel', 'xscale', 'y2label', 'ylabel', 'yscale', 'zoom_lims',
+                     'zoom_style', 'legendfont', 'labelfont', 'titlefont',
+                     'fills', 'traces'):
+            val = getattr(self, attr)
+            if attr in ('legendfont', 'labelfont', 'titlefont'):
+                val = val.get_size()
+            elif attr == 'fills':
+                val = val[:self.ntrace]
+            elif attr == 'traces':
+                val = self.get_traces()[:self.ntrace]
+
+            cnf[attr] = val
         self.configdict = cnf
         return cnf
 
     def load_config(self, conf):
-        self.get_current_config()
+        self.get_config()
         self.configdict.update(conf)
-        self.set_defaults()
+        cnf = self.configdict
+
+        self.ntrace = cnf.get('ntrace', 1)
+
+        # self.lines = [None]*self.ntrace
+        # self.dy    = [None]*self.ntrace
+        # self.fills = [None]*self.ntrace
+
+        self.set_theme(theme=cnf['current_theme'])
+        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',
+                     'plot_type', 'scatter_mask', 'scatter_normalcolor',
+                     'scatter_normaledge', 'scatter_selectcolor', 'scatter_selectedge',
+                     'scatter_size', 'show_grid', 'show_legend', 'show_legend_frame',
+                     'textcolor', 'title', 'viewpad', 'with_data_process',
+                     'xlabel', 'xscale', 'y2label', 'ylabel', 'yscale', 'zoom_lims',
+                     'zoom_style'):
+            if attr in cnf:
+                setattr(self, attr, cnf.get(attr))
+
+#         for fname in ('legendfont', 'labelfont', 'titlefont'):
+#             fsize = cnf.get(fname, None)
+#             if fsize is not None:
+#                 thisfont = getattr(self, fname).set_size(fsize)
+#
+#         for i, xfill in enumerate(cnf['fills']):
+#             self.fills[i] = xfill
+#
+#         self.traces = []
+#         for trace in cnf['traces']:
+#             thistrace = LineProps()
+#             thistrace.set(**trace)
+#             self.traces.append(thistrace)
+
 
     def reset_lines(self):
         self.lines = [None]*len(self.traces)
@@ -393,7 +474,6 @@ class PlotConfig:
         except:
             return self.lines[n-1]
 
-
     def get_trace(self, trace):
         if trace is None:
             trace = self.ntrace
@@ -401,6 +481,13 @@ class PlotConfig:
             self.traces.append(LineProps())
         return trace
 
+    def get_traces(self):
+        out = []
+        for i in range(self.ntrace):
+            out.append(self.traces[i].asdict())
+        return out
+
+
     def relabel(self, xlabel=None, ylabel=None,
                 y2label=None, title=None, delay_draw=False):
         " re draw labels (title, x, y labels)"
@@ -431,11 +518,12 @@ class PlotConfig:
             self.y2label not in ('', None, 'None')):
             axes[1].set_ylabel(self.y2label, **kws)
 
-        for ax in axes[0].xaxis, axes[0].yaxis:
-            for t in ax.get_ticklabels():
-                t.set_color(self.textcolor)
-                if hasattr(t, 'set_fontsize'):
-                    t.set_fontsize(n)
+        for axes in self.canvas.figure.get_axes():
+            for ax in axes.xaxis, axes.yaxis:
+                for t in ax.get_ticklabels():
+                    t.set_color(self.textcolor)
+                    if hasattr(t, 'set_fontsize'):
+                        t.set_fontsize(n)
 
         self.set_added_text_size()
         if self.mpl_legend is not None:
@@ -840,7 +928,7 @@ class PlotConfig:
             labs.append(xl)
         labs = tuple(labs)
 
-        lgn = axes[0].legend
+        lgn = axes[-1].legend
         if self.legend_onaxis.startswith('off'):
             lgn = self.canvas.figure.legend
             # 'best' and 'off axis' not implemented yet

{wxmplot-0.9.58 → wxmplot-0.9.59}/wxmplot/imageconf.py

@@ -217,7 +217,7 @@ class ImageConfig:
         if len(dticks) < 2:
             dticks.append(dat.min())
             dticks.append(dat.max())
-
+        dticks = np.array(dticks)
         dstep = max(2.e-15, abs(np.diff(dticks).mean()))
         if dstep > 5e4 or (dstep < 5.e-4 and dticks.mean() < 5.e-2):
             fmt = '%.2e'

{wxmplot-0.9.58 → wxmplot-0.9.59}/wxmplot/imageframe.py

@@ -181,7 +181,7 @@ class ColorMapPanel(wx.Panel):
             conf.int_hi[col] = val
         lo = conf.int_lo[col]
         hi = conf.int_hi[col]
-        self.islider_range.SetLabel('Shown: [ %.4g :  %.4g ]' % (lo, hi))
+        self.islider_range.SetLabel('Shown: [%.4g : %.4g]' % (lo, hi))
         self.imgpanel.redraw()
 
     def redraw_cmap(self):
@@ -263,7 +263,7 @@ class ContrastPanel(wx.Panel):
         labstyle = wx.ALIGN_LEFT|wx.LEFT|wx.TOP|wx.EXPAND
         sizer = wx.GridBagSizer(2, 2)
 
-        title = wx.StaticText(self, label='Auto-Contrast (%):', size=(120, -1))
+        title = wx.StaticText(self,  label='AutoContrast(%):', size=(120, -1))
         stitle = wx.StaticText(self, label='Adjust Contrast:', size=(120, -1))
 
 

{wxmplot-0.9.58 → wxmplot-0.9.59}/wxmplot/imagepanel.py

@@ -127,20 +127,17 @@ class ImagePanel(BasePanel):
 
         if self.conf.style == 'contour':
             if levels is None:
-                levels = self.conf.ncontour_levels
+                if nlevels is None:
+                    nlevels = self.conf.ncontour_levels = 9
+                nlevels = max(2, nlevels)
+                levels  = np.linspace(img.min(), img.max(), nlevels+1)
             else:
-                self.conf.ncontour_levels = levels
-            if nlevels is None:
-                nlevels = self.conf.ncontour_levels = 9
-            nlevels = max(2, nlevels)
-
-            clevels  = np.linspace(img.min(), img.max(), nlevels+1)
-            self.conf.contour_levels = clevels
+                self.conf.contour_levels = levels
             self.conf.image = self.axes.contourf(img, cmap=self.conf.cmap[col],
-                                                 levels=clevels)
+                                                 levels=levels)
 
             self.conf.contour = self.axes.contour(img, cmap=self.conf.cmap[col],
-                                                  levels=clevels)
+                                                  levels=levels)
             cmap_name = self.conf.cmap[col].name
             xname = 'gray'
             try:
@@ -157,7 +154,7 @@ class ImagePanel(BasePanel):
             if contour_labels is None:
                 contour_labels = self.conf.contour_labels
             if contour_labels:
-                nlog = np.log10(abs(clevels[1]-clevels[0]))
+                nlog = np.log10(abs(levels[1]-levels[0]))
                 fmt = "%.4f"
                 if nlog < -2:
                     fmt = "%%.%df" % (1-nlog)
@@ -165,7 +162,7 @@ class ImagePanel(BasePanel):
                     fmt = "%.1f"
                 self.axes.clabel(self.conf.contour, fontsize=10, inline=1, fmt=fmt)
             if hasattr(self.contour_callback , '__call__'):
-                self.contour_callback(levels=clevels)
+                self.contour_callback(levels=levels)
         else:
             if img.max() > img.min():
                 img = (img - img.min()) /(1.0*img.max() - img.min())

{wxmplot-0.9.58 → wxmplot-0.9.59}/wxmplot/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.9.58'
-__version_tuple__ = version_tuple = (0, 9, 58)
+__version__ = version = '0.9.59'
+__version_tuple__ = version_tuple = (0, 9, 59)

{wxmplot-0.9.58 → wxmplot-0.9.59/wxmplot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wxmplot
-Version: 0.9.58
+Version: 0.9.59
 Summary: wxPython plotting widgets using matplotlib
 Home-page: https://github.com/newville/wxmplot
 Author: Matthew Newville

{wxmplot-0.9.58 → wxmplot-0.9.59}/wxmplot.egg-info/SOURCES.txt

@@ -11,6 +11,7 @@ examples/compare_dislin_mpl.py
 examples/compare_plplot.py
 examples/contour.py
 examples/demo.py
+examples/dump_config.py
 examples/errorbar.py
 examples/fill_to_zero.py
 examples/fill_uncertainties.py