mwxlib 0.99.8__py3-none-any.whl → 0.99.9__py3-none-any.whl

mwx/__init__.py

@@ -8,7 +8,7 @@ from .framework import Frame, MiniFrame, ShellFrame, deb
 
 ## Controls
 from .controls import Param, LParam, Knob, ControlPanel, Clipboard, Icon
-from .controls import Button, ToggleButton, TextCtrl, Choice, Gauge, Indicator
+from .controls import Button, ToggleButton, ClassicButton, TextCtrl, Choice, Gauge, Indicator
 
 ## Plugman
 ## from .graphman import Frame as GraphmanFrame, Layer, Thread, Graph

mwx/controls.py

@@ -823,8 +823,17 @@ class Clipboard:
 ## --------------------------------
 ## Wx custom controls and bitmaps 
 ## --------------------------------
-if 1:
-    _provided_arts = {
+
+class Icon(wx.Bitmap):
+    """Returns an iconic bitmap with the specified size (w, h).
+    
+    The key is either Icon.provided_arts or Icon.custom_images key.
+    If the key is empty it returns a transparent bitmap, otherwise NullBitmap.
+    
+    Note:
+        A null (0-shaped) bitmap fails with AssertionError from 4.1.1
+    """
+    provided_arts = {
             'cut' : wx.ART_CUT,
            'copy' : wx.ART_COPY,
           'paste' : wx.ART_PASTE,
@@ -858,32 +867,69 @@ if 1:
             '|<-' : wx.ART_GOTO_FIRST,
             '->|' : wx.ART_GOTO_LAST,
     }
-    _custom_images = {
+    custom_images = {
         k:v for k, v in vars(images).items()
             if isinstance(v, wx.lib.embeddedimage.PyEmbeddedImage)
     }
-
-class Icon(wx.Bitmap):
-    """Returns an iconic bitmap with the specified size (w, h).
-    
-    The key is either Icon.provided_arts or Icon.custom_images key.
-    If the key is empty it returns a transparent bitmap, otherwise NullBitmap.
-    
-    Note:
-        A null (0-shaped) bitmap fails with AssertionError from 4.1.1
-    """
-    provided_arts = _provided_arts
-    custom_images = _custom_images
     
     def __init__(self, *args, **kwargs):
         try:
-            bmp = _getBitmap1(*args, **kwargs)
+            bmp = Icon._getBitmap1(*args, **kwargs)
         except TypeError:
-            bmp = _getBitmap2(*args, **kwargs)
+            bmp = Icon._getBitmap2(*args, **kwargs)
         wx.Bitmap.__init__(self, bmp)
 
     @staticmethod
-    def bullet(colour, ec=None, size=(16,16), radius=4):
+    def _getBitmap1(key, size=None):
+        if isinstance(key, wx.Bitmap):
+            if size and key.Size != size:
+                key = (key.ConvertToImage()
+                          .Scale(*size, wx.IMAGE_QUALITY_NEAREST)
+                          .ConvertToBitmap())
+            return key #<wx.Bitmap>
+        if not size:
+            size = (16, 16)
+        if key:
+            try:
+                art = Icon.custom_images.get(key)
+                bmp = art.GetBitmap()
+            except Exception:
+                art = Icon.provided_arts.get(key)
+                bmp = wx.ArtProvider.GetBitmap(art or key, wx.ART_OTHER, size)
+            return bmp
+        
+        ## Note: null (0-shaped) bitmap fails with AssertionError from 4.1.1
+        elif key == '':
+            bmp = wx.Bitmap(size)
+            with wx.MemoryDC(bmp) as dc:
+                dc.SetBackground(wx.Brush('black'))
+                dc.Clear()
+            bmp.SetMaskColour('black') # return dummy-sized blank bitmap
+            return bmp
+        
+        return wx.NullBitmap # The standard wx controls accept this,
+
+    @staticmethod
+    def _getBitmap2(back, fore, size=None, subsize=3/4):
+        if not size:
+            size = (16, 16)
+        if isinstance(subsize, float):
+            subsize = wx.Size(size) * subsize
+        back = Icon._getBitmap1(back, size)
+        fore = Icon._getBitmap1(fore, subsize)
+        x = size[0] - subsize[0]
+        y = size[1] - subsize[1]
+        with wx.MemoryDC(back) as dc:
+            ## dc = wx.GCDC(dc)
+            ## dc.DrawBitmap(fore, x, y, useMask=True)
+            gc = wx.GraphicsContext.Create(dc)
+            gc.DrawBitmap(fore, x, y, *subsize)
+        return back
+
+    @staticmethod
+    def bullet(colour, ec=None, size=None, radius=4):
+        if not size:
+            size = (16, 16)
         bmp = wx.Bitmap(size)
         with wx.MemoryDC(bmp) as dc:
             dc.SetBackground(wx.Brush('black'))
@@ -910,55 +956,24 @@ class Icon(wx.Bitmap):
         return bmp
 
 
-def _getBitmap1(key, size=(16,16)):
-    if isinstance(key, wx.Bitmap):
-        if key.Size != size:
-            key = (key.ConvertToImage()
-                      .Scale(*size, wx.IMAGE_QUALITY_NEAREST)
-                      .ConvertToBitmap())
-        return key
-    if key:
-        try:
-            art = _custom_images.get(key)
-            bmp = art.GetBitmap()
-        except Exception:
-            art = _provided_arts.get(key)
-            bmp = wx.ArtProvider.GetBitmap(art or key, wx.ART_OTHER, size)
-        return bmp
-    
-    ## Note: null (0-shaped) bitmap fails with AssertionError from 4.1.1
-    elif key == '':
-        bmp = wx.Bitmap(size)
-        with wx.MemoryDC(bmp) as dc:
-            dc.SetBackground(wx.Brush('black'))
-            dc.Clear()
-        bmp.SetMaskColour('black') # return dummy-sized blank bitmap
-        return bmp
+class ClassicButton(wx.Button):
+    """Flat button
     
-    return wx.NullBitmap # The standard wx controls accept this,
-
-
-def _getBitmap2(back, fore, size=(16,16), subsize=3/4):
-    if isinstance(subsize, float):
-        subsize = wx.Size(size) * subsize
-    back = _getBitmap1(back, size)
-    fore = _getBitmap1(fore, subsize)
-    x = size[0] - subsize[0]
-    y = size[1] - subsize[1]
-    with wx.MemoryDC(back) as dc:
-        ## dc = wx.GCDC(dc)
-        ## dc.DrawBitmap(fore, x, y, useMask=True)
-        gc = wx.GraphicsContext.Create(dc)
-        gc.DrawBitmap(fore, x, y, *subsize)
-    return back
-
-
-def _Icon(v):
-    if isinstance(v, (str, bytes)):
-        return Icon(v)
-    if isinstance(v, wx.lib.embeddedimage.PyEmbeddedImage):
-        return v.GetBitmap()
-    return v
+    Args:
+        label   : button label
+        handler : event handler when the button is pressed
+        icon    : key:str or bitmap for button icon
+        **kwargs: keywords for wx.lib.platebtn.PlateButton
+    """
+    def __init__(self, parent, label='', handler=None, icon=None, **kwargs):
+        wx.Button.__init__(self, parent, -1, label, **kwargs)
+        
+        if handler:
+            self.Bind(wx.EVT_BUTTON, _F(handler))
+        
+        self.SetToolTip(_Tip(handler.__doc__))
+        if icon:
+            self.SetBitmap(Icon(icon))
 
 
 class Button(pb.PlateButton):
@@ -970,17 +985,6 @@ class Button(pb.PlateButton):
         icon    : key:str or bitmap for button icon
         **kwargs: keywords for wx.lib.platebtn.PlateButton
     """
-    @property
-    def icon(self):
-        """Icon key:str or bitmap."""
-        return self.__icon
-    
-    @icon.setter
-    def icon(self, v):
-        self.__icon = v
-        self.SetBitmap(_Icon(v))
-        self.Refresh()
-    
     def __init__(self, parent, label='', handler=None, icon=None, **kwargs):
         kwargs.setdefault('style', pb.PB_STYLE_DEFAULT | pb.PB_STYLE_SQUARE)
         pb.PlateButton.__init__(self, parent, -1, label, **kwargs)
@@ -988,8 +992,9 @@ class Button(pb.PlateButton):
         if handler:
             self.Bind(wx.EVT_BUTTON, _F(handler))
         
-        self.ToolTip = _Tip(handler.__doc__)
-        self.icon = icon
+        self.SetToolTip(_Tip(handler.__doc__))
+        if icon:
+            self.SetBitmap(Icon(icon))
     
     def SetBitmap(self, bmp):
         """Set the bitmap displayed in the button.
@@ -998,7 +1003,8 @@ class Button(pb.PlateButton):
         try:
             pb.PlateButton.SetBitmap(self, bmp)
         except Exception:
-            self._bmp = dict(enable=None, disable=None)
+            self._bmp['enable'] = None
+            self._bmp['disable'] = None
 
 
 class ToggleButton(wx.ToggleButton):
@@ -1013,29 +1019,19 @@ class ToggleButton(wx.ToggleButton):
     Note:
         To get the status, check Value or event.GetInt or event.IsChecked.
     """
-    @property
-    def icon(self):
-        """Icon key:str or bitmap."""
-        return self.__icon
-    
-    @icon.setter
-    def icon(self, v):
-        self.__icon = v
-        if isinstance(v, tuple):
-            self.SetBitmap(_Icon(v[0]))
-            self.SetBitmapPressed(_Icon(v[1]))
-        elif v:
-            self.SetBitmap(_Icon(v))
-        self.Refresh()
-    
     def __init__(self, parent, label='', handler=None, icon=None, **kwargs):
         wx.ToggleButton.__init__(self, parent, -1, label, **kwargs)
         
         if handler:
             self.Bind(wx.EVT_TOGGLEBUTTON, _F(handler))
         
-        self.ToolTip = _Tip(handler.__doc__)
-        self.icon = icon
+        self.SetToolTip(_Tip(handler.__doc__))
+        if icon:
+            try:
+                self.SetBitmap(Icon(icon[0]))
+                self.SetBitmapPressed(Icon(icon[1]))
+            except Exception:
+                self.SetBitmap(Icon(icon))
 
 
 class TextCtrl(wx.Control):
@@ -1057,15 +1053,6 @@ class TextCtrl(wx.Control):
     
     value = Value #: internal use only
     
-    @property
-    def icon(self):
-        """Icon key:str or bitmap."""
-        return self._btn.icon
-    
-    @icon.setter
-    def icon(self, v):
-        self._btn.icon = v
-    
     def __init__(self, parent, label='', handler=None, updater=None,
                  icon=None, readonly=False, size=(-1,-1), **kwargs):
         wx.Control.__init__(self, parent, size=size, style=wx.BORDER_NONE)
@@ -1077,8 +1064,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 = _Tip(handler.__doc__)
-        self._btn.ToolTip = _Tip(updater.__doc__)
+        self._ctrl.SetToolTip(_Tip(handler.__doc__))
+        self._btn.SetToolTip(_Tip(updater.__doc__))
         
         self.SetSizer(
             pack(self, (
@@ -1134,15 +1121,6 @@ class Choice(wx.Control):
         lambda self,v: self._ctrl.SetItems(v),
         doc="combobox items:list")
     
-    @property
-    def icon(self):
-        """Icon key:str or bitmap."""
-        return self._btn.icon
-    
-    @icon.setter
-    def icon(self, v):
-        self._btn.icon = v
-    
     def __init__(self, parent, label='', handler=None, updater=None,
                  icon=None, readonly=False, size=(-1,-1), **kwargs):
         wx.Control.__init__(self, parent, size=size, style=wx.BORDER_NONE)
@@ -1154,8 +1132,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 = _Tip(handler.__doc__)
-        self._btn.ToolTip = _Tip(updater.__doc__)
+        self._ctrl.SetToolTip(_Tip(handler.__doc__))
+        self._btn.SetToolTip(_Tip(updater.__doc__))
         
         self.SetSizer(
             pack(self, (

mwx/framework.py

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

mwx/matplot2.py

@@ -387,7 +387,7 @@ class MatplotPanel(wx.Panel):
     def on_modeline_tip(self, evt): #<wx._core.MouseEvent>
         flag = self.modeline.HitTest(evt.Position)
         if flag == wx.HT_WINDOW_INSIDE:
-            self.modeline.ToolTip = self.modeline.Label
+            self.modeline.SetToolTip(self.modeline.Label)
         evt.Skip()
     
     def on_focus_set(self, evt): #<wx._core.FocusEvent>

mwx/utilus.py

@@ -43,6 +43,8 @@ def warn(message, category=None):
     stacklevel = 1
     while frame.f_code.co_filename in skip:
         frame = frame.f_back
+        if not frame:
+            break
         stacklevel += 1
     return warnings.warn(message, category, stacklevel+1)
 

{mwxlib-0.99.8.dist-info → mwxlib-0.99.9.dist-info}/METADATA

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

{mwxlib-0.99.8.dist-info → mwxlib-0.99.9.dist-info}/RECORD

@@ -1,15 +1,15 @@
-mwx/__init__.py,sha256=U7n9X8JAWdzOavKvVqecHdE4ooiXcCB5DSPCKWxfTnY,653
+mwx/__init__.py,sha256=psabnAMei5VzB2TsB2qBNLrIZMX0LiqjlXCpNGmDejk,668
 mwx/bookshelf.py,sha256=so-xSLq08sMlJBErTxOaDoKUAMa_g1CkIP2pNnff68c,5607
-mwx/controls.py,sha256=5RDA9YgxrxCmjrHOU6XgA_5tcOU1UEwqU4tFEuBNcrk,47648
-mwx/framework.py,sha256=lxqSl_IrGp7ZAUPKJWP5JaUUm3vhaOCjAujFVPocPXg,75501
+mwx/controls.py,sha256=LZqee9K8uPxs-Iqcp1zMMNBjFpGPrHbcMaIBuBOL7oo,47647
+mwx/framework.py,sha256=nJ22_22Hk2U8xSbHOszluJdSMDwYsw6XjI3lOiprcJc,75501
 mwx/graphman.py,sha256=qX5aHEw4u9iGR8lNpZkXDnGPVMhyAH6NnBapiaUbKZw,70265
 mwx/images.py,sha256=_-Eh3xF7Khu42ivkYp97NXIzSNGbjcidqtWjZQFGtqE,47827
-mwx/matplot2.py,sha256=xCJ_ZzdDEWmzctpPaOrzTnwXyHINP4nfFHweoTZa6ug,32899
+mwx/matplot2.py,sha256=zA56jIdRUdzu-wrmPai1PSOjzqV2Erqw2yFKW-jwdA8,32901
 mwx/matplot2g.py,sha256=gCXa8X1MEMP7n_mG73h3SkWKuNZOfjVKUTWNRXXK11c,64310
 mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
 mwx/mgplt.py,sha256=M5rt-H7Uq1OHnlFvMA4a3945UBvppbR9L_mw8NL_YZ0,5602
 mwx/nutshell.py,sha256=zJULq1K8WiOBUncMpXE8HbunqUULa9MUt0hBET5jmgs,141810
-mwx/utilus.py,sha256=iizdVrbwL1lX7eTfsMmltFz4IfHqTXVM37wwlPQ3A3Y,37346
+mwx/utilus.py,sha256=Yyw8L1f-ikhyd7wtFXYtsOswofWxmB4GAmLOZnhUXeU,37388
 mwx/wxmon.py,sha256=yzWqrbY6LzpfRwQeytYUeqFhFuLVm_XEvrVAL_k0HBQ,12756
 mwx/wxpdb.py,sha256=lLowkkAgMhPFHAfklD7wZHq0qbSMjRxnBFtSajmVgME,19133
 mwx/wxwil.py,sha256=hhyB1lPrF9ixeObxCOKQv0Theu-B-kpJg_yVU3EGSNg,5406
@@ -21,8 +21,8 @@ mwx/plugins/frame_listview.py,sha256=yEYPCdLHLSMTJwTv6iYAh3Lo4lJvYfp5BxTLP3FhW9Y
 mwx/plugins/line_profile.py,sha256=--9NIc3x5EfRB3L59JvD7rzENQHyiYfu7wWJo6AuMkA,820
 mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
 mwx/py/filling.py,sha256=fumUG1F5M9TL-Dfqni4G85uk7TmvnUunTbdcPDV0vfo,16857
-mwxlib-0.99.8.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.99.8.dist-info/METADATA,sha256=C8n66k4LeYcPBb91oVSh7D68pfZI2d1JteEJn3F4UQU,7411
-mwxlib-0.99.8.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-mwxlib-0.99.8.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.99.8.dist-info/RECORD,,
+mwxlib-0.99.9.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.99.9.dist-info/METADATA,sha256=1-yAjrG-AehfMfbbEyPN3eMtrGErVkNft7OHtTkwSU0,7411
+mwxlib-0.99.9.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+mwxlib-0.99.9.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.99.9.dist-info/RECORD,,