void SigSession::set_capture_state(capture_state state)
{
lock_guard<mutex> lock(_sampling_mutex);
+ const bool changed = _capture_state != state;
_capture_state = state;
- capture_state_changed(state);
+ if(changed)
+ capture_state_changed(state);
}
/**
const sr_probe *const probe =
(const sr_probe *)l->data;
assert(probe);
- if (!probe->enabled)
- continue;
switch(probe->type) {
case SR_PROBE_LOGIC:
signal = shared_ptr<view::Signal>(
- new view::LogicSignal(
- probe->name,
- _logic_data,
- probe->index));
+ new view::LogicSignal(*this, probe,
+ _logic_data));
break;
case SR_PROBE_ANALOG:
signal = shared_ptr<view::Signal>(
- new view::AnalogSignal(
- probe->name,
- _analog_data,
- probe->index));
+ new view::AnalogSignal(*this, probe,
+ _analog_data));
break;
}
signals_changed();
}
+bool SigSession::is_trigger_enabled() const
+{
+ assert(_sdi);
+ for (const GSList *l = _sdi->probes; l; l = l->next) {
+ const sr_probe *const p = (const sr_probe *)l->data;
+ assert(p);
+ if (p->trigger && p->trigger[0] != '\0')
+ return true;
+ }
+
+ return false;
+}
+
void SigSession::load_thread_proc(const string name,
function<void (const QString)> error_handler)
{
return;
}
- set_capture_state(Running);
+ set_capture_state(is_trigger_enabled() ? AwaitingTrigger : Running);
sr_session_run();
sr_session_destroy();
if (!_cur_logic_snapshot)
{
+ set_capture_state(Running);
+
// Create a new data snapshot
_cur_logic_snapshot = shared_ptr<data::LogicSnapshot>(
new data::LogicSnapshot(logic));
if (!_cur_analog_snapshot)
{
+ set_capture_state(Running);
+
// Create a new data snapshot
_cur_analog_snapshot = shared_ptr<data::AnalogSnapshot>(
new data::AnalogSnapshot(analog));