wxmplot 2026.2.1__tar.gz → 2026.2.2__tar.gz

{wxmplot-2026.2.1/wxmplot.egg-info → wxmplot-2026.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wxmplot
-Version: 2026.2.1
+Version: 2026.2.2
 Summary: wxPython plotting widgets using matplotlib
 Author-email: Matthew Newville <matt.newville@gmail.com>
 License-Expression: MIT

wxmplot-2026.2.2/examples/simple.py

@@ -0,0 +1,8 @@
+#!/usr/bin/python
+import numpy as np
+import wxmplot.interactive as wi
+
+x = np.linspace(0.0, 20.0, 201)
+wi.plot(x, np.sin(x)/(x+1),
+        title='Titles can include latex: $\\chi^2/\\epsilon $ \n and newlines',
+        ylabel='unicde can also be used [\u03c7] (\u212B)',  xlabel='T (sec)')

{wxmplot-2026.2.1 → wxmplot-2026.2.2}/wxmplot/colors.py

@@ -56,10 +56,14 @@ def hexcolor(color):
 
     # now, get color to an rgba tuple
     cvals = (0, 0, 0)
-    if isinstance(color, tuple):
-        cvals = color
-    elif isinstance(color, list):
+    if isinstance(color, list):
         cvals = tuple(color)
+
+    if isinstance(color, tuple):
+        cvals = (min(255, max(0, c)) for c in color)
+        if isinstance(color[0],  float) and color[0] < 2.0:
+            cvals = [int(255*c) for c in color]
+
     elif isinstance(color, str):
         c = color.lower().replace(' ', '').replace('gray', 'grey')
         if c in X11_COLORS:

{wxmplot-2026.2.1 → wxmplot-2026.2.2}/wxmplot/config.py

@@ -222,6 +222,36 @@ def ifnot_none(val, default):
     return val if val is not None else default
 
 
+def clean_texmath(text):
+    """
+    clean a string with mixed TeX math and control strings
+
+    inside of TeX dollar signs, the text is preserved.
+
+    outsde of TeX dollar signs '\\n' will be replaced in '\n', and `\\t' with '\t'
+    """
+    def clean_escape(s):
+        s = s.replace('\\n', '\n').replace('\\t', '\t').replace('\\r', '\r')
+        if '\\N{' in s or '\\u' in s:
+            s = s.encode("utf-8").decode("unicode_escape")
+        return s
+
+    if '$' not in text:
+        return clean_escape(text)
+
+    ndollar = text.count('$')
+    if ndollar == 0 or ndollar % 2 == 1:
+        return clean_escape(text)
+
+    sections = []
+    for isect, sect in enumerate(text.split('$')):
+        if isect % 2 == 0:
+            sect = clean_escape(sect)
+        sections.append(sect)
+    return '$'.join(sections)
+
+
+
 class LineProps:
     """ abstraction for Line2D properties, closely related to a
     MatPlotlib Line2D.  used to set internal line properties, and
@@ -246,7 +276,7 @@ class LineProps:
         if markercolor is None:
             markercolor = color
         self.markercolor= markercolor
-        self.label      = label
+        self.label      = clean_texmath(label)
         self.zorder     = zorder
         self.mpline     = mpline
         self.yaxes      = yaxes
@@ -267,7 +297,7 @@ class LineProps:
         self.marker     = ifnot_none(marker, self.marker)
         self.markersize = ifnot_none(markersize, self.markersize)
         self.markercolor= ifnot_none(markercolor,self.markercolor)
-        self.label      = ifnot_none(label, self.label)
+        self.label      = ifnot_none(clean_texmath(label), self.label)
         self.zorder     = ifnot_none(zorder, self.zorder)
         self.alpha      = ifnot_none(alpha, self.alpha)
         self.yaxes      = ifnot_none(yaxes, self.yaxes)
@@ -425,12 +455,10 @@ class PlotConfig:
             elif attr in conf:
                 setattr(self, attr, conf[attr])
 
-        l, r, t, b = self.margins
-        self.set_margins(l, r, t, b, delay_draw=True)
+        self.set_margins(*self.margins, delay_draw=True)
         if self.auto_margins:
             self.panel.autoset_margins()
 
-        ntrace = self.ntrace
         self.reset_trace_properties()
 
         if 'traces' in conf:
@@ -547,17 +575,17 @@ class PlotConfig:
         rcParams['xtick.labelsize'] =  rcParams['ytick.labelsize'] =  n
 
         if xlabel is not None:
-            self.xlabel = xlabel
+            self.xlabel = clean_texmath(xlabel)
         if ylabel is not None:
-            self.ylabel = ylabel
+            self.ylabel = clean_texmath(ylabel)
         if y2label is not None:
-            self.y2label = y2label
+            self.y2label = clean_texmath(y2label)
         if y3label is not None:
-            self.y3label = y3label
+            self.y3label = clean_texmath(y3label)
         if y4label is not None:
-            self.y4label = y4label
+            self.y4label = clean_texmath(y4label)
         if title is not None:
-            self.title = title
+            self.title = clean_texmath(title)
         if self.canvas is None:
             return
         axes = self.canvas.figure.get_axes()
@@ -928,8 +956,7 @@ class PlotConfig:
         if yaxes_tracecolor is not None:
             self.yaxes_tracecolor = bool(yaxes_tracecolor)
 
-        cur_theme = self.themes[self.current_theme]
-        tcolor = mpl2hexcolor(self.textcolor) # cur_theme['ytick.color'])
+        tcolor = mpl2hexcolor(self.textcolor)
 
         axes = self.canvas.figure.get_axes()
         colors = [tcolor]*(len(axes)+2)
@@ -1096,7 +1123,7 @@ class PlotConfig:
             for trace, lines in enumerate(ax.get_lines()):
                 try:
                     dats = copy(self.data_save[ax][trace])
-                except:
+                except Exception:
                     return
                 xd, yd = np.asarray(dats[0][:]), np.asarray(dats[1][:])
                 if expr == 'Y*X':
@@ -1152,7 +1179,7 @@ class PlotConfig:
                                 x_minpos= min(x[np.where(x>0)])
                             else:
                                 x_minpos= min(x_minpos, min(x[np.where(x>0)]))
-                        except:
+                        except Exception:
                             pass
                         if limits == [None, None, None, None]:
                             limits = [min(x), max(x), min(y), max(y)]
@@ -1177,14 +1204,14 @@ class PlotConfig:
                 try:
                     if xrange < 1.e-10:
                         xrange = max(1.e-10, (limits[1] + limits[0] )/2.0)
-                except:
+                except Exception:
                     pass
 
                 yrange = limits[3] - limits[2]
                 try:
                     if yrange < 1.e-10:
                         yrange = max(1.e-10, (limits[3] + limits[2] )/2.0)
-                except:
+                except Exception:
                     pass
 
                 limits[0] = limits[0] - xrange * self.viewpad /100.0
@@ -1208,11 +1235,11 @@ class PlotConfig:
             all_limits.append(limits)
             try:
                 ax.set_xlim((limits[0], limits[1]), emit=True)
-            except:
+            except Exception:
                 pass
             try:
                 ax.set_ylim((limits[2], limits[3]), emit=True)
-            except:
+            except Exception:
                 pass
         return all_limits
 
@@ -1235,11 +1262,11 @@ class PlotConfig:
                 if i in (1, 2, 3):
                     ys = getattr(self, f'y{i+1}scale', 'linear')
                 axes.set_yscale(ys)
-            except:
+            except Exception:
                 axes.set_yscale('linear')
             try:
                 axes.set_xscale(self.xscale)
-            except:
+            except Exception:
                 axes.set_xscale('linear')
         if not delay_draw:
             self.process_data()
@@ -1255,10 +1282,7 @@ class PlotConfig:
         """make keywords for axes.hist()"""
         kwargs = {}
 
-        # print("make hist kwargs")
         trace = self.get_trace(trace)
-        prop = self.traces[trace]
-        # print("L Trace ", prop)
 
         for key in ('bins', 'density', 'cumulative', 'histtype',
                     'orientation', 'align', 'stacked', 'rwidth'):

{wxmplot-2026.2.1 → wxmplot-2026.2.2}/wxmplot/plotconfigframe.py

@@ -3,14 +3,12 @@
 # wxmplott GUI to Configure Line Plots
 
 from functools import partial
-import yaml
 import numpy as np
 import wx
 import wx.lib.colourselect  as csel
 import wx.lib.scrolledpanel as scrolled
 
-from wxutils import (flatnotebook, get_color, set_color,
-                     SimpleText, TextCtrl)
+from wxutils import (flatnotebook, get_color)
 
 from .utils import LabeledTextCtrl, MenuItem, Choice, FloatSpin
 from .config import PlotConfig
@@ -29,39 +27,10 @@ def ffmt(val):
     if val is not None:
         try:
             return "%.5g" % val
-        except:
+        except Exception:
             pass
     return repr(val)
 
-def clean_texmath(txt):
-    """
-    clean tex math string, preserving control sequences
-    (incluing \n, so also '\nu') inside $ $, while allowing
-    \n and \t to be meaningful in the text string
-    """
-    s = "%s " % txt
-    out = []
-    i = 0
-    while i < len(s)-1:
-        if s[i] == '\\' and s[i+1] in ('n', 't'):
-            if s[i+1] == 'n':
-                out.append('\n')
-            elif s[i+1] == 't':
-                out.append('\t')
-            i += 1
-        elif s[i] == '$':
-            j = s[i+1:].find('$')
-            if j < 0:
-                j = len(s)
-            out.append(s[i:j+2])
-            i += j+2
-        else:
-            out.append(s[i])
-        i += 1
-        if i > 5000:
-            break
-    return ''.join(out).strip()
-
 ############################################################
 #  monkey-patch of ColourSelect text setting
 #  yes, a PR has been submitted to wx, no it is not merged or released.
@@ -245,13 +214,13 @@ class PlotConfigFrame(wx.Frame):
             raxes = axes[1]
         try:
             user_lims = self.conf.user_limits[laxes]
-        except:
+        except Exception:
             user_lims = 4*[None]
         auto_b  = wx.CheckBox(panel,-1, ' From Data ', (-1, -1), (-1, -1))
         auto_b.Bind(wx.EVT_CHECKBOX,self.onAutoBounds)
         try:
             auto_b.SetValue(self.conf.user_limits[laxes] == 4*[None])
-        except:
+        except Exception:
             pass
 
         self.vpad_val = FloatSpin(panel, value=2.5, min_val=0, max_val=100,
@@ -962,7 +931,7 @@ class PlotConfigFrame(wx.Frame):
                 return None
             try:
                 return float(v)
-            except:
+            except Exception:
                 return None
 
         axes = self.canvas.figure.get_axes()
@@ -1096,7 +1065,7 @@ class PlotConfigFrame(wx.Frame):
                 self.conf.relabel(**kws)
                 wid.SetBackgroundColour(get_color('text_bg'))
                 wid.SetForegroundColour(get_color('text'))
-            except: # as from latex error
+            except Exception: # as from latex error
                 print("invalid text for item ", item, s)
 
                 wid.SetBackgroundColour(get_color('text_invalid_bg'))
@@ -1104,7 +1073,7 @@ class PlotConfigFrame(wx.Frame):
         elif item == 'trace':
             try:
                 self.conf.set_trace_label(s, trace=trace)
-            except:
+            except Exception:
                 pass
 
     def onShowGrid(self,event):

{wxmplot-2026.2.1 → wxmplot-2026.2.2}/wxmplot/version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2026.2.1'
-__version_tuple__ = version_tuple = (2026, 2, 1)
+__version__ = version = '2026.2.2'
+__version_tuple__ = version_tuple = (2026, 2, 2)
 
-__commit_id__ = commit_id = 'g1950bafd1'
+__commit_id__ = commit_id = 'gbb23702e8'

{wxmplot-2026.2.1 → wxmplot-2026.2.2/wxmplot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wxmplot
-Version: 2026.2.1
+Version: 2026.2.2
 Summary: wxPython plotting widgets using matplotlib
 Author-email: Matthew Newville <matt.newville@gmail.com>
 License-Expression: MIT

{wxmplot-2026.2.1 → wxmplot-2026.2.2}/wxmplot.egg-info/scm_file_list.json

@@ -1,149 +1,149 @@
 {
   "files": [
-    "LICENSE",
-    "ChangeLog",
-    "pyproject.toml",
-    "MANIFEST.in",
-    "README.md",
-    "setup.py",
-    ".gitignore",
     ".gitattributes",
-    "tests/basic_test.py",
-    "wxmplot/config.py",
-    "wxmplot/baseframe.py",
-    "wxmplot/vispy_utils.py",
-    "wxmplot/histogram.py",
-    "wxmplot/multiframe.py",
-    "wxmplot/basepanel.py",
-    "wxmplot/imagematrixframe.py",
-    "wxmplot/residualplotframe.py",
-    "wxmplot/plotapp.py",
-    "wxmplot/__init__.py",
-    "wxmplot/stackedplotframe.py",
-    "wxmplot/allow_idle_macosx.py",
-    "wxmplot/utils.py",
-    "wxmplot/imageframe.py",
-    "wxmplot/plotpanel.py",
-    "wxmplot/interactive.py",
-    "wxmplot/inputhook.py",
-    "wxmplot/image_canvas.py",
-    "wxmplot/plotframe.py",
-    "wxmplot/imageconf.py",
-    "wxmplot/line_plot.py",
-    "wxmplot/imagepanel.py",
-    "wxmplot/plotconfigframe.py",
-    "wxmplot/colors.py",
-    "examples/stackedplot.py",
-    "examples/scope_mode_generator.py",
-    "examples/time_update.py",
-    "examples/extra_marker_and_line_reporting.py",
-    "examples/time.dat",
-    "examples/scope_mode_mpl_compare.py",
-    "examples/rgb_image.py",
-    "examples/scatterplot.py",
-    "examples/pilatus_display.py",
-    "examples/image_canvas_ex.py",
-    "examples/tifffile.py",
-    "examples/histogram.py",
-    "examples/leftright.py",
-    "examples/wxmplot_jupyter.ipynb",
-    "examples/BasicExamples.ipynb",
-    "examples/DynamicExamples.ipynb",
-    "examples/plotapp.py",
-    "examples/scope_mode_function.py",
-    "examples/discrete_data.py",
-    "examples/basic_screenshot.py",
-    "examples/image_scroll.py",
-    "examples/compare_dislin_mpl.py",
-    "examples/Pilatus.tiff",
-    "examples/timedata.py",
-    "examples/fill_uncertainties.py",
-    "examples/ceo2.tiff",
-    "examples/plot_many_traces.py",
-    "examples/floatcontrol.py",
-    "examples/multiple_yaxes.py",
-    "examples/xafs.dat",
-    "examples/interactive_multiplewindows.py",
-    "examples/stripchart.py",
-    "examples/tiff_display.py",
-    "examples/fill_to_zero.py",
-    "examples/theme_compare.py",
-    "examples/demo.py",
-    "examples/compare_plplot.py",
-    "examples/simple.py",
-    "examples/errorbar.py",
-    "examples/contour.py",
-    "examples/imagematrix.py",
-    "examples/image.py",
-    "examples/multiplot.py",
-    "examples/plot_fromdatafile.py",
     ".github/dependabot.yml",
     ".github/workflows/test_wxmplot_install.yml",
-    "doc/index.rst",
+    ".gitignore",
+    "ChangeLog",
+    "LICENSE",
+    "MANIFEST.in",
+    "README.md",
     "doc/Makefile",
+    "doc/_static/empty",
+    "doc/_static/scope_mode_function.mp4",
+    "doc/_static/scope_mode_generator.mp4",
+    "doc/_static/scope_mode_mpl_compare.mp4",
+    "doc/_templates/indexsidebar.html",
     "doc/comparisons.rst",
     "doc/conf.py",
     "doc/examples.rst",
     "doc/imagepanel.rst",
-    "doc/overview.rst",
-    "doc/interactive.rst",
-    "doc/installation.rst",
-    "doc/other.rst",
-    "doc/plotpanel.rst",
-    "doc/images/plot_compare_wxplot_wx.png",
-    "doc/images/imagedisplay.png",
-    "doc/images/wxmplot_dislin.png",
-    "doc/images/contour_wxmplot.png",
-    "doc/images/plot_alphafill_config.png",
-    "doc/images/plot_compare_plotly.png",
+    "doc/images/ImageConfig.png",
     "doc/images/PlotConfig_LineProps.png",
     "doc/images/PlotConfig_LinePropsAlphaFill.png",
+    "doc/images/PlotConfig_Ranges.png",
+    "doc/images/PlotConfig_Scatter.png",
     "doc/images/PlotConfig_Text.png",
-    "doc/images/multiplot.png",
-    "doc/images/wxmplot_leftright.png",
-    "doc/images/discrete_data.png",
-    "doc/images/imshow_wxmplot.png",
+    "doc/images/basic_screenshot.png",
     "doc/images/contour.png",
-    "doc/images/plot_compare_dislin.png",
-    "doc/images/imshow_no_contrast.png",
-    "doc/images/imshow_scalebar.png",
-    "doc/images/two_axes.png",
-    "doc/images/image_3color_white.png",
-    "doc/images/PlotConfig_Scatter.png",
-    "doc/images/plot_alphafill_to_dy.png",
-    "doc/images/plot_alphafill_to_zero.png",
+    "doc/images/contour_wxmplot.png",
+    "doc/images/datafile_plot.png",
+    "doc/images/discrete_data.png",
     "doc/images/errorbar.png",
     "doc/images/histogram.png",
-    "doc/images/plot_compare_qttutorial1_qt.png",
+    "doc/images/image_3color.png",
+    "doc/images/image_3color_white.png",
+    "doc/images/imagedisplay.png",
+    "doc/images/imagematrix.png",
+    "doc/images/imshow_high_contrast.png",
+    "doc/images/imshow_low_contrast.png",
     "doc/images/imshow_mpl.png",
+    "doc/images/imshow_no_contrast.png",
+    "doc/images/imshow_scalebar.png",
+    "doc/images/imshow_wxmplot.png",
+    "doc/images/interactive1.png",
+    "doc/images/interactive2.png",
     "doc/images/multiple_yaxes.png",
-    "doc/images/wxmplot_composite.png",
+    "doc/images/multiplot.png",
+    "doc/images/plot_alphafill_config.png",
+    "doc/images/plot_alphafill_to_dy.png",
+    "doc/images/plot_alphafill_to_zero.png",
+    "doc/images/plot_compare_dislin.png",
+    "doc/images/plot_compare_plotly.png",
     "doc/images/plot_compare_plplot.png",
+    "doc/images/plot_compare_qt.png",
     "doc/images/plot_compare_qttutorial1.png",
+    "doc/images/plot_compare_qttutorial1_qt.png",
+    "doc/images/plot_compare_wxplot_wx.png",
+    "doc/images/plot_compare_wxplot_wxmplot.png",
     "doc/images/plot_mpl.png",
-    "doc/images/scatterplot.png",
-    "doc/images/PlotConfig_Ranges.png",
     "doc/images/plot_wxmplot.png",
-    "doc/images/plot_compare_wxplot_wxmplot.png",
-    "doc/images/imagematrix.png",
-    "doc/images/plot_compare_qt.png",
-    "doc/images/wxmplot_histogram.png",
+    "doc/images/scatterplot.png",
     "doc/images/stackedplot.png",
-    "doc/images/ImageConfig.png",
     "doc/images/tiff_display.png",
-    "doc/images/imshow_low_contrast.png",
     "doc/images/tifffile_image.png",
+    "doc/images/two_axes.png",
+    "doc/images/wxmplot_composite.png",
+    "doc/images/wxmplot_dislin.png",
+    "doc/images/wxmplot_histogram.png",
+    "doc/images/wxmplot_leftright.png",
     "doc/images/wxmplot_plplot.png",
-    "doc/images/interactive1.png",
-    "doc/images/image_3color.png",
-    "doc/images/datafile_plot.png",
-    "doc/images/basic_screenshot.png",
-    "doc/images/interactive2.png",
-    "doc/images/imshow_high_contrast.png",
-    "doc/_templates/indexsidebar.html",
-    "doc/_static/scope_mode_function.mp4",
-    "doc/_static/empty",
-    "doc/_static/scope_mode_generator.mp4",
-    "doc/_static/scope_mode_mpl_compare.mp4"
+    "doc/index.rst",
+    "doc/installation.rst",
+    "doc/interactive.rst",
+    "doc/other.rst",
+    "doc/overview.rst",
+    "doc/plotpanel.rst",
+    "examples/BasicExamples.ipynb",
+    "examples/DynamicExamples.ipynb",
+    "examples/Pilatus.tiff",
+    "examples/basic_screenshot.py",
+    "examples/ceo2.tiff",
+    "examples/compare_dislin_mpl.py",
+    "examples/compare_plplot.py",
+    "examples/contour.py",
+    "examples/demo.py",
+    "examples/discrete_data.py",
+    "examples/errorbar.py",
+    "examples/extra_marker_and_line_reporting.py",
+    "examples/fill_to_zero.py",
+    "examples/fill_uncertainties.py",
+    "examples/floatcontrol.py",
+    "examples/histogram.py",
+    "examples/image.py",
+    "examples/image_canvas_ex.py",
+    "examples/image_scroll.py",
+    "examples/imagematrix.py",
+    "examples/interactive_multiplewindows.py",
+    "examples/leftright.py",
+    "examples/multiple_yaxes.py",
+    "examples/multiplot.py",
+    "examples/pilatus_display.py",
+    "examples/plot_fromdatafile.py",
+    "examples/plot_many_traces.py",
+    "examples/plotapp.py",
+    "examples/rgb_image.py",
+    "examples/scatterplot.py",
+    "examples/scope_mode_function.py",
+    "examples/scope_mode_generator.py",
+    "examples/scope_mode_mpl_compare.py",
+    "examples/simple.py",
+    "examples/stackedplot.py",
+    "examples/stripchart.py",
+    "examples/theme_compare.py",
+    "examples/tiff_display.py",
+    "examples/tifffile.py",
+    "examples/time.dat",
+    "examples/time_update.py",
+    "examples/timedata.py",
+    "examples/wxmplot_jupyter.ipynb",
+    "examples/xafs.dat",
+    "pyproject.toml",
+    "setup.py",
+    "tests/basic_test.py",
+    "wxmplot/__init__.py",
+    "wxmplot/allow_idle_macosx.py",
+    "wxmplot/baseframe.py",
+    "wxmplot/basepanel.py",
+    "wxmplot/colors.py",
+    "wxmplot/config.py",
+    "wxmplot/histogram.py",
+    "wxmplot/image_canvas.py",
+    "wxmplot/imageconf.py",
+    "wxmplot/imageframe.py",
+    "wxmplot/imagematrixframe.py",
+    "wxmplot/imagepanel.py",
+    "wxmplot/inputhook.py",
+    "wxmplot/interactive.py",
+    "wxmplot/line_plot.py",
+    "wxmplot/multiframe.py",
+    "wxmplot/plotapp.py",
+    "wxmplot/plotconfigframe.py",
+    "wxmplot/plotframe.py",
+    "wxmplot/plotpanel.py",
+    "wxmplot/residualplotframe.py",
+    "wxmplot/stackedplotframe.py",
+    "wxmplot/utils.py",
+    "wxmplot/vispy_utils.py"
   ]
 }

wxmplot-2026.2.2/wxmplot.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "2026.2.2",
+  "distance": 0,
+  "node": "gbb23702e8d55a50452dc722de6db921762942571",
+  "dirty": false,
+  "branch": "master",
+  "node_date": "2026-08-09"
+}

wxmplot-2026.2.1/examples/simple.py

@@ -1,6 +0,0 @@
-#!/usr/bin/python
-import numpy as np
-import wxmplot.interactive as wi
-
-x = np.linspace(0.0, 20.0, 201)
-wi.plot(x, np.sin(x)/(x+1), ylabel='response',  xlabel='T (sec)')

wxmplot-2026.2.1/wxmplot.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "2026.2.1",
-  "distance": 0,
-  "node": "g1950bafd1c567ad5c5c6dbcf1d73184feb37b505",
-  "dirty": false,
-  "branch": "master",
-  "node_date": "2026-07-30"
-}