mwxlib 1.6.5__py3-none-any.whl → 1.6.7__py3-none-any.whl

mwx/bookshelf.py

@@ -23,11 +23,12 @@ class MyDropTarget(wx.DropTarget):
     
     def OnDragOver(self, x, y, result):
         item, flags = self.tree.HitTest((x, y))
-        items = list(self.tree._gen_items(self.tree.RootItem)) # first level items
+        items = list(self.tree._gen_items(self.tree.RootItem))  # first level items
         if not item:
-            item = items[0]
+            item = items[0]  # Select the first tree item.
+            ## return wx.DragNone
         elif item not in items:
-            item = self.tree.GetItemParent(item) # Select the parent item
+            item = self.tree.GetItemParent(item)  # Select the tree item.
         if item != self.tree.Selection:
             self.tree.SelectItem(item)
         return result
@@ -42,7 +43,7 @@ class MyDropTarget(wx.DropTarget):
             if result == wx.DragMove:
                 try:
                     buf = self.tree._buffer  # only for the same process buffer DnD
-                    buf.parent.kill_buffer(buf) # the focus moves
+                    buf.parent.kill_buffer(buf)  # the focus moves
                     wx.CallAfter(self.tree.SetFocus)
                 except AttributeError:
                     pass

mwx/controls.py

@@ -207,7 +207,8 @@ class Param:
     @property
     def index(self):
         """A knob index -> value.
-        Returns -1 if the value is not defined."""
+        Returns -1 if the value is not defined.
+        """
         v = self.value
         if np.isnan(v) or np.isinf(v):
             return -1
@@ -910,7 +911,7 @@ class Icon(wx.Bitmap):
         k: v for k, v in vars(images).items()
              if isinstance(v, wx.lib.embeddedimage.PyEmbeddedImage)
     }
-    
+
     def __init__(self, *args, **kwargs):
         try:
             bmp = Icon._getBitmap1(*args, **kwargs)
@@ -920,13 +921,16 @@ class Icon(wx.Bitmap):
 
     @staticmethod
     def _getBitmap1(key, size=None):
+        if not isinstance(size, (type(None), tuple, wx.Size)):
+            raise TypeError("invalid size type")
+        
         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:
+        if size is None:
             size = (16, 16)
         if key:
             try:
@@ -943,9 +947,9 @@ class Icon(wx.Bitmap):
             with wx.MemoryDC(bmp) as dc:
                 dc.SetBackground(wx.Brush('black'))
                 dc.Clear()
-            bmp.SetMaskColour('black') # return dummy-sized blank bitmap
+            bmp.SetMaskColour('black')  # return dummy-sized blank bitmap
             return bmp
-        return wx.NullBitmap # The standard wx controls accept this.
+        return wx.NullBitmap  # The standard wx controls accept this.
 
     @staticmethod
     def _getBitmap2(back, fore, size=None, subsize=3/4):

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.6.5"
+__version__ = "1.6.7"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -859,8 +859,8 @@ class AuiNotebook(aui.AuiNotebook):
             self.Name = name
         
         def tab_menu(evt):
-            tabs = evt.EventObject #<AuiTabCtrl>
-            page = tabs.Pages[evt.Selection] # GetPage for split notebook.
+            tabs = evt.EventObject  #<AuiTabCtrl>
+            page = tabs.Pages[evt.Selection]  # GetPage for split notebook.
             try:
                 Menu.Popup(self, page.window.menu)
             except AttributeError:
@@ -868,12 +868,12 @@ class AuiNotebook(aui.AuiNotebook):
         self.Bind(aui.EVT_AUINOTEBOOK_TAB_RIGHT_DOWN, tab_menu)
     
     @property
-    def _all_tabs(self): # (deprecated) internal use only
+    def _all_tabs(self):
         """Return all AuiTabCtrl objects (internal use only)."""
         return [x for x in self.Children if isinstance(x, aui.AuiTabCtrl)]
     
     @property
-    def _all_panes(self): # (deprecated) internal use only
+    def _all_panes(self):
         """Return all AuiPaneInfo excluding `dummy` one (internal use only)."""
         return list(self._mgr.AllPanes)[1:]
     
@@ -888,12 +888,12 @@ class AuiNotebook(aui.AuiNotebook):
         """Replace the page with the specified page w/o focusing."""
         j = self.GetPageIndex(win)
         if j != -1:
-            wnd = wx.Window.FindFocus() # original focus
+            wnd = wx.Window.FindFocus()  # original focus
             org = self.CurrentPage
             if j != self.Selection:
-                self.Selection = j      # the focus moves if shown
-            self.CurrentPage.SetFocus() # reset focus
-            if wnd and wnd is not org:  # restore focus other window
+                self.Selection = j       # the focus moves if shown
+            self.CurrentPage.SetFocus()  # reset focus
+            if wnd and wnd is not org:   # restore focus other window
                 wnd.SetFocus()
     
     def get_caption(self, win):
@@ -918,22 +918,24 @@ class AuiNotebook(aui.AuiNotebook):
         Note:
             Argument `win` can also be page.window.Name (not page.caption).
         """
-        for tabs in self._all_tabs: #<aui.AuiTabCtrl>
-            for page in tabs.Pages: #<aui.AuiNotebookPage>
+        for tab in self._all_tabs:  #<aui.AuiTabCtrl>
+            for page in tab.Pages:  #<aui.AuiNotebookPage>
                 ## if page.window is win or page.caption == win:
                 if page.window is win or page.window.Name == win:
-                    return tabs, page
+                    return tab, page
     
-    def move_tab(self, win, tabs):
-        """Move the window page to the specified tabs."""
+    def move_tab(self, win, tab):
+        """Move the window page to the specified tab."""
+        if isinstance(tab, int):
+            tab = self._all_tabs[tab]
         try:
             tc1, nb1 = self.find_tab(win)
             win = nb1.window
-        except Exception: # object not found
+        except Exception:  # object not found
             return
-        page = wx.aui.AuiNotebookPage(nb1) # copy-ctor
+        page = wx.aui.AuiNotebookPage(nb1)  # copy-ctor
         tc1.RemovePage(win)     # Accessing nb1 will crash at this point.
-        tabs.AddPage(win, page) # Add a page with the copied info.
+        tab.AddPage(win, page)  # Add a page with the copied info.
         if tc1.PageCount == 0:
             ## Delete an empty tab and the corresponding pane.
             j = self._all_tabs.index(tc1)
@@ -957,8 +959,7 @@ class AuiNotebook(aui.AuiNotebook):
             pane.name = f"pane{j+1}"
         spec = ""
         for j, tabs in enumerate(self._all_tabs):
-            k = next(k for k, page in enumerate(tabs.Pages)
-                                   if page.window.Shown) # get active window
+            k = next(k for k, page in enumerate(tabs.Pages) if page.window.Shown)
             ## names = [page.caption for page in tabs.Pages]
             names = [page.window.Name for page in tabs.Pages]
             spec += f"pane{j+1}={names};{k}|"
@@ -975,27 +976,24 @@ class AuiNotebook(aui.AuiNotebook):
         tabinfo = re.findall(r"pane\w+?=(.*?);(.*?)\|", tabs)
         try:
             self.Parent.Freeze()
-            ## Collapse all tabs to main tabctrl
-            maintab = self._all_tabs[0]
+            ## Collapse all tabctrls to main tabctrl
             for win in self.get_pages():
-                self.move_tab(win, maintab)
+                self.move_tab(win, 0)
             
-            ## Create a new tab using Split method.
+            ## Create a new tabctrl using Split method.
             ## Note: The normal way of creating panes with `_mgr` crashes.
-            
             all_names = [win.Name for win in self.get_pages()]
             for names, k in tabinfo[1:]:
                 names, k = eval(names), int(k)
-                i = all_names.index(names[0]) # Assuming 0:tab is included.
+                i = all_names.index(names[0])  # Assuming 0:tab is included.
                 self.Split(i, wx.LEFT)
-                newtab = self._all_tabs[-1]
                 for name in names[1:]:
-                    self.move_tab(name, newtab)
-                self.Selection = all_names.index(names[k]) # new tabs active window
+                    self.move_tab(name, -1)
+                self.Selection = all_names.index(names[k])  # new tabctrl active window
             else:
                 names, k = tabinfo[0]
                 names, k = eval(names), int(k)
-                self.Selection = all_names.index(names[k]) # main tabs active window
+                self.Selection = all_names.index(names[k])  # main tabctrl active window
             
             for j, pane in enumerate(self._all_panes):
                 pane.name = f"pane{j+1}"
@@ -1164,9 +1162,7 @@ class ShellFrame(MiniFrame):
         self.console = AuiNotebook(self, size=(600,400), name='console')
         self.console.AddPage(self.__shell, "root", bitmap=Icon('core'))
         self.console.TabCtrlHeight = 0
-        ## self.console.Name = "console"
         
-        ## self.console.Bind(aui.EVT_AUINOTEBOOK_BUTTON, self.OnConsoleCloseBtn)
         self.console.Bind(aui.EVT_AUINOTEBOOK_PAGE_CLOSE, self.OnConsolePageClose)
         self.console.Bind(aui.EVT_AUINOTEBOOK_PAGE_CHANGED, self.OnConsolePageChanged)
         
@@ -1264,6 +1260,7 @@ class ShellFrame(MiniFrame):
                 'monitor_begin' : [ None, self.on_monitor_begin ],
                   'monitor_end' : [ None, self.on_monitor_end ],
                     'shell_new' : [ None, ],
+                     'book_new' : [ None, ],
                       'add_log' : [ None, self.add_log ],
                      'add_help' : [ None, self.add_help ],
                  'title_window' : [ None, self.on_title_window ],
@@ -1349,6 +1346,8 @@ class ShellFrame(MiniFrame):
             o.write("self.SetPosition({})\n".format(self.Position))
             
             for book in self.get_all_editors():
+                if book.Name not in ("Scratch", "Log", "Help"):  # Save default editors only.
+                    continue
                 for buf in book.get_all_buffers():
                     if buf.mtdelta is not None:
                         o.write("self.{}.load_file({!r}, {})\n"
@@ -1511,18 +1510,6 @@ class ShellFrame(MiniFrame):
         nb.TabCtrlHeight = 0 if nb.PageCount == 1 else -1
         evt.Skip()
     
-    ## def OnConsoleCloseBtn(self, evt): #<wx._aui.AuiNotebookEvent>
-    ##     tabs = evt.EventObject
-    ##     win = tabs.Pages[evt.Selection].window # GetPage for split notebook.
-    ##     if win is self.rootshell:
-    ##         ## self.message("- Don't close the root shell.")
-    ##         return
-    ##     elif self.debugger.busy and win is self.debugger.interactive_shell:
-    ##         wx.MessageBox("The debugger is running.\n\n"
-    ##                       "Enter [q]uit to exit before closing.")
-    ##         return
-    ##     evt.Skip()
-    
     def OnConsolePageClose(self, evt): #<wx._aui.AuiNotebookEvent>
         nb = evt.EventObject
         win = list(nb.get_pages())[evt.Selection]
@@ -1628,7 +1615,7 @@ class ShellFrame(MiniFrame):
                 lineno = int(ln)
         editor = next(self.get_all_editors(filename), self.Log)
         ret = editor.load_file(filename, lineno)
-        if ret:
+        if ret and show:
             self.popup_window(editor, show)
         return ret
     
@@ -1937,7 +1924,25 @@ class ShellFrame(MiniFrame):
         editor = self.ghost.CurrentPage
         if isinstance(editor, type(self.Log)):
             return editor
-        return next((x for x in self.get_all_editors() if x.IsShown()), self.Scratch)
+        return next((book for book in self.get_all_editors() if book.IsShown()), self.Scratch)
+    
+    def create_editor(self, bookname):
+        """Create a new editor (internal use only)..
+        If such an editor already exists, no new editor is created.
+        """
+        try:
+            return next(book for book  in self.get_all_editors() if book.Name == bookname)
+        except StopIteration:
+            with wx.FrozenWindow(self.ghost):
+                editor = self.Log.__class__(self, bookname)
+                self.ghost.AddPage(editor, bookname)
+                self.ghost.move_tab(editor, 0)
+            self.handler('book_new', editor)
+            def _attach():
+                editor.handler.append(self.Bookshelf.context)
+                self.Bookshelf.build_tree(clear=0)
+            wx.CallAfter(_attach)
+            return editor
     
     ## --------------------------------
     ## Find / Replace text dialog

mwx/graphman.py

@@ -86,8 +86,10 @@ class Thread:
         except AttributeError:
             self.handler = FSM({ # DNA<Thread>
                 None : {
-                 'thread_begin' : [ None ], # begin processing
-                   'thread_end' : [ None ], # end processing
+                 'thread_begin' : [ None ],
+                   'thread_end' : [ None ],
+                  'thread_quit' : [ None ],
+                 'thread_error' : [ None ],
                 },
             })
     
@@ -181,6 +183,7 @@ class Thread:
                 pass
             except KeyboardInterrupt as e:
                 print("- Thread terminated by user:", e)
+                wx.CallAfter(self.handler, 'thread_quit', self)
             except Exception as e:
                 print("- Thread failed in error:", e)
                 traceback.print_exc()
@@ -189,6 +192,7 @@ class Thread:
                              f"{e}\n\n" + tbstr[-1] + f"{type(e).__name__}: {e}",
                              f"Error in the thread running {f.__name__!r}\n\n",
                              style=wx.ICON_ERROR)
+                wx.CallAfter(self.handler, 'thread_error', self)
             finally:
                 self.active = 0
                 wx.CallAfter(self.handler, 'thread_end', self)
@@ -228,14 +232,14 @@ class LayerInterface(CtrlInterface):
     
     The layer properties can be switched by the following classvars::
     
-        menukey     : menu item key:str in parent menubar
-        category    : title of notebook holder, otherwise None for single pane
-        caption     : flag to set the pane caption to be visible
-                      a string can also be specified (default is __module__)
-        dockable    : flag to set the pane to be dockable
-                      type: bool or dock:int (1:t, 2:r, 3:b, 4:l, 5:c)
-        reloadable  : flag to set the Layer to be reloadable
-        unloadable  : flag to set the Layer to be unloadable
+        menukey:  menu item key:str in parent menubar
+        category: title of notebook holder, otherwise None for single pane
+        caption:  flag to set the pane caption to be visible
+                  a string can also be specified (default is __module__)
+        dockable: flag to set the pane to be dockable
+                  type: bool or dock:int (1:t, 2:r, 3:b, 4:l, 5:c)
+        reloadable: flag to set the Layer to be reloadable
+        unloadable: flag to set the Layer to be unloadable
     
     Note:
         parent <Frame> is not always equal to Parent when floating.
@@ -444,13 +448,13 @@ class LayerInterface(CtrlInterface):
         ## return self.pane.IsShown()
         return self.IsShownOnScreen()
     
-    def Show(self, show=True):
+    def Show(self, show=True, interactive=False):
         """Shows or hides the window.
         
         (override) Show associated pane window.
                    Note: This might be called from a thread.
         """
-        wx.CallAfter(self.parent.show_pane, self, show)  # Show pane windows in the main thread.
+        wx.CallAfter(self.parent.show_pane, self, show, interactive)  # Use main thread.
     
     Drawn = property(
         lambda self: self.IsDrawn(),
@@ -894,7 +898,7 @@ class Frame(mwx.Frame):
         """Get named pane or notebook pane.
         
         Args:
-            name: str or plug object.
+            name: plug name or object.
         """
         plug = self.get_plug(name)
         if plug:
@@ -903,7 +907,16 @@ class Frame(mwx.Frame):
             return self._mgr.GetPane(name)
     
     def show_pane(self, name, show=True, interactive=False):
-        """Show named pane or notebook pane."""
+        """Show named pane or notebook pane.
+        
+        Args:
+            name: plug name or object.
+            show: Show or hide the pane window.
+            interactive: If True, modifier keys can be used to reset or reload
+                         the plugin when showing the pane:
+                         - [S-menu] Reset floating position.
+                         - [M-S-menu] Reload plugin.
+        """
         pane = self.get_pane(name)
         if not pane.IsOk():
             return

mwx/matplot2.py

@@ -371,12 +371,12 @@ class MatplotPanel(wx.Panel):
         return b - a
     
     def mapxy2disp(self, x, y):
-        """Map xydata --> display dot pixel-coordinates."""
+        """Map xydata --> display dot pixel coordinates."""
         v = np.array((x, y)).T
         return self.axes.transData.transform(v)
     
     def mapdisp2xy(self, px, py):
-        """Map display dot pixel-coordinates --> xydata."""
+        """Map display dot pixel coordinates --> xydata."""
         v = np.array((px, py)).T
         return self.axes.transData.inverted().transform(v)
     

mwx/matplot2g.py

@@ -207,10 +207,6 @@ class AxesImagePhantom:
         cx, cy = self.center
         self.__art.set_extent((cx-w, cx+w, cy-h, cy+h))
     
-    selector = _Property('selector')
-    markers = _Property('markers')
-    region = _Property('region')
-    
     artist = property(
         lambda self: self.__art)
     
@@ -260,7 +256,7 @@ class AxesImagePhantom:
     
     @property
     def unit(self):
-        """Logical length per pixel arb.unit [u/pixel]."""
+        """Logical length per pixel arb.unit [u/pix]."""
         return self.__localunit or self.parent.unit
     
     @unit.setter
@@ -314,14 +310,14 @@ class AxesImagePhantom:
     
     @property
     def index(self):
-        """Page number in the parent book."""
+        """Page number in the parent view."""
         return self.parent.index(self)
     
     @property
     def roi(self):
         """Current buffer ROI (region of interest)."""
         if self.parent.region.size:
-            nx, ny = self.xytopixel(*self.parent.region)
+            nx, ny = self.xytopixel(*self.region)
             sx = slice(max(0, nx[0]), nx[1])  # nx slice
             sy = slice(max(0, ny[1]), ny[0])  # ny slice 反転 (降順)
             return self.__buf[sy, sx]
@@ -375,8 +371,8 @@ class AxesImagePhantom:
         nx = (x - l) / ux
         ny = (t - y) / uy # Y ピクセルインデクスは座標と逆
         if cast:
-            return (_cast(nx), _cast(ny))
-        return (nx-0.5, ny-0.5)
+            return np.array((_cast(nx), _cast(ny)))
+        return np.array((nx-0.5, ny-0.5))
     
     def xyfrompixel(self, nx, ny=None):
         """Convert pixel [nx,ny] -> (x,y) xydata (float number).
@@ -389,7 +385,50 @@ class AxesImagePhantom:
         ux, uy = self.xy_unit
         x = l + (nx + 0.5) * ux
         y = t - (ny + 0.5) * uy # Y ピクセルインデクスは座標と逆
-        return (x, y)
+        return np.array((x, y))
+    
+    selector = _Property('selector')
+    markers = _Property('markers')
+    region = _Property('region')
+    
+    @property
+    def selector_pix(self):
+        """Selected points array [[x],[y]] in pixels."""
+        return self.xytopixel(self.selector)
+    
+    @selector_pix.setter
+    def selector_pix(self, v):
+        self.selector = self.xyfrompixel(v)
+    
+    @selector_pix.deleter
+    def selector_pix(self):
+        del self.selector
+    
+    @property
+    def markers_pix(self):
+        """Marked points data array [[x],[y]] in pixels."""
+        return self.xytopixel(self.markers)
+    
+    @markers_pix.setter
+    def markers_pix(self, v):
+        self.markers = self.xyfrompixel(v)
+    
+    @markers_pix.deleter
+    def markers_pix(self):
+        del self.markers
+    
+    @property
+    def region_pix(self):
+        """Cropped points data array [l,r],[b,t] in pixels."""
+        return self.xytopixel(self.region)
+    
+    @region_pix.setter
+    def region_pix(self, v):
+        self.region = self.xyfrompixel(v)
+    
+    @region_pix.deleter
+    def region_pix(self):
+        del self.region
 
 
 class GraphPlot(MatplotPanel):
@@ -604,7 +643,7 @@ class GraphPlot(MatplotPanel):
         self.__Arts = []
         self.__index = None
         
-        ## cf. self.figure.dpi = 80dpi (0.3175mm/pixel)
+        ## cf. self.figure.dpi = 80dpi (0.3175mm/pix)
         self.__unit = 1.0
         
         #<matplotlib.lines.Line2D>
@@ -841,7 +880,7 @@ class GraphPlot(MatplotPanel):
     
     @property
     def unit(self):
-        """Logical length per pixel arb.unit [u/pixel]."""
+        """Logical length per pixel arb.unit [u/pix]."""
         return self.__unit
     
     @unit.setter
@@ -960,7 +999,7 @@ class GraphPlot(MatplotPanel):
         if frame:
             self.modeline.SetLabel(
                 "[{page}/{maxpage}] -{a}- {name} ({data.dtype}:{cmap}{bins}) "
-                "[{data.shape[1]}:{data.shape[0]}] {x} [{unit:g}/pixel]".format(
+                "[{data.shape[1]}:{data.shape[0]}] {x} [{unit:g}/pix]".format(
                 page = self.__index,
              maxpage = len(self),
                 name = frame.name,
@@ -972,7 +1011,7 @@ class GraphPlot(MatplotPanel):
                    a = '%%' if not frame.buffer.flags.writeable else '--'))
         else:
             self.modeline.SetLabel(
-                "[{page}/{maxpage}] ---- No buffer (-:-) [-:-] -- [{unit:g}/pixel]".format(
+                "[{page}/{maxpage}] ---- No buffer (-:-) [-:-] -- [{unit:g}/pix]".format(
                 page = '-',
              maxpage = len(self),
                 unit = self.__unit))
@@ -1124,7 +1163,7 @@ class GraphPlot(MatplotPanel):
             return
         frame = self.frame
         if frame:
-            ## [dots/pixel] = [dots/u] * [u/pixel]
+            ## [dots/pix] = [dots/u] * [u/pix]
             dots = self.ddpu[0] * frame.unit * frame.binning
             
             if frame.get_interpolation() == 'nearest' and dots < 1:
@@ -1264,7 +1303,7 @@ class GraphPlot(MatplotPanel):
         self.handler('line_drawn', self.frame)
     
     ## --------------------------------
-    ## Selector +Line interface
+    ## Selector + Line interface
     ## --------------------------------
     
     def OnLineSelected(self, evt):
@@ -1337,13 +1376,193 @@ class GraphPlot(MatplotPanel):
     def OnLineShiftEnd(self, evt):
         self.handler('line_moved', self.frame)
     
+    ## --------------------------------
+    ## Marker interface
+    ## --------------------------------
+    
+    #: Limit number of markers to display 最大(表示)数を制限する
+    maxnum_markers = 1000
+    
+    @property
+    def markers(self):
+        """Marked points data array [[x],[y]]."""
+        xm, ym = self.marked.get_data(orig=0)
+        return np.array((xm, ym))
+    
+    @markers.setter
+    def markers(self, v):
+        x, y = v
+        if not hasattr(x, '__iter__'):
+            x, y = [x], [y]
+        elif len(x) > self.maxnum_markers:
+            self.message("- Got too many markers ({}) to plot".format(len(x)))
+            return
+        self.marked.set_data(x, y)
+        self.__marksel = []
+        self.update_art_of_mark()
+        self.handler('mark_drawn', self.frame)
+    
+    @markers.deleter
+    def markers(self):
+        if self.markers.size:
+            self.marked.set_data([], [])
+            self.__marksel = []
+            self.update_art_of_mark()
+            self.handler('mark_removed', self.frame)
+    
+    def get_current_mark(self):
+        """Currently selected mark."""
+        xm, ym = self.marked.get_data(orig=0)
+        return np.take((xm, ym), self.__marksel, axis=1)
+    
+    def set_current_mark(self, x, y):
+        xm, ym = self.marked.get_data(orig=0)
+        j = self.__marksel
+        if j:
+            xm[j], ym[j] = x, y
+            self.marked.set_data(xm, ym)
+            self.update_art_of_mark(j, xm[j], ym[j])
+        else:
+            n = len(xm)
+            k = len(x) if hasattr(x, '__iter__') else 1
+            self.__marksel = list(range(n, n+k))
+            xm, ym = np.append(xm, x), np.append(ym, y)
+            self.marked.set_data(xm, ym)
+            self.marked.set_visible(1)
+            self.update_art_of_mark()
+        self.selector = (x, y)
+    
+    def del_current_mark(self):
+        j = self.__marksel
+        if j:
+            xm, ym = self.marked.get_data(orig=0)
+            xm, ym = np.delete(xm, j), np.delete(ym, j)
+            self.__marksel = []
+            self.marked.set_data(xm, ym)
+            n = len(xm)
+            self.__marksel = [j[-1] % n] if n > 0 else []
+            self.update_art_of_mark()
+    
+    def update_art_of_mark(self, *args):
+        if args:
+            for k, x, y in zip(*args):
+                art = self.__markarts[k] # art の再描画処理をして終了
+                art.xy = x, y
+            self.draw(self.marked)
+            return
+        for art in self.__markarts: # or reset all arts
+            art.remove()
+        self.__markarts = []
+        if self.marked.get_visible() and self.handler.current_state in (MARK, MARK+DRAGGING):
+            N = self.maxnum_markers
+            xm, ym = self.marked.get_data(orig=0)
+            for k, (x, y) in enumerate(zip(xm[:N], ym[:N])):
+                self.__markarts.append(
+                  self.axes.annotate(k, #<matplotlib.text.Annotation>
+                    xy=(x,y), xycoords='data',
+                    xytext=(6,6), textcoords='offset points',
+                    bbox=dict(boxstyle="round", fc=(1,1,1,), ec=(1,0,0,)),
+                    color='red', size=7, #fontsize=8,
+                  )
+                )
+            self.trace_point(*self.get_current_mark(), type=MARK)
+        self.draw(self.marked)
+    
+    def OnMarkAppend(self, evt):
+        xs, ys = self.selector
+        if not self.__marksel and len(xs) > 0:
+            self.set_current_mark(xs, ys)
+            self.handler('mark_drawn', self.frame)
+        self.update_art_of_mark()
+    
+    def OnMarkRemove(self, evt):
+        if self.__marksel:
+            self.del_current_mark()
+            self.handler('mark_removed', self.frame)
+    
+    def OnMarkSelected(self, evt): #<matplotlib.backend_bases.PickEvent>
+        k = evt.ind[0]
+        if evt.mouseevent.key == 'shift': # 多重マーカー選択
+            if k not in self.__marksel:
+                self.__marksel += [k]
+        else:
+            self.__marksel = [k]
+        self.update_art_of_mark()
+        self.selector = self.get_current_mark()
+        if self.selector.shape[1] > 1:
+            self.handler('line_drawn', self.frame) # 多重マーカー選択時
+    
+    def OnMarkDeselected(self, evt): #<matplotlib.backend_bases.PickEvent>
+        self.__marksel = []
+        self.update_art_of_mark()
+    
+    def OnMarkDragBegin(self, evt):
+        if not self.frame or self._inaxes(evt):
+            self.handler('quit', evt)
+            return
+        self.__orgpoints = self.get_current_mark()
+    
+    def OnMarkDragMove(self, evt):
+        x, y = self.calc_point(evt.xdata, evt.ydata)
+        self.set_current_mark(x, y)
+        self.handler('mark_draw', self.frame)
+    
+    def OnMarkDragEscape(self, evt):
+        self.set_current_mark(*self.__orgpoints)
+        self.handler('mark_drawn', self.frame)
+    
+    def OnMarkDragEnd(self, evt):
+        self.handler('mark_drawn', self.frame)
+    
+    def OnMarkShift(self, evt):
+        j = self.__marksel
+        if j and self.frame:
+            ux, uy = self.frame.xy_unit
+            du = {
+                'up' : ( 0., uy),
+              'down' : ( 0.,-uy),
+              'left' : (-ux, 0.),
+             'right' : ( ux, 0.),
+            }
+            p = self.get_current_mark() + np.resize(du[evt.key], (2,1))
+            self.set_current_mark(*p)
+            self.handler('mark_draw', self.frame)
+    
+    def OnMarkShiftEnd(self, evt):
+        self.handler('mark_drawn', self.frame)
+    
+    def next_mark(self, j):
+        self.__marksel = [j]
+        xs, ys = self.get_current_mark()
+        self.xlim += xs[-1] - (self.xlim[1] + self.xlim[0]) / 2
+        self.ylim += ys[-1] - (self.ylim[1] + self.ylim[0]) / 2
+        self.selector = (xs, ys)
+        self.trace_point(xs, ys, type=MARK)
+        self.draw()
+    
+    def OnMarkSkipNext(self, evt):
+        n = self.markers.shape[1]
+        j = self.__marksel
+        if j:
+            self.next_mark((j[-1]+1) % n)
+        elif n:
+            self.next_mark(0)
+    
+    def OnMarkSkipPrevious(self, evt):
+        n = self.markers.shape[1]
+        j = self.__marksel
+        if j:
+            self.next_mark((j[-1]-1) % n)
+        elif n:
+            self.next_mark(-1)
+    
     ## --------------------------------
     ## Region interface
     ## --------------------------------
     
     @property
     def region(self):
-        """Rectangle points data array [l,r],[b,t]."""
+        """Cropped rectangle points data array [l,r],[b,t]."""
         x, y = self.rected.get_data(orig=0)
         if len(x) and len(y):
             xo, x = min(x), max(x) #= x[[0, 2]]
@@ -1550,183 +1769,3 @@ class GraphPlot(MatplotPanel):
                 self.set_wxcursor(wx.CURSOR_SIZENWSE) # on-NW/SE-corner
             else:
                 self.set_wxcursor(wx.CURSOR_ARROW) # outside
-    
-    ## --------------------------------
-    ## Marker interface
-    ## --------------------------------
-    
-    #: Limit number of markers to display 最大(表示)数を制限する
-    maxnum_markers = 1000
-    
-    @property
-    def markers(self):
-        """Marked points data array [[x],[y]]."""
-        xm, ym = self.marked.get_data(orig=0)
-        return np.array((xm, ym))
-    
-    @markers.setter
-    def markers(self, v):
-        x, y = v
-        if not hasattr(x, '__iter__'):
-            x, y = [x], [y]
-        elif len(x) > self.maxnum_markers:
-            self.message("- Got too many markers ({}) to plot".format(len(x)))
-            return
-        self.marked.set_data(x, y)
-        self.__marksel = []
-        self.update_art_of_mark()
-        self.handler('mark_drawn', self.frame)
-    
-    @markers.deleter
-    def markers(self):
-        if self.markers.size:
-            self.marked.set_data([], [])
-            self.__marksel = []
-            self.update_art_of_mark()
-            self.handler('mark_removed', self.frame)
-    
-    def get_current_mark(self):
-        """Currently selected mark."""
-        xm, ym = self.marked.get_data(orig=0)
-        return np.take((xm, ym), self.__marksel, axis=1)
-    
-    def set_current_mark(self, x, y):
-        xm, ym = self.marked.get_data(orig=0)
-        j = self.__marksel
-        if j:
-            xm[j], ym[j] = x, y
-            self.marked.set_data(xm, ym)
-            self.update_art_of_mark(j, xm[j], ym[j])
-        else:
-            n = len(xm)
-            k = len(x) if hasattr(x, '__iter__') else 1
-            self.__marksel = list(range(n, n+k))
-            xm, ym = np.append(xm, x), np.append(ym, y)
-            self.marked.set_data(xm, ym)
-            self.marked.set_visible(1)
-            self.update_art_of_mark()
-        self.selector = (x, y)
-    
-    def del_current_mark(self):
-        j = self.__marksel
-        if j:
-            xm, ym = self.marked.get_data(orig=0)
-            xm, ym = np.delete(xm, j), np.delete(ym, j)
-            self.__marksel = []
-            self.marked.set_data(xm, ym)
-            n = len(xm)
-            self.__marksel = [j[-1] % n] if n > 0 else []
-            self.update_art_of_mark()
-    
-    def update_art_of_mark(self, *args):
-        if args:
-            for k, x, y in zip(*args):
-                art = self.__markarts[k] # art の再描画処理をして終了
-                art.xy = x, y
-            self.draw(self.marked)
-            return
-        for art in self.__markarts: # or reset all arts
-            art.remove()
-        self.__markarts = []
-        if self.marked.get_visible() and self.handler.current_state in (MARK, MARK+DRAGGING):
-            N = self.maxnum_markers
-            xm, ym = self.marked.get_data(orig=0)
-            for k, (x, y) in enumerate(zip(xm[:N], ym[:N])):
-                self.__markarts.append(
-                  self.axes.annotate(k, #<matplotlib.text.Annotation>
-                    xy=(x,y), xycoords='data',
-                    xytext=(6,6), textcoords='offset points',
-                    bbox=dict(boxstyle="round", fc=(1,1,1,), ec=(1,0,0,)),
-                    color='red', size=7, #fontsize=8,
-                  )
-                )
-            self.trace_point(*self.get_current_mark(), type=MARK)
-        self.draw(self.marked)
-    
-    def OnMarkAppend(self, evt):
-        xs, ys = self.selector
-        if not self.__marksel and len(xs) > 0:
-            self.set_current_mark(xs, ys)
-            self.handler('mark_drawn', self.frame)
-        self.update_art_of_mark()
-    
-    def OnMarkRemove(self, evt):
-        if self.__marksel:
-            self.del_current_mark()
-            self.handler('mark_removed', self.frame)
-    
-    def OnMarkSelected(self, evt): #<matplotlib.backend_bases.PickEvent>
-        k = evt.ind[0]
-        if evt.mouseevent.key == 'shift': # 多重マーカー選択
-            if k not in self.__marksel:
-                self.__marksel += [k]
-        else:
-            self.__marksel = [k]
-        self.update_art_of_mark()
-        self.selector = self.get_current_mark()
-        if self.selector.shape[1] > 1:
-            self.handler('line_drawn', self.frame) # 多重マーカー選択時
-    
-    def OnMarkDeselected(self, evt): #<matplotlib.backend_bases.PickEvent>
-        self.__marksel = []
-        self.update_art_of_mark()
-    
-    def OnMarkDragBegin(self, evt):
-        if not self.frame or self._inaxes(evt):
-            self.handler('quit', evt)
-            return
-        self.__orgpoints = self.get_current_mark()
-    
-    def OnMarkDragMove(self, evt):
-        x, y = self.calc_point(evt.xdata, evt.ydata)
-        self.set_current_mark(x, y)
-        self.handler('mark_draw', self.frame)
-    
-    def OnMarkDragEscape(self, evt):
-        self.set_current_mark(*self.__orgpoints)
-        self.handler('mark_drawn', self.frame)
-    
-    def OnMarkDragEnd(self, evt):
-        self.handler('mark_drawn', self.frame)
-    
-    def OnMarkShift(self, evt):
-        j = self.__marksel
-        if j and self.frame:
-            ux, uy = self.frame.xy_unit
-            du = {
-                'up' : ( 0., uy),
-              'down' : ( 0.,-uy),
-              'left' : (-ux, 0.),
-             'right' : ( ux, 0.),
-            }
-            p = self.get_current_mark() + np.resize(du[evt.key], (2,1))
-            self.set_current_mark(*p)
-            self.handler('mark_draw', self.frame)
-    
-    def OnMarkShiftEnd(self, evt):
-        self.handler('mark_drawn', self.frame)
-    
-    def next_mark(self, j):
-        self.__marksel = [j]
-        xs, ys = self.get_current_mark()
-        self.xlim += xs[-1] - (self.xlim[1] + self.xlim[0]) / 2
-        self.ylim += ys[-1] - (self.ylim[1] + self.ylim[0]) / 2
-        self.selector = (xs, ys)
-        self.trace_point(xs, ys, type=MARK)
-        self.draw()
-    
-    def OnMarkSkipNext(self, evt):
-        n = self.markers.shape[1]
-        j = self.__marksel
-        if j:
-            self.next_mark((j[-1]+1) % n)
-        elif n:
-            self.next_mark(0)
-    
-    def OnMarkSkipPrevious(self, evt):
-        n = self.markers.shape[1]
-        j = self.__marksel
-        if j:
-            self.next_mark((j[-1]-1) % n)
-        elif n:
-            self.next_mark(-1)

mwx/matplot2lg.py

@@ -609,7 +609,7 @@ class LineProfile(LinePlot):
         if frame:
             self.modeline.SetLabel(
                 "[--] -{a}- {name} ({type}:{mode}) "
-                "[{length}:{width}] {x} [{unit:g}/pixel]".format(
+                "[{length}:{width}] {x} [{unit:g}/pix]".format(
                 name = frame.name,
                 type = frame.buffer.dtype,
                 mode = "logic" if self.__logicp else "pixel",

mwx/nutshell.py

@@ -2435,8 +2435,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
     
     def create_buffer(self, filename, index=None):
         """Create a new buffer (internal use only)."""
-        try:
-            self.Freeze()
+        with wx.FrozenWindow(self):
             buf = Buffer(self, filename, style=wx.BORDER_DEFAULT)
             self.set_attributes(buf, **self.defaultBufferStyle)
             if index is None:
@@ -2444,8 +2443,6 @@ class EditorBook(AuiNotebook, CtrlInterface):
             self.InsertPage(index, buf, buf.name) # => [buffer_activated]
             self.handler('buffer_new', buf)
             return buf
-        finally:
-            self.Thaw()
     
     def new_buffer(self):
         """Create a new default buffer."""

{mwxlib-1.6.5.dist-info → mwxlib-1.6.7.dist-info}/METADATA

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

{mwxlib-1.6.5.dist-info → mwxlib-1.6.7.dist-info}/RECORD

@@ -1,14 +1,14 @@
 mwx/__init__.py,sha256=pS7ZG8QKRypiFFiaWAq_opBB6I_1viZ0zUMk2TbjzE0,667
-mwx/bookshelf.py,sha256=yW17nMNPXKHM7LLXLpr9DaRhyFHz_OBAZ_DsuEK2QzA,8387
-mwx/controls.py,sha256=B9f_A0ev3SPf75K-LIZCusMLeDGYz1O3cMml7IOrDrM,49870
-mwx/framework.py,sha256=S07VXuto0GulB48mVJurs5GsEIRPkvmWPE37l1IgeRI,77463
-mwx/graphman.py,sha256=7y2pNi0pOR7MuSFOaINuz4PNRXAuRXyp5ChMaWpQXBU,70042
+mwx/bookshelf.py,sha256=b3LhF0TXFRhbbjg3HUzq4qTk4BLzF713a3Tbh3_0iVI,8455
+mwx/controls.py,sha256=N_4TAEMGNBD3AiVzm4JZ6SDH8VJ2gFsRPFYF40T6yL0,50006
+mwx/framework.py,sha256=N9gTB2Uyi6FvgTVEYi7KLtHifzHajf3nYBK_b_SdQL4,77596
+mwx/graphman.py,sha256=7R-vNzu0VJ_u4eT6-7Sel_qA8BZoSfG7p7zbaf-uetA,70591
 mwx/images.py,sha256=Kkfy9QI_hMtwShSjUS4-ZpC_EkVuah_XhpBOR4wAKkM,49792
-mwx/matplot2.py,sha256=cjdN12RENqWFw1v9QyO05XQc6dK3Pn_ltdC3OfmhGfg,32995
-mwx/matplot2g.py,sha256=0gxjl7UKx8QGRI2thpniA7dQu9fpHGG0mvl7Ml2exrc,65474
-mwx/matplot2lg.py,sha256=jE-LYPEVaEapQN8L-eviRyEx4Lw-8GyLGzZotrIZShU,27413
+mwx/matplot2.py,sha256=HrURlLP-jEubuHrOhL1yvXOgeduHn1OqYnT2bWg4BoM,32995
+mwx/matplot2g.py,sha256=BzftcjoVx_sFw57osb31jsnIAwJQC8CqexCUC0AY9ZU,66533
+mwx/matplot2lg.py,sha256=91ItF-6_zc_tQGvjMgtgc1UKdI_yhe8dDCzj1nN5TQc,27411
 mwx/mgplt.py,sha256=SVUJ0ls4gC9xulbWxK2qqmDxf0uBCflvwoPkxoF5s3M,5566
-mwx/nutshell.py,sha256=JHFiY-X1pEdFBzSQRXO_loIhJyPuWljWhhGzie3m7TU,147552
+mwx/nutshell.py,sha256=-2QHKIDHEdJhCjcHmhyKBKTYQdydK6m0ssqp597Oe3Q,147505
 mwx/testsuite.py,sha256=pBB7ZNicI_thrg6LmNPgUOgfMWwRoAaYWN1nFy6t6S4,790
 mwx/utilus.py,sha256=JOYBTHoo_GmYykX72PgiPzgD2M-1pcOR8gMBLc2bnck,39016
 mwx/wxmon.py,sha256=aS6lSjDm0PxIhfyBPtg-wIP0v-R3g2K5a3k2mclWSrQ,12798
@@ -22,7 +22,7 @@ mwx/plugins/frame_listview.py,sha256=yd2NCgspqGfTNhj1wxuW8r1zapIm7vNzVX2iytk8CDM
 mwx/plugins/line_profile.py,sha256=zzm6_7lnAnNepLbh07ordp3nRWDFQJtu719ZVjrVf8s,819
 mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
 mwx/py/filling.py,sha256=vWCJoHd_oyXOeXTHtXGY7wfNQeNAZhV3GZu4xlc8GDY,16867
-mwxlib-1.6.5.dist-info/METADATA,sha256=PyFl4mr1WzMpVnXtqD2FKECHGPz8-t48mUwkuwjgsgw,7381
-mwxlib-1.6.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mwxlib-1.6.5.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.6.5.dist-info/RECORD,,
+mwxlib-1.6.7.dist-info/METADATA,sha256=JPmghjPapW6r7Yfk1-naUsmJBlU88iLXxPHe6-ahkpU,7381
+mwxlib-1.6.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mwxlib-1.6.7.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.6.7.dist-info/RECORD,,