Commit b3b8f18b authored by Jameson Rollins's avatar Jameson Rollins
Browse files

Merge branch 'trigger-fixes' into 'master'

trigger fixes

See merge request cds/software/ndscope!72
parents 385c772b 20c6a563
Pipeline #437199 passed with stage
in 6 minutes and 5 seconds
......@@ -399,7 +399,6 @@ class NDScope(*load_ui('scope.ui')):
self.resetRangeButton2.setEnabled(False)
self.windowTab.setEnabled(False)
self.rangeTab.setEnabled(False)
self.triggerTab.setEnabled(False)
self.crosshairTab.setEnabled(False)
self.axisTab.setEnabled(True)
self.exportTab.setEnabled(False)
......@@ -415,7 +414,6 @@ class NDScope(*load_ui('scope.ui')):
self.resetRangeButton2.setEnabled(True)
self.windowTab.setEnabled(True)
self.rangeTab.setEnabled(True)
self.triggerTab.setEnabled(False)
self.crosshairTab.setEnabled(True)
self.axisTab.setEnabled(True)
self.exportTab.setEnabled(True)
......@@ -431,7 +429,6 @@ class NDScope(*load_ui('scope.ui')):
self.resetRangeButton2.setEnabled(True)
self.windowTab.setEnabled(True)
self.rangeTab.setEnabled(False)
self.triggerTab.setEnabled(True)
self.crosshairTab.setEnabled(False)
self.axisTab.setEnabled(False)
self.exportTab.setEnabled(False)
......@@ -1065,7 +1062,6 @@ class NDScope(*load_ui('scope.ui')):
# SLOT
def _data_online_done(self, signal):
self._disable_trigger()
if self.crosshairGroup.isChecked():
self._enable_crosshair()
self._reset_time_axis_mode()
......@@ -1130,8 +1126,12 @@ class NDScope(*load_ui('scope.ui')):
else:
self._set_t0(data.range[1])
for plot in self.plots:
plot.update(data, self.t0)
if online and self.trigger.active and not trigger:
# don't update the plot if there was no trigger
pass
else:
for plot in self.plots:
plot.update(data, self.t0)
if trigger and self.trigger.single:
self.stop()
......@@ -1464,8 +1464,8 @@ class NDScope(*load_ui('scope.ui')):
def _disable_trigger(self):
"""disable trigger, base method"""
self.set_trigger_channel(None)
span = self.get_span()
self.set_window(-span, 0)
# span = self.get_span()
# self.set_window(-span, 0)
logger.info("trigger disabled")
def disable_trigger(self):
......
......@@ -946,7 +946,7 @@
</sizepolicy>
</property>
<property name="toolTip">
<string>enable trigger</string>
<string>enable trigger for online mode</string>
</property>
<property name="autoFillBackground">
<bool>false</bool>
......
......@@ -18,8 +18,8 @@ class Trigger:
movable=True,
label='trigger level',
labelOpts={
'position': 0.5,
'anchors': [(1, 0), (1, 1)],
'position': 0,
'anchors': [(0, 0), (0, 1)],
'fill': LABEL_FILL,
},
)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment