mwxlib 1.3.3__py3-none-any.whl → 1.3.11__py3-none-any.whl

mwx/bookshelf.py

@@ -26,7 +26,9 @@ class MyDropTarget(wx.DropTarget):
         items = list(self.tree._gen_items(self.tree.RootItem)) # first level items
         if not item:
             item = items[0]
-        if item in items and item != self.tree.Selection:
+        elif item not in items:
+            item = self.tree.GetItemParent(item) # Select the parent item
+        if item != self.tree.Selection:
             self.tree.SelectItem(item)
         return result
     
@@ -37,6 +39,13 @@ class MyDropTarget(wx.DropTarget):
         self.GetData()
         if self.datado.Data:
             fn = self.datado.Data.tobytes().decode()
+            if result == wx.DragMove:
+                try:
+                    buf = self.tree._buffer  # only for the same process buffer DnD
+                    buf.parent.kill_buffer(buf) # the focus moves
+                    wx.CallAfter(self.tree.SetFocus)
+                except AttributeError:
+                    pass
             editor.load_file(fn)
             self.datado.SetData(b"")
         elif self.textdo.Text:
@@ -56,7 +65,6 @@ class MyDropTarget(wx.DropTarget):
 class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
     """TreeList/Ctrl
     
-    Construct treectrl in the order of tree:list.
     Note:
         This only works with single selection mode.
     """
@@ -200,7 +208,6 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
                 name = self.GetItemText(evt.Item)
                 editor = self.Parent.FindWindow(name) # window.Name (not page.caption)
                 if not editor.IsShown():
-                    ## editor.SetFocus()
                     self.Parent.Selection = self.Parent.FindPage(editor)
             wx.CallAfter(self.SetFocus)
         evt.Skip()
@@ -208,8 +215,10 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
     def OnBeginDrag(self, evt):
         data = self.GetItemData(evt.Item)
         if data:
+            self._buffer = data
             dd = wx.CustomDataObject("TreeItem")
             dd.SetData(data.filename.encode())
             dropSource = wx.DropSource()
             dropSource.SetData(dd)
             dropSource.DoDragDrop(wx.Drag_AllowMove) # -> wx.DragResult
+            del self._buffer

mwx/controls.py

@@ -40,6 +40,7 @@ class Param:
             - control -> when index is changed by knobs or reset (handler)
             - updated -> when button is pressed (updater)
             - checked -> when tick turns on/off (checker)
+            - notified -> when value changed
             - overflow -> when value overflows
             - underflow -> when value underflows
     """
@@ -63,6 +64,7 @@ class Param:
             'control' : [ _F(handler) ] if handler else [],
             'updated' : [ _F(updater) ] if updater else [],
             'checked' : [ _F(checker) ] if checker else [],
+           'notified' : [],
            'overflow' : [],
           'underflow' : [],
         })
@@ -130,14 +132,10 @@ class Param:
     def value(self, v):
         if v is None:
             v = nan
-        if np.isnan(v) or np.isinf(v):
+        if np.isnan(v) or np.isinf(v):  # Skip events for nan and inf.
             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)
+                knob.update_ctrl(None)
             return
         
         ## If the value is out of range, it will be modified.
@@ -152,6 +150,7 @@ class Param:
             self.callback('overflow', self)
         for knob in self.knobs:
             knob.update_ctrl(valid, notify=True)
+        self.callback('notified', self)
     
     @property
     def std_value(self):
@@ -234,6 +233,7 @@ class LParam(Param):
             - control -> when index is changed by knobs or reset (handler)
             - updated -> when button is pressed (updater)
             - checked -> when tick turns on/off (checker)
+            - notified -> when value changed
             - overflow -> when value overflows
             - underflow -> when value underflows
     """
@@ -289,13 +289,13 @@ class Knob(wx.Panel):
     
     Args:
         param   : <Param> or <LParam> object
-        type    : ctrl type (slider[*], [hv]spin, choice, None)
+        type    : control type (slider[*], [hv]spin, choice, None)
         style   : style of label
                   None -> static text (default)
                   button -> label with flat button
                   chkbox -> label with checkbox
                   checkbox -> label with checkbox
-        cw      : width of ctrl
+        cw      : width of control
         lw      : width of label
         tw      : width of textbox
         h       : height of widget (defaults to 22)
@@ -317,10 +317,8 @@ class Knob(wx.Panel):
                  style=None, cw=-1, lw=-1, tw=-1, h=22, **kwargs):
         wx.Panel.__init__(self, parent, **kwargs)
         
-        assert isinstance(param, Param),\
-          "Argument `param` must be an instance of Param"
+        assert isinstance(param, Param), "Argument `param` must be an instance of Param"
         
-        self.__bit = 1
         self.__par = param
         self.__par.knobs.append(self) # パラメータの関連付けを行う
         
@@ -337,72 +335,72 @@ class Knob(wx.Panel):
         label = self.__par.name + '  '
         
         if style == 'chkbox' or style == 'checkbox':
-            self.label = wx.CheckBox(self, label=label, size=(lw,-1))
-            self.label.Bind(wx.EVT_CHECKBOX, self.OnCheck)
+            self._label = wx.CheckBox(self, label=label, size=(lw,-1))
+            self._label.Bind(wx.EVT_CHECKBOX, self.OnCheck)
         elif style == 'button':
-            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)
+            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))
+            self._label = wx.StaticText(self, label=label, size=(lw,-1))
         else:
-            raise Exception("unknown style: {!r}".format(style))
+            raise Exception(f"unknown style: {style!r}")
         
-        self.label.Bind(wx.EVT_MIDDLE_DOWN, lambda v: self.__par.reset())
-        self.label.SetToolTip(self.__par._tooltip)
-        self.label.Enable(lw) # skip focus
+        self._label.Bind(wx.EVT_MIDDLE_DOWN, lambda v: self.__par.reset())
+        self._label.SetToolTip(self.__par._tooltip)
+        self._label.Enable(lw) # skip focus
         
-        self.text = wx.TextCtrl(self, size=(tw,h), style=wx.TE_PROCESS_ENTER)
-        self.text.Bind(wx.EVT_TEXT_ENTER, self.OnTextEnter)
-        self.text.Bind(wx.EVT_KILL_FOCUS, self.OnTextExit)
-        self.text.Bind(wx.EVT_KEY_DOWN, self.OnTextKeyDown)
-        self.text.Bind(wx.EVT_KEY_UP, self.OnTextKeyUp)
-        self.text.Bind(wx.EVT_MOUSEWHEEL, self.OnMouseWheel)
-        self.text.Bind(wx.EVT_MIDDLE_DOWN, lambda v: self.__par.reset())
+        self._text = wx.TextCtrl(self, size=(tw,h), style=wx.TE_PROCESS_ENTER)
+        self._text.Bind(wx.EVT_TEXT_ENTER, self.OnTextEnter)
+        self._text.Bind(wx.EVT_KILL_FOCUS, self.OnTextExit)
+        self._text.Bind(wx.EVT_KEY_DOWN, self.OnTextKeyDown)
+        self._text.Bind(wx.EVT_KEY_UP, self.OnTextKeyUp)
+        self._text.Bind(wx.EVT_MOUSEWHEEL, self.OnMouseWheel)
+        self._text.Bind(wx.EVT_MIDDLE_DOWN, lambda v: self.__par.reset())
         
-        self.text.Enable(tw) # skip focus
+        self._text.Enable(tw) # skip focus
         
         if type == 'slider':
-            self.ctrl = wx.Slider(self, size=(cw,h), style=wx.SL_HORIZONTAL)
-            self.ctrl.Bind(wx.EVT_SCROLL_CHANGED, self.OnScroll)
-            self.ctrl.Bind(wx.EVT_KEY_DOWN, self.OnCtrlKeyDown)
-            self.ctrl.Bind(wx.EVT_MOUSEWHEEL, self.OnMouseWheel)
+            self._ctrl = wx.Slider(self, size=(cw,h), style=wx.SL_HORIZONTAL)
+            self._ctrl.Bind(wx.EVT_SCROLL_CHANGED, self.OnScroll)
+            self._ctrl.Bind(wx.EVT_KEY_DOWN, self.OnCtrlKeyDown)
+            self._ctrl.Bind(wx.EVT_MOUSEWHEEL, self.OnMouseWheel)
             
         elif type == 'slider*':
-            self.ctrl = wx.Slider(self, size=(cw,h), style=wx.SL_HORIZONTAL)
-            self.ctrl.Bind(wx.EVT_SCROLL, self.OnScroll) # called while dragging
-            self.ctrl.Bind(wx.EVT_SCROLL_CHANGED, lambda v: None) # pass no action
-            self.ctrl.Bind(wx.EVT_KEY_DOWN, self.OnCtrlKeyDown)
-            self.ctrl.Bind(wx.EVT_MOUSEWHEEL, self.OnMouseWheel)
+            self._ctrl = wx.Slider(self, size=(cw,h), style=wx.SL_HORIZONTAL)
+            self._ctrl.Bind(wx.EVT_SCROLL, self.OnScroll) # called while dragging
+            self._ctrl.Bind(wx.EVT_SCROLL_CHANGED, lambda v: None) # pass no action
+            self._ctrl.Bind(wx.EVT_KEY_DOWN, self.OnCtrlKeyDown)
+            self._ctrl.Bind(wx.EVT_MOUSEWHEEL, self.OnMouseWheel)
             
         elif type == 'spin' or type =='hspin':
-            self.ctrl = wx.SpinButton(self, size=(cw,h), style=wx.SP_HORIZONTAL)
-            self.ctrl.Bind(wx.EVT_SPIN, self.OnScroll)
-            self.ctrl.Bind(wx.EVT_MOUSEWHEEL, self.OnMouseWheel)
+            self._ctrl = wx.SpinButton(self, size=(cw,h), style=wx.SP_HORIZONTAL)
+            self._ctrl.Bind(wx.EVT_SPIN, self.OnScroll)
+            self._ctrl.Bind(wx.EVT_MOUSEWHEEL, self.OnMouseWheel)
             
         elif type == 'vspin':
-            self.ctrl = wx.SpinButton(self, size=(cw,h), style=wx.SP_VERTICAL)
-            self.ctrl.Bind(wx.EVT_SPIN, self.OnScroll)
-            self.ctrl.Bind(wx.EVT_MOUSEWHEEL, self.OnMouseWheel)
+            self._ctrl = wx.SpinButton(self, size=(cw,h), style=wx.SP_VERTICAL)
+            self._ctrl.Bind(wx.EVT_SPIN, self.OnScroll)
+            self._ctrl.Bind(wx.EVT_MOUSEWHEEL, self.OnMouseWheel)
             
         elif type == 'choice':
-            self.ctrl = wx.Choice(self, size=(cw,h))
-            self.ctrl.Bind(wx.EVT_CHOICE, self.OnScroll)
-            self.ctrl.SetValue = self.ctrl.SetSelection # setter of choice
-            self.ctrl.GetValue = self.ctrl.GetSelection # getter (ditto)
+            self._ctrl = wx.Choice(self, size=(cw,h))
+            self._ctrl.Bind(wx.EVT_CHOICE, self.OnScroll)
+            self._ctrl.SetValue = self._ctrl.SetSelection # setter of choice
+            self._ctrl.GetValue = self._ctrl.GetSelection # getter (ditto)
             
         else:
-            raise Exception("unknown type: {!r}".format(type))
+            raise Exception(f"unknown type: {type!r}")
         
-        self.ctrl.Bind(wx.EVT_MIDDLE_DOWN, lambda v: self.__par.reset())
-        self.ctrl.Enable(cw) # skip focus
+        self._ctrl.Bind(wx.EVT_MIDDLE_DOWN, lambda v: self.__par.reset())
+        self._ctrl.Enable(cw) # skip focus
         
         c = (cw and type != 'vspin')
         self.SetSizer(
             pack(self, (
-                (self.label, 0, wx.ALIGN_CENTER | wx.LEFT | wx.RIGHT, lw and 1),
-                (self.text,  0, wx.ALIGN_CENTER | wx.LEFT | wx.RIGHT, tw and 1),
-                (self.ctrl,  c, wx.ALIGN_CENTER | wx.LEFT | wx.RIGHT, cw and 1),
+                (self._label, 0, wx.ALIGN_CENTER | wx.LEFT | wx.RIGHT, lw and 1),
+                (self._text,  0, wx.ALIGN_CENTER | wx.LEFT | wx.RIGHT, tw and 1),
+                (self._ctrl,  c, wx.ALIGN_CENTER | wx.LEFT | wx.RIGHT, cw and 1),
             ))
         )
         self.update_range()
@@ -417,33 +415,33 @@ class Knob(wx.Panel):
     def update_range(self):
         """Called when range is being changed (internal use only)."""
         v = self.__par
-        if isinstance(self.ctrl, wx.Choice): #<wx.Choice>
+        if isinstance(self._ctrl, wx.Choice): #<wx.Choice>
             items = [v.__str__(x) for x in v.range]
-            if items != self.ctrl.Items:
-                self.ctrl.SetItems(items)
-                self.ctrl.SetStringSelection(str(v))
+            if items != self._ctrl.Items:
+                self._ctrl.SetItems(items)
+                self._ctrl.SetStringSelection(str(v))
         else:
-            self.ctrl.SetRange(0, len(v)-1) #<wx.Slider> #<wx.SpinButton>
+            self._ctrl.SetRange(0, len(v)-1) #<wx.Slider> #<wx.SpinButton>
     
     def update_label(self):
         """Called when label is being changed (internal use only)."""
         v = self.__par
-        if isinstance(self.label, wx.CheckBox):
-            self.label.SetValue(v.check)
+        if isinstance(self._label, wx.CheckBox):
+            self._label.SetValue(v.check)
         
         t = '  ' if np.isnan(v.std_value) or v.value == v.std_value else '*'
-        self.label.SetLabel(v.name + t)
-        self.label.Refresh()
+        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)."""
         v = self.__par
-        self.ctrl.SetValue(v.index)
-        wx.CallAfter(self.text.SetValue, str(v)) # for wxAssertionError
+        self._ctrl.SetValue(v.index)
+        wx.CallAfter(self._text.SetValue, str(v)) # for wxAssertionError
         if valid:
             if notify:
-                if self.text.BackgroundColour != '#ffff80':
+                if self._text.BackgroundColour != '#ffff80':
                     wx.CallAfter(wx.CallLater, 1000,
                                  self.set_textcolour, '#ffffff')
                     self.set_textcolour('#ffff80') # light-yellow
@@ -459,8 +457,8 @@ class Knob(wx.Panel):
     
     def set_textcolour(self, c):
         if self:
-            self.text.BackgroundColour = c
-            self.text.Refresh()
+            self._text.BackgroundColour = c
+            self._text.Refresh()
     
     def shift_ctrl(self, evt, bit):
         """Called when a key/mouse wheel is pressed/scrolled.
@@ -474,14 +472,14 @@ class Knob(wx.Panel):
             if evt.ControlDown(): bit *= 16
             if evt.AltDown():     bit *= 256
         v = self.__par
-        j = self.ctrl.GetValue() + bit
+        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()
+        j = self._ctrl.GetValue()
         if j != v.index:
             v.index = j
             v.reset(v.value)
@@ -497,8 +495,8 @@ class Knob(wx.Panel):
         if key == wx.WXK_RIGHT: return self.shift_ctrl(evt, 1)
         
         def _focus(c):
-            if isinstance(c, Knob) and c.ctrl.IsEnabled():
-                c.ctrl.SetFocus()
+            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)
@@ -519,11 +517,11 @@ class Knob(wx.Panel):
     
     def OnTextEnter(self, evt): #<wx._core.CommandEvent>
         evt.Skip()
-        x = self.text.Value.strip()
+        x = self._text.Value.strip()
         self.__par.reset(x)
     
     def OnTextExit(self, evt): #<wx._core.FocusEvent>
-        x = self.text.Value.strip()
+        x = self._text.Value.strip()
         if x != str(self.__par):
             self.__par.reset(x)
         evt.Skip()
@@ -537,9 +535,9 @@ class Knob(wx.Panel):
         evt.Skip()
     
     def Enable(self, p=True):
-        self.label.Enable(p)
-        self.ctrl.Enable(p)
-        self.text.Enable(p)
+        self._label.Enable(p)
+        self._ctrl.Enable(p)
+        self._text.Enable(p)
 
 
 class KnobCtrlPanel(scrolled.ScrolledPanel):
@@ -1086,6 +1084,8 @@ class TextBox(wx.Control):
         if updater:
             self._updater = _F(updater)
             self._btn.Bind(wx.EVT_BUTTON, lambda v: self._updater(self))
+        
+        self.Bind(wx.EVT_NAVIGATION_KEY, self.OnNavKey)
     
     def reset(self, v):
         try:
@@ -1093,9 +1093,12 @@ class TextBox(wx.Control):
             self._handler(self)
         except AttributeError:
             pass
-
-
-TextCtrl = TextBox #: for backward compatibility
+    
+    def OnNavKey(self, evt):
+        if evt.EventObject is self._ctrl:
+            self.Navigate(evt.Direction)
+        elif self.IsShown():
+            self._ctrl.SetFocus()
 
 
 class Choice(wx.Control):
@@ -1159,6 +1162,8 @@ class Choice(wx.Control):
         if updater:
             self._updater = _F(updater)
             self._btn.Bind(wx.EVT_BUTTON, lambda v: self._updater(self))
+        
+        self.Bind(wx.EVT_NAVIGATION_KEY, self.OnNavKey)
     
     def reset(self, v):
         try:
@@ -1175,6 +1180,12 @@ class Choice(wx.Control):
             self._ctrl.Append(s)
             self._ctrl.SetStringSelection(s)
         evt.Skip()
+    
+    def OnNavKey(self, evt):
+        if evt.EventObject is self._ctrl:
+            self.Navigate(evt.Direction)
+        elif self.IsShown():
+            self._ctrl.SetFocus()
 
 
 class Indicator(wx.Control):