mwxlib 1.0.0__py3-none-any.whl → 1.8.0__py3-none-any.whl

mwx/plugins/frame_listview.py

@@ -6,7 +6,7 @@ import wx
 from wx import aui
 from wx.lib.mixins.listctrl import ListCtrlAutoWidthMixin
 
-from mwx.framework import CtrlInterface, Menu, StatusBar
+from mwx.framework import CtrlInterface, Menu, StatusBar, pack
 from mwx.controls import Icon, Clipboard
 from mwx.graphman import Layer
 
@@ -21,23 +21,23 @@ class CheckList(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
     @property
     def selected_items(self):
         return filter(self.IsSelected, range(self.ItemCount))
-    
+
     @property
     def checked_items(self):
         return filter(self.IsItemChecked, range(self.ItemCount))
-    
+
     @property
     def focused_item(self):
         return self.FocusedItem
-    
+
     @property
     def all_items(self):
         rows = range(self.ItemCount)
         cols = range(self.ColumnCount)
-        ## return [[self.GetItemText(j, k) for k in cols] for j in rows]
+        # return [[self.GetItemText(j, k) for k in cols] for j in rows]
         for j in rows:
             yield [self.GetItemText(j, k) for k in cols]
-    
+
     def __init__(self, parent, target, **kwargs):
         wx.ListCtrl.__init__(self, parent, size=(400,130),
                              style=wx.LC_REPORT|wx.LC_HRULES, **kwargs)
@@ -51,8 +51,8 @@ class CheckList(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
         
         self.__dir = True
         
-        _alist = ( # assoc-list of column names
-            ("id", 42),
+        _alist = (  # assoc-list of column names
+            ("id", 45),
             ("name", 160),
             ("shape", 90),
             ("dtype", 60),
@@ -65,16 +65,17 @@ class CheckList(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
         
         for j, frame in enumerate(self.Target.all_frames):
             self.InsertItem(j, str(j))
-            self.UpdateInfo(frame) # update all --> 計算が入ると時間がかかる
+            self.UpdateInfo(frame)  # update all --> 計算が入ると時間がかかる
         
-        self.handler.update({ # DNA<frame_listview>
+        self.handler.update({  # DNA<frame_listview>
             0 : {
-             'Lbutton dblclick' : (0, self.OnShowItems), # -> frame_shown
-                'enter pressed' : (0, self.OnShowItems), # -> frame_shown
-               'delete pressed' : (0, self.OnRemoveItems), # -> frame_removed/shown
+             'Lbutton dblclick' : (0, self.OnShowItems),  # -> frame_shown
+                'enter pressed' : (0, self.OnShowItems),  # -> frame_shown
+               'delete pressed' : (0, self.OnRemoveItems),  # -> frame_removed/shown
                   'C-a pressed' : (0, self.OnSelectAllItems),
-                  'C-o pressed' : (0, self.OnLoadItems),
-                  'C-s pressed' : (0, self.OnSaveItems),
+                  'C-c pressed' : (0, self.OnCopyInfo),
+                  'C-l pressed' : (0, self.OnEditLocalUnit),
+                   'f2 pressed' : (0, self.OnEditAnnotation),
                  'M-up pressed' : (0, self.Target.OnPageUp),
                'M-down pressed' : (0, self.Target.OnPageDown),
             },
@@ -84,21 +85,21 @@ class CheckList(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
         self.Bind(wx.EVT_LIST_COL_CLICK, self.OnSortItems)
         self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.OnItemSelected)
         
-        self.context = { # DNA<GraphPlot>
+        self.context = {  # DNA<GraphPlot>
             None: {
-                  'frame_shown' : [ None, self.on_frame_shown ],
-                 'frame_hidden' : [ None, self.on_frame_hidden ],
-                 'frame_loaded' : [ None, self.on_frame_loaded ],
-                'frame_removed' : [ None, self.on_frames_removed ],
-               'frame_modified' : [ None, self.UpdateInfo ],
-                'frame_updated' : [ None, self.UpdateInfo ],
+                  'frame_shown' : [None, self.on_frame_shown],
+                 'frame_hidden' : [None, self.on_frame_hidden],
+                 'frame_loaded' : [None, self.on_frame_loaded],
+                'frame_removed' : [None, self.on_frames_removed],
+               'frame_modified' : [None, self.UpdateInfo],
+                'frame_updated' : [None, self.UpdateInfo],
             }
         }
         self.Target.handler.append(self.context)
         
         self.menu = [
             (100, "Edit localunit", Icon('image'),
-                self.OnEditUnit,
+                self.OnEditLocalUnit,
                 lambda v: v.Enable(self.focused_item != -1)),
                 
             (101, "Edit annotation", Icon('pencil'),
@@ -111,13 +112,11 @@ class CheckList(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
         ]
         self.Bind(wx.EVT_CONTEXT_MENU,
                   lambda v: Menu.Popup(self, self.menu))
-    
+
     def Destroy(self):
-        try:
-            self.Target.handler.remove(self.context)
-        finally:
-            return wx.ListCtrl.Destroy(self)
-    
+        self.Target.handler.remove(self.context)
+        return wx.ListCtrl.Destroy(self)
+
     def UpdateInfo(self, frame):
         ls = ("{}".format(frame.index),
               "{}".format(frame.name),
@@ -130,113 +129,107 @@ class CheckList(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
         j = frame.index
         for k, v in enumerate(ls):
             self.SetItem(j, k, v)
-        if frame.pathname:
-            self.CheckItem(j)
-    
+        self.CheckItem(j, frame.pathname is not None)
+
     def OnShowItems(self, evt):
         self.Target.select(self.focused_item)
-    
+
     def OnRemoveItems(self, evt):
         del self.Target[self.selected_items]
-    
-    def OnSortItems(self, evt): #<wx._controls.ListEvent>
+
+    def OnSortItems(self, evt):  # <wx._controls.ListEvent>
         col = evt.Column
-        if col == 0: # reverse the first column
+        if col == 0:  # reverse the first column
             self.__dir = False
-        self.__dir = not self.__dir # toggle 0:ascend/1:descend
+        self.__dir = not self.__dir  # toggle 0:ascend/1:descend
         
         frames = self.Target.all_frames
         if frames:
             def _eval(x):
                 try:
-                    return eval(x[col].replace('*', '')) # localunit* とか
+                    return eval(x[col].replace('*', ''))  # localunit* とか
                 except Exception:
                     return x[col]
             frame = self.Target.frame
             items = sorted(self.all_items, reverse=self.__dir, key=_eval)
-            frames[:] = [frames[int(c[0])] for c in items] # sort by new Id of items
+            frames[:] = [frames[int(c[0])] for c in items]  # sort by new Id of items
             
             lc = list(self.checked_items)
             
             for j, c in enumerate(items):
                 self.Select(j, False)
                 self.CheckItem(j, int(c[0]) in lc)
-                for k, v in enumerate(c[1:]): # update data except for id(0)
+                for k, v in enumerate(c[1:]):  # update data except for id(0)
                     self.SetItem(j, k+1, v)
-            self.Target.select(frame) # invokes [frame_shown] to select the item
-    
+            self.Target.select(frame)  # invokes [frame_shown] to select the item
+
     def OnSelectAllItems(self, evt):
         for j in range(self.ItemCount):
             self.Select(j)
-    
-    def OnLoadItems(self, evt):
-        self.parent.parent.load_index(view=self.Target)
-    
-    def OnSaveItems(self, evt):
-        selected_frames = [self.Target.all_frames[j] for j in self.selected_items]
-        if selected_frames:
-            self.parent.message("Exporting {} frames.".format(len(selected_frames)))
-            self.parent.parent.save_index(frames=selected_frames)
-        else:
-            self.parent.message("No frame selected.")
-    
+
     def OnCopyInfo(self, evt):
         selected_frames = [self.Target.all_frames[j] for j in self.selected_items]
         if selected_frames:
-            text = ''
-            for frame in selected_frames:
-                text += pformat(frame.attributes, sort_dicts=0) # ALL attributes
-                ## text += '{}\n{}\n'.format(frame.name, frame.annotation)
+            text = '\n'.join(pformat(frame.attributes, sort_dicts=0)  # ALL attributes
+                             for frame in selected_frames)
             Clipboard.write(text)
+            with wx.Dialog(self,
+                    title="Frame Properties",
+                    style=wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER) as dlg:
+                textctrl = wx.TextCtrl(dlg, value=text, style=wx.TE_MULTILINE|wx.TE_READONLY)
+                dlg.SetSizer(pack(dlg, [textctrl], style=(1, wx.ALL | wx.EXPAND, 10)))
+                dlg.ShowModal()
         else:
             self.parent.message("No frame selected.")
-    
-    def OnEditUnit(self, evt):
+
+    def OnEditLocalUnit(self, evt):
         frame = self.Target.all_frames[self.focused_item]
         with wx.TextEntryDialog(self, frame.name,
                 'Enter localunit', repr(frame.localunit)) as dlg:
             if dlg.ShowModal() == wx.ID_OK:
                 frame.unit = eval(dlg.Value or 'None')
-    
+        self.SetFocus()
+
     def OnEditAnnotation(self, evt):
         frame = self.Target.all_frames[self.focused_item]
         with wx.TextEntryDialog(self, frame.name,
                 'Enter an annotation', frame.annotation) as dlg:
             if dlg.ShowModal() == wx.ID_OK:
                 frame.annotation = dlg.Value
-    
+        self.SetFocus()
+
     def OnItemSelected(self, evt):
         frame = self.Target.all_frames[evt.Index]
         self.parent.message(frame.pathname)
         evt.Skip()
-    
+
     ## --------------------------------
-    ## Actions of frame-handler
+    ## Actions of frame-handler.
     ## --------------------------------
-    
+
     def on_frame_loaded(self, frame):
         j = frame.index
         self.InsertItem(j, str(j))
-        for k in range(j+1, self.ItemCount): # id(0) を更新する
+        for k in range(j+1, self.ItemCount):  # id(0) を更新する
             self.SetItem(k, 0, str(k))
         self.UpdateInfo(frame)
-    
+
     def on_frame_shown(self, frame):
         j = frame.index
         self.SetItemFont(j, self.Font.Bold())
         self.Select(j)
         self.Focus(j)
-    
+
     def on_frame_hidden(self, frame):
         j = frame.index
         self.SetItemFont(j, self.Font)
         self.Select(j, False)
-    
+
     def on_frames_removed(self, indices):
         with wx.FrozenWindow(self):
             for j in reversed(indices):
                 self.DeleteItem(j)
-            for k in range(self.ItemCount): # id(0) を更新する
+            for k in range(self.ItemCount):  # id(0) を更新する
                 self.SetItem(k, 0, str(k))
 
 
@@ -246,15 +239,15 @@ class Plugin(Layer):
     menukey = "Plugins/Extensions/&Buffer listbox\tAlt+b"
     caption = "Property list"
     dockable = False
-    
+
     @property
     def all_pages(self):
         return [self.nb.GetPage(i) for i in range(self.nb.PageCount)]
-    
+
     @property
     def message(self):
         return self.statusline
-    
+
     def Init(self):
         self.nb = aui.AuiNotebook(self, size=(400,150),
             style = (aui.AUI_NB_DEFAULT_STYLE|aui.AUI_NB_RIGHT)
@@ -275,12 +268,12 @@ class Plugin(Layer):
             self.parent.select_view(self.nb.CurrentPage.Target)
             evt.Skip()
         self.nb.Bind(wx.EVT_CHILD_FOCUS, on_focus_set)
-    
+
     def attach(self, target, caption):
         if target not in [lc.Target for lc in self.all_pages]:
             lc = CheckList(self, target)
             self.nb.AddPage(lc, caption)
-    
+
     def detach(self, target):
         for k, lc in enumerate(self.all_pages):
             if target is lc.Target:

mwx/plugins/line_profile.py

@@ -11,7 +11,7 @@ class Plugin(Layer):
     menukey = "Plugins/Extensions/&Line profile\tAlt+l"
     caption = "Line profile"
     dockable = False
-    
+
     def Init(self):
         self.plot = LineProfile(self, log=self.message, size=(300,200))
         

mwx/py/filling.py

@@ -3,8 +3,7 @@
 the local namespace or any object.
 """
 __author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
-__author__ += "Kazuya O'moto <komoto@jeol.co.jp>"
-# Tags: py3-port
+# Modified by Kazuya O'moto <komoto@jeol.co.jp>
 
 import wx
 import six
@@ -18,8 +17,8 @@ import types
 import warnings
 
 
-COMMONTYPES = [getattr(types, t) for t in dir(types) \
-               if not t.startswith('_') \
+COMMONTYPES = [getattr(types, t) for t in dir(types)
+               if not t.startswith('_')
                and t not in ('ClassType', 'InstanceType', 'ModuleType')]
 
 DOCTYPES = ('BuiltinFunctionType', 'BuiltinMethodType', 'ClassType',
@@ -27,7 +26,7 @@ DOCTYPES = ('BuiltinFunctionType', 'BuiltinMethodType', 'ClassType',
             'LambdaType', 'MethodType', 'ModuleType',
             'UnboundMethodType', 'method-wrapper')
 
-SIMPLETYPES = [getattr(types, t) for t in dir(types) \
+SIMPLETYPES = [getattr(types, t) for t in dir(types)
                if not t.startswith('_') and t not in DOCTYPES]
 
 #del t
@@ -141,7 +140,7 @@ class FillingTree(wx.TreeCtrl):
     def filter(self, obj, key):
         """Filter function that determines whether the item is displayed."""
         if wx.Platform == '__WXMSW__':
-            if key == 'DropTarget': # Windows bug fix.
+            if key == 'DropTarget':  # Windows bug fix.
                 return False
         return True
 
@@ -212,6 +211,7 @@ class FillingTree(wx.TreeCtrl):
     def display(self, rooting=True):
         """Display the current item data.
         Called when an item/branch needs to be updated.
+        
         Args:
             rooting: True if the current item must be updated
                      False otherwise to reduce overheads.
@@ -219,7 +219,7 @@ class FillingTree(wx.TreeCtrl):
         item = self.item
         if not item:
             return
-        parent = self.GetItemParent(item) # Check a parent one above.
+        parent = self.GetItemParent(item)  # Check a parent one above.
         if parent:
             def _roots(item):
                 """Retrace the root of parent/item data.
@@ -231,8 +231,8 @@ class FillingTree(wx.TreeCtrl):
                 obj = self.GetItemData(parent)
                 key = self.GetItemText(item)
                 try:
-                    # data = self.objGetChildren(obj)[key] # overheads...
-                    data = getattr(obj, key) # easier way to access here.
+                    # data = self.objGetChildren(obj)[key]  # overheads...
+                    data = getattr(obj, key)  # easier way to access here.
                     if self.GetItemData(item) is not data:
                         self.SetItemData(item, data)
                         return item
@@ -242,15 +242,15 @@ class FillingTree(wx.TreeCtrl):
             root = _roots(item)
             if rooting:
                 if root and self.IsExpanded(root):
-                    self.updateChildren(root) # Update roots items.
+                    self.updateChildren(root)  # Update roots items.
                 if parent != root:
-                    self.updateChildren(parent) # Update parent items.
+                    self.updateChildren(parent)  # Update parent items.
         if self.IsExpanded(item):
-            self.updateChildren(item) # Update the current item if necessary.
+            self.updateChildren(item)  # Update the current item if necessary.
         self.setText('')
         obj = self.GetItemData(item)
         if wx.Platform == '__WXMSW__':
-            if obj is None: # Windows bug fix.
+            if obj is None:  # Windows bug fix.
                 return
         self.SetItemHasChildren(item, self.objHasChildren(obj))
         otype = type(obj)
@@ -403,7 +403,6 @@ class Filling(wx.SplitterWindow):
         config.WriteInt('View/Zoom/Filling', self.text.GetZoom())
 
 
-
 class FillingFrame(wx.Frame):
     """Frame containing the namespace tree component."""
 

mwx/testsuite.py

@@ -0,0 +1,38 @@
+#! python3
+"""Test suite for App, Frame, and ControlPanel.
+
+Get the wx.App or wx.Frame instance and start the main-loop if needed.
+
+Usage:
+    with testApp() as app:
+        frm = wx.Frame(None)
+        frm.Show()
+
+Is equivalent to:
+    app = wx.App()
+    frm = wx.Frame(None)
+    frm.Show()
+    app.MainLoop()
+"""
+from contextlib import contextmanager
+import wx
+
+__all__ = ["testApp", "testFrame"]
+
+
+@contextmanager
+def testApp():
+    app = wx.GetApp() or wx.App()
+    yield app
+    if not app.GetMainLoop():
+        app.MainLoop()
+## wx.App.run = staticmethod(testApp)
+
+
+@contextmanager
+def testFrame(**kwargs):
+    with testApp():
+        frm = wx.Frame(None, **kwargs)
+        yield frm
+        frm.Show()
+## wx.Frame.run = staticmethod(testFrame)