mwxlib 0.97.4__py3-none-any.whl → 0.97.6__py3-none-any.whl

mwx/controls.py

@@ -48,7 +48,7 @@ class Param(object):
         self.knobs = []
         self.name = name
         self.range = range
-        self.__std_value = value
+        self.__std_value = value if value is not None else nan
         self.__value = value if value is not None else self.min
         self.__check = False
         if fmt is hex:
@@ -69,7 +69,8 @@ class Param(object):
         self._tooltip = _Tip(handler.__doc__, updater.__doc__)
     
     def __str__(self, v=None):
-        v = self.value if v is None else v
+        if v is None:
+            v = self.value
         try:
             return self.__format(v)
         except ValueError:
@@ -84,45 +85,22 @@ class Param(object):
     def __len__(self):
         return len(self.range)
     
-    def reset(self, v=None, backcall=True):
+    def reset(self, v=None, internal_callback=True):
         """Reset value when indexed (by knobs) with callback."""
-        if v is None or v == '':
+        if v is None:
             v = self.std_value
-            if v is None:
+            if np.isnan(v):
                 return
-        if isinstance(v, str):
-            v = self.__eval(v.replace(',', '')) # eliminates commas; includes nan, inf
-        self._set_value(v)
-        if backcall:
+        elif isinstance(v, str):
+            try:
+                v = self.__eval(v.replace(',', '')) # eliminates commas; includes nan, inf
+            except Exception:
+                v = self.value
+                internal_callback = False
+        self.value = v
+        if internal_callback:
             self.callback('control', self)
     
-    def _set_value(self, v):
-        """Set value and check the limit.
-        If the value is out of range, modify the value.
-        """
-        if v is None:
-            v = nan
-        
-        if np.isnan(v) or np.isinf(v):
-            self.__value = v
-            for knob in self.knobs:
-                knob.update_ctrl(None, notify=False)
-            return
-        elif v == self.__value:
-            return
-        
-        valid = (self.min <= v <= self.max)
-        if valid:
-            self.__value = v
-        elif v < self.min:
-            self.__value = self.min
-            self.callback('underflow', self)
-        else:
-            self.__value = self.max
-            self.callback('overflow', self)
-        for knob in self.knobs:
-            knob.update_ctrl(valid, notify=True)
-    
     @property
     def check(self):
         """A knob check property (user defined)."""
@@ -152,7 +130,30 @@ class Param(object):
     
     @value.setter
     def value(self, v):
-        self._set_value(v)
+        if v is None:
+            v = nan
+        if np.isnan(v) or np.isinf(v):
+            self.__value = v
+            for knob in self.knobs:
+                knob.update_ctrl(None, notify=False)
+            return
+        elif v == self.__value:
+            for knob in self.knobs:
+                knob.update_ctrl(True, notify=False)
+            return
+        
+        ## If the value is out of range, it will be modified.
+        valid = (self.min <= v <= self.max)
+        if valid:
+            self.__value = v
+        elif v < self.min:
+            self.__value = self.min
+            self.callback('underflow', self)
+        else:
+            self.__value = self.max
+            self.callback('overflow', self)
+        for knob in self.knobs:
+            knob.update_ctrl(valid, notify=True)
     
     @property
     def std_value(self):
@@ -161,6 +162,8 @@ class Param(object):
     
     @std_value.setter
     def std_value(self, v):
+        if v is None:
+            v = nan
         self.__std_value = v
         for knob in self.knobs:
             knob.update_label()
@@ -168,21 +171,20 @@ class Param(object):
     @property
     def offset(self):
         """Offset value
-        If std_value is None, this is the same as value.
+        If std_value is nan, this is the same as value.
         """
-        if self.std_value is not None:
+        if not np.isnan(self.std_value):
             return self.value - self.std_value
         return self.value
     
     @offset.setter
     def offset(self, v):
-        if self.std_value is not None:
-            if not np.isnan(v):
-                v += self.std_value
-        self._set_value(v)
+        if not np.isnan(self.std_value):
+            v += self.std_value
+        self.value = v
     
-    min = property(lambda self: self.__range[0])
-    max = property(lambda self: self.__range[-1])
+    min = property(lambda self: self.__range[0] if self else nan)
+    max = property(lambda self: self.__range[-1] if self else nan)
     
     @property
     def range(self):
@@ -192,7 +194,7 @@ class Param(object):
     @range.setter
     def range(self, v):
         if v is None:
-            self.__range = [nan] # dummy data
+            self.__range = [] # dummy data
         else:
             self.__range = sorted(v)
         for knob in self.knobs:
@@ -200,14 +202,17 @@ class Param(object):
     
     @property
     def index(self):
-        """A knob index -> value."""
-        return int(np.searchsorted(self.range, self.value))
+        """A knob index -> value.
+        Returns -1 if the value is not defined."""
+        if self:
+            return int(np.searchsorted(self.range, self.value))
+        return -1
     
     @index.setter
     def index(self, j):
-        n = len(self)
-        i = (0 if j<0 else j if j<n else -1)
-        self._set_value(self.range[i])
+        if self:
+            i = (0 if j < 0 else j if j < len(self) else -1)
+            self.value = self.range[i]
 
 
 class LParam(Param):
@@ -266,7 +271,7 @@ class LParam(Param):
     
     @index.setter
     def index(self, j):
-        return self._set_value(self.min + j * self.step)
+        self.value = self.min + j * self.step
 
 
 ## --------------------------------
@@ -430,28 +435,20 @@ class Knob(wx.Panel):
         if isinstance(self.label, wx.CheckBox):
             self.label.SetValue(v.check)
         
-        if self.label.IsEnabled():
-            t = '  ' if v.std_value is None or v.value == v.std_value else '*'
-            self.label.SetLabel(v.name + t)
-            self.label.Refresh()
+        t = '  ' if np.isnan(v.std_value) or v.value == v.std_value else '*'
+        self.label.SetLabel(v.name + t)
+        self.label.Refresh()
     
     def update_ctrl(self, valid=True, notify=False):
         """Called when value is being changed (internal use only)."""
         v = self.__par
-        try:
-            j = v.index
-        except (OverflowError, ValueError):
-            ## OverflowError: cannot convert float infinity to integer
-            ## ValueError: cannot convert float NaN to integer
-            j = -1
-        
-        self.ctrl.SetValue(j)
+        self.ctrl.SetValue(v.index)
         self.text.SetValue(str(v))
         if valid:
             if notify:
                 if self.text.BackgroundColour != '#ffff80':
                     wx.CallAfter(wx.CallLater, 1000,
-                        self.set_textcolour, '#ffffff')
+                                 self.set_textcolour, '#ffffff')
                     self.set_textcolour('#ffff80') # light-yellow
                 else:
                     self.set_textcolour('#ffffff') # True: white
@@ -465,8 +462,7 @@ class Knob(wx.Panel):
     
     def set_textcolour(self, c):
         if self:
-            if self.text.IsEditable():
-                self.text.BackgroundColour = c
+            self.text.BackgroundColour = c
             self.text.Refresh()
     
     def shift(self, evt, bit):
@@ -497,15 +493,15 @@ class Knob(wx.Panel):
         if key == wx.WXK_LEFT: return self.shift(evt, -1)
         if key == wx.WXK_RIGHT: return self.shift(evt, 1)
         
-        def focus(c):
+        def _focus(c):
             if isinstance(c, Knob) and c.ctrl.IsEnabled():
                 c.ctrl.SetFocus()
                 return True
         
         ls = next(x for x in self.Parent.layout_groups if self in x)
         i = ls.index(self)
-        if key == wx.WXK_DOWN: return any(focus(c) for c in ls[i+1:])
-        if key == wx.WXK_UP: return any(focus(c) for c in ls[i-1::-1])
+        if key == wx.WXK_DOWN: return any(_focus(c) for c in ls[i+1:])
+        if key == wx.WXK_UP: return any(_focus(c) for c in ls[i-1::-1])
     
     def OnTextKeyUp(self, evt): #<wx._core.KeyEvent>
         evt.Skip()
@@ -515,7 +511,7 @@ class Knob(wx.Panel):
         if key == wx.WXK_DOWN: return self.shift(evt, -1)
         if key == wx.WXK_UP: return self.shift(evt, 1)
         if key == wx.WXK_ESCAPE:
-            self.__par.reset(self.__par.value, backcall=None) # restore value
+            self.__par.reset(self.__par.value, internal_callback=None) # restore value
         evt.Skip()
     
     def OnTextEnter(self, evt): #<wx._core.CommandEvent>
@@ -526,11 +522,7 @@ class Knob(wx.Panel):
     def OnTextExit(self, evt): #<wx._core.FocusEvent>
         x = self.text.Value.strip()
         if x != str(self.__par):
-            try:
-                self.__par.reset(x) # reset value if focus out
-            except Exception:
-                self.text.SetValue(str(self.__par))
-                self.__par.reset(self.__par.value, backcall=None) # restore value
+            self.__par.reset(x)
         evt.Skip()
     
     def OnCheck(self, evt): #<wx._core.CommandEvent>
@@ -1359,7 +1351,7 @@ class Gauge(wx.Control):
         dc.Clear()
         dc.SetPen(wx.TRANSPARENT_PEN)
         
-        def gradients(x):
+        def _gradients(x):
             y = 4 * x
             if   y < 1: rgb = (0, y, 1)
             elif y < 2: rgb = (0, 1, 2-y)
@@ -1373,7 +1365,7 @@ class Gauge(wx.Control):
         for i in range(N):
             x = int(i * w / N)
             if i < self.__value:
-                dc.SetBrush(wx.Brush(gradients(i/N)))
+                dc.SetBrush(wx.Brush(_gradients(i/N)))
             else:
                 dc.SetBrush(wx.Brush('white'))
             dc.DrawRectangle(x, 0, d, h)

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.97.4"
+__version__ = "0.97.6"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -513,11 +513,8 @@ def pack(self, items, orient=wx.HORIZONTAL, style=None, label=None):
     else:
         sizer = wx.BoxSizer(orient)
     for item in items:
-        if not item:
-            if item is None:
-                item = (0,0), 0,0,0, # null space
-            else:
-                item = (0,0) # padding space
+        if item is None:
+            item = ((0, 0), 0, 0, 0) # null space
         try:
             try:
                 sizer.Add(item, *style)
@@ -849,7 +846,7 @@ class MiniFrame(wx.MiniFrame, KeyCtrlInterfaceMixin):
 class AuiNotebook(aui.AuiNotebook):
     """AuiNotebook extension class.
     """
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, name=None, **kwargs):
         kwargs.setdefault('style',
             (aui.AUI_NB_DEFAULT_STYLE | aui.AUI_NB_BOTTOM)
             ^ aui.AUI_NB_CLOSE_ON_ACTIVE_TAB
@@ -858,6 +855,8 @@ class AuiNotebook(aui.AuiNotebook):
         aui.AuiNotebook.__init__(self, *args, **kwargs)
         
         self._mgr = self.EventHandler
+        if name:
+            self.Name = name
         
         def tab_menu(evt):
             tabs = evt.EventObject #<AuiTabCtrl>
@@ -1144,37 +1143,35 @@ class ShellFrame(MiniFrame):
         self.ginfo = LocalsWatcher(self, name="globals")
         self.linfo = LocalsWatcher(self, name="locals")
         
-        self.console = AuiNotebook(self, size=(600,400))
+        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.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)
         
-        self.ghost = AuiNotebook(self, size=(600,400))
+        self.ghost = AuiNotebook(self, size=(600,400), name="ghost")
         self.ghost.AddPage(self.Scratch, "Scratch", bitmap=Icon('ghost'))
         self.ghost.AddPage(self.Log, "Log")
         self.ghost.AddPage(self.Help, "Help")
-        self.ghost.Name = "ghost"
         
         self.ghost.AddPage(self.Bookshelf, "Bookshelf", bitmap=Icon('book'))
         
         self.ghost.SetDropTarget(FileDropLoader(self.Scratch))
         
-        self.watcher = AuiNotebook(self, size=(600,400))
+        self.watcher = AuiNotebook(self, size=(600,400), name="watcher")
         self.watcher.AddPage(self.ginfo, "globals")
         self.watcher.AddPage(self.linfo, "locals")
         self.watcher.AddPage(self.monitor, "Monitor", bitmap=Icon('tv'))
         self.watcher.AddPage(self.inspector, "Inspector", bitmap=Icon('inspect'))
-        self.watcher.Name = "watcher"
         
         self.watcher.Bind(wx.EVT_SHOW, self.OnGhostShow)
         
         self._mgr = aui.AuiManager()
         self._mgr.SetManagedWindow(self)
-        self._mgr.SetDockSizeConstraint(0.5, 0.5) # (w, h)/N
+        self._mgr.SetDockSizeConstraint(1, 1)
         
         self._mgr.AddPane(self.console,
                           aui.AuiPaneInfo().Name("console").CenterPane()
@@ -1465,27 +1462,23 @@ class ShellFrame(MiniFrame):
     
     def OnShow(self, evt):
         pane = self._mgr.GetPane(self.watcher)
-        def _watch(show):
-            if show:
-                if pane.IsShown():
-                    self.inspector.watch() # restart
-                    self.monitor.watch()
-            else:
-                if pane.IsDocked():
-                    self.inspector.unwatch()
-                    self.monitor.unwatch()
-        wx.CallAfter(_watch, evt.IsShown())
-        evt.Skip()
-    
-    def OnGhostShow(self, evt):
-        def _watch(show):
-            if show:
-                self.inspector.watch() # restart
+        if evt.IsShown():
+            if pane.IsShown():
+                self.inspector.watch()
                 self.monitor.watch()
-            else:
+        else:
+            if pane.IsDocked():
                 self.inspector.unwatch()
                 self.monitor.unwatch()
-        wx.CallAfter(_watch, evt.IsShown())
+        evt.Skip()
+    
+    def OnGhostShow(self, evt):
+        if evt.IsShown():
+            self.inspector.watch()
+            self.monitor.watch()
+        else:
+            self.inspector.unwatch()
+            self.monitor.unwatch()
         evt.Skip()
     
     def OnConsolePageChanged(self, evt): #<wx._aui.AuiNotebookEvent>
@@ -1553,6 +1546,8 @@ class ShellFrame(MiniFrame):
                 self._mgr.RestoreMaximizedPane()
                 self._mgr.Update()
                 return
+        if pane.IsShown():
+            pane.best_size = win.Size
         self.popup_window(win, not pane.IsShown())
     
     @save_focus_excursion()

mwx/graphman.py

@@ -1242,8 +1242,7 @@ class Frame(mwx.Frame):
                 nb.AddPage(plug, caption)
             else:
                 size = plug.GetSize() + (2,30) # padding for notebook
-                nb = AuiNotebook(self)
-                nb.Name = title
+                nb = AuiNotebook(self, name=title)
                 nb.AddPage(plug, caption)
                 self._mgr.AddPane(nb, aui.AuiPaneInfo()
                                          .Name(title).Caption(title)

{mwxlib-0.97.4.dist-info → mwxlib-0.97.6.dist-info}/METADATA

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

{mwxlib-0.97.4.dist-info → mwxlib-0.97.6.dist-info}/RECORD

@@ -1,8 +1,8 @@
 mwx/__init__.py,sha256=nN62CGTWjME7Zz2h-jIRB8MxwuErIkHPGrlBzydkF0o,643
 mwx/bookshelf.py,sha256=Y4xI2SrEO22DrI1hyyfFx7DfFZA8znOzX9RWMPsA2BE,5137
-mwx/controls.py,sha256=YtcFqSFRZaFyVOCF1RI33F3-BA_r6L75--izYXSLNt8,47843
-mwx/framework.py,sha256=RrwPw08G26GbJFemxqZU1W1SZ1x-Txau8y9F-6qOU8w,75416
-mwx/graphman.py,sha256=SdGWKWqOAkScRzkd3D0yZI44czBnHjFimYxqoEYZbDw,70483
+mwx/controls.py,sha256=LAPGoi_bpiGu6eGhPVHBzv2hx162kWxYBmzlZouMOdk,47582
+mwx/framework.py,sha256=r9nbxrRta0lQat7wWzgBOlHkNay9TYSHHikm1gDRhuk,75209
+mwx/graphman.py,sha256=Cyhl_Da_HGBfk721gu1r5iwSH9L3yPEG8Fzmc2gx-EU,70462
 mwx/images.py,sha256=_-Eh3xF7Khu42ivkYp97NXIzSNGbjcidqtWjZQFGtqE,47827
 mwx/matplot2.py,sha256=xCJ_ZzdDEWmzctpPaOrzTnwXyHINP4nfFHweoTZa6ug,32899
 mwx/matplot2g.py,sha256=wiZFDFuQe3ax71fmyeR_9hvAmgT-4nVfZ30UByv8Nv8,64379
@@ -21,8 +21,8 @@ mwx/plugins/frame_listview.py,sha256=hbApzZWa9-BmQthu7uZBlBbGbtf4iJ_prO8IhxoGMs8
 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.97.4.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.97.4.dist-info/METADATA,sha256=QKmoaVt-Lsr7Ra6T8Z8YPpKtkWDNGDG2fgW1L9E5jdM,1880
-mwxlib-0.97.4.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-mwxlib-0.97.4.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.97.4.dist-info/RECORD,,
+mwxlib-0.97.6.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.97.6.dist-info/METADATA,sha256=j9v4RwJ93aqB5yYTBlE1i0oENtFExZ5GTIoi_rFIo7E,1880
+mwxlib-0.97.6.dist-info/WHEEL,sha256=Rp8gFpivVLXx-k3U95ozHnQw8yDcPxmhOpn_Gx8d5nc,91
+mwxlib-0.97.6.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.97.6.dist-info/RECORD,,

{mwxlib-0.97.4.dist-info → mwxlib-0.97.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (71.1.0)
+Generator: setuptools (72.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any