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

mwx/controls.py

@@ -26,7 +26,7 @@ class Param:
     Args:
         name    : label
         range   : range
-        value   : std_value (default is nan)
+        value   : std_value (default is None)
         fmt     : text formatter or format:str (default is '%g')
                   `hex` specifies hexadecimal format
         handler : called when control changed
@@ -95,8 +95,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,27 +104,7 @@ 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)
     
@@ -137,8 +117,6 @@ class Param:
     def check(self, v):
         self.__check = bool(v)
         self.callback('check', self)
-        for knob in self.knobs:
-            knob.update_label()
     
     @property
     def name(self):
@@ -157,7 +135,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):
@@ -326,7 +327,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
@@ -442,6 +443,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 +480,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>
@@ -590,7 +594,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 +621,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 +633,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.1"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mwxlib
-Version: 0.99.0
+Version: 0.99.1
 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.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 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/controls.py,sha256=IPd2MhiWncKcsNu9m0Pi3WJU61FXUdaup8v9XmgM4Zg,47795
+mwx/framework.py,sha256=UIFTHvaE3gjLg8LMep5_2XWIK-_XGbc6wsJ0jFkfq1Y,75587
 mwx/graphman.py,sha256=N34F5GXpN3ZEMfUIOswlM-OCIB1KObC6X1NTq_Qc2dk,69973
 mwx/images.py,sha256=_-Eh3xF7Khu42ivkYp97NXIzSNGbjcidqtWjZQFGtqE,47827
 mwx/matplot2.py,sha256=xCJ_ZzdDEWmzctpPaOrzTnwXyHINP4nfFHweoTZa6ug,32899
@@ -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.1.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.99.1.dist-info/METADATA,sha256=Hen3Gyc04u6p8FXYzfrB3fwK1h-OFhYVqzlqdMkCsbs,7411
+mwxlib-0.99.1.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+mwxlib-0.99.1.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.99.1.dist-info/RECORD,,