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

mwx/controls.py

@@ -897,16 +897,14 @@ class Icon(wx.Bitmap):
         wx.Bitmap.__init__(self, bmp)
 
     @staticmethod
-    def bullet(colour, ec=None, size=None, radius=4):
-        if not size:
-            size = (16,16)
+    def bullet(colour, ec=None, size=(16,16), radius=4):
         bmp = wx.Bitmap(size)
         with wx.MemoryDC(bmp) as dc:
             dc.SetBackground(wx.Brush('black'))
             dc.Clear()
             dc.SetPen(wx.Pen(ec, style=wx.PENSTYLE_SOLID))
             dc.SetBrush(wx.Brush(colour, style=wx.BRUSHSTYLE_SOLID))
-            dc.DrawCircle(size[0]//2, size[0]//2, radius)
+            dc.DrawCircle(size[0]//2, size[1]//2, radius)
         bmp.SetMaskColour('black')
         return bmp
 
@@ -928,24 +926,27 @@ class Icon(wx.Bitmap):
 Icon2 = Icon # for backward compatibility
 
 
-def _getBitmap1(key, size=None):
+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) # None => AttributeError
-            if not size:
-                bmp = art.GetBitmap()
-            else:
-                bmp = (art.GetImage()
-                          .Scale(*size, wx.IMAGE_QUALITY_NEAREST)
-                          .ConvertToBitmap())
+            art = _custom_images.get(key)
+            bmp = (art.GetImage()
+                      .Scale(*size, wx.IMAGE_QUALITY_NEAREST)
+                      .ConvertToBitmap())
         except Exception:
-            art = _provided_arts.get(key) or key
-            bmp = wx.ArtProvider.GetBitmap(art, wx.ART_OTHER, size or (16,16))
+            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 or (16,16))
+        bmp = wx.Bitmap(size)
         with wx.MemoryDC(bmp) as dc:
             dc.SetBackground(wx.Brush('black'))
             dc.Clear()
@@ -955,9 +956,7 @@ def _getBitmap1(key, size=None):
     return wx.NullBitmap # The standard wx controls accept this,
 
 
-def _getBitmap2(back, fore, size=None, subsize=3/4):
-    if not size:
-        size = (16,16)
+def _getBitmap2(back, fore, size=(16,16), subsize=3/4):
     if isinstance(subsize, float):
         subsize = wx.Size(size) * subsize
     back = _getBitmap1(back, size)
@@ -965,7 +964,10 @@ def _getBitmap2(back, fore, size=None, subsize=3/4):
     x = size[0] - subsize[0]
     y = size[1] - subsize[1]
     with wx.MemoryDC(back) as dc:
-        dc.DrawBitmap(fore, x, y, useMask=True)
+        ## dc = wx.GCDC(dc)
+        ## dc.DrawBitmap(fore, x, y, useMask=True)
+        gc = wx.GraphicsContext.Create(dc)
+        gc.DrawBitmap(fore, x, y, *subsize)
     return back
 
 

mwx/framework.py

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

mwx/nutshell.py

@@ -539,6 +539,7 @@ class EditorInterface(CtrlInterface):
         lsty = self.get_style(p-1)
         rsty = self.get_style(p)
         if lsty == rsty == 'moji': # inside string
+            ## styles = {'moji'}
             return ''
         elif lsty == 'suji' or rsty == 'suji':
             styles = {'suji'}

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

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

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

@@ -1,14 +1,14 @@
 mwx/__init__.py,sha256=SNSLQc0IGuE6LDT5mzaAxXRgcH_k6cRVS3gXzFQqdZM,814
 mwx/bookshelf.py,sha256=DAhMQk3_J4rdE50adBMFu5wNz3WdMh_zzJ37O9ncceo,5103
-mwx/controls.py,sha256=mNSDNuIB6BPZxgd2lZXHBFQz7QaIBLy6bZSrD4dp0LI,48161
-mwx/framework.py,sha256=ygT0sB2hCEDB4ObmJCBYka7pWJrGpINmJ3zqopyleWk,75669
+mwx/controls.py,sha256=9nxVBNXcyZjZT4XBtBJfuzRqTB5X5rkZR3pnHPE9WaI,48289
+mwx/framework.py,sha256=bEb_aHtPTFowVMELMmlFvdm2Edmkw8mfPvRQJ907ulQ,75669
 mwx/graphman.py,sha256=OMO2HQGfeCCGON8MwabmhLYsA-YHKueKaepsJkTDP0c,70489
 mwx/images.py,sha256=gyvqW4TLWdJMKmsaWiPiV_PuHJM1GbHgeELERLwGzg8,45291
 mwx/matplot2.py,sha256=nA7RLW1tf5kQfrenFnrAF900DbrpOUldc3SGaJgJKi0,32794
 mwx/matplot2g.py,sha256=faKpuBdp4H_g-HKfRdxV17AwHtXcfRi2F0myE3cjM04,65393
 mwx/matplot2lg.py,sha256=gI_L_GofQrg5TIgZFMgYu8-7IRoe6VCRG3Ub35ChSpQ,27177
 mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
-mwx/nutshell.py,sha256=ENxoeqSfVaogh2dz43fk3MQaCePKyoz1YzucwiCojxI,137070
+mwx/nutshell.py,sha256=xI5o9os0wxgkY5LFz1wztM36l-4nl2j1iAdzJ11BMv0,137104
 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.5.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.95.5.dist-info/METADATA,sha256=VSx9T74u5-4ID0njjolKRXbZSsbYe_UP8HQ9AzCfTQA,1925
-mwxlib-0.95.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mwxlib-0.95.5.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.95.5.dist-info/RECORD,,
+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,,