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

mwx/bookshelf.py

@@ -2,7 +2,6 @@
 import re
 import wx
 
-from .utilus import funcall as _F
 from .framework import CtrlInterface, postcall
 
 
@@ -18,31 +17,11 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
         self.Font = wx.Font(9, wx.DEFAULT, wx.NORMAL, wx.NORMAL)
         
         self.parent = parent
-        self.target = None
-        
-        self.context = { # DNA<EditorBook>
-            None : {
-                   'buffer_new' : [ None, self.on_buffer_new ],
-                 'buffer_saved' : [ None, ],
-                'buffer_loaded' : [ None, ],
-               'buffer_deleted' : [ None, self.on_buffer_deleted ],
-             'buffer_activated' : [ None, self.on_buffer_selected ],
-           'buffer_inactivated' : [ None, ],
-       'buffer_caption_updated' : [ None, self.on_buffer_filename ],
-            },
-        }
-        wx.CallAfter(self.attach, target=parent)
         
         ## self.Bind(wx.EVT_TREE_ITEM_GETTOOLTIP, self.OnItemTooltip)
         self.Bind(wx.EVT_TREE_SEL_CHANGED, self.OnSelChanged)
         self.Bind(wx.EVT_WINDOW_DESTROY, self.OnDestroy)
         
-        def delete_item():
-            data = self.GetItemData(self.Selection)
-            if data:
-                data.parent.kill_buffer(data) # the focus moves
-                wx.CallAfter(self.SetFocus)
-        
         def dispatch(evt):
             """Fork events to the parent."""
             self.parent.handler(self.handler.current_event, evt)
@@ -54,33 +33,57 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
             '*button* released' : [ None, dispatch ],
             },
             0 : {
-               'delete pressed' : (0, _F(delete_item)),
-                   'f5 pressed' : (0, _F(self.build_tree, clear=0)),
-                 'S-f5 pressed' : (0, _F(self.build_tree, clear=1)),
+               'delete pressed' : (0, self._delete),
+                   'f5 pressed' : (0, self._refresh),
             },
         })
+        self.context = { # DNA<EditorBook>
+            None : {
+                   'buffer_new' : [ None, self.on_buffer_new ],
+                 'buffer_saved' : [ None, ],
+                'buffer_loaded' : [ None, ],
+               'buffer_deleted' : [ None, self.on_buffer_deleted ],
+             'buffer_activated' : [ None, self.on_buffer_selected ],
+           'buffer_inactivated' : [ None, ],
+       'buffer_caption_updated' : [ None, self.on_buffer_filename ],
+            },
+        }
+        def _attach():
+            if self and self.parent:
+                for editor in self.parent.all_editors:
+                    editor.handler.append(self.context)
+                self.build_tree()
+        wx.CallAfter(_attach)
     
     def OnDestroy(self, evt):
-        if evt.EventObject is self:
-            self.detach()
+        if self and self.parent:
+            for editor in self.parent.all_editors:
+                editor.handler.remove(self.context)
         evt.Skip()
     
-    def attach(self, target):
-        if not self:
-            return
-        self.detach()
-        self.target = target
-        for editor in self.target.all_editors:
-            editor.handler.append(self.context)
+    def _refresh(self, evt):
+        def _item(editor):
+            return self._get_item(self.RootItem, editor.Name)
+        ls = []
+        for editor in self.parent.all_editors:
+            if self.IsExpanded(_item(editor)):
+                ls.append(editor)
+        data = None
+        if self.Selection.IsOk():
+            data = self.GetItemData(self.Selection)
+            if data:
+                wx.CallAfter(data.SetFocus)
+                wx.CallAfter(self.SetFocus)
         self.build_tree()
+        for editor in ls:
+            self.Expand(_item(editor))
     
-    def detach(self):
-        if not self or not self.target:
-            return
-        for editor in self.target.all_editors:
-            editor.handler.remove(self.context)
-        self.target = None
-        self.build_tree()
+    def _delete(self, evt):
+        if self.Selection.IsOk():
+            data = self.GetItemData(self.Selection)
+            if data:
+                data.parent.kill_buffer(data) # the focus moves
+                wx.CallAfter(self.SetFocus)
     
     ## --------------------------------
     ## TreeList/Ctrl wrapper interface 
@@ -93,33 +96,39 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
         if clear:
             self.DeleteAllItems()
             self.AddRoot(self.Name)
-        if self.target:
-            for editor in self.target.all_editors:
-                self._set_item(self.RootItem, editor.Name, editor.all_buffers)
+        for editor in self.parent.all_editors:
+            self._set_item(self.RootItem, editor.Name, editor.all_buffers)
         self.Refresh()
     
-    def _get_item(self, root, key):
-        """Returns the first item [root/key] found.
-        Note: Items with the same name are not supported.
-        """
+    def _gen_item(self, root, key):
+        """Generates the [root/key] items."""
         item, cookie = self.GetFirstChild(root)
         while item:
             caption = self.GetItemText(item)
             if key == re.sub(r"^\W+\s+(.*)", r"\1", caption):
-                return item
+                yield item
             item, cookie = self.GetNextChild(root, cookie)
     
+    def _get_item(self, root, key):
+        """Get the first [root/key] item found."""
+        return next(self._gen_item(root, key), None)
+    
     def _set_item(self, root, key, data):
-        """Set the item [root/key] with data recursively.
-        """
-        item = self._get_item(root, key) or self.AppendItem(root, key)
-        if isinstance(data, list):
+        """Set the [root/key] item with data recursively."""
+        for item in self._gen_item(root, key):
+            buf = self.GetItemData(item)
+            if not buf or buf is data:
+                break
+        else:
+            item = self.AppendItem(root, key)
+        try:
             for buf in data:
                 self._set_item(item, buf.name, buf)
-        else:
+        except Exception:
             data.__itemId = item
             self.SetItemData(item, data)
             self.SetItemText(item, data.caption_prefix + data.name)
+        return item
     
     ## --------------------------------
     ## Actions for bookshelf interfaces
@@ -135,10 +144,12 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
     ##       buf.__itemId がない場合がある (delete_buffer 直後など)
     @postcall
     def on_buffer_selected(self, buf):
-        self.SelectItem(buf.__itemId)
+        if self and buf:
+            self.SelectItem(buf.__itemId)
     
     def on_buffer_filename(self, buf):
-        self.SetItemText(buf.__itemId, buf.caption_prefix + buf.name)
+        if self and buf:
+            self.SetItemText(buf.__itemId, buf.caption_prefix + buf.name)
     
     def OnSelChanged(self, evt):
         if self and self.HasFocus():

mwx/controls.py

@@ -7,7 +7,7 @@ import wx.lib.platebtn as pb
 import wx.lib.scrolledpanel as scrolled
 
 from . import images
-from .utilus import SSM
+from .utilus import SSM, warn
 from .utilus import funcall as _F
 from .framework import pack, Menu, postcall
 
@@ -84,6 +84,14 @@ class Param:
     def __len__(self):
         return len(self.range)
     
+    def bind(self, action=None, target='control'):
+        warn("Use `Param.callback.bind('control')` instead.", DeprecationWarning)
+        return self.callback.bind(target, action)
+    
+    def unbind(self, action=None, target='control'):
+        warn("Use `Param.callback.unbind('control')` instead.", DeprecationWarning)
+        return self.callback.unbind(target, action)
+    
     def reset(self, v=None, internal_callback=True):
         """Reset value when indexed (by knobs) with callback."""
         if v is None:

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.98.6"
+__version__ = "0.98.7"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -1135,8 +1135,8 @@ class ShellFrame(MiniFrame):
                                  skip=[Debugger.__module__, # Don't enter debugger
                                        EventMonitor.__module__, # Don't enter event-hook
                                        FSM.__module__,
-                                       'fnmatch', 'warnings', 'bdb', 'pdb',
                                        'wx.core', 'wx.lib.eventwatcher',
+                                       'fnmatch', 'warnings', 'bdb', 'pdb', #'contextlib',
                                        ],
                                  )
         self.inspector = Inspector(self, name="Inspector")

{mwxlib-0.98.6.dist-info → mwxlib-0.98.7.dist-info}/METADATA

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

{mwxlib-0.98.6.dist-info → mwxlib-0.98.7.dist-info}/RECORD

@@ -1,7 +1,7 @@
 mwx/__init__.py,sha256=nN62CGTWjME7Zz2h-jIRB8MxwuErIkHPGrlBzydkF0o,643
-mwx/bookshelf.py,sha256=Y4xI2SrEO22DrI1hyyfFx7DfFZA8znOzX9RWMPsA2BE,5137
-mwx/controls.py,sha256=jhru4HiIijb3QJz2elGt0in9soaR3xilgHsfItYY0JI,47595
-mwx/framework.py,sha256=rp93Nh7eqeAWGpkjxp-NY84RYBfmI1Ahn_tauavWSbg,75475
+mwx/bookshelf.py,sha256=so-xSLq08sMlJBErTxOaDoKUAMa_g1CkIP2pNnff68c,5607
+mwx/controls.py,sha256=TRlwxUNhY5myJYiCWIogisM-khVIVvKbjrCU19e_1Ms,47991
+mwx/framework.py,sha256=RKYDybDicu1JQQmnWZETQjJCqMmSP2O6DqpZF1waMfs,75490
 mwx/graphman.py,sha256=A53ufapRAysL0wTCr1anrg_T_PqpumonnYn-swaC598,70165
 mwx/images.py,sha256=_-Eh3xF7Khu42ivkYp97NXIzSNGbjcidqtWjZQFGtqE,47827
 mwx/matplot2.py,sha256=xCJ_ZzdDEWmzctpPaOrzTnwXyHINP4nfFHweoTZa6ug,32899
@@ -21,8 +21,8 @@ mwx/plugins/frame_listview.py,sha256=hbApzZWa9-BmQthu7uZBlBbGbtf4iJ_prO8IhxoGMs8
 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.98.6.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.98.6.dist-info/METADATA,sha256=RDfB4NPf48FHJKeGXjSM72yYzMlOlrs5nqqPqO45ToU,7411
-mwxlib-0.98.6.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-mwxlib-0.98.6.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.98.6.dist-info/RECORD,,
+mwxlib-0.98.7.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.98.7.dist-info/METADATA,sha256=AB3gj2NFJuTGe34FMOVYzjkQCZAFWZHNQ_bTb_dWMio,7411
+mwxlib-0.98.7.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+mwxlib-0.98.7.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.98.7.dist-info/RECORD,,

{mwxlib-0.98.6.dist-info → mwxlib-0.98.7.dist-info}/WHEEL

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