diff options
author | syr1us <paul.wachendorf@web.de> | 2015-12-30 16:02:45 +0300 |
---|---|---|
committer | syr1us <paul.wachendorf@web.de> | 2015-12-30 16:02:45 +0300 |
commit | 6dbdc361ba4e63ae3430e70e56502e1150b40ac1 (patch) | |
tree | 37a8638463b3286667424589951d7de062c3beef | |
parent | 367501629789ade29bc64f2d02d117f3124d6446 (diff) |
callback should work with any TrigMode...
-rw-r--r-- | src/events.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/events.py b/src/events.py index 72af453..e6dc5b1 100644 --- a/src/events.py +++ b/src/events.py @@ -373,13 +373,12 @@ class EventMapper(object): trigval = sci.ltrig if pos == Pos.LEFT else sci.rtrig trigval_prev = sci_p.ltrig if pos == Pos.LEFT else sci_p.rtrig mode, ev = self._trig_evts[pos] - if self._trig_modes[pos] == TrigModes.AXIS: - if trigval != trigval_prev: - if self._trig_axes_callbacks[pos]: - self._trig_axes_callbacks[pos](self, pos, trigval) - else: - syn.add(mode) - self._uip[mode].axisEvent(ev, trigval) + if trigval != trigval_prev: + if self._trig_axes_callbacks[pos]: + self._trig_axes_callbacks[pos](self, pos, trigval) + elif self._trig_modes[pos] == TrigModes.AXIS: + syn.add(mode) + self._uip[mode].axisEvent(ev, trigval) elif self._trig_modes[pos] == TrigModes.BUTTON: if self._trig_s[pos] is None and trigval > min(trigval_prev + 10, 200): self._trig_s[pos] = max(0, min(trigval - 10, 180)) |