mwxlib 0.93.7__py3-none-any.whl → 0.93.9__py3-none-any.whl

mwx/framework.py

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

mwx/matplot2g.py

@@ -393,7 +393,7 @@ class GraphPlot(MatplotPanel):
     def __init__(self, *args, **kwargs):
         MatplotPanel.__init__(self, *args, **kwargs)
         
-        def _draw_idle(v):
+        def _draw(v):
             self.canvas.draw_idle()
         
         self.handler.update({ # DNA<GraphPlot>
@@ -408,16 +408,16 @@ class GraphPlot(MatplotPanel):
                 'frame_updated' : [ None, _F(self.writeln) ], # unit,name,ratio => update_extent
                 'frame_cmapped' : [ None, _F(self.writeln) ], # cmap
                     'line_draw' : [ None ],
-                   'line_drawn' : [ None, _draw_idle ],
+                   'line_drawn' : [ None, _draw ],
                     'line_move' : [ None ],
-                   'line_moved' : [ None, _draw_idle ],
-                 'line_removed' : [ None, _draw_idle ],
+                   'line_moved' : [ None, _draw ],
+                 'line_removed' : [ None, _draw ],
                     'mark_draw' : [ None ],
-                   'mark_drawn' : [ None, _draw_idle ],
-                 'mark_removed' : [ None, _draw_idle ],
+                   'mark_drawn' : [ None, _draw ],
+                 'mark_removed' : [ None, _draw ],
                   'region_draw' : [ None ],
-                 'region_drawn' : [ None, _draw_idle ],
-               'region_removed' : [ None, _draw_idle ],
+                 'region_drawn' : [ None, _draw ],
+               'region_removed' : [ None, _draw ],
                  'M-up pressed' : [ None, self.OnPageUp ],
                'M-down pressed' : [ None, self.OnPageDown ],
                'pageup pressed' : [ None, self.OnPageUp ],
@@ -440,7 +440,7 @@ class GraphPlot(MatplotPanel):
                     'r pressed' : (REGION, self.OnRegionAppend, self.OnEscapeSelection),
             'r+Lbutton pressed' : (REGION, self.OnRegionAppend, self.OnEscapeSelection),
             'M-Lbutton pressed' : (REGION, self.OnRegionAppend, self.OnEscapeSelection),
-               'escape pressed' : (NORMAL, self.OnEscapeSelection, _draw_idle),
+               'escape pressed' : (NORMAL, self.OnEscapeSelection, _draw),
                 'shift pressed' : (NORMAL, self.on_picker_lock),
                'shift released' : (NORMAL, self.on_picker_unlock),
               'Lbutton pressed' : (NORMAL, self.OnDragLock),
@@ -502,7 +502,7 @@ class GraphPlot(MatplotPanel):
                'right released' : (MARK, self.OnMarkShiftEnd),
                     'n pressed' : (MARK, self.OnMarkSkipNext),
                     'p pressed' : (MARK, self.OnMarkSkipPrevious),
-               'escape pressed' : (NORMAL, self.OnMarkDeselected, _draw_idle),
+               'escape pressed' : (NORMAL, self.OnMarkDeselected, _draw),
                'delete pressed' : (MARK, self.OnMarkRemove),
                 'space pressed' : (PAN, self.OnPanBegin),
                  'ctrl pressed' : (PAN, self.OnPanBegin),
@@ -531,7 +531,7 @@ class GraphPlot(MatplotPanel):
                 'down released' : (REGION, self.OnRegionShiftEnd),
                 'left released' : (REGION, self.OnRegionShiftEnd),
                'right released' : (REGION, self.OnRegionShiftEnd),
-               'escape pressed' : (NORMAL, self.OnRegionDeselected, _draw_idle),
+               'escape pressed' : (NORMAL, self.OnRegionDeselected, _draw),
                'delete pressed' : (NORMAL, self.OnRegionRemove),
                 'space pressed' : (PAN, self.OnPanBegin),
                  'ctrl pressed' : (PAN, self.OnPanBegin),

mwx/matplot2lg.py

@@ -26,6 +26,10 @@ class LinePlot(MatplotPanel):
         MatplotPanel.__init__(self, *args, **kwargs)
         
         self.handler.update({ # DNA<LinePlot>
+            None : {
+                   'region_set' : [ None ],
+                 'region_unset' : [ None ],
+            },
             NORMAL : {
                'escape pressed' : (NORMAL, self.OnEscapeSelection),
                'delete pressed' : (NORMAL, self.OnEscapeSelection),
@@ -78,10 +82,12 @@ class LinePlot(MatplotPanel):
             v = np.array((a, b))
             self.__vspan.set_visible(1)
             self.__vspan.set_xy(((a,0), (a,1), (b,1), (b,0)))
+            self.handler('region_set', self.frame)
         else:
             self.__vspan.set_visible(0)
+            self.handler('region_unset', self.frame)
         self.__region = v
-        
+    
     @region.deleter
     def region(self):
         self.region = None
@@ -92,13 +98,14 @@ class LinePlot(MatplotPanel):
         self.__annotations = []
         
         #<matplotlib.text.Annotation>
-        def annotation(v, xy, xytext,
-            xycoords='data', textcoords='offset points', **arrowprops):
-            return self.axes.annotate('' if v is None else '{:g}'.format(v),
+        def annotation(v, xy, xytext, xycoords='data',
+                textcoords='offset points', **arrowprops):
+            return self.axes.annotate(
+                    '' if v is None else '{:g}'.format(v),
                     xy, xytext, xycoords, textcoords, arrowprops, size='small')
         
-        if self.__region is not None:
-            a, b = self.__region
+        if self.region is not None:
+            a, b = self.region
             x = (b + a) / 2
             y = self.ylim[0] + 20/self.ddpu[1]
             if (b - a) > 60/self.ddpu[0]:
@@ -335,10 +342,7 @@ class Histogram(LinePlot):
     ## Motion/Drag actions (override)
     ## --------------------------------
     
-    def OnDraw(self, evt):
-        """Called before canvas.draw."""
-        ## LinePlot.OnDraw(self, evt) ---> do not annotate
-        
+    def annotate(self):
         if self.__frame:
             x, y = self.__frame.__data
             if len(x) > 1:
@@ -616,6 +620,14 @@ class LineProfile(LinePlot):
             Clipboard.write(o.getvalue(), verbose=0)
             self.message("Write data to clipboard.")
     
+    def annotate(self):
+        LinePlot.annotate(self)
+        
+        x, y = self.plotdata
+        if x.size:
+            self.__fil.set_xy(list(chain([(x[0],0)], zip(x,y), [(x[-1],0)])))
+        self.writeln()
+    
     ## --------------------------------
     ## Motion/Drag actions (override)
     ## --------------------------------
@@ -634,15 +646,6 @@ class LineProfile(LinePlot):
             self.toolbar.push_current()
             self.draw()
     
-    def OnDraw(self, evt):
-        """Called before canvas.draw."""
-        LinePlot.OnDraw(self, evt)
-        
-        x, y = self.plotdata
-        if x.size:
-            self.__fil.set_xy(list(chain([(x[0],0)], zip(x,y), [(x[-1],0)])))
-        self.writeln()
-    
     def OnLineWidth(self, evt):
         n = -2 if evt.key[-1] == '-' else 2
         self.set_linewidth(self.__linewidth + n)
@@ -665,9 +668,6 @@ class LineProfile(LinePlot):
         """Show average value."""
         y = self.calc_average()
         if y is not None:
-            ## self.__hline.set_ydata([y])
-            ## self.__hline.set_visible(1)
-            ## self.canvas.draw_idle()
             self.message(f"ya = {y:g}")
     
     def OnRegionLock(self, evt):

mwx/plugins/__init__.py

@@ -0,0 +1,2 @@
+#! python3
+"""Plug-ins and add-ins."""

mwx/{py → plugins}/fft_view.py

@@ -7,7 +7,8 @@ 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 jgdk import Layer, Param
+from mwx.graphman import Layer
+from mwx.controls import Param
 import editor as edi
 
 

mwx/py/__init__.py

@@ -1,2 +1 @@
 #! python3
-"""Plug-ins / Add-ins."""

{mwxlib-0.93.7.dist-info → mwxlib-0.93.9.dist-info}/METADATA

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

{mwxlib-0.93.7.dist-info → mwxlib-0.93.9.dist-info}/RECORD

@@ -1,12 +1,12 @@
 mwx/__init__.py,sha256=5B4YSOuijG1Uo5-FLtLHGB52Cp_F4vnN--4wGPBx7do,2398
 mwx/bookshelf.py,sha256=FrissUYdGXLABOzJmMaQU6GXvu6n_9DVW3d5wGwQzjM,6613
 mwx/controls.py,sha256=9C1sXBwQl-oZtCb3rXoT-doW48Sv1J359toNq9ScF9M,47173
-mwx/framework.py,sha256=HiXX52Go64R167S9GiKs1SEbkxx-sMps88VDI9mIw5w,73951
+mwx/framework.py,sha256=Q_QSjaa3EwydXi_ON56rvhxWF79M3e_uvgIFq2jw7Ho,73951
 mwx/graphman.py,sha256=SKYJFxi-TqWOALRczYz-M-2ZYEbqiZuAuKCfEIedctY,70156
 mwx/images.py,sha256=mrnUYH12I3XLVSZcEXlpVltX0XMxufbl2yRvDIQJZqc,49957
 mwx/matplot2.py,sha256=qaF_gvLoLn-TimLbRR59KUavNr1ZpZQdSMqjzJk47rk,32682
-mwx/matplot2g.py,sha256=Txcz3yusiFF0j1QnAS0dCGTbGrkx4VC6BZbWbjIRZnw,65585
-mwx/matplot2lg.py,sha256=nKXxy1XZRLTo0WijeIGd0WtQrlSpI1cxkGRwCktrJjY,27263
+mwx/matplot2g.py,sha256=Ca-3RJZmSiZcvNrXmeK_lFf2fdG-0gkp7dYkCtrKi2I,65530
+mwx/matplot2lg.py,sha256=tg8u7w4DxiJdPN-E197NOmbQpc_1gZkgDHYv_xUhbFA,27224
 mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
 mwx/nutshell.py,sha256=5HErOObnOprMc6gYnXV7wY-ALnlwNpmhV8f0EyipYA4,135816
 mwx/utilus.py,sha256=THDxQ-QqbHYVc8iX8qN9yxvfcf7Pvpm7sfTP9ipYvzs,37040
@@ -14,14 +14,15 @@ mwx/wxmon.py,sha256=Qk86VbuuW2rR46pqEYLur13G_aloWz5SVv6sib30YY0,12717
 mwx/wxpdb.py,sha256=2z3ZD9Oo1H-ONBHlaprkB9hrTmAI7o03sqO46ppEFE4,19129
 mwx/wxwil.py,sha256=JK1du4i1RVMbDLqN8jLRDSu_JhKEp4mhHVMElzo4yoE,5578
 mwx/wxwit.py,sha256=2gFHi-8nwWRh26RdvZ_AUP--8PDjJB8TUU72y2fBUWM,7557
-mwx/py/__init__.py,sha256=NzBazvjN9KMFoylsHsLiNOHbcDrNflgSwEFlkT12Rnw,39
-mwx/py/ffmpeg_view.py,sha256=vUYNybIJsF1JGkDzjBgDyBQvDh8e1oKHlEMY5Fwc8L4,9399
-mwx/py/fft_view.py,sha256=1bc6e6muXoo2EHV-w1w4glB7ecPjc6aQXlbX-UplC6I,2642
+mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
+mwx/plugins/ffmpeg_view.py,sha256=vUYNybIJsF1JGkDzjBgDyBQvDh8e1oKHlEMY5Fwc8L4,9399
+mwx/plugins/fft_view.py,sha256=evj2kCe6N10JQczW8IajgLVrUWOihQaHQ2xiBzAsAl4,2675
+mwx/plugins/frame_listview.py,sha256=T-2xSv_D2bk9fJ64aiSEe1rJRTeqaIpLVAYEUXW5vz8,10110
+mwx/plugins/line_profile.py,sha256=WJB5z7F53yg4dII2R36IFZvtkSOGWT669b1HmAAXSnQ,816
+mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
 mwx/py/filling.py,sha256=KaHooM32hrGGgqw75Cbt8lAvACwC6RXadob9LGgNnEc,16806
-mwx/py/frame_listview.py,sha256=T-2xSv_D2bk9fJ64aiSEe1rJRTeqaIpLVAYEUXW5vz8,10110
-mwx/py/line_profile.py,sha256=WJB5z7F53yg4dII2R36IFZvtkSOGWT669b1HmAAXSnQ,816
-mwxlib-0.93.7.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.93.7.dist-info/METADATA,sha256=7uW6eS4CsshRUk0W1Qf7o4qqcpVZNJjbA-KKyWW-zQc,1925
-mwxlib-0.93.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mwxlib-0.93.7.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.93.7.dist-info/RECORD,,
+mwxlib-0.93.9.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.93.9.dist-info/METADATA,sha256=nAajTF4HxuXA8Mee0naQz9t8mxUyduim3U5C0Dwjo7E,1925
+mwxlib-0.93.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mwxlib-0.93.9.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.93.9.dist-info/RECORD,,