mwxlib 1.0.3__py3-none-any.whl → 1.0.6__py3-none-any.whl

mwx/controls.py

@@ -465,7 +465,13 @@ class Knob(wx.Panel):
             self.text.BackgroundColour = c
             self.text.Refresh()
     
-    def shift(self, evt, bit):
+    def shift_ctrl(self, evt, bit):
+        """Called when a key/mouse wheel is pressed/scrolled.
+        
+        In addition to direct key input to the textctrl,
+        [up][down][wheelup][wheeldown] keys can be used,
+        with modifiers S- 2x, C- 16x, and M- 256x steps.
+        """
         if bit:
             if evt.ShiftDown():   bit *= 2
             if evt.ControlDown(): bit *= 16
@@ -485,13 +491,13 @@ class Knob(wx.Panel):
         evt.Skip()
     
     def OnMouseWheel(self, evt): #<wx._core.MouseEvent>
-        self.shift(evt, 1 if evt.WheelRotation>0 else -1)
+        self.shift_ctrl(evt, 1 if evt.WheelRotation>0 else -1)
         evt.Skip(False)
     
     def OnCtrlKeyDown(self, evt): #<wx._core.KeyEvent>
         key = evt.GetKeyCode()
-        if key == wx.WXK_LEFT: return self.shift(evt, -1)
-        if key == wx.WXK_RIGHT: return self.shift(evt, 1)
+        if key == wx.WXK_LEFT: return self.shift_ctrl(evt, -1)
+        if key == wx.WXK_RIGHT: return self.shift_ctrl(evt, 1)
         
         def _focus(c):
             if isinstance(c, Knob) and c.ctrl.IsEnabled():
@@ -508,8 +514,8 @@ class Knob(wx.Panel):
     
     def OnTextKeyDown(self, evt): #<wx._core.KeyEvent>
         key = evt.GetKeyCode()
-        if key == wx.WXK_DOWN: return self.shift(evt, -1)
-        if key == wx.WXK_UP: return self.shift(evt, 1)
+        if key == wx.WXK_DOWN: return self.shift_ctrl(evt, -1)
+        if key == wx.WXK_UP: return self.shift_ctrl(evt, 1)
         if key == wx.WXK_ESCAPE:
             self.__par.reset(self.__par.value, internal_callback=None) # restore value
         evt.Skip()

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.0.3"
+__version__ = "1.0.6"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -395,9 +395,9 @@ class CtrlInterface(KeyCtrlInterfaceMixin):
     
     def on_hotkey_press(self, evt): #<wx._core.KeyEvent>
         """Called when a key is pressed."""
-        if evt.EventObject is not self:
-            evt.Skip()
-            return
+        ## if evt.EventObject is not self:
+        ##     evt.Skip()
+        ##     return
         key = hotkey(evt)
         self.__key = regulate_key(key + '-')
         if self.handler('{} pressed'.format(key), evt) is None:

mwx/matplot2g.py

@@ -48,6 +48,8 @@ def _to_buffer(img):
     if isinstance(img, wx.Image): # image to RGB array; RGB to grayscale
         w, h = img.GetSize()
         img = np.frombuffer(img.GetDataBuffer(), dtype='uint8').reshape(h, w, 3)
+    
+    if img.ndim > 2:
         return cv2.cvtColor(img, cv2.COLOR_RGB2GRAY)
     return img
 

mwx/nutshell.py

@@ -503,9 +503,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
                   ## 'C-/ pressed' : (0, ), # cf. C-a home
                   ## 'C-\ pressed' : (0, ), # cf. C-e end
                   'C-; pressed' : (0, _F(self.comment_out_line)),
-                'C-S-; pressed' : (0, _F(self.comment_out_line)),
                   'C-: pressed' : (0, _F(self.uncomment_line)),
-                'C-S-: pressed' : (0, _F(self.uncomment_line)),
                   'select_line' : (11, self.on_linesel_begin),
                  'select_lines' : (11, self.on_linesel_next),
             },
@@ -637,10 +635,10 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         self.IndicatorSetForeground(10, "red")
         
         self.IndicatorSetStyle(11, stc.STC_INDIC_STRAIGHTBOX)
+        self.IndicatorSetForeground(11, "yellow")
         self.IndicatorSetUnder(11, True)
-        self.IndicatorSetAlpha(11, 60)
-        self.IndicatorSetOutlineAlpha(11, 60)
-        self.IndicatorSetForeground(11, "light gray")
+        self.IndicatorSetAlpha(11, 0xe8)
+        self.IndicatorSetOutlineAlpha(11, 0)
         
         self.IndicatorSetStyle(2, stc.STC_INDIC_DOTS)
         self.IndicatorSetForeground(2, "light gray")
@@ -1849,7 +1847,7 @@ class Buffer(EditorInterface, EditWindow):
             """Fork events to the parent."""
             self.parent.handler(self.handler.current_event, evt)
         
-        ## Note: Key events are not propagated from Buffer to EditorBook.
+        ## Note: Mouse events are not propagated from Buffer to EditorBook.
         ## They are explicitly dispatched from buffer.handler to editor.handler.
         
         self.handler.update({ # DNA<Buffer>
@@ -1869,8 +1867,9 @@ class Buffer(EditorInterface, EditWindow):
              '*[LR]win pressed' : (-1, ),
             },
             0 : { # Normal mode
-                    '* pressed' : (0, skip, dispatch),
+                    '* pressed' : (0, skip),
                    '* released' : (0, skip, dispatch),
+             '*button* pressed' : (0, skip, dispatch),
                'escape pressed' : (-1, self.on_enter_escmap),
                   'C-h pressed' : (0, self.call_helpTip),
                     '. pressed' : (2, self.OnEnterDot),
@@ -2211,10 +2210,11 @@ class EditorBook(AuiNotebook, CtrlInterface):
              'buffer_activated' : [ None, dispatch, self.on_activated ],
            'buffer_inactivated' : [ None, dispatch, self.on_inactivated ],
        'buffer_caption_updated' : [ None, dispatch ],
-             '*button* pressed' : [ None, dispatch, skip ],
-            '*button* released' : [ None, dispatch, skip ],
             },
             0 : { # Normal mode
+                    '* pressed' : (0, skip),
+                   '* released' : (0, skip, dispatch),
+             '*button* pressed' : (0, skip, dispatch),
                  'M-up pressed' : (0, _F(self.previous_buffer)),
                'M-down pressed' : (0, _F(self.next_buffer)),
             },
@@ -2437,10 +2437,14 @@ class EditorBook(AuiNotebook, CtrlInterface):
                 self.swap_buffer(buf, lineno)
                 return True
             return False
+        except FileNotFoundError:
+            self.post_message(f"New file: {filename!r}.")
+            self.delete_buffer(buf)
+            return False
         except Exception as e:
             self.post_message(f"Failed to load {filename!r}.", e)
             self.delete_buffer(buf)
-            return False
+            raise
     
     def find_file(self, filename=None):
         """Open the specified file."""
@@ -2453,7 +2457,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
                     for fn in dlg.Paths:
                         self.find_file(fn)
             return
-        if not self.load_file(filename):
+        if self.load_file(filename) == False:
             buf = self.create_buffer(filename)
             buf._Buffer__mtime = 0 # => need_buffer_save
             self.swap_buffer(buf)
@@ -2815,8 +2819,6 @@ class Nautilus(EditorInterface, Shell):
                'shell_modified' : [ None, dispatch ],
               'shell_activated' : [ None, dispatch, self.on_activated ],
             'shell_inactivated' : [ None, dispatch, self.on_inactivated ],
-             '*button* pressed' : [ None, dispatch, skip ],
-            '*button* released' : [ None, dispatch, skip ],
             },
             -1 : { # original action of the wx.py.shell
                     '* pressed' : (0, skip, self.on_exit_escmap),
@@ -2833,7 +2835,8 @@ class Nautilus(EditorInterface, Shell):
             },
             0 : { # Normal mode
                     '* pressed' : (0, skip),
-                   '* released' : (0, skip),
+                   '* released' : (0, skip, dispatch),
+             '*button* pressed' : (0, skip, dispatch),
                'escape pressed' : (-1, self.on_enter_escmap),
                 'space pressed' : (0, self.OnSpace),
            '*backspace pressed' : (0, self.OnBackspace),

mwx/plugins/ffmpeg_view.py

@@ -109,8 +109,8 @@ class Plugin(Layer):
         self.snp = Button(self, handler=self.snapshot, icon='clip')
         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='->|')
+        self.rw = Button(self, handler=lambda v: self.seekto(-100), icon='|<-')
+        self.fw = Button(self, handler=lambda v: self.seekto(+100), icon='->|')
         
         self.layout((self.mc,), expand=2)
         self.layout((self.ss, self.to, self.rw, self.fw,
@@ -130,14 +130,24 @@ class Plugin(Layer):
         self.parent.handler.bind("unknown_format", self.load_media)
         
         self.handler.update({ # DNA<ffmpeg_viewer>
-            0 : {
-                         'play' : (1, ),
-                'space pressed' : (1, _F(self.mc.Play)),
+            0 : { # MEDIASTATE_STOPPED
+                         'play' : (2, ),
+                'space pressed' : (2, _F(self.mc.Play)),
+                 'left pressed' : (0, _F(self.seekd, -1000)),
+                'right pressed' : (0, _F(self.seekd,  1000)),
             },
-            1 : {
+            1 : { # MEDIASTATE_PAUSED
                          'stop' : (0, ),
-                        'pause' : (0, ),
+                'space pressed' : (2, _F(self.mc.Play)),
+                 'left pressed' : (1, _F(self.seekd, -1000)),
+                'right pressed' : (1, _F(self.seekd,  1000)),
+            },
+            2 : { # MEDIASTATE_PLAYING
+                         'stop' : (0, ),
+                        'pause' : (1, ),
                 'space pressed' : (1, _F(self.mc.Pause)),
+                 'left pressed' : (2, _F(self.seekd, -1000)),
+                'right pressed' : (2, _F(self.seekd,  1000)),
             },
         })
         
@@ -145,10 +155,8 @@ class Plugin(Layer):
         self.mc.Bind(wx.media.EVT_MEDIA_PLAY, partial(self.handler, 'play'))
         self.mc.Bind(wx.media.EVT_MEDIA_STOP, partial(self.handler, 'stop'))
         
-        ## self.mc.Bind(wx.EVT_KEY_DOWN, self.on_hotkey_down)
-        ## self.mc.Bind(wx.EVT_KEY_UP, self.on_hotkey_up)
-        self.mc.Bind(wx.EVT_KEY_DOWN, self.OnKeyDown)
-        self.mc.Bind(wx.EVT_KEY_UP, self.OnKeyUp)
+        self.mc.Bind(wx.EVT_KEY_DOWN, self.on_hotkey_down)
+        self.mc.Bind(wx.EVT_KEY_UP, self.on_hotkey_up)
         
         self.Bind(wx.EVT_SHOW, self.OnShow)
     
@@ -158,14 +166,6 @@ class Plugin(Layer):
         finally:
             return Layer.Destroy(self)
     
-    def OnKeyDown(self, evt):
-        if self.handler('{} pressed'.format(hotkey(evt)), evt) is None:
-            evt.Skip()
-    
-    def OnKeyUp(self, evt):
-        if self.handler('{} released'.format(hotkey(evt)), evt) is None:
-            evt.Skip()
-    
     def OnShow(self, evt):
         if not evt.IsShown():
             if self.mc:
@@ -250,18 +250,24 @@ class Plugin(Layer):
             crop = "{}:{}:0:0".format(*self.video_size)
         self.crop.Value = crop
     
-    def seekdelta(self, offset):
-        """Seek relative position [ms]."""
-        if wx.GetKeyState(wx.WXK_SHIFT):
-            offset /= 10
+    def seekto(self, offset):
+        """Seek position with offset [ms] from the `to` position."""
         try:
             t = self.to.value + offset/1000
-        except Exception as e:
-            print(e)
-        else:
-            if self._path and 0 <= t < self.video_dur:
+            if 0 <= t < self.video_dur:
                 self.to.value = round(t, 3)
-            self.set_offset(self.to) # => seek
+            self.set_offset(self.to)
+        except AttributeError:
+            pass
+    
+    def seekd(self, offset):
+        """Seek position with offset [ms] from the current position."""
+        try:
+            t = self.mc.Tell() + offset
+            if 0 <= t < self.video_dur * 1000:
+                self.mc.Seek(self.DELTA + t)
+        except AttributeError:
+            pass
     
     def snapshot(self):
         """Create a snapshot of the current frame.

{mwxlib-1.0.3.dist-info → mwxlib-1.0.6.dist-info}/METADATA

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

{mwxlib-1.0.3.dist-info → mwxlib-1.0.6.dist-info}/RECORD

@@ -1,28 +1,28 @@
 mwx/__init__.py,sha256=psabnAMei5VzB2TsB2qBNLrIZMX0LiqjlXCpNGmDejk,668
 mwx/bookshelf.py,sha256=so-xSLq08sMlJBErTxOaDoKUAMa_g1CkIP2pNnff68c,5607
-mwx/controls.py,sha256=fL_DdAjW9fIRFzlZYP296vo76e7d9cgLp4_fcWariUY,47654
-mwx/framework.py,sha256=PFUIaqPkHe-5ozh0Otg8EM8zcjHPnoijdXvSJekMLRY,75809
+mwx/controls.py,sha256=iXNTk4ge6sHStenjxC7bFKgQHvqxMwfb82IbgiDmtEk,47944
+mwx/framework.py,sha256=Y0YBqjcbfPMTqal_-vN9LPAXaHVNTYbxQ1UpMbVAb_8,75818
 mwx/graphman.py,sha256=mDnhy3jAzZCo8_p6ZcA-NDPMuOyW_R2r_fuxUIAM7D8,69669
 mwx/images.py,sha256=oxCn0P-emiWujSS2gUgU5TUnr5cPjix2jBcjOBDr24I,48701
 mwx/matplot2.py,sha256=zA56jIdRUdzu-wrmPai1PSOjzqV2Erqw2yFKW-jwdA8,32901
-mwx/matplot2g.py,sha256=diwWNxzyy-c8KBDaolHaMqWdFXSYhEumgwXIZ9wAEYk,64467
+mwx/matplot2g.py,sha256=4G5uZJZzATEC3QEVZ4pGHetEDfu5NJNUFyeAaQScK5s,64495
 mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
 mwx/mgplt.py,sha256=M5rt-H7Uq1OHnlFvMA4a3945UBvppbR9L_mw8NL_YZ0,5602
-mwx/nutshell.py,sha256=6JC855mDnZ8juWDkQ6DqXaiCJB88GJ4wgqH8VqYfSnM,142028
+mwx/nutshell.py,sha256=9QeJXQluEmZSB0B8rGSH9SU_WvjCymmDdU0DKd3fkko,142076
 mwx/utilus.py,sha256=Yyw8L1f-ikhyd7wtFXYtsOswofWxmB4GAmLOZnhUXeU,37388
 mwx/wxmon.py,sha256=yzWqrbY6LzpfRwQeytYUeqFhFuLVm_XEvrVAL_k0HBQ,12756
 mwx/wxpdb.py,sha256=--TQr-_zs9dWPYV2V4s3Zr4abvN14o5wD8anT9frHUg,18875
 mwx/wxwil.py,sha256=hhyB1lPrF9ixeObxCOKQv0Theu-B-kpJg_yVU3EGSNg,5406
 mwx/wxwit.py,sha256=1hHtMi2YEy2T_LnUpwdmrIdtCuvxMOFyykqnbq6jLP0,7294
 mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
-mwx/plugins/ffmpeg_view.py,sha256=ZKkSLpyuzpVuRbaPib04rChzlwAifNp3pcgxABeqE4k,10693
+mwx/plugins/ffmpeg_view.py,sha256=Yp1BMeNfkTTPwykvWW1_h4wrvhBSeBUdAvKhnMQIa6g,11102
 mwx/plugins/fft_view.py,sha256=08A_Y73XirV7kXpwf-v0mUA0Hr0MOfdMXv3tvL1hvWA,2789
 mwx/plugins/frame_listview.py,sha256=gowjQ-ARNonMkDSXkQgPKq4U9YBJ-vQ0jK2krBVOdCs,10420
 mwx/plugins/line_profile.py,sha256=zzm6_7lnAnNepLbh07ordp3nRWDFQJtu719ZVjrVf8s,819
 mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
 mwx/py/filling.py,sha256=fumUG1F5M9TL-Dfqni4G85uk7TmvnUunTbdcPDV0vfo,16857
-mwxlib-1.0.3.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-1.0.3.dist-info/METADATA,sha256=LnXTIWenG879NSl5xuUgY8rJMXF8B589tXumD0VUzho,7259
-mwxlib-1.0.3.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-mwxlib-1.0.3.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.0.3.dist-info/RECORD,,
+mwxlib-1.0.6.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-1.0.6.dist-info/METADATA,sha256=p5q3rC09GOoq4pW_UWNKP7Z1SvrX24kKCy-I19tKmts,7259
+mwxlib-1.0.6.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+mwxlib-1.0.6.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.0.6.dist-info/RECORD,,

{mwxlib-1.0.3.dist-info → mwxlib-1.0.6.dist-info}/WHEEL

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