mwxlib 0.79.8__py3-none-any.whl → 0.80.0__py3-none-any.whl

mwx/controls.py

@@ -5,8 +5,6 @@
 Author: Kazuya O'moto <komoto@jeol.co.jp>
 """
 from itertools import chain
-import numpy as np
-from numpy import nan, inf
 import wx
 import wx.lib.platebtn as pb
 import wx.lib.scrolledpanel as scrolled
@@ -15,6 +13,9 @@ from . import images
 from .utilus import SSM
 from .framework import pack, Menu, CtrlInterface
 
+import numpy as np
+from numpy import nan, inf
+
 
 class Param(object):
     """Standard Parameter
@@ -786,22 +787,27 @@ class Clipboard:
     @staticmethod
     def read():
         do = wx.TextDataObject()
-        wx.TheClipboard.Open() or print("- Unable to open the clipboard")
-        wx.TheClipboard.GetData(do)
-        wx.TheClipboard.Close()
-        text = do.GetText()
-        if Clipboard.verbose:
-            print("From clipboard: {}".format(text))
-        return text
+        if wx.TheClipboard.Open():
+            wx.TheClipboard.GetData(do)
+            wx.TheClipboard.Close()
+            text = do.GetText()
+            if Clipboard.verbose:
+                print("From clipboard: {}".format(text))
+            return text
+        else:
+            print("- Unable to open clipboard.")
     
     @staticmethod
     def write(text):
         do = wx.TextDataObject(str(text))
-        wx.TheClipboard.Open() or print("- Unable to open the clipboard")
-        wx.TheClipboard.SetData(do)
-        wx.TheClipboard.Close()
-        if Clipboard.verbose:
-            print("To clipboard: {}".format(text))
+        if wx.TheClipboard.Open():
+            wx.TheClipboard.SetData(do)
+            wx.TheClipboard.Flush()
+            wx.TheClipboard.Close()
+            if Clipboard.verbose:
+                print("To clipboard: {}".format(text))
+        else:
+            print("- Unable to open clipboard.")
 
 
 ## --------------------------------

mwx/framework.py

@@ -4,7 +4,7 @@
 
 Author: Kazuya O'moto <komoto@jeol.co.jp>
 """
-__version__ = "0.79.8"
+__version__ = "0.80.0"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial
@@ -1110,8 +1110,10 @@ class ShellFrame(MiniFrame):
     LOGGING_FILE = get_rootpath("deb-logging.log")
     HISTORY_FILE = get_rootpath("deb-history.log")
     
-    def load_session(self):
+    def load_session(self, rc=None):
         """Load session from file."""
+        if rc:
+            self.SESSION_FILE = os.path.abspath(rc)
         try:
             scratch = self.Scratch.default_buffer
             if not scratch or scratch.mtdelta is not None:
@@ -1120,9 +1122,7 @@ class ShellFrame(MiniFrame):
             
             with open(self.SESSION_FILE) as i:
                 exec(i.read())
-            return True
-        except FileNotFoundError:
-            pass
+            
         except Exception:
             traceback.print_exc()
             print("- Failed to load session")
@@ -1167,7 +1167,6 @@ class ShellFrame(MiniFrame):
                     if buffer.mtdelta is not None:
                         o.write("self.Scratch.load_file({!r}, {})\n".format(
                                 buffer.filename, buffer.markline+1))
-            return True
         except Exception:
             traceback.print_exc()
             print("- Failed to save session")

mwx/graphman.py

@@ -19,20 +19,14 @@ import platform
 import re
 import wx
 from wx import aui
-try:
-    from mwx import framework as mwx
-    from mwx.utilus import funcall as _F
-    from mwx.controls import ControlPanel, Icon
-    from mwx.framework import CtrlInterface
-    from mwx.matplot2g import GraphPlot
-    from mwx.matplot2lg import Histogram
-except ImportError:
-    from . import framework as mwx
-    from .utilus import funcall as _F
-    from .controls import ControlPanel, Icon
-    from .framework import CtrlInterface
-    from .matplot2g import GraphPlot
-    from .matplot2lg import Histogram
+
+from . import framework as mwx
+from .utilus import funcall as _F
+from .controls import ControlPanel, Icon
+from .framework import CtrlInterface
+from .matplot2g import GraphPlot
+from .matplot2lg import Histogram
+
 from matplotlib import cm
 from matplotlib import colors
 ## from matplotlib import pyplot as plt
@@ -1681,7 +1675,7 @@ class Frame(mwx.Frame):
         if flush:
             del self.graph[:]
             del self.output[:]
-            for name in list(self.plugins): # OrderedDict mutated during iteration
+            for name in list(self.plugins): # plugins:dict mutates during iteration
                 self.unload_plug(name)
         
         self.statusbar("Loading session from {!r}...".format(f))
@@ -1784,15 +1778,7 @@ if __name__ == "__main__":
     ## frm.load_plug("demo.template.py", show=1, force=1)
     ## frm.load_plug("demo/template.py", show=1, force=1)
     
-    frm.load_plug(r"C:\usr\home\lib\python\demo\template.py", show=1, dock=0)
-    
-    ## sys.path.append(r"C:\usr\home\lib\python\Lib\wxpyNautilus\plugins")
-    ## frm.require("viewfft")
-    ## frm.require("viewframe")
-    ## frm.require("lineprofile")
-    ## frm.require("ffmpeg_viewer")
-    ## frm.load_plug("randn.py", show=1, dock=0)
+    frm.load_plug(r"C:\usr\home\lib\python\demo\template.py", show=1, dock=4)
     
-    frm.shellframe.debugger.skip.remove(mwx.FSM.__module__)
     frm.Show()
     app.MainLoop()

mwx/matplot2.py

@@ -4,12 +4,10 @@
 
 Author: Kazuya O'moto <komoto@jeol.co.jp>
 """
-import sys
 import wx
-try:
-    from mwx import framework as mwx
-except ImportError:
-    from . import framework as mwx
+
+from . import framework as mwx
+
 import matplotlib; matplotlib.use('wxagg') # noqa
 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
 from matplotlib.backends.backend_wxagg import NavigationToolbar2WxAgg as Toolbar
@@ -21,6 +19,7 @@ from matplotlib.figure import Figure
 from matplotlib import cm
 import numpy as np
 
+
 ## state constants
 NORMAL = 'Normal'
 DRAGGING = '-dragging'

mwx/matplot2g.py

@@ -5,18 +5,13 @@
 Author: Kazuya O'moto <komoto@jeol.co.jp>
 """
 import traceback
-import sys
 import wx
-try:
-    from mwx import framework as mwx
-    from mwx.utilus import funcall as _F
-    from mwx.matplot2 import MatplotPanel
-    from mwx.matplot2 import NORMAL, DRAGGING, PAN, ZOOM, MARK, LINE, REGION
-except ImportError:
-    from . import framework as mwx
-    from .utilus import funcall as _F
-    from .matplot2 import MatplotPanel
-    from .matplot2 import NORMAL, DRAGGING, PAN, ZOOM, MARK, LINE, REGION
+
+from . import framework as mwx
+from .utilus import funcall as _F
+from .matplot2 import MatplotPanel
+from .matplot2 import NORMAL, DRAGGING, PAN, ZOOM, MARK, LINE, REGION
+
 from matplotlib import cm
 from matplotlib import patches
 from PIL import Image
@@ -371,36 +366,47 @@ class Clipboard:
     
     @staticmethod
     def imread():
-        try:
-            do = wx.BitmapDataObject()
-            wx.TheClipboard.Open() or print("- Unable to open the clipboard")
+        do = wx.BitmapDataObject()
+        if wx.TheClipboard.Open():
             wx.TheClipboard.GetData(do)
+            wx.TheClipboard.Close()
             bmp = do.GetBitmap()
+        else:
+            print("- Unable to open clipboard.")
+            return
+        try:
+            ## Convert bmp --> buf
             img = bmp.ConvertToImage()
             buf = np.array(img.GetDataBuffer()) # do copy, don't ref
             if Clipboard.verbose:
                 print("From clipboard {:.1f} Mb data".format(buf.nbytes/1e6))
             w, h = img.GetSize()
             return buf.reshape(h, w, 3)
-        finally:
-            wx.TheClipboard.Close()
+        except Exception:
+            print("- The contents of the clipboard are not images.")
     
     @staticmethod
     def imwrite(buf):
         try:
+            ## Convert buf --> bmp
             h, w = buf.shape[:2]
             if buf.ndim < 3:
                 ## buf = np.array([buf] * 3).transpose((1,2,0)) # convert to gray bitmap
-                buf = buf.repeat(3, axis=1)
+                buf = buf.repeat(3, axis=1) # convert to gray bitmap
             img = wx.Image(w, h, buf.tobytes())
             bmp = img.ConvertToBitmap()
-            do = wx.BitmapDataObject(bmp)
-            wx.TheClipboard.Open() or print("- Unable to open the clipboard")
+        except Exception:
+            print("- The contents of the clipboard are not images.")
+            return
+        do = wx.BitmapDataObject(bmp)
+        if wx.TheClipboard.Open():
             wx.TheClipboard.SetData(do)
+            wx.TheClipboard.Flush()
+            wx.TheClipboard.Close()
             if Clipboard.verbose:
                 print("To clipboard: {:.1f} Mb data".format(buf.nbytes/1e6))
-        finally:
-            wx.TheClipboard.Close()
+        else:
+            print("- Unable to open clipboard.")
 
 
 class GraphPlot(MatplotPanel):

mwx/matplot2lg.py

@@ -5,18 +5,13 @@
 Author: Kazuya O'moto <komoto@jeol.co.jp>
 """
 from itertools import chain
-import sys
 import wx
-try:
-    from mwx import framework as mwx
-    from mwx.utilus import funcall as _F
-    from mwx.matplot2 import MatplotPanel
-    from mwx.matplot2 import NORMAL, MARK, LINE, REGION
-except ImportError:
-    from . import framework as mwx
-    from .utilus import funcall as _F
-    from .matplot2 import MatplotPanel
-    from .matplot2 import NORMAL, MARK, LINE, REGION
+
+from . import framework as mwx
+from .utilus import funcall as _F
+from .matplot2 import MatplotPanel
+from .matplot2 import NORMAL, MARK, LINE, REGION
+
 from matplotlib import patches
 import numpy as np
 from scipy import signal

mwx/nutshell.py

@@ -1376,7 +1376,13 @@ class Buffer(EditWindow, EditorInterface):
             self.__mtime = os.path.getmtime(f)
         else:
             self.__mtime = None
+        try:
+            renamed = (self.filename != f)
+        except AttributeError:
+            renamed = False
         self.__filename = f
+        if renamed:
+            self.parent.handler('buffer_filename_set', self)
     
     @property
     def mtdelta(self):
@@ -1695,9 +1701,10 @@ class EditorBook(aui.AuiNotebook, CtrlInterface):
               'buffer_selected' : [ None, ],
              'buffer_activated' : [ None, ],
            'buffer_inactivated' : [ None, ],
+          'buffer_filename_set' : [ None, ],
+                 'title_window' : [ None, dispatch ],
              '*button* pressed' : [ None, dispatch, skip ],
             '*button* released' : [ None, dispatch, skip ],
-                 'title_window' : [ None, dispatch ],
             },
             0 : { # Normal mode
                     '* pressed' : (0, skip),

mwx/utilus.py

@@ -4,7 +4,6 @@
 
 Author: Kazuya O'moto <komoto@jeol.co.jp>
 """
-from collections import OrderedDict
 from functools import wraps
 from bdb import BdbQuit
 import traceback
@@ -396,7 +395,7 @@ def get_rootpath(f):
 ## Finite State Machine
 ## --------------------------------
 
-class SSM(OrderedDict):
+class SSM(dict):
     """Single State Machine/Context of FSM
     """
     def __call__(self, event, *args, **kwargs):
@@ -664,7 +663,7 @@ class FSM(dict):
         context = self[state]
         ast = []
         bra = []
-        for event in list(context): #? OrderedDict mutated during iteration
+        for event in list(context): # context mutates during iteration
             if re.search(r"\[.+\]", event):
                 bra.append((event, context.pop(event))) # event key has '[]'
             elif '*' in event or '?' in event:
@@ -709,8 +708,10 @@ class FSM(dict):
                         continue
                     for act in transaction[1:]:
                         self.unbind(event, act, k)
-                    if not any(callable(x) for x in transaction):
-                        self[k].pop(event) # remove null event:transaction
+        ## cleanup
+        for k, v in list(self.items()): # self mutates during iteration
+            if not v:
+                del self[k]
     
     def define(self, event, action=None, state=None, state2=None):
         self.unbind(event, None, state)
@@ -800,7 +801,7 @@ class FSM(dict):
 
 
 class TreeList(object):
-    """TreeList of <item : (key, data)>
+    """Tree access wrapper of list<item : (key, value)>
     [
         [key, [item,
                item, ...]],
@@ -814,8 +815,11 @@ class TreeList(object):
     ## __getattr__ may be called before __init__.
     __items = None
     
-    def __init__(self):
-        self.__items = []
+    def __init__(self, ls=None):
+        self.__items = ls or []
+    
+    def __call__(self, k):
+        return TreeList(self[k])
     
     def __getattr__(self, attr):
         return getattr(self.__items, attr)
@@ -841,7 +845,28 @@ class TreeList(object):
             return self.delf(self.__items, k)
         return self.__items.__delitem__(k)
     
-    @classmethod
+    def items(self):
+        def _items(ls, key=None):
+            for item in ls:
+                try:
+                    k, v = item
+                    rootkey = f"{key}/{k}" if key else k
+                except Exception:
+                    yield key, item
+                else:
+                    if v and isinstance(v, (list, tuple)):
+                        yield from _items(v, rootkey)
+                    else:
+                        yield rootkey, v
+        yield from _items(self)
+    
+    def _find_item(self, ls, key):
+        for x in ls:
+            if isinstance(x, (tuple, list)) and x and x[0] == key:
+                if len(x) < 2:
+                    raise ValueError("No value for key={!r}".format(key))
+                return x
+    
     def getf(self, ls, key):
         if '/' in key:
             a, b = key.split('/', 1)
@@ -849,9 +874,10 @@ class TreeList(object):
             if la is not None:
                 return self.getf(la, b)
             return None
-        return next((x[-1] for x in ls if x and x[0] == key), None)
+        li = self._find_item(ls, key)
+        if li is not None:
+            return li[-1]
     
-    @classmethod
     def setf(self, ls, key, value):
         if '/' in key:
             a, b = key.split('/', 1)
@@ -861,18 +887,17 @@ class TreeList(object):
             p, key = key.rsplit('/', 1)
             return self.setf(ls, p, [[key, value]]) # >>> ls[p].append([key, value])
         try:
-            li = next((x for x in ls if x and x[0] == key), None)
+            li = self._find_item(ls, key)
             if li is not None:
-                if isinstance(value, list):
-                    li[-1][:] = value # assign value:list to items:list
-                else:
-                    li[-1] = value # assign value to item (li must be a list)
+                try:
+                    li[-1] = value # assign value to item (ls must be a list)
+                except TypeError:
+                    li[-1][:] = value # assign value to items:list
             else:
                 ls.append([key, value]) # append to items:list
-        except (TypeError, AttributeError) as e:
+        except (ValueError, TypeError, AttributeError) as e:
             print("- TreeList:warning {!r}: key={!r}".format(e, key))
     
-    @classmethod
     def delf(self, ls, key):
         if '/' in key:
             p, key = key.rsplit('/', 1)

{mwxlib-0.79.8.dist-info → mwxlib-0.80.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mwxlib
-Version: 0.79.8
+Version: 0.80.0
 Summary: A wrapper of matplotlib and wxPython (phoenix)
 Home-page: https://github.com/komoto48g/mwxlib
 Author: Kazuya O'moto <komoto@jeol.co.jp>

mwxlib-0.80.0.dist-info/RECORD

@@ -0,0 +1,22 @@
+mwx/__init__.py,sha256=CxhKHOhig62F8p6GvP5gii-VvQtSjp9yWJpHvC_Kans,2592
+mwx/controls.py,sha256=d5ZRw21nXxV06QHV5Y9t85Lqm3pLZRoPS27YknC_H54,42455
+mwx/framework.py,sha256=m4iGorLqvdUnsr_6aP3uECEMe55WXAcc5vZY2EdRL98,69041
+mwx/graphman.py,sha256=M5hUEW4hZDlXTOvROab2te68HWb6OVgxakz8Z4iEEy0,69214
+mwx/images.py,sha256=9e8X7OpJ6Z3fF3ez17P_qk2D1NMO10-lN8TCtulAqT0,46248
+mwx/matplot2.py,sha256=OnG33VYvNY9tPbTiUdhM1bibnMwx8Z91hq2Wv7az78s,36000
+mwx/matplot2g.py,sha256=yfF4r6juclU1I1k41lGb_VwxRmp0ktuD8az-wQ26MsE,67727
+mwx/matplot2lg.py,sha256=Dnz_U7K_QkPmsJd18WzZ6PkaTOtWu_IwOgkfEdJv4d0,27606
+mwx/mgplt.py,sha256=49_wpFZUEKErQmtobqrlNKDjWlAsdLft-izlqSyGPD0,6878
+mwx/nutshell.py,sha256=EO4s_67Dk4EiI7h-3vHOzWyI9WnaXl4QQmsVkF7s5Xk,133557
+mwx/utilus.py,sha256=3VaUX_hclVLYixOyDC-4gxxug9_4kMzCTQcDuHs3REA,34863
+mwx/wxmon.py,sha256=Odmh13Ek4oJo9V5uFCTemoWlsPyZt4ITTmYZiKl_BKI,11405
+mwx/wxpdb.py,sha256=WweNxRCaJa3DAO8mkpU57sluTk4oxBEZm44AVBR4vSI,18700
+mwx/wxwil.py,sha256=BUfEF0Nc1E-mVC3Vdz6k1E-2s5J0PO6qEzRQ6lfyePI,5246
+mwx/wxwit.py,sha256=M_jRGJOZge2B4Cq1OsAHqnGjeg56UI-v1BolDybPR-o,7246
+mwx/py/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mwx/py/filling.py,sha256=NnQnfUVol-Nz4QYZUKFIyRX-Yxp54m5n54Yxza3Iwho,16655
+mwxlib-0.80.0.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.80.0.dist-info/METADATA,sha256=8cua-4t5PPXlX-lsmZ587VDduSYK6DdMSieqonWiLQg,1995
+mwxlib-0.80.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+mwxlib-0.80.0.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.80.0.dist-info/RECORD,,

mwxlib-0.79.8.dist-info/RECORD

@@ -1,22 +0,0 @@
-mwx/__init__.py,sha256=CxhKHOhig62F8p6GvP5gii-VvQtSjp9yWJpHvC_Kans,2592
-mwx/controls.py,sha256=zUAiaJp-eypBjtRCfmL7zbIyOQw3r6mZmlzVrvFLyE4,42324
-mwx/framework.py,sha256=kdWJs4ccryP0ynTtXJPotJ5raQ2k2YKu9VoPqUyFREE,69052
-mwx/graphman.py,sha256=MIN4Ddd-Dc2F_F4DBYJxjcQ3gN661uv2WG7xLYEHxJ0,69846
-mwx/images.py,sha256=9e8X7OpJ6Z3fF3ez17P_qk2D1NMO10-lN8TCtulAqT0,46248
-mwx/matplot2.py,sha256=8eRrf6G4On-wi2F-SizQbOcNFWoJG4P8172PU4ke3mQ,36075
-mwx/matplot2g.py,sha256=fgbeaOsXmQLwur69BSKNh1qS7XokgWCyN_IaTVeUPCE,67611
-mwx/matplot2lg.py,sha256=Uybj8ZpK8N3E7KmTog4Mipf03am6Z6gknautOtC39QY,27837
-mwx/mgplt.py,sha256=49_wpFZUEKErQmtobqrlNKDjWlAsdLft-izlqSyGPD0,6878
-mwx/nutshell.py,sha256=4yMxL9pO9pXIO53PXCtlVbbahKoHlRUliq8e3k8Srpk,133309
-mwx/utilus.py,sha256=c1NRpehYxyE2GzN9mIW3FW6TJPjaZfsilpH9-qw4IJE,34086
-mwx/wxmon.py,sha256=Odmh13Ek4oJo9V5uFCTemoWlsPyZt4ITTmYZiKl_BKI,11405
-mwx/wxpdb.py,sha256=WweNxRCaJa3DAO8mkpU57sluTk4oxBEZm44AVBR4vSI,18700
-mwx/wxwil.py,sha256=BUfEF0Nc1E-mVC3Vdz6k1E-2s5J0PO6qEzRQ6lfyePI,5246
-mwx/wxwit.py,sha256=M_jRGJOZge2B4Cq1OsAHqnGjeg56UI-v1BolDybPR-o,7246
-mwx/py/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mwx/py/filling.py,sha256=NnQnfUVol-Nz4QYZUKFIyRX-Yxp54m5n54Yxza3Iwho,16655
-mwxlib-0.79.8.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.79.8.dist-info/METADATA,sha256=9QEcfsV2sn0hAyu5I3jTQgWlJGI0MvPQTjg52WRzZRQ,1995
-mwxlib-0.79.8.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-mwxlib-0.79.8.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.79.8.dist-info/RECORD,,