mwxlib 0.96.5__py3-none-any.whl → 0.96.6__py3-none-any.whl

mwx/controls.py

@@ -16,6 +16,11 @@ import numpy as np
 from numpy import nan, inf  # noqa: necessary to eval
 
 
+def _Tip(*tips):
+    """Concatenate tips with newline char."""
+    return '\n'.join(filter(None, tips)).strip()
+
+
 class Param(object):
     """Standard Parameter
     
@@ -61,9 +66,7 @@ class Param(object):
            'overflow' : [],
           'underflow' : [],
         })
-        ## Concatenate tips with newline char.
-        tips = (handler.__doc__, updater.__doc__)
-        self._tooltip = '\n'.join(filter(None, tips)).strip()
+        self._tooltip = _Tip(handler.__doc__, updater.__doc__)
     
     def __str__(self, v=None):
         v = self.value if v is None else v
@@ -1004,7 +1007,7 @@ class Button(pb.PlateButton):
         if handler:
             self.Bind(wx.EVT_BUTTON, _F(handler))
         
-        self.ToolTip = handler.__doc__
+        self.ToolTip = _Tip(handler.__doc__)
         self.icon = icon
     
     def SetBitmap(self, bmp):
@@ -1050,7 +1053,7 @@ class ToggleButton(wx.ToggleButton):
         if handler:
             self.Bind(wx.EVT_TOGGLEBUTTON, _F(handler))
         
-        self.ToolTip = handler.__doc__
+        self.ToolTip = _Tip(handler.__doc__)
         self.icon = icon
 
 
@@ -1093,8 +1096,8 @@ class TextCtrl(wx.Control):
         self._ctrl = wx.TextCtrl(self, **kwargs)
         self._btn = Button(self, label, None, icon,
                            size=(-1,-1) if label or icon else (0,0))
-        self._ctrl.ToolTip = handler.__doc__
-        self._btn.ToolTip = updater.__doc__
+        self._ctrl.ToolTip = _Tip(handler.__doc__)
+        self._btn.ToolTip = _Tip(updater.__doc__)
         
         self.SetSizer(
             pack(self, (
@@ -1170,8 +1173,8 @@ class Choice(wx.Control):
         self._ctrl = wx.ComboBox(self, **kwargs)
         self._btn = Button(self, label, None, icon,
                            size=(-1,-1) if label or icon else (0,0))
-        self._ctrl.ToolTip = handler.__doc__
-        self._btn.ToolTip = updater.__doc__
+        self._ctrl.ToolTip = _Tip(handler.__doc__)
+        self._btn.ToolTip = _Tip(updater.__doc__)
         
         self.SetSizer(
             pack(self, (

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.96.5"
+__version__ = "0.96.6"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial

mwx/nutshell.py

@@ -9,6 +9,7 @@ from bdb import BdbQuit
 import traceback
 import inspect
 import builtins
+import operator
 import dis
 import pydoc
 import keyword
@@ -163,10 +164,19 @@ class EditorInterface(CtrlInterface):
         ## This avoids sending the `EVT_STC_NEEDSHOWN` notification.
         self.SetAutomaticFold(stc.STC_AUTOMATICFOLD_SHOW)
         
+        def _dunders(*objects):
+            ss = set()
+            for obj in objects:
+                ss |= set(x for x in dir(obj) if x.startswith('__'))
+            return ss
+        
         ## Keyword(2) setting
         self.SetLexer(stc.STC_LEX_PYTHON)
         self.SetKeyWords(0, ' '.join(keyword.kwlist))
-        self.SetKeyWords(1, ' '.join(builtins.__dict__) + ' self this')
+        self.SetKeyWords(1, ' '.join(builtins.__dict__)
+                          + ' '.join(_dunders(type, int, float, str, bytes,
+                                              tuple, list, range, operator,))
+                          + ' self this')
         
         ## AutoComp setting
         self.AutoCompSetAutoHide(False)

mwx/plugins/fft_view.py

@@ -4,12 +4,18 @@
 import wx
 import numpy as np
 from numpy.fft import fft2,ifft2,fftshift,ifftshift
-## from scipy.fftpack import fft,ifft,fft2,ifft2 Memory Leak? <scipy 0.16.1>
-## import cv2
 
 from mwx.graphman import Layer
 from mwx.controls import Param
-import editor as edi
+
+
+def fftcrop(src):
+    """Crop src image in 2**N square ROI centered at (x, y)."""
+    h, w = src.shape
+    m = min(h, w)
+    n = 1 if m < 2 else 2 ** int(np.log2(m) - 1) # +-m/2
+    x, y = w//2, h//2
+    return src[y-n:y+n, x-n:x+n]
 
 
 class Plugin(Layer):
@@ -45,7 +51,7 @@ class Plugin(Layer):
         frame = self.graph.frame
         if frame:
             self.message("FFT execution...")
-            src = edi.fftcrop(frame.roi)
+            src = fftcrop(frame.roi)
             h, w = src.shape
             
             dst = fftshift(fft2(src))

mwx/plugins/frame_listview.py

@@ -233,10 +233,11 @@ class CheckList(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
         self.Select(j, False)
     
     def on_frames_removed(self, indices):
-        for j in reversed(indices):
-            self.DeleteItem(j)
-        for k in range(self.ItemCount): # id(0) を更新する
-            self.SetItem(k, 0, str(k))
+        with wx.FrozenWindow(self):
+            for j in reversed(indices):
+                self.DeleteItem(j)
+            for k in range(self.ItemCount): # id(0) を更新する
+                self.SetItem(k, 0, str(k))
 
 
 class Plugin(Layer):

mwx/utilus.py

@@ -692,7 +692,8 @@ class FSM(dict):
                               "  to     : {}".format(self.__state),
                               "  action : {}".format(typename(act)),
                               "  args   : {}".format(args),
-                              "  kwargs : {}".format(kwargs))
+                              "  kwargs : {}".format(kwargs),
+                              "")
             self.__matched_pattern = None
             return retvals
         

{mwxlib-0.96.5.dist-info → mwxlib-0.96.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mwxlib
-Version: 0.96.5
+Version: 0.96.6
 Summary: A wrapper of matplotlib and wxPython (phoenix)
 Home-page: https://github.com/komoto48g/mwxlib
 Author: Kazuya O'moto
@@ -16,11 +16,9 @@ Classifier: Topic :: Scientific/Engineering :: Image Processing
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 License-File: LICENSE
 Requires-Dist: wxpython
-Requires-Dist: numpy
-Requires-Dist: scipy
-Requires-Dist: pillow
 Requires-Dist: matplotlib
 Requires-Dist: opencv-python
+Requires-Dist: scipy
 
 Project description
 ===================

{mwxlib-0.96.5.dist-info → mwxlib-0.96.6.dist-info}/RECORD

@@ -1,28 +1,28 @@
 mwx/__init__.py,sha256=nN62CGTWjME7Zz2h-jIRB8MxwuErIkHPGrlBzydkF0o,643
 mwx/bookshelf.py,sha256=CjcgtHC33KR5mHp1lW6Bqfndpzr7hC8ICkFihw4kM3g,5134
-mwx/controls.py,sha256=CAfptYrYxHg1qix3MInXuSp3epI33gpQxf183jLPTvo,48321
-mwx/framework.py,sha256=9-FMc30KMYYkYCuql8k8Wa8ynjj6GTbMamZV_x5GVgs,75227
+mwx/controls.py,sha256=s6yJzQyYnjCzcjXa6nbTJncxzpMI0E5zYWPn3-cFy5Q,48378
+mwx/framework.py,sha256=xo6rnlRMtCtGT3FDJt2dJ8dOdelnPRoN93I1lKQO5lE,75227
 mwx/graphman.py,sha256=XoD_wbt5wrmiRf8Q3lpn_eklakE2K-rLfpzfXG1L-Pc,71269
 mwx/images.py,sha256=_-Eh3xF7Khu42ivkYp97NXIzSNGbjcidqtWjZQFGtqE,47827
 mwx/matplot2.py,sha256=-G7z0Osozm9NjLfXvX5UcdFviwbNUktjbd904_g-PqQ,33516
 mwx/matplot2g.py,sha256=22rpdkqJQEJADINPaG5htACutbt8oG1ewO8LMpxaqH4,65237
 mwx/matplot2lg.py,sha256=MDbkO0vn5yi9rwTBCBJ4rsIHcWyoGXeNTbp0xfrvTdM,27381
 mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
-mwx/nutshell.py,sha256=HNo8ZuhLZPKd_Cg4s9NN-KfuSXHRP_jaw1s59GVXkN4,136971
-mwx/utilus.py,sha256=d-cDI4n4S-v-Gya2ekbVURq686BQfFZ7S2i63wIKHQg,37298
+mwx/nutshell.py,sha256=cdrg3cuF6AVU2OuR3QswSiTWrTsGIVaqrBSMuxJIjdE,137364
+mwx/utilus.py,sha256=8GK_2mGY08DVN5_SGWynLKQEJsCKqvqWTDToar1XozM,37333
 mwx/wxmon.py,sha256=f3V24EF7kdMlYF7usLYK9QE5KU6fSu0jVqsvwAiA-Ag,12647
 mwx/wxpdb.py,sha256=lLowkkAgMhPFHAfklD7wZHq0qbSMjRxnBFtSajmVgME,19133
 mwx/wxwil.py,sha256=0bzSTfMEjllJheKxZPb4p8Luz6Il3V29bCLBty72U2o,5576
 mwx/wxwit.py,sha256=yU6XeCCWRBP7CLmpphjT072PfXAL30DNaxoChDX2p0I,7322
 mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
 mwx/plugins/ffmpeg_view.py,sha256=QjNqnvPEd9vCwfATU2BOO75fIOFD5LQ-Wf-BBhvZNZs,9368
-mwx/plugins/fft_view.py,sha256=HcnBr-y_yFdSfASPRzMLANta4SwSDShd65QWnCU3XhM,2665
-mwx/plugins/frame_listview.py,sha256=Li993CV0pPY23Jb8cGQkc3wVeDlHWLEe8RuDbNZeB8s,10351
+mwx/plugins/fft_view.py,sha256=HVptnn1dq-Dg7AzXKJXq1dfKiy38catlrMbJkvyLM98,2790
+mwx/plugins/frame_listview.py,sha256=7LDAYbl5NvmD4Ehc690IrTbcRgCALRWeLVVOT9cm9Do,10404
 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.96.5.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.96.5.dist-info/METADATA,sha256=7bmBbSe5QXryHXNY8gbPkgx7wMUMIl-wGVn_esBg5fU,1925
-mwxlib-0.96.5.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-mwxlib-0.96.5.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.96.5.dist-info/RECORD,,
+mwxlib-0.96.6.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.96.6.dist-info/METADATA,sha256=8MHmMhq14c6bbvPdH1uCOk-LxYTijq_07e7ACN_bbpQ,1880
+mwxlib-0.96.6.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+mwxlib-0.96.6.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.96.6.dist-info/RECORD,,