mwxlib 0.98.1__py3-none-any.whl → 0.98.6__py3-none-any.whl

mwx/controls.py

@@ -9,7 +9,7 @@ import wx.lib.scrolledpanel as scrolled
 from . import images
 from .utilus import SSM
 from .utilus import funcall as _F
-from .framework import pack, Menu
+from .framework import pack, Menu, postcall
 
 import numpy as np
 from numpy import nan, inf  # noqa: necessary to eval
@@ -20,7 +20,7 @@ def _Tip(*tips):
     return '\n'.join(filter(None, tips)).strip()
 
 
-class Param(object):
+class Param:
     """Standard Parameter
     
     Args:
@@ -438,6 +438,8 @@ class Knob(wx.Panel):
         self.label.SetLabel(v.name + t)
         self.label.Refresh()
     
+    ## Note: wxAssertionError in text.SetValue
+    @postcall
     def update_ctrl(self, valid=True, notify=False):
         """Called when value is being changed (internal use only)."""
         v = self.__par
@@ -724,8 +726,7 @@ class ControlPanel(scrolled.ScrolledPanel):
                 except AttributeError:
                     p.value = v
                 except Exception as e: # failed to eval
-                    print(f"- Failed to reset {p!r}:", e)
-                    pass
+                    print(f"- Failed to reset {p!r}.", e)
     
     reset_params = set_params #: for backward compatibility
     

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.98.1"
+__version__ = "0.98.6"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -222,8 +222,6 @@ class KeyCtrlInterfaceMixin:
         spec-map    : 'C-c'
         esc-map     : 'escape'
     """
-    message = print # override this in subclass
-    
     @postcall
     def post_message(self, *args, **kwargs):
         return self.message(*args, **kwargs)
@@ -332,17 +330,22 @@ class CtrlInterface(KeyCtrlInterfaceMixin):
     """
     handler = property(lambda self: self.__handler)
     
+    message = print # override this in subclass
+    
     def __init__(self):
         self.__key = ''
         self.__button = ''
         self.__isDragging = False
-        self.__handler = FSM({None:{}, 0:{}})
+        self.__handler = FSM({ # DNA<CtrlInterface>
+                None : {
+                },
+                0 : {
+                },
+            },
+        )
         
         _M = self._mouse_handler
-        
-        def _N(event, evt):
-            if self.handler(event, evt) is None:
-                evt.Skip()
+        _N = self._normal_handler
         
         def activate(evt):
             self.handler('focus_set', evt)
@@ -383,7 +386,7 @@ class CtrlInterface(KeyCtrlInterfaceMixin):
         self.Bind(wx.EVT_MOUSE_AUX2_DCLICK, lambda v: _M('Xbutton2 dblclick', v))
         
         self.Bind(wx.EVT_MOUSE_CAPTURE_LOST, lambda v: _N('capture_lost', v))
-        self.Bind(wx.EVT_MOUSE_CAPTURE_CHANGED, lambda v: _N('capture_lost', v))
+        self.Bind(wx.EVT_MOUSE_CAPTURE_CHANGED, lambda v: _N('capture_changed', v))
     
     def on_hotkey_press(self, evt): #<wx._core.KeyEvent>
         """Called when a key is pressed."""
@@ -461,6 +464,10 @@ class CtrlInterface(KeyCtrlInterfaceMixin):
             self.SetFocusIgnoringChildren() # let the panel accept keys
         except AttributeError:
             pass
+    
+    def _normal_handler(self, event, evt): #<wx._core.Event>
+        if self.handler(event, evt) is None:
+            evt.Skip()
 
 
 ## --------------------------------
@@ -763,15 +770,10 @@ class Frame(wx.Frame, KeyCtrlInterfaceMixin):
                     evt.Skip()
         self.Bind(wx.EVT_CHAR_HOOK, hook_char)
         
-        def close(evt):
-            """Close the window."""
-            self.Close()
-        
         self.__handler = FSM({ # DNA<Frame>
                 None : {
                 },
                 0 : {
-                  'M-q pressed' : (0, close),
                 },
             },
         )
@@ -829,15 +831,10 @@ class MiniFrame(wx.MiniFrame, KeyCtrlInterfaceMixin):
         ## To default close >>> self.Unbind(wx.EVT_CLOSE)
         self.Bind(wx.EVT_CLOSE, lambda v: self.Show(0))
         
-        def close(evt):
-            """Close the window."""
-            self.Close()
-        
         self.__handler = FSM({ # DNA<MiniFrame>
                 None : {
                 },
                 0 : {
-                  'M-q pressed' : (0, close),
                 },
             },
         )
@@ -1010,7 +1007,7 @@ class AuiNotebook(aui.AuiNotebook):
             self._mgr.LoadPerspective(frames)
             self._mgr.Update()
         except Exception as e:
-            print("- Failed to load perspective:", e)
+            print("- Failed to load perspective.", e)
         finally:
             self.Parent.Thaw()
 
@@ -1278,16 +1275,13 @@ class ShellFrame(MiniFrame):
         
         @self.Scratch.define_key('C-j')
         def eval_line(evt):
-            shell = self.current_shell
-            self.Scratch.buffer.py_eval_line(shell.globals, shell.locals)
-            evt.Skip(False)
+            self.Scratch.buffer.eval_line()
+            evt.Skip(False) # Don't skip explicitly.
         
-        @self.Scratch.define_key('C-S-j')
         @self.Scratch.define_key('M-j')
         def eval_buffer(evt):
-            shell = self.current_shell
-            self.Scratch.buffer.py_exec_region(shell.globals, shell.locals)
-            evt.Skip(False)
+            self.Scratch.buffer.exec_region()
+            evt.Skip(False) # Don't skip explicitly.
         
         ## Session
         self.SESSION_FILE = get_rootpath(".debrc")
@@ -1298,7 +1292,9 @@ class ShellFrame(MiniFrame):
             os.path.abspath(debrc) if debrc else self.SESSION_FILE)
     
     def load_session(self, filename):
-        """Load session from file."""
+        """Load session from file.
+        Buffers, pointers, and the entire layout are loaded.
+        """
         def _fload(editor, filename):
             try:
                 buffer = editor.default_buffer or editor.new_buffer()
@@ -1325,7 +1321,9 @@ class ShellFrame(MiniFrame):
             self.Position = (0, 0)
     
     def save_session(self):
-        """Save session to file."""
+        """Save session to file.
+        Buffers, pointers, and the entire layout are saved.
+        """
         def _fsave(editor, filename):
             try:
                 buffer = editor.default_buffer
@@ -1340,20 +1338,20 @@ class ShellFrame(MiniFrame):
         with open(self.SESSION_FILE, 'w', encoding='utf-8', newline='') as o:
             o.write("#! Session file (This file is generated automatically)\n")
             
-            for book in self.all_editors:
+            for book in (self.Scratch, self.Log):
                 for buf in book.all_buffers:
                     if buf.mtdelta is not None:
-                        o.write("self._load({!r}, {!r}, {!r})\n"
-                                .format(buf.filename, buf.markline+1, book.Name))
+                        o.write("self.{}.load_file({!r}, {})\n"
+                                .format(book.Name, buf.filename, buf.markline+1))
             o.write('\n'.join((
                 "self.SetSize({})".format(self.Size),
                 "self.SetPosition({})".format(self.Position),
-                "self.ghost.SetSelection({})".format(self.ghost.Selection),
-                "self.watcher.SetSelection({})".format(self.watcher.Selection),
+                "self.Scratch.loadPerspective({!r})".format(self.Scratch.savePerspective()),
+                "self.Log.loadPerspective({!r})".format(self.Log.savePerspective()),
                 ## Note: Perspectives should be called after all pages have been added.
-                "wx.CallAfter(self._mgr.LoadPerspective, {!r})".format(self._mgr.SavePerspective()),
-                "wx.CallAfter(self.ghost.loadPerspective, {!r})".format(self.ghost.savePerspective()),
-                "wx.CallAfter(self.watcher.loadPerspective, {!r})".format(self.watcher.savePerspective()),
+                "self.ghost.loadPerspective({!r})".format(self.ghost.savePerspective()),
+                "self.watcher.loadPerspective({!r})".format(self.watcher.savePerspective()),
+                "self._mgr.LoadPerspective({!r})".format(self._mgr.SavePerspective()),
                 "self._mgr.Update()\n",
             )))
     
@@ -1547,9 +1545,8 @@ class ShellFrame(MiniFrame):
         pane = self._mgr.GetPane(win)
         if pane.IsDocked():
             if not self.console.IsShown():
-                self._mgr.RestoreMaximizedPane()
-                self._mgr.Update()
-                return
+                self._mgr.RestoreMaximizedPane() # いったん表示切替
+                self._mgr.Update()               # 更新後に best_size 取得
         if pane.IsShown():
             pane.best_size = win.Size
         self.popup_window(win, not pane.IsShown())
@@ -1597,7 +1594,7 @@ class ShellFrame(MiniFrame):
         self.indicator.Value = 1
         self.message("Quit")
     
-    def _load(self, filename, lineno, editor):
+    def _load(self, filename, lineno, editor): # for backward compatibility
         """Load file in the session (internal use only)."""
         if isinstance(editor, str):
             editor = getattr(self, editor, None)

mwx/graphman.py

@@ -50,7 +50,7 @@ def split_paths(obj):
     return os.path.split(obj)
 
 
-class Thread(object):
+class Thread:
     """Thread manager for graphman.Layer
     
     The worker:thread runs the given target.
@@ -342,7 +342,6 @@ class LayerInterface(CtrlInterface):
                  'thread_error' : [ None ], # failed in error
                    'page_shown' : [ None, _F(self.Draw, True)  ],
                   'page_closed' : [ None, _F(self.Draw, False) ],
-                  'page_hidden' : [ None, _F(self.Draw, False) ],
             },
             0 : {
                   'C-c pressed' : (0, _F(copy_params)),
@@ -387,7 +386,6 @@ class LayerInterface(CtrlInterface):
                   lambda v: Menu.Popup(self, self.menu))
         
         self.Bind(wx.EVT_WINDOW_DESTROY, self.OnDestroy)
-        self.Bind(wx.EVT_SHOW, self.OnShow)
         
         try:
             self.Init()
@@ -427,15 +425,6 @@ class LayerInterface(CtrlInterface):
             del self.Arts
         evt.Skip()
     
-    def OnShow(self, evt):
-        if not self:
-            return
-        if evt.IsShown():
-            self.handler('page_shown', self)
-        elif isinstance(self.Parent, aui.AuiNotebook):
-            self.handler('page_hidden', self)
-        evt.Skip()
-    
     Shown = property(
         lambda self: self.IsShown(),
         lambda self,v: self.Show(v))
@@ -443,16 +432,19 @@ class LayerInterface(CtrlInterface):
     def IsShown(self):
         """Returns True if the window is physically visible on the screen.
         
-        Note: This method is overridden to be equivalent to IsShownOnScreen,
-              as the object may be a page within a notebook.
+        (override) Equivalent to ``IsShownOnScreen``.
+                   Note: The instance could be a page within a notebook.
         """
         ## return self.pane.IsShown()
         return self.IsShownOnScreen()
     
-    def Show(self, show=True, interactive=False):
-        """Show associated pane (override) window."""
-        ## Note: This might be called from a thread.
-        wx.CallAfter(self.parent.show_pane, self, show, interactive)
+    def Show(self, show=True):
+        """Shows or hides the window.
+        
+        (override) Show associated pane window.
+                   Note: This might be called from a thread.
+        """
+        wx.CallAfter(self.parent.show_pane, self, show)
     
     Drawn = property(
         lambda self: self.IsDrawn(),
@@ -478,21 +470,16 @@ class LayerInterface(CtrlInterface):
             if canvas:
                 canvas.draw_idle()
         except Exception as e:
-            print(f"- Failed to draw Arts of {self.__module__}:", e)
+            print(f"- Failed to draw Arts of {self.__module__}.", e)
             del self.Arts
 
 
-class Layer(ControlPanel, LayerInterface):
+class Layer(LayerInterface, ControlPanel):
     """Graphman.Layer
     """
     def __init__(self, parent, session=None, **kwargs):
         ControlPanel.__init__(self, parent, **kwargs)
         LayerInterface.__init__(self, parent, session)
-    
-    ## Explicit (override) precedence
-    IsShown = LayerInterface.IsShown
-    Shown = LayerInterface.Shown
-    Show = LayerInterface.Show
 
 
 class Graph(GraphPlot):
@@ -942,9 +929,6 @@ class Frame(mwx.Frame):
                 pane.Float()
                 show = True
         
-        ## Fork page shown/closed events to emulatie EVT_SHOW => plug.on_show.
-        ## cf. >>> win.EventHandler.ProcessEvent(wx.ShowEvent(win.Id, show))
-        ## 
         ## Note: We need to distinguish cases whether:
         ##       - pane.window is AuiNotebook or normal Panel,
         ##       - pane.window is floating (win.Parent is AuiFloatingFrame) or docked.
@@ -1023,6 +1007,7 @@ class Frame(mwx.Frame):
                 plug.handler('page_closed', plug)
         else:
             win.handler('page_closed', win)
+        evt.Skip()
     
     ## --------------------------------
     ## Plugin <Layer> interface
@@ -1070,15 +1055,10 @@ class Frame(mwx.Frame):
             module.Plugin = cls
             return cls
         
-        class _Plugin(cls, LayerInterface):
+        class _Plugin(LayerInterface, cls):
             def __init__(self, parent, session=None, **kwargs):
                 cls.__init__(self, parent, **kwargs)
                 LayerInterface.__init__(self, parent, session)
-            
-            ## Explicit (override) precedence
-            IsShown = LayerInterface.IsShown
-            Shown = LayerInterface.Shown
-            Show = LayerInterface.Show
         
         _Plugin.__module__ = cls.__module__ = module.__name__
         _Plugin.__name__ = cls.__name__ + str("~")
@@ -1110,7 +1090,7 @@ class Frame(mwx.Frame):
             else:
                 module = import_module(name)
         except Exception as e:
-            print(f"- Unable to load {root!r}:", e)
+            print(f"- Unable to load {root!r}.", e)
             return False
         
         ## the module must have a class `Plugin`.
@@ -1172,7 +1152,7 @@ class Frame(mwx.Frame):
         
         module = self.load_module(root)
         if not module:
-            return module # False (failed to import)
+            return False # failed to import
         
         try:
             name = module.Plugin.__module__
@@ -1328,18 +1308,21 @@ class Frame(mwx.Frame):
     
     def reload_plug(self, name):
         plug = self.get_plug(name)
-        if not plug:
+        if not plug or not plug.reloadable:
             return
-        if plug.reloadable:
-            session = {}
-            try:
-                print("Reloading {}...".format(plug))
-                plug.save_session(session)
-            except Exception:
-                traceback.print_exc()
-                print("- Failed to save session of", plug)
-            return self.load_plug(plug.__module__, force=1, session=session)
-        return False
+        session = {}
+        try:
+            print("Reloading {}...".format(plug))
+            plug.save_session(session)
+        except Exception:
+            traceback.print_exc()
+            print("- Failed to save session of", plug)
+        self.load_plug(plug.__module__, force=1, session=session)
+        
+        ## Update shell.target --> new plug
+        for shell in self.shellframe.all_shells:
+            if shell.target is plug:
+                shell.handler('shell_activated', shell)
     
     @ignore(ResourceWarning)
     def edit_plug(self, name):
@@ -1398,12 +1381,16 @@ class Frame(mwx.Frame):
     
     def load_index(self, filename=None, view=None):
         """Load frames :ref to the Index file.
+        
+        If no view given, the currently selected view is chosen.
         """
         if not view:
             view = self.selected_view
         
         if not filename:
+            fn = view.frame.pathname if view.frame else ''
             with wx.FileDialog(self, "Select index file to import",
+                    defaultDir=os.path.dirname(fn or ''),
                     defaultFile=self.ATTRIBUTESFILE,
                     wildcard="Index (*.index)|*.index|"
                              "ALL files (*.*)|*.*",
@@ -1431,15 +1418,16 @@ class Frame(mwx.Frame):
     def save_index(self, filename=None, frames=None):
         """Save frames :ref to the Index file.
         """
+        view = self.selected_view
         if not frames:
-            frames = self.selected_view.all_frames
+            frames = view.all_frames
             if not frames:
                 return None
         
         if not filename:
-            fn = next((x.pathname for x in frames if x.pathname), '')
+            fn = view.frame.pathname if view.frame else ''
             with wx.FileDialog(self, "Select index file to export",
-                    defaultDir=os.path.dirname(fn),
+                    defaultDir=os.path.dirname(fn or ''),
                     defaultFile=self.ATTRIBUTESFILE,
                     wildcard="Index (*.index)|*.index",
                     style=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT) as dlg:
@@ -1463,8 +1451,8 @@ class Frame(mwx.Frame):
                     frame.name = os.path.basename(fn) # new name and pathname
                 output_frames.append(frame)
                 print(' ', self.message("\b done."))
-            except (PermissionError, OSError):
-                print('-', self.message("\b failed."))
+            except (PermissionError, OSError) as e:
+                print('-', self.message("\b failed.", e))
         
         frames = output_frames
         res, mis = self.write_attributes(filename, frames)
@@ -1504,7 +1492,7 @@ class Frame(mwx.Frame):
         except FileNotFoundError:
             pass
         except Exception as e:
-            print("- Failed to read attributes:", e)
+            print("- Failed to read attributes.", e)
             wx.MessageBox(str(e), style=wx.ICON_ERROR)
         finally:
             return res, mis # finally raises no exception
@@ -1526,7 +1514,7 @@ class Frame(mwx.Frame):
                 print(pformat(tuple(new.items())), file=o)
             
         except Exception as e:
-            print("- Failed to write attributes:", e)
+            print("- Failed to write attributes.", e)
             wx.MessageBox(str(e), style=wx.ICON_ERROR)
         finally:
             return new, mis # finally raises no exception
@@ -1607,7 +1595,10 @@ class Frame(mwx.Frame):
             paths = [paths]
         
         if paths is None:
+            fn = view.frame.pathname if view.frame else ''
             with wx.FileDialog(self, "Open image files",
+                    defaultDir=os.path.dirname(fn or ''),
+                    defaultFile='',
                     wildcard='|'.join(self.wildcards),
                     style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST
                                     |wx.FD_MULTIPLE) as dlg:
@@ -1653,16 +1644,17 @@ class Frame(mwx.Frame):
     
     def save_buffer(self, path=None, frame=None):
         """Save buffer of the frame to a file.
-        
-        If no view given, the currently selected view is chosen.
         """
+        view = self.selected_view
         if not frame:
-            frame = self.selected_view.frame
+            frame = view.frame
             if not frame:
                 return None
         
         if not path:
+            fn = view.frame.pathname if view.frame else ''
             with wx.FileDialog(self, "Save buffer as",
+                    defaultDir=os.path.dirname(fn or ''),
                     defaultFile=re.sub(r'[\/:*?"<>|]', '_', frame.name),
                     wildcard='|'.join(self.wildcards),
                     style=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT) as dlg:

mwx/matplot2g.py

@@ -110,7 +110,7 @@ def _Property(name):
         lambda self:   delattr(self.parent, name))
 
 
-class AxesImagePhantom(object):
+class AxesImagePhantom:
     """Phantom of frame facade
     
     Args:
@@ -957,7 +957,7 @@ class GraphPlot(MatplotPanel):
             self.message("Write buffer to clipboard.")
         except Exception as e:
             traceback.print_exc()
-            self.message("- Failed to write to clipboard:", e)
+            self.message("- Failed to write to clipboard.", e)
     
     def read_buffer_from_clipboard(self):
         """Read buffer data from clipboard."""
@@ -974,7 +974,7 @@ class GraphPlot(MatplotPanel):
                 self.load(Clipboard.imread())
         except Exception as e:
             traceback.print_exc()
-            self.message("- No data in clipboard:", e)
+            self.message("- No data in clipboard.", e)
     
     def destroy_colorbar(self):
         if self.cbar:

mwx/mgplt.py

@@ -12,7 +12,7 @@ from . import framework as mwx
 from .controls import ControlPanel
 
 
-class Gnuplot(object):
+class Gnuplot:
     """Gnuplot - gnuplot:pipe wrapper
     """
     debug = 0