mwxlib 0.99.0__py3-none-any.whl → 0.99.2__py3-none-any.whl

mwx/controls.py

@@ -25,25 +25,26 @@ class Param:
     
     Args:
         name    : label
-        range   : range
-        value   : std_value (default is nan)
+        range   : list of values
+        value   : std_value (default is None)
         fmt     : text formatter or format:str (default is '%g')
                   `hex` specifies hexadecimal format
-        handler : called when control changed
-        updater : called when check changed
+        handler : called when knob is handled.
+        updater : called when button is pressed.
+        checker : called when tick turns on/off.
     
     Attributes:
         knobs       : knob list
         callback    : single state machine that handles following events
         
-            - control -> when index changed by knobs or reset (handler)
-            - update  -> when button pressed (updater)
-            - check   -> when check marked (updater)
+            - control -> when index is changed by knobs or reset (handler)
+            - updated -> when button is pressed (updater)
+            - checked -> when tick turns on/off (checker)
             - overflow -> when value overflows
             - underflow -> when value underflows
     """
     def __init__(self, name, range=None, value=None, fmt=None,
-                 handler=None, updater=None):
+                 handler=None, updater=None, checker=None):
         self.knobs = []
         self.name = name
         self.range = range
@@ -60,8 +61,8 @@ class Param:
                 self.__format = lambda v: fmt % v
         self.callback = SSM({
             'control' : [ _F(handler) ] if handler else [],
-             'update' : [ _F(updater) ] if updater else [],
-              'check' : [ _F(updater) ] if updater else [],
+            'updated' : [ _F(updater) ] if updater else [],
+            'checked' : [ _F(checker) ] if checker else [],
            'overflow' : [],
           'underflow' : [],
         })
@@ -95,8 +96,8 @@ class Param:
     def reset(self, v=None, internal_callback=True):
         """Reset value when indexed (by knobs) with callback."""
         if v is None:
-            v = self.std_value  # reset to std_value
-            if np.isnan(v):     # do nothing if std_value is nan
+            v = self.std_value
+            if np.isnan(v):
                 return
         elif isinstance(v, str):
             try:
@@ -104,41 +105,19 @@ class Param:
             except Exception:
                 v = self.value
                 internal_callback = False
-        
-        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
-        if v != self.__value:
-            ## 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)
+        self.value = v
         if internal_callback:
             self.callback('control', self)
     
     @property
     def check(self):
-        """A knob check property (user defined)."""
+        """A knob check-flag (user defined)."""
         return self.__check
     
     @check.setter
     def check(self, v):
         self.__check = bool(v)
-        self.callback('check', self)
-        for knob in self.knobs:
-            knob.update_label()
+        self.callback('checked', self)
     
     @property
     def name(self):
@@ -157,7 +136,30 @@ class Param:
     
     @value.setter
     def value(self, v):
-        self.reset(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):
@@ -224,19 +226,21 @@ class LParam(Param):
     
     Args:
         name    : label
-        range   : range [min:max:step]
+        range   : range params [min:max:step]
         value   : std_value (default is None)
         fmt     : text formatter or format:str (default is '%g')
                   `hex` specifies hexadecimal format
-        handler : called when control changed
-        updater : called when check changed
+        handler : called when knob is handled.
+        updater : called when button is pressed.
+        checker : called when tick turns on/off.
     
     Attributes:
         knobs       : knob list
         callback    : single state machine that handles following events
         
-            - control -> when index changed by knobs or reset (handler)
-            - check   -> when check ticks on/off (updater)
+            - control -> when index is changed by knobs or reset (handler)
+            - updated -> when button is pressed (updater)
+            - checked -> when tick turns on/off (checker)
             - overflow -> when value overflows
             - underflow -> when value underflows
     """
@@ -295,8 +299,9 @@ class Knob(wx.Panel):
         type    : ctrl type (slider[*], [hv]spin, choice, None)
         style   : style of label
                   None -> static text (default)
-                  chkbox -> label with check box
                   button -> label with flat button
+                  chkbox -> label with checkbox
+                  checkbox -> label with checkbox
         cw      : width of ctrl
         lw      : width of label
         tw      : width of textbox
@@ -326,7 +331,7 @@ class Knob(wx.Panel):
         self.__par = param
         self.__par.knobs.append(self) # パラメータの関連付けを行う
         
-        if type is None:
+        if not type:
             type = 'slider'
             if cw < 0:
                 cw = 0
@@ -338,19 +343,17 @@ class Knob(wx.Panel):
         
         label = self.__par.name + '  '
         
-        if style == 'chkbox':
+        if style == 'chkbox' or style == 'checkbox':
             if lw >= 0:
                 lw += 16
             self.label = wx.CheckBox(self, label=label, size=(lw,-1))
             self.label.Bind(wx.EVT_CHECKBOX, self.OnCheck)
-            
         elif style == 'button':
             if lw >= 0:
                 lw += 16
             self.label = pb.PlateButton(self, label=label, size=(lw,-1),
                             style=pb.PB_STYLE_DEFAULT|pb.PB_STYLE_SQUARE)
             self.label.Bind(wx.EVT_BUTTON, self.OnPress)
-            
         elif not style:
             self.label = wx.StaticText(self, label=label, size=(lw,-1))
         else:
@@ -442,6 +445,7 @@ class Knob(wx.Panel):
         t = '  ' if np.isnan(v.std_value) or v.value == v.std_value else '*'
         self.label.SetLabel(v.name + t)
         self.label.Refresh()
+        self.Refresh()
     
     def update_ctrl(self, valid=True, notify=False):
         """Called when value is being changed (internal use only)."""
@@ -478,12 +482,14 @@ class Knob(wx.Panel):
         j = self.ctrl.GetValue() + bit
         if j != v.index:
             v.index = j
+            v.reset(v.value)
     
     def OnScroll(self, evt): #<wx._core.ScrollEvent><wx._controls.SpinEvent><wx._core.CommandEvent>
         v = self.__par
         j = self.ctrl.GetValue()
         if j != v.index:
             v.index = j
+            v.reset(v.value)
         evt.Skip()
     
     def OnMouseWheel(self, evt): #<wx._core.MouseEvent>
@@ -532,7 +538,7 @@ class Knob(wx.Panel):
         evt.Skip()
     
     def OnPress(self, evt): #<wx._core.CommandEvent>
-        self.__par.callback('update', self.__par)
+        self.__par.callback('updated', self.__par)
         evt.Skip()
     
     def Enable(self, p=True):
@@ -590,7 +596,6 @@ class KnobCtrlPanel(scrolled.ScrolledPanel):
                         for cc in obj.Children: # child of child <wx._core.SizerItem>
                             cc.Show(not cc.IsShown())
                         self.Layout()
-                        self.SendSizeEvent()
                         break
         evt.Skip()
     
@@ -618,9 +623,7 @@ class KnobCtrlPanel(scrolled.ScrolledPanel):
         ## child = self.Sizer.Children[groupid]
         ## child.Show(p)
         self.Sizer.Show(groupid % len(self.__groups), p)
-        ## self.Sizer.Fit(self) # do Fit(self.Parent) if needed
         self.Layout()
-        self.Parent.SendSizeEvent() # let parent redraw the child panel
     
     def is_folded(self, groupid):
         child = self.Sizer.Children[groupid]
@@ -632,9 +635,7 @@ class KnobCtrlPanel(scrolled.ScrolledPanel):
         if isinstance(child.Sizer, wx.StaticBoxSizer) and child.IsShown():
             for cc in child.Sizer.Children: # child of child <wx._core.SizerItem>
                 cc.Show(not p)
-            ## self.Sizer.Fit(self) # do Fit(self.Parent) if needed
             self.Layout()
-            self.Parent.SendSizeEvent() # let parent redraw the child panel
     
     def layout(self, items, title=None,
                row=0, expand=0, border=2, hspacing=1, vspacing=1,

mwx/framework.py

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

mwx/graphman.py

@@ -336,6 +336,7 @@ class LayerInterface(CtrlInterface):
                  'thread_error' : [ None ], # failed in error
                    'page_shown' : [ None, _F(self.Draw, True)  ],
                   'page_closed' : [ None, _F(self.Draw, False) ],
+                  'page_hidden' : [ None, _F(self.Draw, False) ],
             },
             0 : {
                   'C-c pressed' : (0, _F(copy_params)),
@@ -380,6 +381,7 @@ class LayerInterface(CtrlInterface):
                   lambda v: Menu.Popup(self, self.menu))
         
         self.Bind(wx.EVT_WINDOW_DESTROY, self.OnDestroy)
+        self.Bind(wx.EVT_SHOW, self.OnShow)
         
         try:
             self.Init()
@@ -419,6 +421,16 @@ class LayerInterface(CtrlInterface):
             del self.Arts
         evt.Skip()
     
+    def OnShow(self, evt):
+        if not self:
+            return
+        if isinstance(self.Parent, aui.AuiNotebook):
+            if evt.IsShown():
+                self.handler('page_shown', self)
+            else:
+                self.handler('page_hidden', self)
+        evt.Skip()
+    
     Shown = property(
         lambda self: self.IsShown(),
         lambda self,v: self.Show(v))
@@ -1001,7 +1013,7 @@ class Frame(mwx.Frame):
                 plug.handler('page_closed', plug)
         else:
             win.handler('page_closed', win)
-        evt.Skip()
+        evt.Skip(False) # Don't skip to avoid being called twice.
     
     ## --------------------------------
     ## Plugin <Layer> interface

mwx/utilus.py

@@ -197,7 +197,7 @@ def typename(obj, docp=False, qualp=True):
     
     modname = getattr(obj, '__module__', None)
     if modname and modname != "__main__" and not modname.startswith('mwx'):
-        name = modname + '.' + name
+        name = modname + ('.' if qualp else '..') + name
     
     if docp and callable(obj) and obj.__doc__:
         name += "<{!r}>".format(obj.__doc__.splitlines()[0]) # concat the first doc line

{mwxlib-0.99.0.dist-info → mwxlib-0.99.2.dist-info}/METADATA

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

{mwxlib-0.99.0.dist-info → mwxlib-0.99.2.dist-info}/RECORD

@@ -1,15 +1,15 @@
 mwx/__init__.py,sha256=nN62CGTWjME7Zz2h-jIRB8MxwuErIkHPGrlBzydkF0o,643
 mwx/bookshelf.py,sha256=so-xSLq08sMlJBErTxOaDoKUAMa_g1CkIP2pNnff68c,5607
-mwx/controls.py,sha256=WYd0nbpXL7eiE5E7l7jG49pm_u4mfgHI4c1dop4lsMM,48103
-mwx/framework.py,sha256=28_DX0eYwintdgBaO-06ds0NGevwXu_UdYmXjqTy4os,75587
-mwx/graphman.py,sha256=N34F5GXpN3ZEMfUIOswlM-OCIB1KObC6X1NTq_Qc2dk,69973
+mwx/controls.py,sha256=1WTJEFeeGY9_gycGzHMQUdgBGgwc2QnvDnQPJ49bRZY,48053
+mwx/framework.py,sha256=dCQ_xwPssrjBpGYLwxQRlKRHf-kX4tumFgZlVt7iQ3Q,75587
+mwx/graphman.py,sha256=-klqkJ8h5Vi01Xe9H_N28m-59x2lbRe_ow3NHswnDZE,70433
 mwx/images.py,sha256=_-Eh3xF7Khu42ivkYp97NXIzSNGbjcidqtWjZQFGtqE,47827
 mwx/matplot2.py,sha256=xCJ_ZzdDEWmzctpPaOrzTnwXyHINP4nfFHweoTZa6ug,32899
 mwx/matplot2g.py,sha256=gCXa8X1MEMP7n_mG73h3SkWKuNZOfjVKUTWNRXXK11c,64310
 mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
 mwx/mgplt.py,sha256=0WJ1RN_Y0a4Y3rz1C_Lx-WhumtOMdb1N49guX9aZZ_o,5602
 mwx/nutshell.py,sha256=xoHTyWZ46geGy3u4aU8k8_-mr520EdGcvuQRO4TBU_A,140715
-mwx/utilus.py,sha256=B76pDg6_kW8FMNdQ6xO0Bwy4KJ0laY98Gg6N3iqV7c8,37325
+mwx/utilus.py,sha256=iizdVrbwL1lX7eTfsMmltFz4IfHqTXVM37wwlPQ3A3Y,37346
 mwx/wxmon.py,sha256=Pq8XXigM_isJd80yiqG18iRVdArJpsePpxfnZOkk-Uw,12573
 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.0.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.99.0.dist-info/METADATA,sha256=Ix7YJKkft0nZZfhvPm-XOgN65HwIZF3T6asdSvhsCP0,7411
-mwxlib-0.99.0.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-mwxlib-0.99.0.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.99.0.dist-info/RECORD,,
+mwxlib-0.99.2.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.99.2.dist-info/METADATA,sha256=fLuVjSWTwHhXJmBuIEwD-HCdHHhFPVHnXapKkretuvQ,7411
+mwxlib-0.99.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+mwxlib-0.99.2.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.99.2.dist-info/RECORD,,

{mwxlib-0.99.0.dist-info → mwxlib-0.99.2.dist-info}/WHEEL

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