diff --git a/slic/gui/daqpanels/scan.py b/slic/gui/daqpanels/scan.py index ac01c22b2..5d3b178c6 100644 --- a/slic/gui/daqpanels/scan.py +++ b/slic/gui/daqpanels/scan.py @@ -1,6 +1,6 @@ import wx -from slic.utils import nice_arange, printed_exception +from slic.utils import printed_exception from slic.utils.reprate import get_pvname_reprate from ..widgets import STRETCH, TwoButtons, StepsRangeEntry, LabeledMathEntry, LabeledFilenameEntry, make_filled_vbox, post_event @@ -67,7 +67,7 @@ class ScanPanel(wx.Panel): post_event(wx.EVT_BUTTON, self.btn_go.btn2) return - start_pos, end_pos, step_size = self.adj_range.get_values() + steps = self.adj_range.get_values() filename = self.le_fname.GetValue() @@ -84,7 +84,7 @@ class ScanPanel(wx.Panel): relative = self.cb_relative.GetValue() return_to_initial_values = self.cb_return.GetValue() - self.scan = self.scanner.scan1D(adjustable, start_pos, end_pos, step_size, n_pulses, filename, relative=relative, return_to_initial_values=return_to_initial_values, n_repeat=n_repeat, start_immediately=False) + self.scan = self.scanner.scan1D_seq(adjustable, steps, n_pulses, filename, relative=relative, return_to_initial_values=return_to_initial_values, n_repeat=n_repeat, start_immediately=False) def wait(): with printed_exception: diff --git a/slic/gui/daqpanels/scan2d.py b/slic/gui/daqpanels/scan2d.py index 1bd3b74a2..45eab332a 100644 --- a/slic/gui/daqpanels/scan2d.py +++ b/slic/gui/daqpanels/scan2d.py @@ -1,6 +1,6 @@ import wx -from slic.utils import nice_arange, printed_exception +from slic.utils import printed_exception from slic.utils.reprate import get_pvname_reprate from ..widgets import EXPANDING, MINIMIZED, STRETCH, TwoButtons, StepsRangeEntry, LabeledMathEntry, LabeledFilenameEntry, make_filled_vbox, post_event @@ -59,8 +59,8 @@ class Scan2DPanel(wx.Panel): post_event(wx.EVT_BUTTON, self.btn_go.btn2) return - start_pos1, end_pos1, step_size1 = self.adjbox1.adj_range.get_values() - start_pos2, end_pos2, step_size2 = self.adjbox2.adj_range.get_values() + steps1 = self.adjbox1.adj_range.get_values() + steps2 = self.adjbox2.adj_range.get_values() filename = self.le_fname.GetValue() @@ -78,11 +78,11 @@ class Scan2DPanel(wx.Panel): relative2 = self.adjbox2.cb_relative.GetValue() return_to_initial_values = self.cb_return.GetValue() - self.scan = self.scanner.scan2D( - adjustable1, start_pos1, end_pos1, step_size1, - adjustable2, start_pos2, end_pos2, step_size2, - n_pulses, filename, - relative1=relative1, relative2=relative2, + self.scan = self.scanner.scan2D_seq( + adjustable1, steps1, + adjustable2, steps2, + n_pulses, filename, + relative1=relative1, relative2=relative2, return_to_initial_values=return_to_initial_values, n_repeat=n_repeat, start_immediately=False ) diff --git a/slic/gui/widgets/entries.py b/slic/gui/widgets/entries.py index ad5f10846..d5d69cd4f 100644 --- a/slic/gui/widgets/entries.py +++ b/slic/gui/widgets/entries.py @@ -26,6 +26,8 @@ class StepsRangeEntry(wx.BoxSizer): def __init__(self, parent): super().__init__(wx.HORIZONTAL) + self.steps = None + self.start = start = LabeledMathEntry(parent, label="Start", value=0) self.stop = stop = LabeledMathEntry(parent, label="Stop", value=10) self.step = step = LabeledMathEntry(parent, label="Step Size", value=0.1) @@ -46,7 +48,9 @@ class StepsRangeEntry(wx.BoxSizer): def on_change(self, _event): try: try: - start_pos, end_pos, step_size = self.get_values() + start_pos = self.start.GetValue() + end_pos = self.stop.GetValue() + step_size = self.step.GetValue() except: raise ValueError else: @@ -58,7 +62,7 @@ class StepsRangeEntry(wx.BoxSizer): nsteps = "" tooltip = "Start, Stop and Step Size need to be floats.\nStep Size cannot be zero." else: - steps = nice_arange(start_pos, end_pos, step_size) + self.steps = steps = nice_arange(start_pos, end_pos, step_size) nsteps = str(len(steps)) tooltip = str(steps) self.nsteps.SetValue(nsteps) @@ -66,10 +70,7 @@ class StepsRangeEntry(wx.BoxSizer): def get_values(self): - start_pos = self.start.GetValue() - end_pos = self.stop.GetValue() - step_size = self.step.GetValue() - return start_pos, end_pos, step_size + return self.steps