tligui_y/slic
0
0
Fork 0
forked from slic/slic
Code Pull Requests Actions Wiki Activity

rearranged tweak buttons; added fast-forward buttons

Browse Source
This commit is contained in:
augustin_s
2020-11-21 14:33:57 +01:00
parent 94b6a3c74b
commit fa5cd52409
2 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slic/gui/daqpanels.py
+16 -2
View File
@@ -251,12 +251,14 @@ class TweakPanel(wx.Panel):
# widgets:
self.st_adj = st_adj = wx.StaticText(self)
self.cb_adjs = cb_adjs = AdjustableComboBox(self)
self.le_abs = le_abs = LabeledEntry(self, label="Absolute")
self.le_abs = le_abs = LabeledEntry(self, label="Absolute Position")
self.on_change_adj(None) # update static text and entry with default selection
cb_adjs.Bind(wx.EVT_COMBOBOX, self.on_change_adj)
lte = LabeledTweakEntry(self, label="Relative", value=0.01)
lte = LabeledTweakEntry(self, label="Relative Step", value=0.01)
lte.btn_left.Bind(wx.EVT_BUTTON, self.on_left)
lte.btn_right.Bind(wx.EVT_BUTTON, self.on_right)
self.btn_go = btn_go = TwoButtons(self)
btn_go.Bind1(wx.EVT_BUTTON, self.on_go)
@@ -287,6 +289,18 @@ class TweakPanel(wx.Panel):
def on_stop(self, event):
print("move stopped", event)
def on_left(self, event):
print("step left", event)
def on_right(self, event):
print("step right", event)
def on_ff_left(self, event):
print("fast forward left", event)
def on_ff_right(self, event):
print("fast forward right", event)
slic/gui/widgets.py
+12 -8
View File
@@ -141,22 +141,26 @@ class LabeledTweakEntry(wx.BoxSizer):
self.label = label = wx.StaticText(parent, label=label)
self.text = text = wx.TextCtrl(parent, value=value, style=wx.TE_RIGHT)
self.btn_left = btn_left = wx.Button(parent, label="<<")
self.btn_right = btn_right = wx.Button(parent, label=">>")
self.btn_left = btn_left = wx.Button(parent, label="<")
self.btn_right = btn_right = wx.Button(parent, label=">")
hb_tweak = wx.BoxSizer(wx.HORIZONTAL)
hb_tweak.Add(btn_left)
hb_tweak.Add(btn_right)
hb_tweak.Add(text, proportion=1, flag=wx.ALL|wx.EXPAND)
self.btn_ff_left = btn_ff_left = wx.Button(parent, label="<<")
self.btn_ff_right = btn_ff_right = wx.Button(parent, label=">>")
self.Add(label, flag=wx.EXPAND)
self.Add(hb_tweak, flag=wx.EXPAND)
widgets = (btn_ff_left, btn_left, btn_right, btn_ff_right)
hb_tweak = make_filled_hbox(widgets)
self.Add(label, flag=wx.EXPAND)
self.Add(text, flag=wx.EXPAND)
self.Add(hb_tweak, flag=wx.EXPAND|wx.TOP, border=10)
def Disable(self):
self.text.Disable()
self.btn_left.Disable()
self.btn_right.Disable()
self.btn_ff_left.Disable()
self.btn_ff_right.Disable()
def __getattr__(self, name):