mwxlib 0.95.7__py3-none-any.whl → 0.95.9__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

@@ -1225,7 +1225,7 @@ class Indicator(wx.Control):
         self.Refresh()
     
     def update_design(self, **kwargs):
-        """Update design attributes.
+        """Update multiple design properties at once.
         
         This method is useful for changing colors, spacing, radius, etc.
         The best size will be automatically invalidated and re-calculated.

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.95.7"
+__version__ = "0.95.9"
 __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):

mwx/matplot2lg.py

@@ -57,6 +57,9 @@ class LinePlot(MatplotPanel):
         self.__region = None
         self.__annotations = []
         
+        ## Note for matplotlib >= 3.9.0:
+        ## axhspan and axvspan now return Rectangles, not Polygons.
+        #<matplotlib.patches.Rectangle>
         #<matplotlib.patches.Polygon>
         self.__vspan = self.axes.axvspan(0, 0,
             color='none', ls='dashed', lw=1, ec='black', visible=0, zorder=2)
@@ -81,7 +84,11 @@ class LinePlot(MatplotPanel):
                 elif b > r: b = r
             v = np.array((a, b))
             self.__vspan.set_visible(1)
-            self.__vspan.set_xy(((a,0), (a,1), (b,1), (b,0)))
+            try:
+                self.__vspan.set_x(a)
+                self.__vspan.set_width(b-a)
+            except AttributeError:
+                self.__vspan.set_xy(((a,0), (a,1), (b,1), (b,0)))
             self.handler('region_set', self.frame)
         else:
             self.__vspan.set_visible(0)
@@ -299,11 +306,9 @@ class Histogram(LinePlot):
         self.__frame = frame # update reference of the frame
         if frame:
             try:
-                image = self.frmae.image
-                h, w = image.shape
-                x, y = frame.__data # reuse the data unless,
+                x, y = frame.__data # reuse cached data
             except Exception:
-                x, y = frame.__data = self.calc(frame) # histogram_data buffer
+                x, y = frame.__data = self.calc(frame) # new histogram_data buffer
             
             self.__plot.set_data(x, y)
             self.xlim = x.min(), x.max()

mwx/nutshell.py

@@ -867,7 +867,7 @@ class EditorInterface(CtrlInterface):
         self.Overtype = mode if mode is not None else not self.Overtype
     
     def wrap(self, mode=1):
-        """Sets whether text is word wrapped.
+        """Set whether text is word wrapped.
         
         (override) mode in {0:no-wrap, 1:word-wrap, 2:char-wrap,
                             3:whitespace-wrap, None:toggle}
@@ -1800,8 +1800,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
         evt.Skip()
     
     def set_attributes(self, buf=None, **kwargs):
-        """Sets attributes and defaultBufferStyle
-        that apply to all buffers contained in the EditorBook.
+        """Set multiple properties at once to the buffer(s).
         
         Args:
             buf : a buffer to apply (if None, applies to all buffers).

{mwxlib-0.95.7.dist-info → mwxlib-0.95.9.dist-info}/METADATA

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

{mwxlib-0.95.7.dist-info → mwxlib-0.95.9.dist-info}/RECORD

@@ -1,14 +1,14 @@
-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=ejttyU7pC50tr71cOWQj9ImN_AMeTKtQWozPD8pLwhE,48183
-mwx/framework.py,sha256=EUEdJLA7YyYxGKEu5mMioiJj4iUnsZ4i5dC2WnIvvac,75669
-mwx/graphman.py,sha256=OMO2HQGfeCCGON8MwabmhLYsA-YHKueKaepsJkTDP0c,70489
+mwx/controls.py,sha256=IAT3l3-azlPFtMc2VGNMiQhI390ExW0S4CgjEOKFI4s,48200
+mwx/framework.py,sha256=OVFv_5c-vrXRuvWm9YN8cHWmvN-svodmMAnlOAPBwQ4,75669
+mwx/graphman.py,sha256=NBe58KdAstFNPqyEmpPMMmWwjtNgJB7HumSI7-gjw54,70533
 mwx/images.py,sha256=gyvqW4TLWdJMKmsaWiPiV_PuHJM1GbHgeELERLwGzg8,45291
-mwx/matplot2.py,sha256=YB7Ug3PaHDFbNQRX8G_rW9-50bn7c1UQe4P1ZzAxlhU,32768
+mwx/matplot2.py,sha256=1ISXVwqlu1EJKe5JXmBC2tuecsRoFzJrMZsqQMxdC50,33432
 mwx/matplot2g.py,sha256=KIuownEsF7t2RgHn3kOxjBXbKOdfS99X_CtQweG_FrM,65471
-mwx/matplot2lg.py,sha256=gI_L_GofQrg5TIgZFMgYu8-7IRoe6VCRG3Ub35ChSpQ,27177
+mwx/matplot2lg.py,sha256=pcu1oDPE_BlpFqNGPPKf9vpTuDs_h_u3OTRAJx5-Sds,27392
 mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
-mwx/nutshell.py,sha256=xI5o9os0wxgkY5LFz1wztM36l-4nl2j1iAdzJ11BMv0,137104
+mwx/nutshell.py,sha256=pbsQATwt906lOXGFWJmuwZIwU_ve78o46I2g5zNjvG4,137050
 mwx/utilus.py,sha256=Uwj6vbNUUztwOswPG75xtsT2y_PZqh3QiJraxmA9iT0,37401
 mwx/wxmon.py,sha256=6es-jVz9Ht7vZnG7VBJcaNYLHY0PnZtij60SXcZRTeY,12727
 mwx/wxpdb.py,sha256=lLowkkAgMhPFHAfklD7wZHq0qbSMjRxnBFtSajmVgME,19133
@@ -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.7.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.95.7.dist-info/METADATA,sha256=P_R_5M65Dcw6LuaTKAn1eA7TIDcM07NQPV0QXKaG3zM,1925
-mwxlib-0.95.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mwxlib-0.95.7.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.95.7.dist-info/RECORD,,
+mwxlib-0.95.9.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.95.9.dist-info/METADATA,sha256=TpQuGm-jesDFI2I-g8nwPcIqT7Edpv4_pM1ZFBb3gwo,1925
+mwxlib-0.95.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mwxlib-0.95.9.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.95.9.dist-info/RECORD,,