mwxlib 0.93.8__py3-none-any.whl → 0.94.0__py3-none-any.whl

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.93.8"
+__version__ = "0.94.0"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial
@@ -975,7 +975,7 @@ class FileDropLoader(wx.DropTarget):
     def __init__(self, target):
         wx.DropTarget.__init__(self)
         
-        self.editor = target
+        self.book = target
         self.textdo = wx.TextDataObject()
         self.filedo = wx.FileDataObject()
         self.DataObject = wx.DataObjectComposite()
@@ -983,25 +983,26 @@ class FileDropLoader(wx.DropTarget):
         self.DataObject.Add(self.filedo, True)
     
     def OnData(self, x, y, result):
+        editor = self.book
         self.GetData()
         if self.textdo.TextLength > 1:
             f = self.textdo.Text.strip()
-            res = self.editor.load_file(f)
+            res = editor.load_file(f)
             if res:
-                self.editor.buffer.SetFocus()
+                editor.buffer.SetFocus()
                 result = wx.DragCopy
             elif res is None:
-                self.editor.post_message("Load canceled.")
+                editor.post_message("Load canceled.")
                 result = wx.DragCancel
             else:
-                self.editor.post_message(f"Loading {f!r} failed.")
+                editor.post_message(f"Loading {f!r} failed.")
                 result = wx.DragNone
             self.textdo.Text = ''
         else:
             for f in self.filedo.Filenames:
-                if self.editor.load_file(f):
-                    self.editor.buffer.SetFocus()
-                    self.editor.post_message(f"Loaded {f!r} successfully.")
+                if editor.load_file(f):
+                    editor.buffer.SetFocus()
+                    editor.post_message(f"Loaded {f!r} successfully.")
             self.filedo.SetData(wx.DF_FILENAME, None)
         return result
 
@@ -1487,26 +1488,26 @@ class ShellFrame(MiniFrame):
             evt.Skip()
     
     def About(self, evt=None):
-        buf = self.Help.buffer
-        with buf.off_readonly():
-            buf.SetText('\n\n'.join((
+        self.add_help(
+            '\n\n'.join((
                 "#<module 'mwx' from {!r}>".format(__file__),
                 "Author: {!r}".format(__author__),
                 "Version: {!s}".format(__version__),
                 self.__class__.__doc__,
                 self.rootshell.__class__.__doc__,
+                
                 ## Thanks to wx.py.shell.
                 "#{!r}".format(wx.py),
                 "Author: {!r}".format(wx.py.version.__author__),
                 "Version: {!s}".format(wx.py.version.VERSION),
                 wx.py.shell.Shell.__doc__,
                 textwrap.indent("*original" + wx.py.shell.HELP_TEXT, ' '*4),
+                
                 ## Thanks are also due to wx.
                 "#{!r}".format(wx),
                 "To show the credit, press C-M-Mbutton.\n",
                 ))
             )
-        self.popup_window(self.Help, focus=0)
     
     def toggle_window(self, win, focus=False):
         self.popup_window(win, show=None, focus=focus)

mwx/graphman.py

@@ -713,12 +713,12 @@ class Frame(mwx.Frame):
             ("Options", []), # reserved for optional app settings
             (),
             (mwx.ID_(13), "&Graph window\tF9", "Show graph window", wx.ITEM_CHECK,
-                lambda v: self.show_pane("graph", v.IsChecked()),
-                lambda v: v.Check(self.graph.IsShown())),
+                lambda v: self.show_pane(self.graph, v.IsChecked()),
+                lambda v: v.Check(self.graph.IsShownOnScreen())),
                 
             (mwx.ID_(14), "&Output window\tF10", "Show Output window", wx.ITEM_CHECK,
-                lambda v: self.show_pane("output", v.IsChecked()),
-                lambda v: v.Check(self.output.IsShown())),
+                lambda v: self.show_pane(self.output, v.IsChecked()),
+                lambda v: v.Check(self.output.IsShownOnScreen())),
             (),
         ]
         self.menubar["Edit"] = [
@@ -743,8 +743,8 @@ class Frame(mwx.Frame):
                 lambda v: self.__view.hide_layers()),
             (),
             (mwx.ID_(24), "&Histogram\tCtrl-h", "Show Histogram window", wx.ITEM_CHECK,
-                lambda v: self.show_pane("histogram", v.IsChecked()),
-                lambda v: v.Check(self.histogram.IsShown())),
+                lambda v: self.show_pane(self.histogram, v.IsChecked()),
+                lambda v: v.Check(self.histogram.IsShownOnScreen())),
                 
             (mwx.ID_(25), "&Invert Color\t(C-i)", "Invert colormap", wx.ITEM_CHECK,
                 lambda v: self.__view.invert_cmap(),
@@ -783,14 +783,14 @@ class Frame(mwx.Frame):
         ]
         self.menubar.reset()
         
-        def show_graph(frame):
+        def show_frameview(frame):
             wx.CallAfter(self.show_pane, frame.parent) # Show graph / output
         
         self.graph.handler.append({ # DNA<Graph:Frame>
             None : {
                   'frame_shown' : [ None, self.set_title ],
-                 'frame_loaded' : [ None, show_graph ],
-               'frame_modified' : [ None, show_graph ],
+                 'frame_loaded' : [ None, show_frameview ],
+               'frame_modified' : [ None, show_frameview ],
                'frame_selected' : [ None, self.set_title ],
                   'canvas_draw' : [ None, lambda v: self.sync(self.graph, self.output) ],
             },
@@ -798,8 +798,8 @@ class Frame(mwx.Frame):
         self.output.handler.append({ # DNA<Graph:Frame>
             None : {
                   'frame_shown' : [ None, self.set_title ],
-                 'frame_loaded' : [ None, show_graph ],
-               'frame_modified' : [ None, show_graph ],
+                 'frame_loaded' : [ None, show_frameview ],
+               'frame_modified' : [ None, show_frameview ],
                'frame_selected' : [ None, self.set_title ],
                   'canvas_draw' : [ None, lambda v: self.sync(self.output, self.graph) ],
             },
@@ -1802,16 +1802,12 @@ class Frame(mwx.Frame):
                 o.write("self.load_plug({!r}, session={})\n".format(path, session or None))
             o.write("self._mgr.LoadPerspective({!r})\n".format(self._mgr.SavePerspective()))
             
-            ## set-global-unit
-            o.write("self.graph.unit = {:g}\n".format(self.graph.unit))
-            o.write("self.output.unit = {:g}\n".format(self.output.unit))
-            
             ## stack-frame
             paths = [x.pathname for x in self.graph.all_frames if x.pathname]
             if paths:
                 o.write("self.load_frame(\n{}, self.graph)\n".format(
                         pformat(paths, width=160)))
-            if len(paths) > 1:
+                
                 frame = self.graph.frame # restore currently selected frame
                 if frame and frame.pathname:
                     o.write("self.graph.select({!r})\n".format(frame.name))

mwx/matplot2g.py

@@ -393,7 +393,7 @@ class GraphPlot(MatplotPanel):
     def __init__(self, *args, **kwargs):
         MatplotPanel.__init__(self, *args, **kwargs)
         
-        def _draw_idle(v):
+        def _draw(v):
             self.canvas.draw_idle()
         
         self.handler.update({ # DNA<GraphPlot>
@@ -408,16 +408,16 @@ class GraphPlot(MatplotPanel):
                 'frame_updated' : [ None, _F(self.writeln) ], # unit,name,ratio => update_extent
                 'frame_cmapped' : [ None, _F(self.writeln) ], # cmap
                     'line_draw' : [ None ],
-                   'line_drawn' : [ None, _draw_idle ],
+                   'line_drawn' : [ None, _draw ],
                     'line_move' : [ None ],
-                   'line_moved' : [ None, _draw_idle ],
-                 'line_removed' : [ None, _draw_idle ],
+                   'line_moved' : [ None, _draw ],
+                 'line_removed' : [ None, _draw ],
                     'mark_draw' : [ None ],
-                   'mark_drawn' : [ None, _draw_idle ],
-                 'mark_removed' : [ None, _draw_idle ],
+                   'mark_drawn' : [ None, _draw ],
+                 'mark_removed' : [ None, _draw ],
                   'region_draw' : [ None ],
-                 'region_drawn' : [ None, _draw_idle ],
-               'region_removed' : [ None, _draw_idle ],
+                 'region_drawn' : [ None, _draw ],
+               'region_removed' : [ None, _draw ],
                  'M-up pressed' : [ None, self.OnPageUp ],
                'M-down pressed' : [ None, self.OnPageDown ],
                'pageup pressed' : [ None, self.OnPageUp ],
@@ -440,7 +440,7 @@ class GraphPlot(MatplotPanel):
                     'r pressed' : (REGION, self.OnRegionAppend, self.OnEscapeSelection),
             'r+Lbutton pressed' : (REGION, self.OnRegionAppend, self.OnEscapeSelection),
             'M-Lbutton pressed' : (REGION, self.OnRegionAppend, self.OnEscapeSelection),
-               'escape pressed' : (NORMAL, self.OnEscapeSelection, _draw_idle),
+               'escape pressed' : (NORMAL, self.OnEscapeSelection, _draw),
                 'shift pressed' : (NORMAL, self.on_picker_lock),
                'shift released' : (NORMAL, self.on_picker_unlock),
               'Lbutton pressed' : (NORMAL, self.OnDragLock),
@@ -502,7 +502,7 @@ class GraphPlot(MatplotPanel):
                'right released' : (MARK, self.OnMarkShiftEnd),
                     'n pressed' : (MARK, self.OnMarkSkipNext),
                     'p pressed' : (MARK, self.OnMarkSkipPrevious),
-               'escape pressed' : (NORMAL, self.OnMarkDeselected, _draw_idle),
+               'escape pressed' : (NORMAL, self.OnMarkDeselected, _draw),
                'delete pressed' : (MARK, self.OnMarkRemove),
                 'space pressed' : (PAN, self.OnPanBegin),
                  'ctrl pressed' : (PAN, self.OnPanBegin),
@@ -531,7 +531,7 @@ class GraphPlot(MatplotPanel):
                 'down released' : (REGION, self.OnRegionShiftEnd),
                 'left released' : (REGION, self.OnRegionShiftEnd),
                'right released' : (REGION, self.OnRegionShiftEnd),
-               'escape pressed' : (NORMAL, self.OnRegionDeselected, _draw_idle),
+               'escape pressed' : (NORMAL, self.OnRegionDeselected, _draw),
                'delete pressed' : (NORMAL, self.OnRegionRemove),
                 'space pressed' : (PAN, self.OnPanBegin),
                  'ctrl pressed' : (PAN, self.OnPanBegin),

mwx/matplot2lg.py

@@ -98,13 +98,14 @@ class LinePlot(MatplotPanel):
         self.__annotations = []
         
         #<matplotlib.text.Annotation>
-        def annotation(v, xy, xytext,
-            xycoords='data', textcoords='offset points', **arrowprops):
-            return self.axes.annotate('' if v is None else '{:g}'.format(v),
+        def annotation(v, xy, xytext, xycoords='data',
+                textcoords='offset points', **arrowprops):
+            return self.axes.annotate(
+                    '' if v is None else '{:g}'.format(v),
                     xy, xytext, xycoords, textcoords, arrowprops, size='small')
         
-        if self.__region is not None:
-            a, b = self.__region
+        if self.region is not None:
+            a, b = self.region
             x = (b + a) / 2
             y = self.ylim[0] + 20/self.ddpu[1]
             if (b - a) > 60/self.ddpu[0]:
@@ -190,11 +191,9 @@ class LinePlot(MatplotPanel):
         else:
             self.message("- No region.") #<FSM logic-error>
         self.draw()
-        ## self.handler('region_draw', self.frame)
     
     def OnDragEnd(self, evt):
         self.set_wxcursor(wx.CURSOR_ARROW)
-        ## self.handler('region_drawn', self.frame)
     
     def OnEscapeSelection(self, evt):
         MatplotPanel.OnEscapeSelection(self, evt)
@@ -202,7 +201,6 @@ class LinePlot(MatplotPanel):
         self.set_wxcursor(wx.CURSOR_ARROW)
         self.region = None
         self.draw()
-        ## self.handler('region_removed', self.frame)
 
 
 class Histogram(LinePlot):
@@ -344,10 +342,7 @@ class Histogram(LinePlot):
     ## Motion/Drag actions (override)
     ## --------------------------------
     
-    def OnDraw(self, evt):
-        """Called before canvas.draw."""
-        ## LinePlot.OnDraw(self, evt) ---> do not annotate
-        
+    def annotate(self):
         if self.__frame:
             x, y = self.__frame.__data
             if len(x) > 1:
@@ -625,6 +620,14 @@ class LineProfile(LinePlot):
             Clipboard.write(o.getvalue(), verbose=0)
             self.message("Write data to clipboard.")
     
+    def annotate(self):
+        LinePlot.annotate(self)
+        
+        x, y = self.plotdata
+        if x.size:
+            self.__fil.set_xy(list(chain([(x[0],0)], zip(x,y), [(x[-1],0)])))
+        self.writeln()
+    
     ## --------------------------------
     ## Motion/Drag actions (override)
     ## --------------------------------
@@ -643,15 +646,6 @@ class LineProfile(LinePlot):
             self.toolbar.push_current()
             self.draw()
     
-    def OnDraw(self, evt):
-        """Called before canvas.draw."""
-        LinePlot.OnDraw(self, evt)
-        
-        x, y = self.plotdata
-        if x.size:
-            self.__fil.set_xy(list(chain([(x[0],0)], zip(x,y), [(x[-1],0)])))
-        self.writeln()
-    
     def OnLineWidth(self, evt):
         n = -2 if evt.key[-1] == '-' else 2
         self.set_linewidth(self.__linewidth + n)
@@ -674,9 +668,6 @@ class LineProfile(LinePlot):
         """Show average value."""
         y = self.calc_average()
         if y is not None:
-            ## self.__hline.set_ydata([y])
-            ## self.__hline.set_visible(1)
-            ## self.canvas.draw_idle()
             self.message(f"ya = {y:g}")
     
     def OnRegionLock(self, evt):

mwx/nutshell.py

@@ -2730,7 +2730,7 @@ class Nautilus(Shell, EditorInterface):
         rst = self.get_style(p)
         if p == self.bolc:
             self.ReplaceSelection('self') # replace [.] --> [self.]
-        elif st in ('nil', 'op', 'sep', 'lparen'):
+        elif st in ('nil', 'space', 'op', 'sep', 'lparen'):
             self.ReplaceSelection('self')
         elif st not in ('moji', 'word', 'rparen') or rst == 'word':
             self.handler('quit', evt) # don't enter autocomp

mwx/plugins/__init__.py

@@ -0,0 +1,2 @@
+#! python3
+"""Plug-ins and add-ins."""

mwx/py/__init__.py

@@ -1,2 +1 @@
 #! python3
-"""Plug-ins / Add-ins."""

{mwxlib-0.93.8.dist-info → mwxlib-0.94.0.dist-info}/METADATA

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

mwxlib-0.94.0.dist-info/RECORD

@@ -0,0 +1,28 @@
+mwx/__init__.py,sha256=5B4YSOuijG1Uo5-FLtLHGB52Cp_F4vnN--4wGPBx7do,2398
+mwx/bookshelf.py,sha256=FrissUYdGXLABOzJmMaQU6GXvu6n_9DVW3d5wGwQzjM,6613
+mwx/controls.py,sha256=9C1sXBwQl-oZtCb3rXoT-doW48Sv1J359toNq9ScF9M,47173
+mwx/framework.py,sha256=kMfGFudj900FfShXWeFlyqogCdxCKwgbH2Y--1pn6Pk,73877
+mwx/graphman.py,sha256=UsNBo5Z1eiuXj3VkxCZds_Uy8R0cQV7mXoCwLtejbCE,70001
+mwx/images.py,sha256=mrnUYH12I3XLVSZcEXlpVltX0XMxufbl2yRvDIQJZqc,49957
+mwx/matplot2.py,sha256=qaF_gvLoLn-TimLbRR59KUavNr1ZpZQdSMqjzJk47rk,32682
+mwx/matplot2g.py,sha256=Ca-3RJZmSiZcvNrXmeK_lFf2fdG-0gkp7dYkCtrKi2I,65530
+mwx/matplot2lg.py,sha256=tg8u7w4DxiJdPN-E197NOmbQpc_1gZkgDHYv_xUhbFA,27224
+mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
+mwx/nutshell.py,sha256=o5QHqlnLmKBZ63BWHcWXQO2LZ6YOzT0u46x3zEJAYQw,135825
+mwx/utilus.py,sha256=THDxQ-QqbHYVc8iX8qN9yxvfcf7Pvpm7sfTP9ipYvzs,37040
+mwx/wxmon.py,sha256=Qk86VbuuW2rR46pqEYLur13G_aloWz5SVv6sib30YY0,12717
+mwx/wxpdb.py,sha256=2z3ZD9Oo1H-ONBHlaprkB9hrTmAI7o03sqO46ppEFE4,19129
+mwx/wxwil.py,sha256=JK1du4i1RVMbDLqN8jLRDSu_JhKEp4mhHVMElzo4yoE,5578
+mwx/wxwit.py,sha256=2gFHi-8nwWRh26RdvZ_AUP--8PDjJB8TUU72y2fBUWM,7557
+mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
+mwx/plugins/ffmpeg_view.py,sha256=vUYNybIJsF1JGkDzjBgDyBQvDh8e1oKHlEMY5Fwc8L4,9399
+mwx/plugins/fft_view.py,sha256=evj2kCe6N10JQczW8IajgLVrUWOihQaHQ2xiBzAsAl4,2675
+mwx/plugins/frame_listview.py,sha256=T-2xSv_D2bk9fJ64aiSEe1rJRTeqaIpLVAYEUXW5vz8,10110
+mwx/plugins/line_profile.py,sha256=WJB5z7F53yg4dII2R36IFZvtkSOGWT669b1HmAAXSnQ,816
+mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
+mwx/py/filling.py,sha256=KaHooM32hrGGgqw75Cbt8lAvACwC6RXadob9LGgNnEc,16806
+mwxlib-0.94.0.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.94.0.dist-info/METADATA,sha256=G-NumcRVK3w8tTgMgMM_64pEpkJaZqqGFYoo7Vs7CoM,1925
+mwxlib-0.94.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mwxlib-0.94.0.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.94.0.dist-info/RECORD,,

mwxlib-0.93.8.dist-info/RECORD

@@ -1,27 +0,0 @@
-mwx/__init__.py,sha256=5B4YSOuijG1Uo5-FLtLHGB52Cp_F4vnN--4wGPBx7do,2398
-mwx/bookshelf.py,sha256=FrissUYdGXLABOzJmMaQU6GXvu6n_9DVW3d5wGwQzjM,6613
-mwx/controls.py,sha256=9C1sXBwQl-oZtCb3rXoT-doW48Sv1J359toNq9ScF9M,47173
-mwx/framework.py,sha256=ZwsNOIUpR8Xpilvc_ndcdhKIgoDoJ0whMTKweAwSzlI,73951
-mwx/graphman.py,sha256=SKYJFxi-TqWOALRczYz-M-2ZYEbqiZuAuKCfEIedctY,70156
-mwx/images.py,sha256=mrnUYH12I3XLVSZcEXlpVltX0XMxufbl2yRvDIQJZqc,49957
-mwx/matplot2.py,sha256=qaF_gvLoLn-TimLbRR59KUavNr1ZpZQdSMqjzJk47rk,32682
-mwx/matplot2g.py,sha256=Txcz3yusiFF0j1QnAS0dCGTbGrkx4VC6BZbWbjIRZnw,65585
-mwx/matplot2lg.py,sha256=IfTZSJaKtiw7SWM3lDNBO6qz5AOTJ6UmPVoMzXZoR8I,27653
-mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
-mwx/nutshell.py,sha256=5HErOObnOprMc6gYnXV7wY-ALnlwNpmhV8f0EyipYA4,135816
-mwx/utilus.py,sha256=THDxQ-QqbHYVc8iX8qN9yxvfcf7Pvpm7sfTP9ipYvzs,37040
-mwx/wxmon.py,sha256=Qk86VbuuW2rR46pqEYLur13G_aloWz5SVv6sib30YY0,12717
-mwx/wxpdb.py,sha256=2z3ZD9Oo1H-ONBHlaprkB9hrTmAI7o03sqO46ppEFE4,19129
-mwx/wxwil.py,sha256=JK1du4i1RVMbDLqN8jLRDSu_JhKEp4mhHVMElzo4yoE,5578
-mwx/wxwit.py,sha256=2gFHi-8nwWRh26RdvZ_AUP--8PDjJB8TUU72y2fBUWM,7557
-mwx/py/__init__.py,sha256=NzBazvjN9KMFoylsHsLiNOHbcDrNflgSwEFlkT12Rnw,39
-mwx/py/ffmpeg_view.py,sha256=vUYNybIJsF1JGkDzjBgDyBQvDh8e1oKHlEMY5Fwc8L4,9399
-mwx/py/fft_view.py,sha256=evj2kCe6N10JQczW8IajgLVrUWOihQaHQ2xiBzAsAl4,2675
-mwx/py/filling.py,sha256=KaHooM32hrGGgqw75Cbt8lAvACwC6RXadob9LGgNnEc,16806
-mwx/py/frame_listview.py,sha256=T-2xSv_D2bk9fJ64aiSEe1rJRTeqaIpLVAYEUXW5vz8,10110
-mwx/py/line_profile.py,sha256=WJB5z7F53yg4dII2R36IFZvtkSOGWT669b1HmAAXSnQ,816
-mwxlib-0.93.8.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.93.8.dist-info/METADATA,sha256=zJOmDRH4dCa-5QzpMr-hCP-ZhYBPlwZ2AlNzSn_q9Nw,1925
-mwxlib-0.93.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mwxlib-0.93.8.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.93.8.dist-info/RECORD,,