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

mwx/controls.py

@@ -896,6 +896,18 @@ class Icon(wx.Bitmap):
             bmp = _getBitmap2(*args, **kwargs)
         wx.Bitmap.__init__(self, bmp)
 
+    @staticmethod
+    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[1]//2, radius)
+        bmp.SetMaskColour('black')
+        return bmp
+
     @staticmethod
     def iconify(icon, w, h):
         ## if wx.VERSION >= (4,1,0):
@@ -914,46 +926,48 @@ 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
-    if key == '':
-        bmp = wx.Bitmap(size or (16,16))
-        if 1:
-            dc = wx.MemoryDC(bmp)
+    elif key == '':
+        bmp = wx.Bitmap(size)
+        with wx.MemoryDC(bmp) as dc:
             dc.SetBackground(wx.Brush('black'))
             dc.Clear()
-            del dc
         bmp.SetMaskColour('black') # return dummy-sized blank bitmap
         return bmp
+    
     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)
     fore = _getBitmap1(fore, subsize)
     x = size[0] - subsize[0]
     y = size[1] - subsize[1]
-    dc = wx.MemoryDC(back)
-    dc.DrawBitmap(fore, x, y, useMask=True)
-    del dc
+    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
 
 

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.95.4"
+__version__ = "0.95.6"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial
@@ -1116,6 +1116,10 @@ class ShellFrame(MiniFrame):
         self.Log = EditorBook(self, name="Log")
         self.Help = EditorBook(self, name="Help")
         
+        self.Bookshelf = EditorTreeCtrl(self, name="Bookshelf",
+                                        style=wx.TR_DEFAULT_STYLE|wx.TR_HIDE_ROOT)
+        wx.CallAfter(self.Bookshelf.attach, self)
+        
         from .wxpdb import Debugger
         from .wxwit import Inspector
         from .wxmon import EventMonitor
@@ -1152,10 +1156,6 @@ class ShellFrame(MiniFrame):
         self.ghost.AddPage(self.Help, "Help")
         self.ghost.Name = "ghost"
         
-        self.Bookshelf = EditorTreeCtrl(self, name="Bookshelf",
-                                        style=wx.TR_DEFAULT_STYLE|wx.TR_HIDE_ROOT)
-        self.Bookshelf.attach(self)
-        
         self.ghost.AddPage(self.Bookshelf, "Bookshelf", bitmap=Icon('book'))
         
         self.ghost.SetDropTarget(FileDropLoader(self.Scratch))

mwx/graphman.py

@@ -594,7 +594,7 @@ class MyFileDropLoader(wx.FileDropTarget):
             elif ext == '.jssn':
                 self.loader.load_session(fn)
             elif ext == '.index':
-                self.loader.import_index(fn, self.view)
+                self.loader.load_index(fn, self.view)
             else:
                 paths.append(fn) # image file just stacks to be loaded
         if paths:
@@ -697,10 +697,10 @@ class Frame(mwx.Frame):
             (),
             ## ("Index", (
             ##     (mwx.ID_(11), "&Import index\tCtrl+Shift+o", "Import index file", Icon('open'),
-            ##         lambda v: self.import_index()),
+            ##         lambda v: self.load_index()),
             ##         
             ##     (mwx.ID_(12), "&Export index\tCtrl+Shift+s", "Export index file", Icon('saveas'),
-            ##         lambda v: self.export_index(),
+            ##         lambda v: self.save_index(),
             ##         lambda v: v.Enable(self.__view.frame is not None)),
             ##     )),
             ("Session", (
@@ -1401,7 +1401,7 @@ class Frame(mwx.Frame):
     ## --------------------------------
     ATTRIBUTESFILE = "results.index"
     
-    def import_index(self, filename=None, view=None):
+    def load_index(self, filename=None, view=None):
         """Load frames :ref to the Index file.
         """
         if not view:
@@ -1433,7 +1433,7 @@ class Frame(mwx.Frame):
         print(self.message.read())
         return frames
     
-    def export_index(self, filename=None, frames=None):
+    def save_index(self, filename=None, frames=None):
         """Save frames :ref to the Index file.
         """
         if not frames:
@@ -1481,6 +1481,9 @@ class Frame(mwx.Frame):
         print(self.message.read())
         return frames
     
+    import_index = load_index # for backward compatibility
+    export_index = save_index # for backward compatibility
+    
     ## --------------------------------
     ## load/save frames and attributes 
     ## --------------------------------

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'}

mwx/plugins/frame_listview.py

@@ -180,14 +180,14 @@ class CheckList(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
             self.Select(j)
     
     def OnLoadItems(self, evt):
-        self.parent.parent.import_index(view=self.Target)
+        self.parent.parent.load_index(view=self.Target)
     
     def OnSaveItems(self, evt):
         frames = self.Target.all_frames
         selected_frames = [frames[j] for j in self.selected_items]
         if selected_frames:
             self.parent.message("Exporting {} frames.".format(len(selected_frames)))
-            self.parent.parent.export_index(frames=selected_frames)
+            self.parent.parent.save_index(frames=selected_frames)
         else:
             self.parent.message("No frame selected.")
     

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mwxlib
-Version: 0.95.4
+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.4.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=JBMUbDgHFf4Dx0PofCdnoQExBnGjxiAeSGkdS_0Qgo4,47673
-mwx/framework.py,sha256=UMmTHqx85SQPI84alNKx0AMQx9amB4qxj6sypFtIXMs,75655
-mwx/graphman.py,sha256=PacQF1Of6oaqw26uFoXaAK9IrwggGRwoJe9uCP5JZ28,70373
+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
@@ -17,12 +17,12 @@ mwx/wxwit.py,sha256=yU6XeCCWRBP7CLmpphjT072PfXAL30DNaxoChDX2p0I,7322
 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=HcnBr-y_yFdSfASPRzMLANta4SwSDShd65QWnCU3XhM,2665
-mwx/plugins/frame_listview.py,sha256=fY27r_8ttf2hi-T0CPgY_LGbH9xKkQmSIqgaALMyVCM,10112
+mwx/plugins/frame_listview.py,sha256=RaYOj-YKrpLqhT8TkBRDX1TQnSPv90V185j8OjrWJTs,10108
 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.4.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.95.4.dist-info/METADATA,sha256=jkWKBPw5LwejFe36g5StdBMWOdRLw3DQ7-wY3ZMlATA,1925
-mwxlib-0.95.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mwxlib-0.95.4.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.95.4.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,,