mwxlib 0.95.6__py3-none-any.whl → 0.95.8__py3-none-any.whl

mwx/__init__.py

@@ -7,20 +7,12 @@ from .framework import Menu, MenuBar, StatusBar
 from .framework import Frame, MiniFrame, ShellFrame, deb
 
 ## Controls
-## from . import controls
 from .controls import Param, LParam, Knob, ControlPanel, Clipboard, Icon
 from .controls import Button, ToggleButton, TextCtrl, Choice, Gauge, Indicator
 
 ## Plugman
-## from . import graphman
-## from .graphman import Frame as ViewFrame, Layer, Thread, Graph
-
-## Matplot
-## from .matplot2 import MatplotPanel
-## from .matplot2g import GraphPlot
-## from .matplot2lg import LinePlot
-## from .matplot2lg import Histogram
-## from .matplot2lg import LineProfile
+## from .graphman import Frame as GraphmanFrame, Layer, Thread, Graph
+## from .graphman import MatplotPanel, GraphPlot, LinePlot, LineProfile, Histogram
 
 ## Gnuplot
 ## from .mgplt import Gnuplot, GnuplotFrame

mwx/controls.py

@@ -936,9 +936,7 @@ def _getBitmap1(key, size=(16,16)):
     if key:
         try:
             art = _custom_images.get(key)
-            bmp = (art.GetImage()
-                      .Scale(*size, wx.IMAGE_QUALITY_NEAREST)
-                      .ConvertToBitmap())
+            bmp = art.GetBitmap()
         except Exception:
             art = _provided_arts.get(key)
             bmp = wx.ArtProvider.GetBitmap(art or key, wx.ART_OTHER, size)

mwx/framework.py

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

mwx/graphman.py

@@ -4,7 +4,7 @@
 from functools import wraps
 from importlib import reload, import_module
 from contextlib import contextmanager
-from pprint import pprint, pformat
+from pprint import pformat
 from bdb import BdbQuit
 import subprocess
 import threading
@@ -29,7 +29,11 @@ from . import framework as mwx
 from .utilus import funcall as _F
 from .controls import ControlPanel, Icon
 from .framework import CtrlInterface, AuiNotebook
+
+from .matplot2 import MatplotPanel # noqa
 from .matplot2g import GraphPlot
+from .matplot2lg import LinePlot # noqa
+from .matplot2lg import LineProfile # noqa
 from .matplot2lg import Histogram
 
 
@@ -1531,8 +1535,7 @@ class Frame(mwx.Frame):
             new.update(res) # copy res back keeping new order.
             
             with open(filename, 'w') as o:
-                ## pprint(new, stream=o, sort_dicts=False) # write new <dict> PY38
-                pprint(tuple(new.items()), stream=o)
+                print(pformat(tuple(new.items())), file=o)
             
         except Exception as e:
             print("- Failed to write attributes:", e)

mwx/matplot2.py

@@ -38,17 +38,32 @@ if matplotlib.parse_version(matplotlib.__version__).release < (3,8,0):
 if 1:
     class Cursor(Cursor):
         def onmove(self, event):
-            if self.ignore(event)\
-              or not self.canvas.widgetlock.available(self):
+            """Internal event handler to draw the cursor when the mouse moves.
+            (override) If the cursor is off the axes, the xdata and ydata will
+                       be None, and will simply be cleared rather than drawn.
+            """
+            if self.ignore(event):
                 return
+            if not self.canvas.widgetlock.available(self):
+                return
+            
             ## xdata, ydata = self._get_data_coords(event) # >= 3.8 only
             xdata, ydata = event.xdata, event.ydata
             self.linev.set_xdata((xdata, xdata))
             self.linev.set_visible(self.visible and self.vertOn)
             self.lineh.set_ydata((ydata, ydata))
             self.lineh.set_visible(self.visible and self.horizOn)
-            if self.visible and (self.vertOn or self.horizOn):
-                self._update()
+            if not (self.visible and (self.vertOn or self.horizOn)):
+                return
+            ## Redraw.
+            if self.useblit:
+                if self.background is not None:
+                    self.canvas.restore_region(self.background)
+                self.ax.draw_artist(self.linev)
+                self.ax.draw_artist(self.lineh)
+                self.canvas.blit(self.ax.bbox)
+            else:
+                self.canvas.draw_idle()
 
 
 class MatplotPanel(wx.Panel):
@@ -152,8 +167,8 @@ class MatplotPanel(wx.Panel):
                   'canvas_draw' : [ None, self.OnDraw ], # before canvas.draw
                 #'canvas_drawn' : [ None, ],             # after canvas.draw
               #'canvas_resized' : [ None, ],
-                    'focus_set' : [ None, self.on_focus_set, self.escape ],
-                   'focus_kill' : [ None, self.on_focus_kill, self.escape ],
+                    'focus_set' : [ None, self.on_focus_set ],
+                   'focus_kill' : [ None, self.on_focus_kill ],
                  'figure_enter' : [ None, self.on_figure_enter ],
                  'figure_leave' : [ None, self.on_figure_leave ],
                    'axes_enter' : [ None, ],

mwx/matplot2g.py

@@ -888,6 +888,7 @@ class GraphPlot(MatplotPanel):
         MatplotPanel.on_focus_set(self, evt)
         if self.frame:
             self.handler('frame_selected', self.frame)
+            self.on_picker_unlock(evt)
         self.trace_point(*self.Selector)
     
     def on_focus_kill(self, evt):
@@ -895,6 +896,7 @@ class GraphPlot(MatplotPanel):
         MatplotPanel.on_focus_kill(self, evt)
         if self.frame:
             self.handler('frame_deselected', self.frame)
+            self.on_picker_lock(evt)
     
     def get_cmap(self):
         if self.frame:

{mwxlib-0.95.6.dist-info → mwxlib-0.95.8.dist-info}/METADATA

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

{mwxlib-0.95.6.dist-info → mwxlib-0.95.8.dist-info}/RECORD

@@ -1,11 +1,11 @@
-mwx/__init__.py,sha256=SNSLQc0IGuE6LDT5mzaAxXRgcH_k6cRVS3gXzFQqdZM,814
+mwx/__init__.py,sha256=nN62CGTWjME7Zz2h-jIRB8MxwuErIkHPGrlBzydkF0o,643
 mwx/bookshelf.py,sha256=DAhMQk3_J4rdE50adBMFu5wNz3WdMh_zzJ37O9ncceo,5103
-mwx/controls.py,sha256=9nxVBNXcyZjZT4XBtBJfuzRqTB5X5rkZR3pnHPE9WaI,48289
-mwx/framework.py,sha256=bEb_aHtPTFowVMELMmlFvdm2Edmkw8mfPvRQJ907ulQ,75669
-mwx/graphman.py,sha256=OMO2HQGfeCCGON8MwabmhLYsA-YHKueKaepsJkTDP0c,70489
+mwx/controls.py,sha256=ejttyU7pC50tr71cOWQj9ImN_AMeTKtQWozPD8pLwhE,48183
+mwx/framework.py,sha256=ITmjul_u4gp9jAJ_qbCDUVhlLI02cFhLLABCbYS-13k,75669
+mwx/graphman.py,sha256=NBe58KdAstFNPqyEmpPMMmWwjtNgJB7HumSI7-gjw54,70533
 mwx/images.py,sha256=gyvqW4TLWdJMKmsaWiPiV_PuHJM1GbHgeELERLwGzg8,45291
-mwx/matplot2.py,sha256=nA7RLW1tf5kQfrenFnrAF900DbrpOUldc3SGaJgJKi0,32794
-mwx/matplot2g.py,sha256=faKpuBdp4H_g-HKfRdxV17AwHtXcfRi2F0myE3cjM04,65393
+mwx/matplot2.py,sha256=1ISXVwqlu1EJKe5JXmBC2tuecsRoFzJrMZsqQMxdC50,33432
+mwx/matplot2g.py,sha256=KIuownEsF7t2RgHn3kOxjBXbKOdfS99X_CtQweG_FrM,65471
 mwx/matplot2lg.py,sha256=gI_L_GofQrg5TIgZFMgYu8-7IRoe6VCRG3Ub35ChSpQ,27177
 mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
 mwx/nutshell.py,sha256=xI5o9os0wxgkY5LFz1wztM36l-4nl2j1iAdzJ11BMv0,137104
@@ -21,8 +21,8 @@ mwx/plugins/frame_listview.py,sha256=RaYOj-YKrpLqhT8TkBRDX1TQnSPv90V185j8OjrWJTs
 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.95.6.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.95.6.dist-info/METADATA,sha256=oWMpii7LOaEx62rOLP7IERjo59bWV0VLVEBt2Ju2xa0,1925
-mwxlib-0.95.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mwxlib-0.95.6.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.95.6.dist-info/RECORD,,
+mwxlib-0.95.8.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.95.8.dist-info/METADATA,sha256=_rLSaOpBEIzfQxz1acUok9ODoGNNth0lRqmIOLZv0Xs,1925
+mwxlib-0.95.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mwxlib-0.95.8.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.95.8.dist-info/RECORD,,