mwxlib 0.95.9__py3-none-any.whl → 0.96.1__py3-none-any.whl

mwx/controls.py

@@ -12,7 +12,7 @@ from .utilus import funcall as _F
 from .framework import pack, Menu
 
 import numpy as np
-from numpy import nan, inf
+from numpy import nan, inf  # noqa: necessary to eval
 
 
 def _Tip(*tips):
@@ -97,10 +97,8 @@ class Param(object):
             v = self.std_value
             if v is None:
                 return
-        elif v == 'nan': v = nan
-        elif v == 'inf': v = inf
-        elif isinstance(v, str):
-            v = self.__eval(v.replace(',', '')) # eliminates commas
+        if isinstance(v, str):
+            v = self.__eval(v.replace(',', '')) # eliminates commas; includes nan, inf
         self._set_value(v)
         if backcall:
             self.callback('control', self)
@@ -111,7 +109,8 @@ class Param(object):
         """
         if v is None:
             v = nan
-        if v in (nan, inf):
+        
+        if np.isnan(v) or np.isinf(v):
             self.__value = v
             for knob in self.knobs:
                 knob.update_ctrl(None, notify=False)
@@ -185,7 +184,7 @@ class Param(object):
     @offset.setter
     def offset(self, v):
         if self.std_value is not None:
-            if v is not nan: # Note: nan +x is not nan
+            if not np.isnan(v):
                 v += self.std_value
         self._set_value(v)
     
@@ -253,6 +252,7 @@ class LParam(Param):
     
     @range.setter
     def range(self, v):
+        assert v is None or len(v) <= 3, "The range must be of length <= 3 or None"
         if v is None:
             v = (0, 0)
         self.__min = v[0]
@@ -266,7 +266,8 @@ class LParam(Param):
         """A knob index -> value
         Returns -1 if the value is nan or inf.
         """
-        if self.value in (nan, inf):
+        v = self.value
+        if np.isnan(v) or np.isinf(v):
             return -1
         return int(round((self.value - self.min) / self.step))
     
@@ -319,7 +320,7 @@ class Knob(wx.Panel):
         wx.Panel.__init__(self, parent, **kwargs)
         
         assert isinstance(param, Param),\
-          "Argument `param` must be an instance of Param class."
+          "Argument `param` must be an instance of Param"
         
         self.__bit = 1
         self.__par = param

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.95.9"
+__version__ = "0.96.1"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial
@@ -232,7 +232,7 @@ class KeyCtrlInterfaceMixin:
         state = self.handler.default_state
         event = keymap + ' pressed'
         
-        assert state is not None, "Don't make keymap for None:state."
+        assert state is not None, "Don't make keymap for None:state"
         
         self.handler.update({ # DNA<KeyCtrlInterfaceMixin>
             state : {
@@ -1131,7 +1131,7 @@ class ShellFrame(MiniFrame):
                                  stdout=self.__shell.interp.stdout,
                                  skip=[Debugger.__module__, # Don't enter debugger
                                        EventMonitor.__module__, # Don't enter event-hook
-                                       ## FSM.__module__,
+                                       FSM.__module__,
                                        'fnmatch', 'warnings', 'bdb', 'pdb',
                                        'wx.core', 'wx.lib.eventwatcher',
                                        ],

mwx/graphman.py

@@ -28,7 +28,7 @@ from PIL.TiffImagePlugin import TiffImageFile
 from . import framework as mwx
 from .utilus import funcall as _F
 from .controls import ControlPanel, Icon
-from .framework import CtrlInterface, AuiNotebook
+from .framework import CtrlInterface, AuiNotebook, Menu, FSM
 
 from .matplot2 import MatplotPanel # noqa
 from .matplot2g import GraphPlot
@@ -96,7 +96,7 @@ class Thread(object):
         try:
             self.handler = self.owner.handler
         except AttributeError:
-            self.handler = mwx.FSM({ # DNA<Thread>
+            self.handler = FSM({ # DNA<Thread>
                 None : {
                  'thread_begin' : [ None ], # begin processing
                    'thread_end' : [ None ], # end processing
@@ -263,10 +263,10 @@ class LayerInterface(CtrlInterface):
     ## thread_type = Thread
     thread = None
     
-    ## layout helper function
+    ## layout helper function (deprecated: internal use only)
     pack = mwx.pack
     
-    ## funcall = interactive_call
+    ## funcall = interactive_call (deprecated: internal use only)
     funcall = staticmethod(_F)
     
     ## for debug (internal use only)
@@ -384,7 +384,7 @@ class LayerInterface(CtrlInterface):
                 lambda v: self.parent.inspect_plug(self.__module__)),
         ]
         self.Bind(wx.EVT_CONTEXT_MENU,
-                  lambda v: mwx.Menu.Popup(self, self.menu))
+                  lambda v: Menu.Popup(self, self.menu))
         
         self.Bind(wx.EVT_WINDOW_DESTROY, self.OnDestroy)
         self.Bind(wx.EVT_SHOW, self.OnShow)
@@ -699,14 +699,15 @@ class Frame(mwx.Frame):
                 lambda v: self.save_buffers_as_tiffs(),
                 lambda v: v.Enable(self.__view.frame is not None)),
             (),
-            ## ("Index", (
-            ##     (mwx.ID_(11), "&Import index\tCtrl+Shift+o", "Import index file", Icon('open'),
-            ##         lambda v: self.load_index()),
-            ##         
-            ##     (mwx.ID_(12), "&Export index\tCtrl+Shift+s", "Export index file", Icon('saveas'),
-            ##         lambda v: self.save_index(),
-            ##         lambda v: v.Enable(self.__view.frame is not None)),
-            ##     )),
+            ("Index", (
+                (mwx.ID_(11), "&Import index\tCtrl+Shift+o", "Import index file", Icon('open'),
+                    lambda v: self.load_index()),
+                    
+                (mwx.ID_(12), "&Export index\tCtrl+Shift+s", "Export index file", Icon('saveas'),
+                    lambda v: self.save_index(),
+                    lambda v: v.Enable(self.__view.frame is not None)),
+                )),
+            (),
             ("Session", (
                 (mwx.ID_(15), "&Open session", "Open session file",
                     lambda v: self.load_session()),
@@ -1380,7 +1381,8 @@ class Frame(mwx.Frame):
             plug = _plug
         init(shell)
         self.shellframe.Show()
-        self.shellframe.load(plug)
+        if wx.GetKeyState(wx.WXK_SHIFT):
+            self.shellframe.load(plug)
     
     def OnLoadPlugins(self, evt):
         with wx.FileDialog(self, "Load a plugin file",

mwx/matplot2.py

@@ -12,6 +12,7 @@ from matplotlib import cm
 import numpy as np
 
 from . import framework as mwx
+from .framework import hotkey, regulate_key, pack, Menu, FSM
 
 
 ## state constants
@@ -111,7 +112,7 @@ class MatplotPanel(wx.Panel):
         self.infobar.Size = (0, 0) # workaround for incorrect wrap sizing
         
         self.SetSizer(
-            mwx.pack(self, (
+            pack(self, (
                 (self.canvas,   1, wx.EXPAND | wx.ALL, 0),
                 (self.infobar,  0, wx.EXPAND | wx.ALL, 0),
                 (self.modeline, 0, wx.EXPAND | wx.ALL, 2),
@@ -162,7 +163,7 @@ class MatplotPanel(wx.Panel):
             if self.handler.fork(self.handler.current_event, evt) is None:
                 evt.Skip()
         
-        self.__handler = mwx.FSM({ # DNA<MatplotPanel>
+        self.__handler = FSM({ # DNA<MatplotPanel>
                 None : {
                   'canvas_draw' : [ None, self.OnDraw ], # before canvas.draw
                 #'canvas_drawn' : [ None, ],             # after canvas.draw
@@ -397,6 +398,7 @@ class MatplotPanel(wx.Panel):
             self.modeline.SetBackgroundColour(self.selectedModeLineBg)
             self.modeline.SetForegroundColour(self.selectedModeLineFg)
             self.modeline.Refresh()
+        self.escape()
         evt.Skip()
     
     def on_focus_kill(self, evt): #<wx._core.FocusEvent>
@@ -404,6 +406,7 @@ class MatplotPanel(wx.Panel):
             self.modeline.SetBackgroundColour(self.unselectedModeLineBg)
             self.modeline.SetForegroundColour(self.unselectedModeLineFg)
             self.modeline.Refresh()
+        self.escape()
         evt.Skip()
     
     def escape(self, evt=None):
@@ -491,7 +494,7 @@ class MatplotPanel(wx.Panel):
     def on_menu(self, evt): #<matplotlib.backend_bases.MouseEvent>
         if self.__isMenu:
             self.canvas.SetFocus()
-            mwx.Menu.Popup(self, self.menu)
+            Menu.Popup(self, self.menu)
         self.__isMenu = 0
     
     def on_pick(self, evt): #<matplotlib.backend_bases.PickEvent>
@@ -527,8 +530,8 @@ class MatplotPanel(wx.Panel):
     
     def on_hotkey_press(self, evt): #<wx._core.KeyEvent>
         """Called when a key is pressed."""
-        key = mwx.hotkey(evt)
-        self.__key = mwx.regulate_key(key + '+')
+        key = hotkey(evt)
+        self.__key = regulate_key(key + '+')
         if self.handler('{} pressed'.format(key), evt) is None:
             evt.Skip()
     
@@ -543,7 +546,7 @@ class MatplotPanel(wx.Panel):
     
     def on_hotkey_release(self, evt): #<wx._core.KeyEvent>
         """Called when a key is released."""
-        key = mwx.hotkey(evt)
+        key = hotkey(evt)
         self.__key = ''
         if self.handler('{} released'.format(key), evt) is None:
             evt.Skip()

mwx/matplot2g.py

@@ -10,10 +10,11 @@ from matplotlib import patches
 from PIL import Image
 import cv2
 import numpy as np
-from numpy import pi, nan
+from numpy import pi
 from scipy import ndimage as ndi
 
 from . import framework as mwx
+from .framework import Menu
 from .utilus import funcall as _F
 from .controls import Clipboard
 from .matplot2 import MatplotPanel
@@ -223,16 +224,18 @@ class AxesImagePhantom(object):
     @property
     def unit(self):
         """Logical length per pixel arb.unit [u/pixel]."""
-        return self.__localunit or self.parent.globalunit
+        return self.__localunit or self.parent.unit
     
     @unit.setter
     def unit(self, v):
         u = self.unit
-        if v in (None, nan):
-            v = self.parent.globalunit
+        if v is None:
+            v = self.parent.unit
             self.__localunit = None
+        elif np.isnan(v) or np.isinf(v):
+            raise ValueError("The unit value cannot be NaN or Inf")
         elif v <= 0:
-            raise Exception("The unit value must be greater than zero.")
+            raise ValueError("The unit value must be greater than zero")
         else:
             if v == self.__localunit: # no effect when v is localunit
                 return
@@ -248,7 +251,7 @@ class AxesImagePhantom(object):
     
     @property
     def xy_unit(self):
-        u = self.__localunit or self.parent.globalunit
+        u = self.__localunit or self.parent.unit
         return (u, u * self.__aspect_ratio)
     
     @property
@@ -583,7 +586,7 @@ class GraphPlot(MatplotPanel):
                 lambda v: v.Check(self.frame is not None and self.frame.name == s))
         
         self.modeline.Bind(wx.EVT_CONTEXT_MENU, lambda v:
-            mwx.Menu.Popup(self,
+            Menu.Popup(self,
                 (_menu(j, art.name) for j, art in enumerate(self.__Arts))))
         
         self.modeline.Show(1)
@@ -827,10 +830,12 @@ class GraphPlot(MatplotPanel):
     
     @unit.setter
     def unit(self, v):
-        if v in (None, nan):
-            raise Exception("The globalunit must be non-nil value.")
+        if v is None:
+            raise ValueError("The globalunit must be non-nil value")
+        elif np.isnan(v) or np.isinf(v):
+            raise ValueError("Axis limits cannot be NaN or Inf")
         elif v <= 0:
-            raise Exception("The unit value must be greater than zero.")
+            raise ValueError("The unit value must be greater than zero")
         else:
             if v == self.__unit:  # no effect unless unit changes
                 return
@@ -843,7 +848,7 @@ class GraphPlot(MatplotPanel):
             for art in self.__Arts:
                 self.handler('frame_updated', art)
     
-    globalunit = unit
+    globalunit = unit # for backward compatibility
     
     def update_markup_ratio(self, r):
         """Modify markup objects position."""

mwx/nutshell.py

@@ -1986,7 +1986,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
                     self.swap_buffer(buf, lineno)
                     return True
                 ## return False
-                raise Exception("The requested URL was not found.")
+                raise Exception("The requested URL was not found")
             if buf._load_file(filename):
                 self.swap_buffer(buf, lineno)
                 return True

mwx/plugins/ffmpeg_view.py

@@ -106,8 +106,8 @@ class Plugin(Layer):
                         updater=self.get_crop,
                         )
         
-        self.snp = Button(self, handler=self.snapshot, tip='Snapshot', icon='clock')
-        self.exp = Button(self, handler=self.export, tip="Export", icon='save')
+        self.snp = Button(self, handler=self.snapshot, icon='clock')
+        self.exp = Button(self, handler=self.export, icon='save')
         
         self.rw = Button(self, handler=lambda v: self.seekdelta(-100), icon='|<-')
         self.fw = Button(self, handler=lambda v: self.seekdelta(+100), icon='->|')

mwx/utilus.py

@@ -438,9 +438,8 @@ def find_modules(force=False, verbose=True):
         for info in walk_packages_no_import(['.']):
             _callback('.', info.name)
     else:
-        print("Please wait a moment "
-              "while Py{} gathers a list of all available modules... "
-              "(This is executed once)".format(sys.winver))
+        print(f"Please wait a moment while Py{sys.winver} gathers a list of "
+               "all available modules... (This is executed once)")
         
         lm = list(sys.builtin_module_names)
         
@@ -684,7 +683,6 @@ class FSM(dict):
                               "  action : {}".format(typename(act)),
                               "  args   : {}".format(args),
                               "  kwargs : {}".format(kwargs))
-                    traceback.print_exc()
             self.__matched_pattern = None
             return retvals
         
@@ -728,12 +726,11 @@ class FSM(dict):
     
     @staticmethod
     def dump(*args):
-        print(*args, sep='\n', file=sys.__stderr__)
         fn = get_rootpath("deb-dump.log")
         with open(fn, 'a') as o:
             print(time.strftime('!!! %Y/%m/%d %H:%M:%S'), file=o)
-            print(*args, sep='\n', end='\n', file=o)
-            print(traceback.format_exc(), file=o)
+            print(*args, traceback.format_exc(), sep='\n', file=o)
+        print(*args, traceback.format_exc(), sep='\n', file=sys.__stderr__)
     
     @staticmethod
     def duplicate(context):

{mwxlib-0.95.9.dist-info → mwxlib-0.96.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mwxlib
-Version: 0.95.9
+Version: 0.96.1
 Summary: A wrapper of matplotlib and wxPython (phoenix)
 Home-page: https://github.com/komoto48g/mwxlib
 Author: Kazuya O'moto

{mwxlib-0.95.9.dist-info → mwxlib-0.96.1.dist-info}/RECORD

@@ -1,28 +1,28 @@
 mwx/__init__.py,sha256=nN62CGTWjME7Zz2h-jIRB8MxwuErIkHPGrlBzydkF0o,643
 mwx/bookshelf.py,sha256=DAhMQk3_J4rdE50adBMFu5wNz3WdMh_zzJ37O9ncceo,5103
-mwx/controls.py,sha256=IAT3l3-azlPFtMc2VGNMiQhI390ExW0S4CgjEOKFI4s,48200
-mwx/framework.py,sha256=OVFv_5c-vrXRuvWm9YN8cHWmvN-svodmMAnlOAPBwQ4,75669
-mwx/graphman.py,sha256=NBe58KdAstFNPqyEmpPMMmWwjtNgJB7HumSI7-gjw54,70533
+mwx/controls.py,sha256=2US02WAmYVydsPJ8ILzZ7opV83giX1P6kY5rr_ZTX2E,48278
+mwx/framework.py,sha256=rzhushWI0BYuGeorx4M6ElKEtpMxrQIrlKOxqqEIokI,75665
+mwx/graphman.py,sha256=4SRwCMs4-sS3n23FthythhuG9dBJ8TLz_TVyoYAbdoA,70639
 mwx/images.py,sha256=gyvqW4TLWdJMKmsaWiPiV_PuHJM1GbHgeELERLwGzg8,45291
-mwx/matplot2.py,sha256=1ISXVwqlu1EJKe5JXmBC2tuecsRoFzJrMZsqQMxdC50,33432
-mwx/matplot2g.py,sha256=KIuownEsF7t2RgHn3kOxjBXbKOdfS99X_CtQweG_FrM,65471
+mwx/matplot2.py,sha256=-G7z0Osozm9NjLfXvX5UcdFviwbNUktjbd904_g-PqQ,33516
+mwx/matplot2g.py,sha256=2vDx1pY89b4A7uaLd_RHK2HQ5hnwtH4C4wiYZLzuQjw,65707
 mwx/matplot2lg.py,sha256=pcu1oDPE_BlpFqNGPPKf9vpTuDs_h_u3OTRAJx5-Sds,27392
 mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
-mwx/nutshell.py,sha256=pbsQATwt906lOXGFWJmuwZIwU_ve78o46I2g5zNjvG4,137050
-mwx/utilus.py,sha256=Uwj6vbNUUztwOswPG75xtsT2y_PZqh3QiJraxmA9iT0,37401
+mwx/nutshell.py,sha256=yQbih2Q1SXexJPuFNSwJnky5teRHXEKks12laHo6joo,137049
+mwx/utilus.py,sha256=YShC4f67dIyjIOSZhSOEgBUfNR1nVOS6pxtm0GKMWrA,37320
 mwx/wxmon.py,sha256=6es-jVz9Ht7vZnG7VBJcaNYLHY0PnZtij60SXcZRTeY,12727
 mwx/wxpdb.py,sha256=lLowkkAgMhPFHAfklD7wZHq0qbSMjRxnBFtSajmVgME,19133
 mwx/wxwil.py,sha256=zP1-5Fpi1wpDQU977229zIH6QRuSkkyfuAlNKWjGoGg,5588
 mwx/wxwit.py,sha256=yU6XeCCWRBP7CLmpphjT072PfXAL30DNaxoChDX2p0I,7322
 mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
-mwx/plugins/ffmpeg_view.py,sha256=vUYNybIJsF1JGkDzjBgDyBQvDh8e1oKHlEMY5Fwc8L4,9399
+mwx/plugins/ffmpeg_view.py,sha256=wZXRgsiPyIphcA8hvXQoE7NZp4cc_YBOO0ZpuKmUJKE,9369
 mwx/plugins/fft_view.py,sha256=HcnBr-y_yFdSfASPRzMLANta4SwSDShd65QWnCU3XhM,2665
 mwx/plugins/frame_listview.py,sha256=RaYOj-YKrpLqhT8TkBRDX1TQnSPv90V185j8OjrWJTs,10108
 mwx/plugins/line_profile.py,sha256=--9NIc3x5EfRB3L59JvD7rzENQHyiYfu7wWJo6AuMkA,820
 mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
 mwx/py/filling.py,sha256=KaHooM32hrGGgqw75Cbt8lAvACwC6RXadob9LGgNnEc,16806
-mwxlib-0.95.9.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.95.9.dist-info/METADATA,sha256=TpQuGm-jesDFI2I-g8nwPcIqT7Edpv4_pM1ZFBb3gwo,1925
-mwxlib-0.95.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mwxlib-0.95.9.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.95.9.dist-info/RECORD,,
+mwxlib-0.96.1.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.96.1.dist-info/METADATA,sha256=0D7iaLq2lSivCrt81_r6TINYUkXkU-tUAdsIVugNrrY,1925
+mwxlib-0.96.1.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
+mwxlib-0.96.1.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.96.1.dist-info/RECORD,,

{mwxlib-0.95.9.dist-info → mwxlib-0.96.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (70.1.1)
 Root-Is-Purelib: true
 Tag: py3-none-any