mwxlib 1.5.9__py3-none-any.whl → 1.5.10__py3-none-any.whl

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.5.9"
+__version__ = "1.5.10"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager

mwx/graphman.py

@@ -377,12 +377,12 @@ class LayerInterface(CtrlInterface):
                 lambda v: reset_params(v, checked_only=wx.GetKeyState(wx.WXK_SHIFT)),
                 lambda v: v.Enable(bool(self.parameters))),
             (),
-            (mwx.ID_(201), "&Reload module", "Reload module", Icon('load'),
+            (mwx.ID_(201), "&Reload {!r}".format(self.__module__), "Reload", Icon('load'),
                 lambda v: self.parent.reload_plug(self.__module__),
                 lambda v: v.Enable(self.reloadable
                             and not (self.thread and self.thread.active))),
                 
-            (mwx.ID_(202), "&Unload module", "Unload module", Icon('delete'),
+            (mwx.ID_(202), "&Unload {!r}".format(self.__module__), "Unload", Icon('delete'),
                 lambda v: self.parent.unload_plug(self.__module__),
                 lambda v: v.Enable(self.unloadable
                             and not (self.thread and self.thread.active))),
@@ -1713,7 +1713,7 @@ class Frame(mwx.Frame):
                 filename = dlg.Path
         
         if flush:
-            for name in list(self.plugins): # plugins:dict mutates during iteration
+            for name in list(self.plugins):  # plugins:dict mutates during iteration
                 self.unload_plug(name)
             del self.graph[:]
             del self.output[:]
@@ -1767,24 +1767,25 @@ class Frame(mwx.Frame):
         self.message("Saving session to {!r}...".format(self.session_file))
         
         with open(self.session_file, 'w') as o,\
-          np.printoptions(threshold=np.inf): # printing all(inf) elements
+          np.printoptions(threshold=np.inf):  # printing all(inf) elements
             o.write("#! Session file (This file is generated automatically)\n")
             o.write("self.SetSize({})\n".format(self.Size))
             o.write("self.SetPosition({})\n".format(self.Position))
             
             for name, module in self.plugins.items():
                 plug = self.get_plug(name)
-                path = os.path.abspath(module.__file__)
-                basename = os.path.basename(path)
-                if basename == "__init__.py": # is module package?
-                    path = path[:-12]
+                if '.' not in name:
+                    name = os.path.abspath(module.__file__)  # Replace name with full path.
+                    basename = os.path.basename(name)
+                    if basename == "__init__.py":  # is module package?
+                        name = name[:-12]
                 session = {}
                 try:
                     plug.save_session(session)
                 except Exception:
                     traceback.print_exc()
                     print("- Failed to save session of", plug)
-                o.write("self.load_plug({!r}, session={})\n".format(path, session or None))
+                o.write("self.load_plug({!r}, session={})\n".format(name, session or None))
             o.write("self._mgr.LoadPerspective({!r})\n".format(self._mgr.SavePerspective()))
             
             def _save(view):

mwx/plugins/frame_listview.py

@@ -75,6 +75,10 @@ class CheckList(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
                   'C-a pressed' : (0, self.OnSelectAllItems),
                   'C-o pressed' : (0, self.OnLoadItems),
                   'C-s pressed' : (0, self.OnSaveItems),
+                'C-S-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),
             },
@@ -98,7 +102,7 @@ class CheckList(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
         
         self.menu = [
             (100, "Edit localunit", Icon('image'),
-                self.OnEditUnit,
+                self.OnEditLocalUnit,
                 lambda v: v.Enable(self.focused_item != -1)),
                 
             (101, "Edit annotation", Icon('pencil'),
@@ -181,20 +185,20 @@ class CheckList(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
     def OnCopyInfo(self, evt):
         selected_frames = [self.Target.all_frames[j] for j in self.selected_items]
         if selected_frames:
-            text = ''
+            text = []
             for frame in selected_frames:
-                text += pformat(frame.attributes, sort_dicts=0) # ALL attributes
-                ## text += '{}\n{}\n'.format(frame.name, frame.annotation)
-            Clipboard.write(text)
+                text += [pformat(frame.attributes, sort_dicts=0)]  # ALL attributes
+            Clipboard.write('\n'.join(text))
         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]
@@ -202,6 +206,7 @@ class CheckList(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
                 '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]

mwx/utilus.py

@@ -278,14 +278,14 @@ def pp(obj):
     pprint(obj, **pp.__dict__)
 
 
-if pp:
+if 1:
     pp.indent = 1
     pp.width = 80 # default 80
     pp.depth = None
     if sys.version_info >= (3,6):
         pp.compact = False
     if sys.version_info >= (3,8):
-        pp.sort_dicts = True
+        pp.sort_dicts = False
 
 
 def split_words(text, reverse=False):

{mwxlib-1.5.9.dist-info → mwxlib-1.5.10.dist-info}/METADATA

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

{mwxlib-1.5.9.dist-info → mwxlib-1.5.10.dist-info}/RECORD

@@ -1,8 +1,8 @@
 mwx/__init__.py,sha256=pS7ZG8QKRypiFFiaWAq_opBB6I_1viZ0zUMk2TbjzE0,667
 mwx/bookshelf.py,sha256=yW17nMNPXKHM7LLXLpr9DaRhyFHz_OBAZ_DsuEK2QzA,8387
 mwx/controls.py,sha256=Mpzpp2eWyS_X7RjxTJay1-Fldchk-x-rUBpUhHSG-5w,49924
-mwx/framework.py,sha256=Bgvh2fqP5oRE79H0NFU5n_bFVLaE1c8JYHEJ8SUuqfw,77784
-mwx/graphman.py,sha256=zaKfcWbj6YYg2GFj_ijiqLd44OORFVKOvbQwucxNpno,69894
+mwx/framework.py,sha256=hvjhA9nWgrWkpDzx1m478BD5_1OLUrSP-dfSZN463FA,77785
+mwx/graphman.py,sha256=mrs4am6VbIT20gS2j9-ISHSIscZeP-eM_lLj3xYhufo,70012
 mwx/images.py,sha256=Kkfy9QI_hMtwShSjUS4-ZpC_EkVuah_XhpBOR4wAKkM,49792
 mwx/matplot2.py,sha256=5Z-m9KXtSXpzBQs3swqPbfl_mfVdDoPaWKqpiepfau8,33019
 mwx/matplot2g.py,sha256=hLBYWjXPc2jgtKPTQWCdieIegQvS4jjUUaedV4qDLoE,65255
@@ -10,7 +10,7 @@ mwx/matplot2lg.py,sha256=fpxOX18vonUTpA_nAr-wBhQ_2YNsL_nfxdCDliuP1sU,27430
 mwx/mgplt.py,sha256=SVUJ0ls4gC9xulbWxK2qqmDxf0uBCflvwoPkxoF5s3M,5566
 mwx/nutshell.py,sha256=CX-NK3kOEi3JHhjKh39R2_m1po1SvMxraaDk2xt6q-Y,147617
 mwx/testsuite.py,sha256=0Q_n_XOOsZ8lsLWUkuO8QW00hts9wEQfnUKMpf0BAyU,1235
-mwx/utilus.py,sha256=RiBKZLLnVqT-YrU3gFZ69eZAD25RaPARm2_fOGXG4cw,38964
+mwx/utilus.py,sha256=YVU-2aR9_22-clA0OCFKfmW0c49uhNWdbQaNXxNKXxA,38964
 mwx/wxmon.py,sha256=NIksW_CZv7Kw4dod8tWVwakO4iJuvE8hJSAcjkYfLaE,12800
 mwx/wxpdb.py,sha256=kKzEGivjoZ9zGcB3ttYsAym4putyilmXZXj-5CGaivQ,18813
 mwx/wxwil.py,sha256=hhyB1lPrF9ixeObxCOKQv0Theu-B-kpJg_yVU3EGSNg,5406
@@ -18,11 +18,11 @@ mwx/wxwit.py,sha256=mTH92bWw1F3ycaq4EoxVD_4hIxy2fbKZZbQg3f1ZD1Y,7350
 mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
 mwx/plugins/ffmpeg_view.py,sha256=GT3mAP7cvAgkzHyA0Em_FP8wiWS-dRekUyBgaXIBQCc,10982
 mwx/plugins/fft_view.py,sha256=Hsho8y-42hG3htQAJ9ct1347NHJ8qPvN4snq_1jYOxw,2793
-mwx/plugins/frame_listview.py,sha256=q-8CrWPovgkEe4ICESfdRUDfAWJYoriElufuAcyu30U,10380
+mwx/plugins/frame_listview.py,sha256=yd2NCgspqGfTNhj1wxuW8r1zapIm7vNzVX2iytk8CDM,10618
 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.5.9.dist-info/METADATA,sha256=nOrVtH-e2vPfhgGbjSkhKVVF-E1i8Z3pyP-HryhUPhs,7381
-mwxlib-1.5.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mwxlib-1.5.9.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.5.9.dist-info/RECORD,,
+mwxlib-1.5.10.dist-info/METADATA,sha256=TVRXE_-HQOVN7z-VvBMRAs1IKcYwvsPoWP-qS8Bcwh4,7382
+mwxlib-1.5.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mwxlib-1.5.10.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.5.10.dist-info/RECORD,,