first try on a GoTo panel

slic/gui/daqframe.py

@@ -1,6 +1,6 @@
 import wx
 
-from .daqpanels import ConfigPanel, StaticPanel, ScanPanel, TweakPanel
+from .daqpanels import ConfigPanel, StaticPanel, ScanPanel, TweakPanel, GoToPanel
 from .special import SpecialScanPanel
 from .widgets import MainPanel, NotebookDX
 from .icon import get_wx_icon
@@ -25,14 +25,16 @@ class DAQFrame(wx.Frame):
         panel_scan   = ScanPanel(notebook, scanner, instrument, name="Scan")
         panel_spec   = SpecialScanPanel(notebook, scanner, instrument, name="Special")
         panel_tweak  = TweakPanel(notebook, name="Tweak")
+        panel_goto   = GoToPanel(notebook, name="GoTo")
 
         notebook.AddPage(panel_config)
         if show_static: notebook.AddPage(panel_static)
         if show_scan:   notebook.AddPage(panel_scan)
         if show_spec:   notebook.AddPage(panel_spec)
         notebook.AddPage(panel_tweak)
+        notebook.AddPage(panel_goto)
 
-        notebook.SetSelection(-2) # start on second to last page (Scan or Special)
+        notebook.SetSelection(-3) #TODO
 
         # make sure the window is large enough
         sizer = wx.BoxSizer(wx.VERTICAL)

slic/gui/daqpanels.py

@@ -13,6 +13,7 @@ from slic.core.acquisition.bschannels import BSChannels
 from slic.utils.registry import instances
 from slic.utils import nice_arange, readable_seconds
 from slic.utils.reprate import get_beamline, get_pvname_reprate
+from slic.utils import Marker 
 
 
 NOMINAL_REPRATE = 100 # Hz
@@ -489,6 +490,74 @@ class TweakPanel(wx.Panel):
 
 
 
+class GoToPanel(wx.Panel):
+
+    def __init__(self, parent, *args, **kwargs):
+        wx.Panel.__init__(self, parent, *args, **kwargs)
+
+#        btn_add = wx.Button(self, label="Add")
+#        btn_add.Bind(wx.EVT_BUTTON, self.on_click_add)
+
+        st_name     = wx.StaticText(self, label="Name")
+        st_pv       = wx.StaticText(self, label="PV")
+        st_value    = wx.StaticText(self, label="Value")
+        st_go_dummy = wx.StaticText(self, label="", size=(100, -1))
+
+        widgets = (st_name, st_pv, st_value)
+        labels = make_filled_hbox(widgets, flag = wx.RIGHT|wx.EXPAND, border=10)
+        labels.Add(st_go_dummy, 0, wx.LEFT|wx.EXPAND, 10)
+
+        markers = sorted(instances(Marker), key=lambda x: repr(x))
+
+#        widgets = (btn_add, labels)
+        widgets = [labels] + [GoToLine(self, m) for m in markers]
+        self.vbox = vbox = make_filled_vbox(widgets, border=10)
+        self.SetSizerAndFit(vbox)
+
+#        self.on_click_add(None)
+
+
+#    def on_click_add(self, event):
+#        new = GoToLine(self)
+#        self.vbox.Add(new, 0, wx.ALL|wx.EXPAND, 10)
+#        self.vbox.Layout()
+#        self.Fit()
+
+
+
+class GoToLine(wx.BoxSizer):
+
+    def __init__(self, parent, marker, id=wx.ID_ANY):
+        super().__init__(wx.HORIZONTAL)
+
+        self.marker = marker
+
+        self.tc_name  = tc_name  = wx.TextCtrl(parent, value=marker.name)
+        self.tc_pv    = tc_pv    = wx.TextCtrl(parent, value=marker.adj.name) #AdjustableComboBox(parent)
+        self.tc_value = tc_value = wx.TextCtrl(parent, value=str(marker.value))
+
+#        tc_name.SetHint("Name / Description")
+#        tc_pv.SetHint("PV Name")
+#        tc_value.SetHint("Value")
+
+        tc_name.Disable()
+        tc_pv.Disable()
+        tc_value.Disable()
+
+        self.btn_go = btn_go = wx.Button(parent, label="Go!", size=(100, -1))
+        btn_go.Bind(wx.EVT_BUTTON, self.on_go)
+
+        self.Add(tc_name,  1)
+        self.Add(tc_pv,    1)
+        self.Add(tc_value, 1)
+        self.Add(btn_go,   0, wx.LEFT|wx.EXPAND, 10)
+
+
+    def on_go(self, _event):
+        self.marker.goto()
+
+
+
 class AdjustableComboBox(wx.ComboBox):
 
     def __init__(self, parent):