mwxlib 0.99.3__py3-none-any.whl → 0.99.6__py3-none-any.whl

mwx/__init__.py

@@ -2,7 +2,7 @@
 """mwxlib framework (based on matplotlib/wx)
 """
 from .framework import __version__, __author__
-from .framework import FSM
+from .framework import FSM, TreeList
 from .framework import Menu, MenuBar, StatusBar
 from .framework import Frame, MiniFrame, ShellFrame, deb
 

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.99.3"
+__version__ = "0.99.6"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -24,17 +24,18 @@ from .utilus import get_rootpath, ignore, warn
 from .utilus import FSM, TreeList, apropos, typename, where, mro, pp
 
 
-def deb(target=None, loop=True, locals=None, **kwargs):
+def deb(target=None, loop=True, locals=None, debrc=None, **kwargs):
     """Dive into the process.
     
     Args:
         target  : Object or module (default None).
                   If None, the target is set to `__main__`.
         loop    : If True, the app and the mainloop will be created.
-                  Otherwise, neither the app nor the mainloop will be created.
         locals  : Additional context of the shell
+        debrc   : file name of the session; defaults to None.
+                  If None, no session will be created or saved.
         
-        **kwargs: Nautilus arguments
+        **kwargs: Nautilus ShellFrame arguments
         
             - introText         : introductory of the shell
             - startupScript     : startup script file (default None)
@@ -45,25 +46,19 @@ def deb(target=None, loop=True, locals=None, **kwargs):
     Note:
         This will execute the startup script $(PYTHONSTARTUP).
     """
-    quote_unqoute = """
-        Anything one man can imagine, other man can make real.
-        --- Jules Verne (1828--1905)
-        """
-    kwargs.setdefault("introText",
-                      "mwx {}".format(__version__) + quote_unqoute)
+    kwargs.setdefault("introText", f"mwx {__version__}\n")
     kwargs.setdefault("execStartupScript", True)
     kwargs.setdefault("ensureClose", True)
-    
+
     app = wx.GetApp() or wx.App()
-    frame = ShellFrame(None, target, **kwargs)
+    frame = ShellFrame(None, target, session=debrc, **kwargs)
     frame.Show()
     frame.rootshell.SetFocus()
     if locals:
         frame.rootshell.locals.update(locals)
-    if not loop:
-        return frame
-    if not app.GetMainLoop():
-        return app.MainLoop()
+    if loop and not app.GetMainLoop():
+        app.MainLoop()
+    return frame
 
 
 def postcall(f):
@@ -741,7 +736,7 @@ class Frame(wx.Frame, KeyCtrlInterfaceMixin):
     def __init__(self, *args, **kwargs):
         wx.Frame.__init__(self, *args, **kwargs)
         
-        self.shellframe = ShellFrame(None, target=self)
+        self.shellframe = ShellFrame(None, target=self, session='')
         
         self.menubar = MenuBar()
         self.menubar["File"] = [
@@ -1028,7 +1023,7 @@ class FileDropLoader(wx.DropTarget):
     def __init__(self, target):
         wx.DropTarget.__init__(self)
         
-        self.editor = target
+        self.target = target
         self.textdo = wx.TextDataObject()
         self.filedo = wx.FileDataObject()
         self.DataObject = wx.DataObjectComposite()
@@ -1036,7 +1031,7 @@ class FileDropLoader(wx.DropTarget):
         self.DataObject.Add(self.filedo, True)
     
     def OnData(self, x, y, result):
-        editor = self.editor
+        editor = self.target.current_editor
         self.GetData()
         if self.textdo.TextLength > 1:
             f = self.textdo.Text.strip()
@@ -1065,12 +1060,12 @@ class ShellFrame(MiniFrame):
     
     Args:
         target  : target object of the rootshell.
-                  If None, it will be `__main__`.
-        debrc   : session file for deb run command.
-                  SESSION_FILE will be overwritten.
-        ensureClose : A flag for the shell standalone.
+                  If None, it will be __main__.
+        session : file name of the session; defaults to None.
+                  If None, no session will be created or saved.
+        ensureClose : flag for the shell standalone.
                       If True, EVT_CLOSE will close the window.
-                      Otherwise it will be only hidden.
+                      Otherwise the window will be only hidden.
         **kwargs    : Nautilus arguments
     
     Attributes:
@@ -1104,18 +1099,14 @@ class ShellFrame(MiniFrame):
     """
     rootshell = property(lambda self: self.__shell) #: the root shell
     
-    def __init__(self, parent, target=None, debrc=None, ensureClose=False,
-                 title=None, size=(1280,720), style=wx.DEFAULT_FRAME_STYLE,
-                 **kwargs):
-        MiniFrame.__init__(self, parent, size=size, style=style)
+    def __init__(self, parent, target=None, session=None, ensureClose=False, **kwargs):
+        MiniFrame.__init__(self, parent, size=(1280,720), style=wx.DEFAULT_FRAME_STYLE)
         
         self.statusbar.resize((-1,120))
         self.statusbar.Show(1)
         
         self.__standalone = bool(ensureClose)
         
-        ## Initialize self-specific builtins.
-        ## Note: This should be called before creating root shell.
         self.Init()
         
         from .nutshell import Nautilus, EditorBook
@@ -1170,7 +1161,7 @@ class ShellFrame(MiniFrame):
         
         self.ghost.AddPage(self.Bookshelf, "Bookshelf", bitmap=Icon('book'))
         
-        self.ghost.SetDropTarget(FileDropLoader(self.Scratch))
+        self.ghost.SetDropTarget(FileDropLoader(self))
         
         self.watcher = AuiNotebook(self, size=(600,400), name="watcher")
         self.watcher.AddPage(self.ginfo, "globals")
@@ -1276,31 +1267,17 @@ class ShellFrame(MiniFrame):
             },
         })
         
-        self.Scratch.set_attributes(Style=self.rootshell.get_stylus())
-        
-        self.Log.set_attributes(ReadOnly=True)
-        self.Help.set_attributes(ReadOnly=False)
-        
-        self.set_hookable(self.Scratch)
-        self.set_hookable(self.Log)
-        
-        @self.Scratch.define_key('C-j')
-        def eval_line(evt):
-            self.Scratch.buffer.eval_line()
-            evt.Skip(False) # Don't skip explicitly.
-        
-        @self.Scratch.define_key('M-j')
-        def eval_buffer(evt):
-            self.Scratch.buffer.exec_region()
-            evt.Skip(False) # Don't skip explicitly.
-        
-        ## Session
+        ## Session files
         self.SESSION_FILE = get_rootpath(".debrc")
         self.SCRATCH_FILE = get_rootpath("scratch.py")
         self.LOGGING_FILE = get_rootpath("deb-logging.log")
         
-        self.load_session(
-            os.path.abspath(debrc) if debrc else self.SESSION_FILE)
+        if session is not None:
+            self.load_session(session or self.SESSION_FILE)
+        else:
+            self.SESSION_FILE = None
+        
+        self.postInit()
     
     def load_session(self, filename):
         """Load session from file.
@@ -1319,13 +1296,13 @@ class ShellFrame(MiniFrame):
         ## Re-open the *log* file.
         self.add_log("#! Opened: <{}>\r\n".format(datetime.datetime.now()))
         
-        fn = os.path.abspath(filename)
+        session = os.path.abspath(filename)
         try:
-            with open(fn, encoding='utf-8', newline='') as i:
+            with open(session) as i:
                 exec(i.read())
         except FileNotFoundError:
             pass
-        self.SESSION_FILE = fn
+        self.SESSION_FILE = session
         
         ## Reposition the window if it is not on the desktop.
         if wx.Display.GetFromWindow(self) == -1:
@@ -1346,6 +1323,9 @@ class ShellFrame(MiniFrame):
         _fsave(self.Scratch, self.SCRATCH_FILE) # save scratch
         _fsave(self.Log,     self.LOGGING_FILE) # save log
         
+        if not self.SESSION_FILE:
+            return
+        
         with open(self.SESSION_FILE, 'w') as o:
             o.write("#! Session file (This file is generated automatically)\n")
             o.write("self.SetSize({})\n".format(self.Size))
@@ -1365,7 +1345,39 @@ class ShellFrame(MiniFrame):
                 "self._mgr.Update()\n",
             )))
     
+    def postInit(self):
+        """Set shell and editor styles.
+        Note:
+            This is called after loading session.
+        """
+        from .nutshell import Stylus
+        
+        self.Scratch.set_attributes(Style=Stylus.py_shell_mode)
+        
+        self.Log.set_attributes(ReadOnly=True,
+                                Style=Stylus.py_log_mode)
+        
+        self.Help.set_attributes(ReadOnly=False,
+                                 Style=Stylus.py_text_mode)
+        
+        self.set_hookable(self.Scratch)
+        self.set_hookable(self.Log)
+        
+        @self.Scratch.define_key('C-j')
+        def eval_line(evt):
+            self.Scratch.buffer.eval_line()
+            evt.Skip(False) # Don't skip explicitly.
+        
+        @self.Scratch.define_key('M-j')
+        def eval_buffer(evt):
+            self.Scratch.buffer.exec_region()
+            evt.Skip(False) # Don't skip explicitly.
+    
     def Init(self):
+        """Initialize self-specific builtins.
+        Note:
+            This should be called before creating root shell.
+        """
         try:
             builtins.dive
         except AttributeError:

mwx/graphman.py

@@ -625,8 +625,8 @@ class Frame(mwx.Frame):
         
         self.__plugins = {} # modules in the order of load/save
         
-        self.__graph = Graph(self, log=self.message, margin=None, size=(600,600))
-        self.__output = Graph(self, log=self.message, margin=None, size=(600,600))
+        self.__graph = Graph(self, log=self.message, margin=None)
+        self.__output = Graph(self, log=self.message, margin=None)
         
         self.__histgrm = Histogram(self, log=self.message, margin=None, size=(130,65))
         self.__histgrm.attach(self.graph)
@@ -822,14 +822,14 @@ class Frame(mwx.Frame):
         ## Accepts DnD
         self.SetDropTarget(MyFileDropLoader(self.graph, self))
         
-        ## Script editor for plugins (external call)
-        self.Editor = "notepad"
+    ## Script editor for plugins (external call)
+    EDITOR = "notepad"
     
-    sync_switch = True
+    SYNC_SWITCH = True
     
     def sync(self, a, b):
         """Synchronize b to a."""
-        if (self.sync_switch
+        if (self.SYNC_SWITCH
             and a.frame and b.frame
             and a.frame.unit == b.frame.unit
             and a.buffer.shape == b.buffer.shape):
@@ -1336,8 +1336,7 @@ class Frame(mwx.Frame):
         if not plug:
             return
         
-        Popen([self.Editor,
-               inspect.getmodule(plug).__file__])
+        Popen([self.EDITOR, inspect.getmodule(plug).__file__])
     
     def inspect_plug(self, name):
         """Dive into the process to inspect plugs in the shell.

mwx/mgplt.py

@@ -129,7 +129,7 @@ class GnuplotFrame(mwx.Frame):
         mwx.Frame.__init__(self, *args, **kwargs)
         
         self.gnuplot = Gnuplot()
-        self.panel = GnuplotPanel(self)
+        self.panel = ControlPanel(self)
         
         self.menubar["Edit"] = [
             (wx.ID_COPY, "&Copy params\tCtrl-c", "Copy params to clipboard",

mwx/nutshell.py

@@ -17,7 +17,8 @@ import sys
 import os
 import re
 import wx
-from wx import stc, aui
+from wx import aui
+from wx import stc
 from wx.py import dispatcher
 from wx.py import introspect
 from wx.py import interpreter
@@ -53,7 +54,7 @@ stc.STC_STYLE_CARETLINE = 40
 stc.STC_STYLE_ANNOTATION = 41
 
 class Stylus:
-    py_buffer_mode = {
+    py_log_mode = {
         stc.STC_STYLE_DEFAULT     : "fore:#7f7f7f,back:#ffffb8,size:9,face:MS Gothic",
         stc.STC_STYLE_LINENUMBER  : "fore:#000000,back:#ffffb8,size:9",
         stc.STC_STYLE_BRACELIGHT  : "fore:#000000,back:#ffffb8,bold",
@@ -1930,7 +1931,7 @@ class Buffer(EditorInterface, EditWindow):
         })
         
         self.show_folder()
-        self.set_stylus(Stylus.py_buffer_mode)
+        self.set_stylus(Stylus.py_text_mode)
     
     def __contains__(self, code):
         if inspect.iscode(code) and self.code:

{mwxlib-0.99.3.dist-info → mwxlib-0.99.6.dist-info}/METADATA

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

{mwxlib-0.99.3.dist-info → mwxlib-0.99.6.dist-info}/RECORD

@@ -1,14 +1,14 @@
-mwx/__init__.py,sha256=nN62CGTWjME7Zz2h-jIRB8MxwuErIkHPGrlBzydkF0o,643
+mwx/__init__.py,sha256=U7n9X8JAWdzOavKvVqecHdE4ooiXcCB5DSPCKWxfTnY,653
 mwx/bookshelf.py,sha256=so-xSLq08sMlJBErTxOaDoKUAMa_g1CkIP2pNnff68c,5607
 mwx/controls.py,sha256=0UkLeyIsQU0uj--v1NYctx-GzqO36Z5rdeNpCsfIN10,47657
-mwx/framework.py,sha256=YG3NHz8Jc0llVmlU22W9KOALESPJnjTc0zL5PQmwbQA,75304
-mwx/graphman.py,sha256=s0qlaDIPFFvJaY7MeFNcEg4kxbF27jsyu-dJFgulo_U,70327
+mwx/framework.py,sha256=jsOZNCo0Sjea8XWBGSEghENyNTVGVAvZxkDQYi_6BUA,75632
+mwx/graphman.py,sha256=EZiRUKhPb6V-S1BcgFhsOQoaZvp4yw6F4SF45uUjla4,70266
 mwx/images.py,sha256=_-Eh3xF7Khu42ivkYp97NXIzSNGbjcidqtWjZQFGtqE,47827
 mwx/matplot2.py,sha256=xCJ_ZzdDEWmzctpPaOrzTnwXyHINP4nfFHweoTZa6ug,32899
 mwx/matplot2g.py,sha256=gCXa8X1MEMP7n_mG73h3SkWKuNZOfjVKUTWNRXXK11c,64310
 mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
-mwx/mgplt.py,sha256=0WJ1RN_Y0a4Y3rz1C_Lx-WhumtOMdb1N49guX9aZZ_o,5602
-mwx/nutshell.py,sha256=1lHjyrCY4J_wtRlMnJuLq6xn22ofWw6TrZPtGthXZyc,142080
+mwx/mgplt.py,sha256=M5rt-H7Uq1OHnlFvMA4a3945UBvppbR9L_mw8NL_YZ0,5602
+mwx/nutshell.py,sha256=etvpwPctuf9KhvIB1WZwTAaljYQ2ciMRfUWzmXW6NUo,142090
 mwx/utilus.py,sha256=iizdVrbwL1lX7eTfsMmltFz4IfHqTXVM37wwlPQ3A3Y,37346
 mwx/wxmon.py,sha256=Pq8XXigM_isJd80yiqG18iRVdArJpsePpxfnZOkk-Uw,12573
 mwx/wxpdb.py,sha256=lLowkkAgMhPFHAfklD7wZHq0qbSMjRxnBFtSajmVgME,19133
@@ -21,8 +21,8 @@ mwx/plugins/frame_listview.py,sha256=yEYPCdLHLSMTJwTv6iYAh3Lo4lJvYfp5BxTLP3FhW9Y
 mwx/plugins/line_profile.py,sha256=--9NIc3x5EfRB3L59JvD7rzENQHyiYfu7wWJo6AuMkA,820
 mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
 mwx/py/filling.py,sha256=fumUG1F5M9TL-Dfqni4G85uk7TmvnUunTbdcPDV0vfo,16857
-mwxlib-0.99.3.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.99.3.dist-info/METADATA,sha256=W98i-ZcPeMT7ctVJ055GvGZ_wKDf7LG0dWC9l_Wu13c,7411
-mwxlib-0.99.3.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-mwxlib-0.99.3.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.99.3.dist-info/RECORD,,
+mwxlib-0.99.6.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.99.6.dist-info/METADATA,sha256=oJA02gAxSPxjaJwcQ9DEyrxQHoRuR-1kAD7ZSq1JLMs,7411
+mwxlib-0.99.6.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+mwxlib-0.99.6.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.99.6.dist-info/RECORD,,