wxmplot 0.9.18__tar.gz → 0.9.20__tar.gz

{wxmplot-0.9.18 → wxmplot-0.9.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: wxmplot
-Version: 0.9.18
+Version: 0.9.20
 Summary: A library for plotting in wxPython using matplotlib
 Home-page: http://newville.github.io/wxmplot/
 Author: Matthew Newville
@@ -23,3 +23,4 @@ Classifier: Topic :: Scientific/Engineering :: Visualization
 Requires: wx
 Requires: numpy
 Requires: matplotlib
+Requires: six

{wxmplot-0.9.18 → wxmplot-0.9.20}/README.txt

@@ -52,9 +52,9 @@ user can zoom in, rotate, or flip the image, and adjust the smoothing of
 the image and adjust the color table and intensity scale.
 
 Programmatically, one can make the same adjustments to an ImagePanel by
-changing its configuaration attributes and runnign the redraw() method.
+changing its configuaration attributes and running the redraw() method.
 
 =====
 
-last update: 2011-Nov-20   Matt Newville <newville@cars.uchicago.edu>
+last update: 2016-Oct-24   Matt Newville <newville@cars.uchicago.edu>
 

{wxmplot-0.9.18 → wxmplot-0.9.20}/doc/installation.rst

@@ -1,66 +1,69 @@
-====================================
-Downloading and Installation
-====================================
-
-Prerequisites
-~~~~~~~~~~~~~~~
-
-The wxmplot package requires Python, wxPython, numpy, and matplotlib.  Some
-of the example applications rely on the Image module as well.
-
-With wxPython and the WX matplotlib backend supported well on Python 2.7,
-but poorly for Python 3, little testing has been done with wxPhoenix or the
-matplotlib WX backend.
-
-Downloads
-~~~~~~~~~~~~~
-
-.. _github:   http://github.com/newwville/wxmplot
-.. _PyPI:     http://pypi.python.org/pypi/wxmplot
-
-The latest version is available from `PyPI`_ or `github`_, and the package
-can be installed with::
-
-   pip install wxmplot
-
-Development Version
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-To get the latest development version, use::
-
-   git clone http://github.com/newville/wxmplot.git
-
-Installation from Source
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-wxmplot is a pure python module, so installation on all platforms can use the source kit::
-
-   tar xvzf wxmplot-0.9.XX.tar.gz
-   cd wxmplot-0.9.XX/
-   python setup.py install
-
-You can also install with ``pip install wxmplot``, or for Anaconda Python,
-using ``conda install -c newville wxmplot``
-
-License
-~~~~~~~~~~~~~
-
-The wxmplot code is distribution under the following license:
-
-  Copyright (c) 2015 Matthew Newville, The University of Chicago
-
-  Permission to use and redistribute the source code or binary forms of this
-  software and its documentation, with or without modification is hereby
-  granted provided that the above notice of copyright, these terms of use,
-  and the disclaimer of warranty below appear in the source code and
-  documentation, and that none of the names of The University of Chicago or
-  the authors appear in advertising or endorsement of works derived from this
-  software without specific prior written permission from all parties.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-  DEALINGS IN THIS SOFTWARE.
+====================================
+Downloading and Installation
+====================================
+
+Prerequisites
+~~~~~~~~~~~~~~~
+
+The wxmplot package requires wxpython, matplotlib, numpy, and six.
+
+For wxPython Classic, wxmplot works well with Python 2.7, but not Python 3.
+Since matplotlib 1.5 introduced support for wxPython Phoenix, wxmplot also
+works with matplotlib 1.5, wxPython Phoenix 3.0.3, and with both Python 2.7
+and Python 3.5.  As wxPython Phoenix is still in development (available at
+http://wxpython.org/Phoenix/snapshot-builds/), support for it should be
+viewed as provisional.  Testing with Phoenix and with Python 3.5 has been
+modest, but all wxmplot functionality appears to work.
+
+Downloads
+~~~~~~~~~~~~~
+
+.. _github:   http://github.com/newwville/wxmplot
+.. _PyPI:     http://pypi.python.org/pypi/wxmplot
+
+The latest version is available from `PyPI`_ or `github`_, and the package
+can be installed with::
+
+   pip install wxmplot
+
+Development Version
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+To get the latest development version, use::
+
+   git clone http://github.com/newville/wxmplot.git
+
+Installation from Source
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+wxmplot is a pure python module, so installation on all platforms can use the source kit::
+
+   tar xvzf wxmplot-0.9.XX.tar.gz
+   cd wxmplot-0.9.XX/
+   python setup.py install
+
+You can also install with ``pip install wxmplot``, or for Anaconda Python,
+using ``conda install -c newville wxmplot``
+
+License
+~~~~~~~~~~~~~
+
+The wxmplot code is distribution under the following license:
+
+  Copyright (c) 2015 Matthew Newville, The University of Chicago
+
+  Permission to use and redistribute the source code or binary forms of this
+  software and its documentation, with or without modification is hereby
+  granted provided that the above notice of copyright, these terms of use,
+  and the disclaimer of warranty below appear in the source code and
+  documentation, and that none of the names of The University of Chicago or
+  the authors appear in advertising or endorsement of works derived from this
+  software without specific prior written permission from all parties.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  DEALINGS IN THIS SOFTWARE.

{wxmplot-0.9.18 → wxmplot-0.9.20}/doc/plotpanel.rst

@@ -82,7 +82,8 @@ many additional methods to interact with the plots.
 
 .. method:: oplot(x, y, **kws)
 
-   Draw a plot of the numpy arrays *x* and *y*, overwriting any existing plot.
+   Draw a plot of the numpy arrays *x* and *y*, overplotting any existing
+   plot, so that both traces are visible.
 
    The :meth:`oplot` method has many optional parameters,  as listed in
    :ref:`Table of Plot Arguments <plotopt_table>`

{wxmplot-0.9.18 → wxmplot-0.9.20}/examples/contour.py

@@ -1,8 +1,4 @@
 import sys
-if not hasattr(sys, 'frozen'):
-    import wxversion
-    wxversion.ensureMinimal('2.8')
-
 import wx
 from numpy import exp, random, arange, outer
 from wxmplot import ImageFrame

{wxmplot-0.9.18 → wxmplot-0.9.20}/examples/demo.py

@@ -1,9 +1,11 @@
 import sys
-if not hasattr(sys, 'frozen'):
-    import wxversion
-    wxversion.ensureMinimal('2.8')
-
 import wx
+is_wxPhoenix = 'phoenix' in wx.PlatformInfo
+if is_wxPhoenix:
+    PyDeadObjectError = RuntimeError
+else:
+    from wx._core import PyDeadObjectError
+
 import time, os, sys
 
 from numpy import arange, sin, cos, exp, pi, linspace, ones, random
@@ -22,17 +24,16 @@ class TestFrame(wx.Frame):
         self.SetFont(wx.Font(12,wx.SWISS,wx.NORMAL,wx.BOLD,False))
         menu = wx.Menu()
         ID_EXIT  = wx.NewId()
-        ID_TIMER = wx.NewId()
 
-        menu.Append(ID_EXIT, "E&xit", "Terminate the program")
+        menu_exit = menu.Append(ID_EXIT, "E&xit", "Terminate the program")
 
         menuBar = wx.MenuBar()
         menuBar.Append(menu, "&File");
         self.SetMenuBar(menuBar)
 
-        wx.EVT_MENU(self, ID_EXIT,  self.OnExit)
+        self.Bind(wx.EVT_MENU, self.OnExit, menu_exit)
 
-        self.Bind(wx.EVT_CLOSE,self.OnExit) # CloseEvent)
+        self.Bind(wx.EVT_CLOSE, self.OnExit) # CloseEvent)
 
         self.plotframe  = None
 
@@ -79,8 +80,8 @@ class TestFrame(wx.Frame):
         self.SetSizer(framesizer)
         framesizer.Fit(self)
 
-        wx.EVT_TIMER(self, ID_TIMER, self.onTimer)
-        self.timer = wx.Timer(self, ID_TIMER)
+        self.Bind(wx.EVT_TIMER, self.onTimer)
+        self.timer = wx.Timer(self)
         self.Refresh()
 
     def create_data(self):
@@ -105,7 +106,7 @@ class TestFrame(wx.Frame):
             self.has_plot = False
         try:
             self.plotframe.Show()
-        except wx.PyDeadObjectError:
+        except PyDeadObjectError:
             self.plotframe = PlotFrame(self)
             self.plotframe.Show()
 

{wxmplot-0.9.18 → wxmplot-0.9.20}/examples/floatcontrol.py

@@ -5,17 +5,9 @@ This is a collection of general purpose utility functions and classes,
 especially useful for wx functionality
 """
 import sys
-try:
-    if not hasattr(sys, 'frozen'):
-        import wxversion
-        wxversion.ensureMinimal('2.8')
-except:
-    pass
-
 import wx
 import wx.lib.masked as masked
 
-import fpformat
 import numpy
 
 
@@ -210,7 +202,8 @@ class FloatCtrl(wx.TextCtrl):
 
     def GetValue(self):
         if self.__prec > 0:
-            return set_float(fpformat.fix(self.__val, self.__prec))
+            fmt = "{{:.{:d}f}}".format(self.__prec)
+            return set_float(fmt.format(self.__val))
         else:
             return int(self.__val)
 
@@ -252,5 +245,3 @@ class FloatCtrl(wx.TextCtrl):
         self.SetForegroundColour(fgcol)
         self.SetBackgroundColour(bgcol)
         self.Refresh()
-
-

{wxmplot-0.9.18 → wxmplot-0.9.20}/examples/image.py

@@ -1,9 +1,7 @@
 import sys
-if not hasattr(sys, 'frozen'):
-    import wxversion
-    wxversion.ensureMinimal('2.8')
 
 import wx
+
 from numpy import exp, random, arange, outer
 from wxmplot import ImageFrame
 

{wxmplot-0.9.18 → wxmplot-0.9.20}/examples/leftright.py

@@ -3,9 +3,6 @@
 #  example plot with left and right axes with different scales
 
 import sys
-if not hasattr(sys, 'frozen'):
-    import wxversion
-    wxversion.ensureMinimal('2.8')
 
 import wx
 import numpy as np

{wxmplot-0.9.18 → wxmplot-0.9.20}/examples/multiplot.py

@@ -14,6 +14,8 @@ y4  = numpy.cos(2*x)*numpy.exp(-x/10.)
 app = wx.App()
 
 pframe = wxmplot.MultiPlotFrame(rows=2,cols=3,panelsize=(2.5,1.75))
+
+
 pframe.plot(x,y1,panel=(0,0))
 pframe.plot(x,y2,panel=(0,1))
 pframe.plot(x,y3,panel=(1,1))
@@ -26,4 +28,3 @@ pframe.Show()
 pframe.Raise()
 
 app.MainLoop()
-

{wxmplot-0.9.18 → wxmplot-0.9.20}/examples/pilatus_display.py

@@ -1,10 +1,6 @@
 #
 # read Pilatus image into numpy array
 import sys
-if not hasattr(sys, 'frozen'):
-    import wxversion
-    wxversion.ensureMinimal('2.8')
-
 import wx
 from tifffile import imread
 from wxmplot import ImageFrame

{wxmplot-0.9.18 → wxmplot-0.9.20}/examples/scatterplot.py

@@ -3,19 +3,14 @@
 # scatterplot example, with lassoing and
 # a user-level lasso-callback
 import sys
-if not hasattr(sys, 'frozen'):
-    import wxversion
-    wxversion.ensureMinimal('2.8')
-
-import wxmplot
-
 import wx
+import wxmplot
 import numpy
 
 x   = numpy.arange(100)/20.0 + numpy.random.random(size=100)
 y   = numpy.random.random(size=len(x))
 def onlasso(data=None, selected=None, mask=None):
-    print ':: lasso ', selected
+    print( ':: lasso ', selected)
 
 app = wx.App()
 
@@ -28,5 +23,3 @@ pframe.write_message('WXMPlot PlotFrame example: Try Help->Quick Reference')
 pframe.Show()
 #
 app.MainLoop()
-
-

{wxmplot-0.9.18 → wxmplot-0.9.20}/examples/simple.py

@@ -1,13 +1,7 @@
 #!/usr/bin/python
 #
-# simple example of MPlot
+# simple example of wxMPlot
 import sys
-if not hasattr(sys, 'frozen'):
-    try:
-        import wxversion
-        wxversion.ensureMinimal('2.8')
-    except:
-        pass
 import wx
 import numpy
 import wxmplot

{wxmplot-0.9.18 → wxmplot-0.9.20}/examples/stripchart.py

@@ -2,10 +2,6 @@
 import time
 import numpy as np
 import sys
-if not hasattr(sys, 'frozen'):
-    import wxversion
-    wxversion.ensureMinimal('2.8')
-
 import wx
 from wx.lib import masked
 from floatcontrol import FloatCtrl
@@ -34,16 +30,17 @@ class StripChartFrame(wx.Frame):
         ID_EXIT  = wx.NewId()
         ID_TIMER = wx.NewId()
 
-        menu.Append(ID_EXIT, "E&xit", "Terminate the program")
+        menu_exit = menu.Append(ID_EXIT, "E&xit",
+                                "Terminate the program")
 
         menuBar = wx.MenuBar()
         menuBar.Append(menu, "&File");
         self.SetMenuBar(menuBar)
 
-        wx.EVT_MENU(self, ID_EXIT,  self.OnExit)
+        self.Bind(wx.EVT_MENU,  self.OnExit, menu_exit)
         self.Bind(wx.EVT_CLOSE, self.OnExit)
 
-        sbar = self.CreateStatusBar(2,wx.CAPTION|wx.THICK_FRAME)
+        sbar = self.CreateStatusBar(2,wx.CAPTION)
         sfont = sbar.GetFont()
         sfont.SetWeight(wx.BOLD)
         sfont.SetPointSize(11)
@@ -83,8 +80,8 @@ class StripChartFrame(wx.Frame):
         self.SetSizer(mainsizer)
         mainsizer.Fit(self)
 
-        wx.EVT_TIMER(self, ID_TIMER, self.onTimer)
-        self.timer = wx.Timer(self, ID_TIMER)
+        self.Bind(wx.EVT_TIMER, self.onTimer)
+        self.timer = wx.Timer(self)
         self.Refresh()
 
     def write_message(self, msg, panel=0):

{wxmplot-0.9.18 → wxmplot-0.9.20}/examples/tiff_display.py

@@ -1,13 +1,9 @@
 import sys
-if not hasattr(sys, 'frozen'):
-    import wxversion
-    wxversion.ensureMinimal('2.8')
-
 import wx
 from tifffile import imread
 from wxmplot import ImageFrame
 
-img = imread("ceo2.tiff")
+img = imread('Pilatus.tiff')
 
 app = wx.App()
 frame = ImageFrame()

{wxmplot-0.9.18 → wxmplot-0.9.20}/lib/__init__.py

@@ -1,13 +1,13 @@
 #!/usr/bin/env python
 #
 # Name:      wxmplot
-# Version:   0.9.14
-# Purpose:   Provide user-configurable 2D plotting module, using wxPython
+# Version:   0.9.20
+# user-configurable 2D plotting module, using wxPython
 #            and matplotlib.
 # Author:    Matthew Newville
-# Copyright: Matthew Newville, The University of Chicago, 2013
+# Copyright: Matthew Newville, The University of Chicago, 2016
 # Licence:   BSD license
-# Updated:   2013/11/23
+# Updated:   2016/11/22
 #-----------------------------------------------------------------------------
 
 """
@@ -64,18 +64,11 @@ these basic methods:
    save_figure():  bring up file dialog for saving image of figure
 """
 
-__version__  = '0.9.18'
-__date__     = '2015-Dec-14'
+__version__  = '0.9.20'
+__date__     = '2016-Nov-22'
 
 import sys
-try:
-    if not hasattr(sys, 'frozen'):
-        import wxversion
-        wxversion.ensureMinimal('2.8')
-except ImportError:
-    pass
-except: # probably a useless exception from ensureMinimal() about wx already being Imported.
-    pass
+import wx
 
 from .baseframe import BaseFrame
 from .plotframe import PlotFrame

{wxmplot-0.9.18 → wxmplot-0.9.20}/lib/baseframe.py

@@ -127,7 +127,7 @@ Matt Newville <newville@cars.uchicago.edu>""" % __version__
     ####
     def BuildFrame(self):
         # Python3 note: wxPython has no THICK_FRAME
-        sbar = self.CreateStatusBar(2, wx.CAPTION|wx.THICK_FRAME)
+        sbar = self.CreateStatusBar(2, wx.CAPTION)
         sfont = sbar.GetFont()
         sfont.SetWeight(wx.BOLD)
         sfont.SetPointSize(10)

{wxmplot-0.9.18 → wxmplot-0.9.20}/lib/basepanel.py

@@ -7,6 +7,8 @@ import sys
 import time
 import os
 import wx
+is_wxPhoenix = 'phoenix' in wx.PlatformInfo
+
 import matplotlib
 from matplotlib.widgets import Lasso
 from matplotlib import dates
@@ -194,7 +196,7 @@ class BasePanel(wx.Panel):
                             defaultDir = os.getcwd(),
                             defaultFile=ofile,
                             wildcard=file_choices,
-                            style=wx.SAVE|wx.CHANGE_DIR)
+                            style=wx.FD_SAVE|wx.FD_CHANGE_DIR)
 
         if dlg.ShowModal() == wx.ID_OK:
             path = dlg.GetPath()
@@ -473,14 +475,16 @@ class BasePanel(wx.Panel):
         zdc.SetBrush(wx.TRANSPARENT_BRUSH)
         zdc.SetPen(wx.Pen('White', 2, wx.SOLID))
         zdc.ResetBoundingBox()
-        zdc.BeginDrawing()
+        if not is_wxPhoenix:
+            zdc.BeginDrawing()
 
         # erase previous box
         if self.rbbox is not None:
             zdc.DrawRectangle(*self.rbbox)
         self.rbbox = (x0, y0, width, height)
         zdc.DrawRectangle(*self.rbbox)
-        zdc.EndDrawing()
+        if not is_wxPhoenix:
+            zdc.EndDrawing()
 
     def zoom_leftdown(self, event=None):
         """leftdown event handler for zoom mode"""

{wxmplot-0.9.18 → wxmplot-0.9.20}/lib/colors.py

@@ -4,6 +4,7 @@ color support for MPlot.
 
 """
 import numpy as np
+import six
 
 HAS_MPL = False
 try:
@@ -327,7 +328,7 @@ def hexcolor(color):
     " returns hex color given a tuple, wx.Color, or X11 named color"
     # first, if this is a hex color already, return!
     # Python 3: needs rewrite for str/unicode change
-    if isinstance(color, (str, unicode)):
+    if isinstance(color, six.string_types):
         if color[0] == '#' and len(color)==7:
             return color
 
@@ -337,7 +338,7 @@ def hexcolor(color):
         rgb = color
     elif isinstance(color, list):
         rgb = tuple(color)
-    elif isinstance(color, (str, unicode)):
+    elif isinstance(color, six.string_types):
         c = color.lower()
         if c.find(' ')>-1:    c = c.replace(' ','')
         if c.find('gray')>-1: c = c.replace('gray','grey')
@@ -404,7 +405,7 @@ def register_custom_colormaps():
     """
     registers custom color maps
     """
-    if not HAS_MPL: 
+    if not HAS_MPL:
         return ()
     makemap = LinearSegmentedColormap.from_list
     for name, val in custom_colormap_data.items():
@@ -417,4 +418,3 @@ def register_custom_colormaps():
 
     return ('stdgamma', 'red_heat', 'green_heat', 'blue_heat',
             'red', 'green', 'blue')
-

{wxmplot-0.9.18 → wxmplot-0.9.20}/lib/config.py

@@ -164,9 +164,9 @@ class PlotConfig:
     def __init__(self, canvas=None): # trace_color_callback=None):
         self.canvas = canvas
 
-        self.styles      = StyleMap.keys()
-        self.drawstyles  = DrawStyleMap.keys()
-        self.symbols     = MarkerMap.keys()
+        self.styles      = list(StyleMap.keys())
+        self.drawstyles  = list(DrawStyleMap.keys())
+        self.symbols     = list(MarkerMap.keys())
 
         self.legend_locs = ['upper right' , 'lower right', 'center right',
                             'upper left', 'lower left',  'center left',
@@ -311,6 +311,9 @@ class PlotConfig:
             for t in (ax.get_ticklabels() + ax.get_ticklines()):
                 t.set_color(self.textcolor)
         self.set_added_text_size()
+        if self.mpl_legend is not None:
+            for t in self.mpl_legend.get_texts():
+                t.set_color(self.textcolor)
         self.canvas.draw()
 
 
@@ -458,7 +461,11 @@ class PlotConfig:
             self.mpl_legend = lgn(lins, labs,
                                   loc=self.legend_loc,
                                   prop=self.legendfont)
+            for t in self.mpl_legend.get_texts():
+                t.set_color(self.textcolor)
             self.mpl_legend.draw_frame(self.show_legend_frame)
+            self.mpl_legend.legendPatch.set_facecolor(axes[0].get_axis_bgcolor())
+
         self.set_added_text_size()
         self.canvas.draw()
 

{wxmplot-0.9.18 → wxmplot-0.9.20}/lib/imageframe.py

@@ -4,7 +4,11 @@ wxmplot ImageFrame: a wx.Frame for image display, using matplotlib
 """
 import os
 import wx
-from wx._core import PyDeadObjectError
+is_wxPhoenix = 'phoenix' in wx.PlatformInfo
+if is_wxPhoenix:
+    PyDeadObjectError = RuntimeError
+else:
+    from wx._core import PyDeadObjectError
 
 import numpy as np
 from   matplotlib.cm import get_cmap
@@ -94,7 +98,7 @@ Keyboard Shortcuts:   (For Mac OSX, replace 'Ctrl' with 'Apple')
         self.config_mode = None
         if subtitles is not None:
             self.subtitles = subtitles
-        sbar = self.CreateStatusBar(2, wx.CAPTION|wx.THICK_FRAME)
+        sbar = self.CreateStatusBar(2, wx.CAPTION)
         sfont = sbar.GetFont()
         sfont.SetWeight(wx.BOLD)
         sfont.SetPointSize(10)
@@ -479,7 +483,7 @@ Keyboard Shortcuts:   (For Mac OSX, replace 'Ctrl' with 'Apple')
         cm_wid   = 1.00
         cm_ratio = 0.12
         col = 'int'
-        self.cmap_dat[col] = np.outer(np.ones(cmax*cm_ratio),
+        self.cmap_dat[col] = np.outer(np.ones(int(cmax*cm_ratio)),
                                        np.linspace(0, 1, cmax))
 
         fig = Figure((cm_wid, cm_wid*cm_ratio), dpi=150)
@@ -787,7 +791,7 @@ Keyboard Shortcuts:   (For Mac OSX, replace 'Ctrl' with 'Apple')
                             defaultDir=os.getcwd(),
                             defaultFile=ofile,
                             wildcard=file_choices,
-                            style=wx.SAVE|wx.CHANGE_DIR)
+                            style=wx.FD_SAVE|wx.FD_CHANGE_DIR)
 
         if dlg.ShowModal() == wx.ID_OK:
             self.cmap_canvas[col].print_figure(dlg.GetPath(), dpi=600)

{wxmplot-0.9.18 → wxmplot-0.9.20}/lib/imagepanel.py

@@ -73,6 +73,8 @@ class ImagePanel(BasePanel):
         conf.log_scale = False
         conf.rot, conf.flip_ud, conf.flip_lr = False, False, False
         conf.highlight_areas = []
+        if 1 in data.shape:
+            data = data.squeeze()
         self.data_shape = data.shape
         self.data_range = [0, data.shape[1], 0, data.shape[0]]
 
@@ -300,7 +302,7 @@ class ImagePanel(BasePanel):
                             defaultDir = os.getcwd(),
                             defaultFile=ofile,
                             wildcard=file_choices,
-                            style=wx.SAVE|wx.CHANGE_DIR)
+                            style=wx.FD_SAVE|wx.FD_CHANGE_DIR)
 
         if dlg.ShowModal() == wx.ID_OK:
             self.writeASCIIFile(dlg.GetPath(), title=title)

{wxmplot-0.9.18 → wxmplot-0.9.20}/lib/multiframe.py

@@ -101,7 +101,7 @@ class MultiPlotFrame(BaseFrame):
     ## create GUI
     ####
     def BuildFrame(self):
-        sbar = self.CreateStatusBar(2,wx.CAPTION|wx.THICK_FRAME)
+        sbar = self.CreateStatusBar(2,wx.CAPTION)
         sfont = sbar.GetFont()
         sfont.SetWeight(wx.BOLD)
         sfont.SetPointSize(10)
@@ -119,7 +119,7 @@ class MultiPlotFrame(BaseFrame):
                 self.panels[(i,j)] = PlotPanel(self, size=self.panelsize)
                 self.panels[(i,j)].messenger = self.write_message
                 panel = self.panels[(i,j)]
-                self.Build_DefaultUserMenus()
+
                 sizer.Add(panel,(i,j),(1,1),flag=wx.EXPAND|wx.ALIGN_CENTER)
                 panel.reportLeftDown = Closure(self.reportLeftDown,
                                                panelkey=(i,j))
@@ -147,4 +147,3 @@ class MultiPlotFrame(BaseFrame):
             self.BindMenuToPanel(panel=self.panel)
             self.panel.set_bg('#FEFEFA')
             self.panel.canvas.draw()
-

{wxmplot-0.9.18 → wxmplot-0.9.20}/lib/plotconfigframe.py

@@ -43,6 +43,35 @@ def autopack(panel, sizer):
     panel.SetSizer(sizer)
     sizer.Fit(panel)
 
+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()    
+
 class PlotConfigFrame(wx.Frame):
     """ GUI Configure Frame"""
     def __init__(self, parent=None, config=None, trace_color_callback=None):
@@ -243,7 +272,7 @@ class PlotConfigFrame(wx.Frame):
                         self.conf.plot_type == 'scatter')
         for i in range(self.nb.GetPageCount()):
             self.nb.GetPage(i).SetBackgroundColour(self.bgcol)
-        
+
         #bok = wx.Button(panel, -1, 'OK',    size=(-1,-1))
         #bok.Bind(wx.EVT_BUTTON,self.onExit)
 
@@ -373,11 +402,10 @@ class PlotConfigFrame(wx.Frame):
                             min_val=0, max_val=10, increment=0.5, digits=1)
             thk.Bind(EVT_FLOATSPIN, Closure(self.onThickness, argu=argu))
 
-            sty = wx.Choice(panel, -1, choices=self.conf.styles, size=(120,-1))
+            sty = wx.Choice(panel, choices=self.conf.styles, size=(120,-1))
             sty.Bind(wx.EVT_CHOICE,Closure(self.onStyle,argu=argu))
             sty.SetStringSelection(dsty)
 
-
             msz = FloatSpin(panel, -1,  pos=(-1,-1), size=(FSPINSIZE, 30), value=dmsz,
                             min_val=0, max_val=30, increment=1, digits=0)
             msz.Bind(EVT_FLOATSPIN, Closure(self.onMarkerSize, argu=argu))
@@ -573,8 +601,9 @@ class PlotConfigFrame(wx.Frame):
         except TypeError:
             s = ''
 
-        if '\\n' in s:
-            s = s.replace('\\n', '\n')
+        if '\\' in s and '$' in s:
+            s = clean_texmath(s)
+            # print(" s = ", s)
         if argu in ('xlabel', 'ylabel', 'y2label', 'title'):
             try:
                 kws = {argu: s}

{wxmplot-0.9.18 → wxmplot-0.9.20}/lib/plotpanel.py

@@ -5,6 +5,12 @@ wxmplot PlotPanel: a wx.Panel for 2D line plotting, using matplotlib
 import os
 import sys
 import wx
+is_wxPhoenix = 'phoenix' in wx.PlatformInfo
+if is_wxPhoenix:
+    wxCursor = wx.Cursor
+else:
+    wxCursor = wx.StockCursor
+
 from numpy import nonzero, where, ma, nan
 import matplotlib
 
@@ -166,7 +172,7 @@ class PlotPanel(BasePanel):
             axes.set_yscale(self.conf.yscale, basey=10)
         except:
             axes.set_yscale('linear')
-            
+
         axes.xaxis.set_major_formatter(FuncFormatter(self.xformatter))
         if self.use_dates:
             x_dates = [datetime.fromtimestamp(i) for i in xdata]
@@ -508,12 +514,18 @@ class PlotPanel(BasePanel):
 
     def configure(self, event=None):
         """show configuration frame"""
-        try:
-            self.win_config.Raise()
-        except:
+        if self.win_config is not None:
+            try:
+                self.win_config.Raise()
+            except:
+                self.win_config = None
+
+        if self.win_config is None:
             self.win_config = PlotConfigFrame(parent=self,
                                               config=self.conf,
                                               trace_color_callback=self.trace_color_callback)
+            self.win_config.Raise()
+
 
     ####
     ## create GUI
@@ -534,7 +546,7 @@ class PlotPanel(BasePanel):
         self.printer.canvas = self.canvas
         self.set_bg()
         self.conf.canvas = self.canvas
-        self.canvas.SetCursor(wx.StockCursor(wx.CURSOR_CROSS))
+        self.canvas.SetCursor(wxCursor(wx.CURSOR_CROSS))
 
         # overwrite ScalarFormatter from ticker.py here:
         self.axes.xaxis.set_major_formatter(FuncFormatter(self.xformatter))
@@ -605,7 +617,10 @@ class PlotPanel(BasePanel):
 
         # Axes positions update
         for ax in self.fig.get_axes():
-            ax.update_params()
+            try:
+                ax.update_params()
+            except ValueError:
+                pass
             ax.set_position(ax.figbox)
 
     def draw(self):
@@ -663,7 +678,7 @@ class PlotPanel(BasePanel):
         dlg = wx.FileDialog(self, message='Export Map Data to ASCII...',
                             defaultDir = os.getcwd(),
                             defaultFile=ofile,
-                            style=wx.SAVE|wx.CHANGE_DIR)
+                            style=wx.FD_SAVE|wx.FD_CHANGE_DIR)
 
         if dlg.ShowModal() == wx.ID_OK:
             self.writeASCIIFile(dlg.GetPath(), title=title)
@@ -703,7 +718,7 @@ class PlotPanel(BasePanel):
                             defaultDir=thisdir,
                             defaultFile=ofile,
                             wildcard=file_choices,
-                            style=wx.SAVE|wx.CHANGE_DIR)
+                            style=wx.FD_SAVE|wx.FD_CHANGE_DIR)
 
         if dlg.ShowModal() == wx.ID_OK:
             self.writeASCIIFile(dlg.GetPath(), title=title)

{wxmplot-0.9.18 → wxmplot-0.9.20}/lib/utils.py

@@ -2,6 +2,8 @@
 #
 
 import wx
+is_wxPhoenix = 'phoenix' in wx.PlatformInfo
+
 import sys
 import matplotlib
 if (matplotlib.__version__ < '1.2'):
@@ -50,7 +52,7 @@ class LabelEntry(wx.TextCtrl):
 #                     style=wx.ALIGN_LEFT|wx.ST_NO_AUTORESIZE)
 #  row   = wx.BoxSizer(wx.HORIZONTAL)
 #  row.Add(entry.label, 1,wx.ALIGN_LEFT|wx.EXPAND)
-#  row.Add(entry,    1,wx.ALIGN_LEFT|wx.EXPAND)        
+#  row.Add(entry,    1,wx.ALIGN_LEFT|wx.EXPAND)
 
     """
     def __init__(self,parent,value,size=-1,
@@ -64,7 +66,7 @@ class LabelEntry(wx.TextCtrl):
         if action is None:
             action = self.GetValue
         self.action = action
-        
+
         if labeltext is not None:
             self.label = wx.StaticText(parent, -1, labeltext,
                                        size = (labelsize,-1),
@@ -92,13 +94,13 @@ class LabelEntry(wx.TextCtrl):
             self.SetForegroundColour(color)
         if bgcolor:
             self.SetBackgroundColour(bgcolor)
-        
+
     def __act(self,event=None):
         self.action(event=event)
         val = self.GetValue()
         event.Skip()
         return val
-    
+
 class PrintoutWx(wx.Printout):
     """Simple wrapper around wx Printout class -- all the real work
     here is scaling the matplotlib canvas bitmap to the current
@@ -109,7 +111,7 @@ class PrintoutWx(wx.Printout):
                  title=None):
         if title is None:
             title = self._title_
-    
+
         wx.Printout.__init__(self, title=title)
         self.canvas = canvas
         self.width  = width
@@ -126,7 +128,10 @@ class PrintoutWx(wx.Printout):
 
         ppw,pph = self.GetPPIPrinter()      # printer's pixels per in
         pgw,pgh = self.GetPageSizePixels()  # page size in pixels
-        grw,grh = self.canvas.GetSizeTuple()
+        if is_wxPhoenix:
+            grw, grh = self.canvas.GetSize()
+        else:
+            grw, grh = self.canvas.GetSizeTuple()
         dc      = self.GetDC()
         dcw,dch = dc.GetSize()
 
@@ -150,7 +155,7 @@ class PrintoutWx(wx.Printout):
             self.canvas.draw()
         except:
             return
-        
+
         # page may need additional scaling on preview
         page_scale = 1.0
         if self.IsPreview():   page_scale = float(dcw)/pgw
@@ -264,5 +269,3 @@ def inside_poly(vertices,data):
         mask = Path(vertices).contains_points(data)
 
     return mask
-
-

{wxmplot-0.9.18 → wxmplot-0.9.20}/setup.py

@@ -19,7 +19,7 @@ setup(name = 'wxmplot',
       author_email = 'newville@cars.uchicago.edu',
       url          = 'http://newville.github.io/wxmplot/',
       download_url = 'http://github.com/newville/wxmplot/',
-      requires     = ('wx', 'numpy', 'matplotlib'),
+      requires     = ('wx', 'numpy', 'matplotlib', 'six'),
       license      = 'OSI Approved :: MIT License',
       description  = 'A library for plotting in wxPython using matplotlib',
       long_description = long_desc,

wxmplot-0.9.18/examples/Demo_py2app.py

@@ -1,48 +0,0 @@
-from setuptools import setup
-import epics
-import sys
-import os
-import wx
-import wx.lib.agw.flatnotebook
-import numpy
-import scipy
-import matplotlib
-matplotlib.use('WXAgg')
-
-import sqlalchemy
-import wxutils
-import wxmplot
-from wxmplot.plotframe import PlotFrame
-
-
-APP = 'demo.py'
-
-
-OPTIONS = {'includes': ['ConfigParser', 'Image', 'ctypes',
-                        'fpformat',
-                        'matplotlib', 'numpy', 'scipy',
-                        'scipy.constants', 'scipy.fftpack',
-                        'scipy.io.matlab.mio5_utils',
-                        'scipy.io.matlab.streams', 'scipy.io.netcdf',
-                        'scipy.optimize', 'scipy.signal',
-                        'scipy.sparse.csgraph._validation', 'skimage',
-                        'skimage.exposure', 'sqlalchemy',
-                        'sqlalchemy.dialects.sqlite', 'sqlalchemy.orm',
-                        'sqlalchemy.pool', 'sqlite3', 'wx', 'wx._core',
-                        'wx.lib', 'wx.lib.*', 'wx.lib.agw',
-                        'wx.lib.agw.flatnotebook',
-                        'wx.lib.agw.pycollapsiblepane',
-                        'wx.lib.colourselect', 'wx.lib.masked',
-                        'wx.lib.mixins', 'wx.lib.mixins.inspection',
-                        'wx.lib.newevent', 'wx.py', 'wxmplot', 'wxutils',
-                        'wxversion', 'xml.etree',
-                        'xml.etree.cElementTree'],
-           'excludes': ['Tkinter', '_tkinter', 'Tkconstants', 'tcl',
-                        'h5py.ipy_completer', 'IPython',
-                        '_imagingtk', 'PIL._imagingtk', 'ImageTk',
-                        'PIL.ImageTk', 'FixTk''_gtkagg', '_tkagg',
-                        'matplotlib.tests',
-                        'qt', 'PyQt4Gui', 'email', 'IPython'],
-           'site_packages': True,
-                        }
-setup(app=[APP],  options={'py2app': OPTIONS})

wxmplot-0.9.18/examples/dislin_comp.spec

@@ -1,33 +0,0 @@
-# -*- mode: python -*-
-
-block_cipher = None
-
-
-a = Analysis(['dislin_comp.py'],
-             pathex=['/Users/Newville/Codes/wxmplot/examples'],
-             binaries=None,
-             datas=None,
-             hiddenimports=[],
-             hookspath=None,
-             runtime_hooks=None,
-             excludes=None,
-             win_no_prefer_redirects=None,
-             win_private_assemblies=None,
-             cipher=block_cipher)
-pyz = PYZ(a.pure, a.zipped_data,
-             cipher=block_cipher)
-exe = EXE(pyz,
-          a.scripts,
-          exclude_binaries=True,
-          name='dislin_comp',
-          debug=False,
-          strip=None,
-          upx=True,
-          console=True )
-coll = COLLECT(exe,
-               a.binaries,
-               a.zipfiles,
-               a.datas,
-               strip=None,
-               upx=True,
-               name='dislin_comp')