mwxlib 0.81.0__py3-none-any.whl → 0.81.2__py3-none-any.whl

mwx/__init__.py

@@ -26,18 +26,6 @@ from .framework import Frame, MiniFrame, ShellFrame
 ## from .mgplt import Gnuplot
 ## from .mgplt import GnuplotFrame
 
-from importlib import reload
-import contextlib
-import wx
-
-
-@contextlib.contextmanager
-def app(loop=True):
-    app = wx.GetApp() or wx.App()
-    yield app
-    if loop and not app.GetMainLoop():
-        app.MainLoop()
-
 
 def deb(target=None, loop=True, locals=None, **kwargs):
     """Dive into the process.
@@ -60,6 +48,8 @@ def deb(target=None, loop=True, locals=None, **kwargs):
     Note:
         This will execute the startup script $(PYTHONSTARTUP).
     """
+    import wx
+    
     quote_unqoute = """
         Anything one man can imagine, other man can make real.
         --- Jules Verne (1828--1905)
@@ -68,11 +58,17 @@ def deb(target=None, loop=True, locals=None, **kwargs):
                       "mwx {}".format(__version__) + quote_unqoute)
     kwargs.setdefault("execStartupScript", True)
     kwargs.setdefault("ensureClose", True)
-    with app(loop):
-        frame = ShellFrame(None, target, **kwargs)
-        frame.Show()
-        shell = frame.rootshell
-        shell.SetFocus()
-        if locals:
-            shell.locals.update(locals)
-        return frame
+    
+    app = wx.GetApp() or wx.App()
+    frame = ShellFrame(None, target, **kwargs)
+    frame.Show()
+    shell = frame.rootshell
+    shell.SetFocus()
+    if locals:
+        shell.locals.update(locals)
+    if loop:
+        if not app.GetMainLoop():
+            app.MainLoop()
+        else:
+            pass # The mainloop is already running.
+    return frame

mwx/controls.py

@@ -1133,11 +1133,12 @@ class Indicator(wx.Control):
     spacing = 7
     radius = 5
     
-    def __init__(self, parent, value=0, tip='', size=(-1,-1), **kwargs):
-        s = self.spacing
-        size = np.maximum((s*6, s*2+1), size) # minimum size:(6s,2s)
-        wx.Control.__init__(self, parent, size=size,
-                            style=wx.BORDER_NONE, **kwargs)
+    def __init__(self, parent, value=0, tip='',
+                 size=(-1,-1), style=wx.BORDER_NONE, **kwargs):
+        s = self.spacing # minimum size:(6s,2s)
+        w = max(size[0], s*6)
+        h = max(size[1], s*2+1)
+        wx.Control.__init__(self, parent, size=(w,h), style=style, **kwargs)
         
         self.__value = value
         self.ToolTip = tip.strip()
@@ -1201,8 +1202,9 @@ class Gauge(wx.Control):
         self.__range = int(v)
         self.Draw()
     
-    def __init__(self, parent, range=24, value=0, tip='', **kwargs):
-        wx.Control.__init__(self, parent, style=wx.BORDER_NONE, **kwargs)
+    def __init__(self, parent, range=24, value=0, tip='',
+                 style=wx.BORDER_NONE, **kwargs):
+        wx.Control.__init__(self, parent, style=style, **kwargs)
         
         self.__range = range
         self.__value = value

mwx/framework.py

@@ -4,7 +4,7 @@
 
 Author: Kazuya O'moto <komoto@jeol.co.jp>
 """
-__version__ = "0.81.0"
+__version__ = "0.81.2"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial
@@ -388,9 +388,8 @@ def pack(self, items, orient=wx.HORIZONTAL, style=None, label=None):
     Args:
         items   : wx objects (with some packing parameters)
         
-                - (obj, 1) -> sized with ratio 1 (orient と同方向)
-                  他に 0 以外を指定しているオブジェクトとエリアを分け合う
-                - (obj, 1, wx.EXPAND) -> expanded with ratio 1 (orient と垂直方向)
+                - (obj, 1) -> sized with ratio 1 (parallel to `orient`)
+                - (obj, 1, wx.EXPAND) -> expanded with ratio 1 (perpendicular to `orient`)
                 - (obj, 0, wx.ALIGN_CENTER | wx.LEFT, 4) -> center with 4 pixel at wx.LEFT
                 - ((-1,-1), 1, wx.EXPAND) -> stretched space
                 - (-1,-1) -> padding space
@@ -466,9 +465,9 @@ class Menu(wx.Menu):
                     menu_item.SetBitmaps(*icons)
                 self.Append(menu_item)
                 try:
-                    self.owner.Bind(wx.EVT_MENU, handlers[0], id=id)
-                    self.owner.Bind(wx.EVT_UPDATE_UI, handlers[1], id=id)
-                    self.owner.Bind(wx.EVT_MENU_HIGHLIGHT, handlers[2], id=id)
+                    owner.Bind(wx.EVT_MENU, handlers[0], menu_item)
+                    owner.Bind(wx.EVT_UPDATE_UI, handlers[1], menu_item)
+                    owner.Bind(wx.EVT_MENU_HIGHLIGHT, handlers[2], menu_item)
                 except IndexError:
                     pass
             else:
@@ -479,8 +478,8 @@ class Menu(wx.Menu):
                 if icons:
                     submenu_item.SetBitmaps(*icons)
                 self.Append(submenu_item)
-                self.Enable(submenu_item.Id, len(subitems)) # Disable an empty menu
-                submenu.Id = submenu_item.Id # <- ID_ANY
+                self.Enable(submenu_item.Id, len(subitems)) # Disable an empty menu.
+                submenu.Id = submenu_item.Id # <- ID_ANY (dummy to check empty sbumenu)
     
     @staticmethod
     def Popup(parent, menu, *args, **kwargs):
@@ -521,14 +520,14 @@ class MenuBar(wx.MenuBar, TreeList):
         """
         if self.Parent:
             menu = self.getmenu(key)
-            if not menu:     # 新規のメニューアイテムを挿入する
-                self.reset() # リセットして終了
+            if not menu:
+                self.reset()
                 return
             
             for item in menu.MenuItems: # delete all items
-                self.Parent.Unbind(wx.EVT_MENU, id=item.Id)
-                self.Parent.Unbind(wx.EVT_UPDATE_UI, id=item.Id)
-                self.Parent.Unbind(wx.EVT_MENU_HIGHLIGHT, id=item.Id)
+                self.Parent.Unbind(wx.EVT_MENU, item)
+                self.Parent.Unbind(wx.EVT_UPDATE_UI, item)
+                self.Parent.Unbind(wx.EVT_MENU_HIGHLIGHT, item)
                 menu.Delete(item)
             
             menu2 = Menu(self.Parent, self[key]) # new menu2 to swap menu
@@ -536,7 +535,7 @@ class MenuBar(wx.MenuBar, TreeList):
                 menu.Append(menu2.Remove(item)) # 重複しないようにいったん切り離して追加する
             
             if hasattr(menu, 'Id'):
-                self.Enable(menu.Id, menu.MenuItemCount > 0) # 空のサブメニューは無効にする
+                self.Enable(menu.Id, menu.MenuItemCount > 0) # Disable empty submenu.
     
     def reset(self):
         """Recreates menubar if the Parent were attached by SetMenuBar.
@@ -546,16 +545,16 @@ class MenuBar(wx.MenuBar, TreeList):
             for j in range(self.GetMenuCount()): # remove and del all top-level menu
                 menu = self.Remove(0)
                 for item in menu.MenuItems: # delete all items
-                    self.Parent.Unbind(wx.EVT_MENU, id=item.Id)
-                    self.Parent.Unbind(wx.EVT_UPDATE_UI, id=item.Id)
-                    self.Parent.Unbind(wx.EVT_MENU_HIGHLIGHT, id=item.Id)
+                    self.Parent.Unbind(wx.EVT_MENU, item)
+                    self.Parent.Unbind(wx.EVT_UPDATE_UI, item)
+                    self.Parent.Unbind(wx.EVT_MENU_HIGHLIGHT, item)
                 menu.Destroy()
             
             for j, (key, values) in enumerate(self):
-                menu = Menu(self.Parent, values) # 空のメインメニューでも表示に追加する
+                menu = Menu(self.Parent, values)
                 self.Append(menu, key)
                 if not values:
-                    self.EnableTop(j, False) # 空のメインメニューは無効にする
+                    self.EnableTop(j, False) # Disable empty main menu.
 
 
 class StatusBar(wx.StatusBar):
@@ -1213,8 +1212,7 @@ class ShellFrame(MiniFrame):
             self.Log.default_buffer.SaveFile(self.LOGGING_FILE)
             self.History.default_buffer.SaveFile(self.HISTORY_FILE)
             self.save_session()
-        except Exception:
-            traceback.print_exc()
+            self.timer.Stop()
         finally:
             self._mgr.UnInit()
             return MiniFrame.Destroy(self)
@@ -1451,8 +1449,8 @@ class ShellFrame(MiniFrame):
     def help(self, obj):
         self.rootshell.help(obj)
     
-    def highlight(self, obj):
-        self.inspector.highlight(obj)
+    def highlight(self, obj, *args, **kwargs):
+        self.inspector.highlight(obj, *args, **kwargs)
     
     ## Note: history 変数に余計な文字列が入らないようにする
     @postcall

mwx/graphman.py

@@ -408,12 +408,17 @@ class LayerInterface(CtrlInterface):
             del self.Arts
 
 
-class Layer(LayerInterface, ControlPanel):
+class Layer(ControlPanel, LayerInterface):
     """Graphman.Layer
     """
     def __init__(self, parent, session=None, **kwargs):
         ControlPanel.__init__(self, parent, **kwargs)
         LayerInterface.__init__(self, parent, session)
+    
+    ## Explicit (override) precedence
+    message = LayerInterface.message
+    IsShown = LayerInterface.IsShown
+    Show = LayerInterface.Show
 
 
 class Graph(GraphPlot):
@@ -992,16 +997,24 @@ class Frame(mwx.Frame):
             module = inspect.getmodule(cls) # rebase module or __main__
         
         if issubclass(cls, LayerInterface):
-            warnings.warn("Use class name 'Plugin' instead of {!r}."
+            warnings.warn("Duplicate iniheritance of LayerInterface by {!r}."
                           .format(cls.__name__), stacklevel=2)
             cls.__module__ = module.__name__ # __main__ to module
             module.Plugin = cls
             return cls
         
-        class _Plugin(LayerInterface, cls):
+        class _Plugin(cls, LayerInterface):
             def __init__(self, parent, session=None, **kwargs):
                 cls.__init__(self, parent, **kwargs)
                 LayerInterface.__init__(self, parent, session)
+            
+            ## Explicit (override) precedence
+            message = LayerInterface.message
+            IsShown = LayerInterface.IsShown
+            Show = LayerInterface.Show
+            
+            ## Implicit (override) precedence
+            ## cls.Init / cls.save_session / cls.load_session
         
         _Plugin.__module__ = cls.__module__ = module.__name__
         _Plugin.__name__ = cls.__name__ + str("~")
@@ -1023,6 +1036,8 @@ class Frame(mwx.Frame):
         else:
             rootpath = root
         
+        assert isinstance(rootpath, str)
+        
         name = os.path.basename(rootpath)
         if name.endswith(".py"):
             name,_ = os.path.splitext(name)

mwx/nutshell.py

@@ -115,10 +115,10 @@ class EditorInterface(CtrlInterface):
                 'C-S-; pressed' : (0, _F(self.comment_out_line)),
                   'C-: pressed' : (0, _F(self.uncomment_line)),
                 'C-S-: pressed' : (0, _F(self.uncomment_line)),
-              'Lbutton pressed' : (0, lambda v: margin_fork(v, 'Lclick'), skip),
-              'Rbutton pressed' : (0, lambda v: margin_fork(v, 'Rclick'), skip),
-              'Mbutton pressed' : (0, lambda v: margin_fork(v, 'Mclick'), skip),
-             'Lbutton dblclick' : (0, lambda v: margin_fork(v, 'dblclick'), skip),
+              'Lbutton pressed' : (0, lambda v: click_fork(v, 'Lclick')),
+              'Rbutton pressed' : (0, lambda v: click_fork(v, 'Rclick')),
+              'Mbutton pressed' : (0, lambda v: click_fork(v, 'Mclick')),
+             'Lbutton dblclick' : (0, lambda v: click_fork(v, 'dblclick')),
               'margin_dblclick' : (0, self.on_margin_dblclick),
                  'select_itext' : (10, self.filter_text, self.on_filter_text_enter),
                   'select_line' : (100, self.on_linesel_begin, skip),
@@ -137,10 +137,12 @@ class EditorInterface(CtrlInterface):
             },
         })
         
-        def margin_fork(v, click):
+        def click_fork(v, click):
             if self._margin is not None:
                 v.Margin = self._margin # Add info to event object. OK ??
                 self.handler(f"margin_{click}", v)
+            v.Skip()
+        self._margin = None
         
         def on_motion(v):
             self._window_handler('motion', v)
@@ -152,6 +154,7 @@ class EditorInterface(CtrlInterface):
                     self._margin = m # current margin under mouse
                     return
             self._margin = None
+            v.Skip()
         self.Bind(wx.EVT_MOTION, on_motion)
         
         self.Bind(wx.EVT_MOUSE_CAPTURE_LOST,

mwx/wxwit.py

@@ -102,7 +102,8 @@ class Inspector(it.InspectionTree, CtrlInterface):
             return "{} ({!r} {})".format(clsname, obj.Name, obj.Id)
         return clsname
     
-    def highlight(self, obj):
+    def highlight(self, obj, msec=2000):
+        self.highlighter.highlightTime = msec
         if isinstance(obj, wx.Window):
             self.highlighter.HighlightWindow(obj)
         elif isinstance(obj, wx.Sizer):

{mwxlib-0.81.0.dist-info → mwxlib-0.81.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mwxlib
-Version: 0.81.0
+Version: 0.81.2
 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.81.0.dist-info → mwxlib-0.81.2.dist-info}/RECORD

@@ -1,22 +1,22 @@
-mwx/__init__.py,sha256=CxhKHOhig62F8p6GvP5gii-VvQtSjp9yWJpHvC_Kans,2592
-mwx/controls.py,sha256=J0zbs7l-2HHpA9MAlg2Dfp12EslnhK_0XM_PuNxvk70,42983
-mwx/framework.py,sha256=k5J9Axv26uMHYFYvZOAVOan2mcOIdWPt8Jdfu-1TRP4,71691
-mwx/graphman.py,sha256=ubJq0LuF2II1D2XrTUc62tad1yO9HnYk77hfj5DC_e4,69191
+mwx/__init__.py,sha256=132PKNl-qpvV8godY4iAnHcupnmPTWfFx-j7tantnmA,2521
+mwx/controls.py,sha256=nK98yYgWczs1xKUbCXyM7A2XXl84iOm65c8DRjMrTPI,43034
+mwx/framework.py,sha256=rq5mUn4FYYwPhLT405HODh25rpgfhwytan0MnfIo_dk,71410
+mwx/graphman.py,sha256=zXGOxVVWQJxlMl2TNigfCBIhiPAjlgMb8Qn-D1AxN88,69722
 mwx/images.py,sha256=9e8X7OpJ6Z3fF3ez17P_qk2D1NMO10-lN8TCtulAqT0,46248
 mwx/matplot2.py,sha256=mzctMUk00m-tvs268PTwdLln7G3NCl6J-5zFzJkfsVI,36004
 mwx/matplot2g.py,sha256=yfF4r6juclU1I1k41lGb_VwxRmp0ktuD8az-wQ26MsE,67727
 mwx/matplot2lg.py,sha256=h_aFij_7ksG2DXuYCaGmjtlcl122vZnwbMTv21Mprcg,27606
 mwx/mgplt.py,sha256=49_wpFZUEKErQmtobqrlNKDjWlAsdLft-izlqSyGPD0,6878
-mwx/nutshell.py,sha256=b1Py22yFLq8AM5EfR9Njoq_v4TlryHWFomiCRhekjVg,135191
+mwx/nutshell.py,sha256=5BxB3TeyY1I5W0uDCSTZc6lh5nGW6ckBOQwHZa_RKD8,135235
 mwx/utilus.py,sha256=NBU4PG3AQ8bE1Iadpe4QaZOGZYPh7NQ85ff6jxeKVG4,36281
 mwx/wxmon.py,sha256=g55Ds_dRpDS8dNmaVQwgnd1inuj45tqLMIgJA23cOIw,11291
 mwx/wxpdb.py,sha256=-_rDNxk3S3z1PgDZ6AAhKksFp8wJL3NBKDxfOZ74E3c,19790
 mwx/wxwil.py,sha256=BUfEF0Nc1E-mVC3Vdz6k1E-2s5J0PO6qEzRQ6lfyePI,5246
-mwx/wxwit.py,sha256=2JLf94XoVKLt8IIwVdYS7Zoa9SII60XQ69y2JrptBuE,7166
+mwx/wxwit.py,sha256=lJX2A26IcSA_MpdTnlV5QYg1PruE47ckk1yL8E_dYiE,7224
 mwx/py/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mwx/py/filling.py,sha256=NnQnfUVol-Nz4QYZUKFIyRX-Yxp54m5n54Yxza3Iwho,16655
-mwxlib-0.81.0.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.81.0.dist-info/METADATA,sha256=y4i0aywQSMfWTp28-JohFotBFpwOlP2_J-7KmSz-t2E,1893
-mwxlib-0.81.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-mwxlib-0.81.0.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.81.0.dist-info/RECORD,,
+mwxlib-0.81.2.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.81.2.dist-info/METADATA,sha256=_7B7dFMBRvG7kIXyhuUBz8Ntv1Ul0tDDK1Qlv3hYc5Y,1893
+mwxlib-0.81.2.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+mwxlib-0.81.2.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.81.2.dist-info/RECORD,,