mwxlib 0.95.8__py3-none-any.whl → 0.96.0__py3-none-any.whl

mwx/controls.py

@@ -1225,7 +1225,7 @@ class Indicator(wx.Control):
         self.Refresh()
     
     def update_design(self, **kwargs):
-        """Update design attributes.
+        """Update multiple design properties at once.
         
         This method is useful for changing colors, spacing, radius, etc.
         The best size will be automatically invalidated and re-calculated.

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.95.8"
+__version__ = "0.96.0"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial
@@ -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

@@ -14,6 +14,7 @@ from numpy import pi, nan
 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
@@ -583,7 +584,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)

mwx/matplot2lg.py

@@ -57,6 +57,9 @@ class LinePlot(MatplotPanel):
         self.__region = None
         self.__annotations = []
         
+        ## Note for matplotlib >= 3.9.0:
+        ## axhspan and axvspan now return Rectangles, not Polygons.
+        #<matplotlib.patches.Rectangle>
         #<matplotlib.patches.Polygon>
         self.__vspan = self.axes.axvspan(0, 0,
             color='none', ls='dashed', lw=1, ec='black', visible=0, zorder=2)
@@ -81,7 +84,11 @@ class LinePlot(MatplotPanel):
                 elif b > r: b = r
             v = np.array((a, b))
             self.__vspan.set_visible(1)
-            self.__vspan.set_xy(((a,0), (a,1), (b,1), (b,0)))
+            try:
+                self.__vspan.set_x(a)
+                self.__vspan.set_width(b-a)
+            except AttributeError:
+                self.__vspan.set_xy(((a,0), (a,1), (b,1), (b,0)))
             self.handler('region_set', self.frame)
         else:
             self.__vspan.set_visible(0)
@@ -299,11 +306,9 @@ class Histogram(LinePlot):
         self.__frame = frame # update reference of the frame
         if frame:
             try:
-                image = self.frmae.image
-                h, w = image.shape
-                x, y = frame.__data # reuse the data unless,
+                x, y = frame.__data # reuse cached data
             except Exception:
-                x, y = frame.__data = self.calc(frame) # histogram_data buffer
+                x, y = frame.__data = self.calc(frame) # new histogram_data buffer
             
             self.__plot.set_data(x, y)
             self.xlim = x.min(), x.max()

mwx/nutshell.py

@@ -867,7 +867,7 @@ class EditorInterface(CtrlInterface):
         self.Overtype = mode if mode is not None else not self.Overtype
     
     def wrap(self, mode=1):
-        """Sets whether text is word wrapped.
+        """Set whether text is word wrapped.
         
         (override) mode in {0:no-wrap, 1:word-wrap, 2:char-wrap,
                             3:whitespace-wrap, None:toggle}
@@ -1800,8 +1800,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
         evt.Skip()
     
     def set_attributes(self, buf=None, **kwargs):
-        """Sets attributes and defaultBufferStyle
-        that apply to all buffers contained in the EditorBook.
+        """Set multiple properties at once to the buffer(s).
         
         Args:
             buf : a buffer to apply (if None, applies to all buffers).

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='->|')

{mwxlib-0.95.8.dist-info → mwxlib-0.96.0.dist-info}/METADATA

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

{mwxlib-0.95.8.dist-info → mwxlib-0.96.0.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=ejttyU7pC50tr71cOWQj9ImN_AMeTKtQWozPD8pLwhE,48183
-mwx/framework.py,sha256=ITmjul_u4gp9jAJ_qbCDUVhlLI02cFhLLABCbYS-13k,75669
-mwx/graphman.py,sha256=NBe58KdAstFNPqyEmpPMMmWwjtNgJB7HumSI7-gjw54,70533
+mwx/controls.py,sha256=IAT3l3-azlPFtMc2VGNMiQhI390ExW0S4CgjEOKFI4s,48200
+mwx/framework.py,sha256=Z-WbpepmraX_7wCq4jWpOCeDhUrUO5NlOmFLf2RjoLk,75666
+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/matplot2lg.py,sha256=gI_L_GofQrg5TIgZFMgYu8-7IRoe6VCRG3Ub35ChSpQ,27177
+mwx/matplot2.py,sha256=-G7z0Osozm9NjLfXvX5UcdFviwbNUktjbd904_g-PqQ,33516
+mwx/matplot2g.py,sha256=Ii0y4Ebod-9EJ-WPaCyZ-voM5uC3MTDmNktJD7OiTtA,65496
+mwx/matplot2lg.py,sha256=pcu1oDPE_BlpFqNGPPKf9vpTuDs_h_u3OTRAJx5-Sds,27392
 mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
-mwx/nutshell.py,sha256=xI5o9os0wxgkY5LFz1wztM36l-4nl2j1iAdzJ11BMv0,137104
+mwx/nutshell.py,sha256=pbsQATwt906lOXGFWJmuwZIwU_ve78o46I2g5zNjvG4,137050
 mwx/utilus.py,sha256=Uwj6vbNUUztwOswPG75xtsT2y_PZqh3QiJraxmA9iT0,37401
 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.8.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.95.8.dist-info/METADATA,sha256=_rLSaOpBEIzfQxz1acUok9ODoGNNth0lRqmIOLZv0Xs,1925
-mwxlib-0.95.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mwxlib-0.95.8.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.95.8.dist-info/RECORD,,
+mwxlib-0.96.0.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.96.0.dist-info/METADATA,sha256=3UowIlnhpmH3yDgustsBu7iviC9fFKYIWtspEFsWYNs,1925
+mwxlib-0.96.0.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+mwxlib-0.96.0.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.96.0.dist-info/RECORD,,

{mwxlib-0.95.8.dist-info → mwxlib-0.96.0.dist-info}/WHEEL

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