X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=27635f902f1fe80e47595e95a829fd3ad49957b7;hp=3624ccf0f26b2df1dce6624c95a78d974d69b5bd;hb=6ac6242b25cfbd4df14abe7580adc9d0f4cffe43;hpb=01fd32630269c1cfb99eb2b0d6060d7d19a42475 diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp index 3624ccf0..27635f90 100644 --- a/pv/view/logicsignal.cpp +++ b/pv/view/logicsignal.cpp @@ -20,18 +20,27 @@ #include -#include +#include +#include + +#include +#include #include "logicsignal.h" #include "view.h" -#include "pv/sigsession.h" -#include "pv/data/logic.h" -#include "pv/data/logicsnapshot.h" -#include "pv/view/view.h" +#include +#include +#include +#include +#include -using namespace boost; -using namespace std; +using std::deque; +using std::max; +using std::min; +using std::pair; +using std::shared_ptr; +using std::vector; namespace pv { namespace view { @@ -55,11 +64,10 @@ const QColor LogicSignal::SignalColours[10] = { QColor(0xEE, 0xEE, 0xEC), // White }; -LogicSignal::LogicSignal(pv::SigSession &session, const sr_probe *const probe, - shared_ptr data) : - Signal(session, probe), +LogicSignal::LogicSignal(shared_ptr dev_inst, + const sr_channel *const channel, shared_ptr data) : + Signal(dev_inst, channel), _data(data), - _separator(NULL), _trigger_none(NULL), _trigger_rising(NULL), _trigger_high(NULL), @@ -67,97 +75,49 @@ LogicSignal::LogicSignal(pv::SigSession &session, const sr_probe *const probe, _trigger_low(NULL), _trigger_change(NULL) { - _colour = SignalColours[probe->index % countof(SignalColours)]; + struct sr_trigger *trigger; + struct sr_trigger_stage *stage; + struct sr_trigger_match *match; + const GSList *l, *m; + + _colour = SignalColours[channel->index % countof(SignalColours)]; + + /* Populate this channel's trigger setting with whatever we + * find in the current session trigger, if anything. */ + _trigger_match = 0; + if ((trigger = sr_session_trigger_get(SigSession::_sr_session))) { + for (l = trigger->stages; l && !_trigger_match; l = l->next) { + stage = (struct sr_trigger_stage *)l->data; + for (m = stage->matches; m && !_trigger_match; m = m->next) { + match = (struct sr_trigger_match *)m->data; + if (match->channel == _channel) + _trigger_match = match->match; + } + } + } } LogicSignal::~LogicSignal() { } -void LogicSignal::init_context_bar_actions(QWidget *parent) +shared_ptr LogicSignal::data() const { - Signal::init_context_bar_actions(parent); - - _separator = new QAction(parent); - _separator->setSeparator(true); - - _trigger_none = new QAction(QIcon(":/icons/trigger-none.svg"), - tr("No trigger"), this); - _trigger_none->setCheckable(true); - connect(_trigger_none, SIGNAL(triggered()), - this, SLOT(on_trigger_none())); - - _trigger_rising = new QAction(QIcon(":/icons/trigger-rising.svg"), - tr("Trigger on rising edge"), this); - _trigger_rising->setCheckable(true); - connect(_trigger_rising, SIGNAL(triggered()), - this, SLOT(on_trigger_rising())); - - _trigger_high = new QAction(QIcon(":/icons/trigger-low.svg"), - tr("Trigger on high level"), this); - _trigger_high->setCheckable(true); - connect(_trigger_high, SIGNAL(triggered()), - this, SLOT(on_trigger_high())); - - _trigger_falling = new QAction(QIcon(":/icons/trigger-falling.svg"), - tr("Trigger on falling edge"), this); - _trigger_falling->setCheckable(true); - connect(_trigger_falling, SIGNAL(triggered()), - this, SLOT(on_trigger_falling())); - - _trigger_low = new QAction(QIcon(":/icons/trigger-low.svg"), - tr("Trigger on low level"), this); - _trigger_low->setCheckable(true); - connect(_trigger_low, SIGNAL(triggered()), - this, SLOT(on_trigger_low())); - - _trigger_change = new QAction(QIcon(":/icons/trigger-change.svg"), - tr("Trigger on rising or falling edge"), this); - _trigger_change->setCheckable(true); - connect(_trigger_change, SIGNAL(triggered()), - this, SLOT(on_trigger_change())); + return _data; } -const list LogicSignal::get_context_bar_actions() +shared_ptr LogicSignal::logic_data() const { - GVariant *gvar; - list actions; - - actions.push_back(_name_action); - - // Add the trigger actions - const sr_dev_inst *const sdi = _session.get_device(); - if (sr_config_list(sdi->driver, SR_CONF_TRIGGER_TYPE, - &gvar, sdi) == SR_OK) { - const char *const trig_types = - g_variant_get_string(gvar, NULL); - - if (trig_types && trig_types[0] != '\0') { - actions.push_back(_separator); - - actions.push_back(_trigger_none); - - add_trigger_action(trig_types, 'r', - _trigger_rising, actions); - add_trigger_action(trig_types, '1', - _trigger_high, actions); - add_trigger_action(trig_types, 'f', - _trigger_falling, actions); - add_trigger_action(trig_types, '0', - _trigger_low, actions); - add_trigger_action(trig_types, 'c', - _trigger_change, actions); - - update_trigger_actions(); - } - - g_variant_unref(gvar); - } + return _data; +} - return actions; +void LogicSignal::paint_back(QPainter &p, int left, int right) +{ + if (_channel->enabled) + paint_axis(p, get_y(), left, right); } -void LogicSignal::paint(QPainter &p, int left, int right) +void LogicSignal::paint_mid(QPainter &p, int left, int right) { using pv::view::View; @@ -165,7 +125,7 @@ void LogicSignal::paint(QPainter &p, int left, int right) vector< pair > edges; - assert(_probe); + assert(_channel); assert(_data); assert(right >= left); @@ -177,11 +137,9 @@ void LogicSignal::paint(QPainter &p, int left, int right) const double offset = _view->offset(); - if (!_probe->enabled) + if (!_channel->enabled) return; - paint_axis(p, y, left, right); - const float high_offset = y - View::SignalHeight + 0.5f; const float low_offset = y + 0.5f; @@ -193,7 +151,7 @@ void LogicSignal::paint(QPainter &p, int left, int right) const shared_ptr &snapshot = snapshots.front(); - double samplerate = _data->get_samplerate(); + double samplerate = _data->samplerate(); // Show sample rate as 1Hz when it is unknown if (samplerate == 0.0) @@ -209,7 +167,7 @@ void LogicSignal::paint(QPainter &p, int left, int right) snapshot->get_subsampled_edges(edges, min(max((int64_t)floor(start), (int64_t)0), last_sample), min(max((int64_t)ceil(end), (int64_t)0), last_sample), - samples_per_pixel / Oversampling, _probe->index); + samples_per_pixel / Oversampling, _channel->index); assert(edges.size() >= 2); // Paint the edges @@ -217,9 +175,7 @@ void LogicSignal::paint(QPainter &p, int left, int right) QLineF *const edge_lines = new QLineF[edge_count]; line = edge_lines; - for (vector::const_iterator i = - edges.begin() + 1; - i != edges.end() - 1; i++) { + for (auto i = edges.cbegin() + 1; i != edges.cend() - 1; i++) { const float x = ((*i).first / samples_per_pixel - pixels_offset) + left; *line++ = QLineF(x, high_offset, x, low_offset); @@ -230,7 +186,7 @@ void LogicSignal::paint(QPainter &p, int left, int right) delete[] edge_lines; // Paint the caps - const unsigned int max_cap_line_count = (edges.size() - 1); + const unsigned int max_cap_line_count = edges.size(); QLineF *const cap_lines = new QLineF[max_cap_line_count]; p.setPen(HighColour); @@ -250,8 +206,7 @@ void LogicSignal::paint_caps(QPainter &p, QLineF *const lines, { QLineF *line = lines; - for (vector::const_iterator i = - edges.begin(); i != (edges.end() - 1); i++) + for (auto i = edges.begin(); i != (edges.end() - 1); i++) if ((*i).second == level) { *line++ = QLineF( ((*i).first / samples_per_pixel - @@ -263,76 +218,123 @@ void LogicSignal::paint_caps(QPainter &p, QLineF *const lines, p.drawLines(lines, line - lines); } -void LogicSignal::add_trigger_action(const char *trig_types, char type, - QAction *action, list &actions) -{ - while(*trig_types) - if(*trig_types++ == type) { - actions.push_back(action); - break; - } -} - -void LogicSignal::update_trigger_actions() +void LogicSignal::init_trigger_actions(QWidget *parent) { - const char cur_trigger = _probe->trigger ? - _probe->trigger[0] : '\0'; - _trigger_none->setChecked(cur_trigger == '\0'); - _trigger_rising->setChecked(cur_trigger == 'r'); - _trigger_high->setChecked(cur_trigger == '1'); - _trigger_falling->setChecked(cur_trigger == 'f'); - _trigger_low->setChecked(cur_trigger == '0'); - _trigger_change->setChecked(cur_trigger == 'c'); -} + _trigger_none = new QAction(QIcon(":/icons/trigger-none.svg"), + tr("No trigger"), parent); + _trigger_none->setCheckable(true); + connect(_trigger_none, SIGNAL(triggered()), this, SLOT(on_trigger())); -void LogicSignal::set_trigger(char type) -{ - const char trigger_type_string[2] = {type, 0}; - const char *const trigger_string = - (type != 0) ? trigger_type_string : NULL; + _trigger_rising = new QAction(QIcon(":/icons/trigger-rising.svg"), + tr("Trigger on rising edge"), parent); + _trigger_rising->setCheckable(true); + connect(_trigger_rising, SIGNAL(triggered()), this, SLOT(on_trigger())); - const sr_dev_inst *const sdi = _session.get_device(); - const int probe_count = g_slist_length(sdi->probes); - assert(probe_count > 0); + _trigger_high = new QAction(QIcon(":/icons/trigger-high.svg"), + tr("Trigger on high level"), parent); + _trigger_high->setCheckable(true); + connect(_trigger_high, SIGNAL(triggered()), this, SLOT(on_trigger())); - assert(_probe && _probe->index < probe_count); + _trigger_falling = new QAction(QIcon(":/icons/trigger-falling.svg"), + tr("Trigger on falling edge"), parent); + _trigger_falling->setCheckable(true); + connect(_trigger_falling, SIGNAL(triggered()), this, SLOT(on_trigger())); - for (int i = 0; i < probe_count; i++) { - sr_dev_trigger_set(sdi, i, (i == _probe->index) ? - trigger_string : NULL); - } + _trigger_low = new QAction(QIcon(":/icons/trigger-low.svg"), + tr("Trigger on low level"), parent); + _trigger_low->setCheckable(true); + connect(_trigger_low, SIGNAL(triggered()), this, SLOT(on_trigger())); - update_trigger_actions(); + _trigger_change = new QAction(QIcon(":/icons/trigger-change.svg"), + tr("Trigger on rising or falling edge"), parent); + _trigger_change->setCheckable(true); + connect(_trigger_change, SIGNAL(triggered()), this, SLOT(on_trigger())); } -void LogicSignal::on_trigger_none() +QAction* LogicSignal::match_action(int match) { - set_trigger('\0'); -} + QAction *action; + + action = _trigger_none; + switch (match) { + case SR_TRIGGER_ZERO: + action = _trigger_low; + break; + case SR_TRIGGER_ONE: + action = _trigger_high; + break; + case SR_TRIGGER_RISING: + action = _trigger_rising; + break; + case SR_TRIGGER_FALLING: + action = _trigger_falling; + break; + case SR_TRIGGER_EDGE: + action = _trigger_change; + break; + } -void LogicSignal::on_trigger_rising() -{ - set_trigger('r'); + return action; } -void LogicSignal::on_trigger_high() +int LogicSignal::action_match(QAction *action) { - set_trigger('1'); + int match; + + if (action == _trigger_low) + match = SR_TRIGGER_ZERO; + else if (action == _trigger_high) + match = SR_TRIGGER_ONE; + else if (action == _trigger_rising) + match = SR_TRIGGER_RISING; + else if (action == _trigger_falling) + match = SR_TRIGGER_FALLING; + else if (action == _trigger_change) + match = SR_TRIGGER_EDGE; + else + match = 0; + + return match; } -void LogicSignal::on_trigger_falling() +void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form) { - set_trigger('f'); -} + GVariant *gvar; + gsize num_opts; + const int32_t *trig_matches; + unsigned int i; + bool is_checked; + + Signal::populate_popup_form(parent, form); + + if (!(gvar = _dev_inst->list_config(NULL, SR_CONF_TRIGGER_MATCH))) + return; + + _trigger_bar = new QToolBar(parent); + init_trigger_actions(_trigger_bar); + _trigger_bar->addAction(_trigger_none); + trig_matches = (const int32_t *)g_variant_get_fixed_array(gvar, + &num_opts, sizeof(int32_t)); + for (i = 0; i < num_opts; i++) { + _trigger_bar->addAction(match_action(trig_matches[i])); + is_checked = _trigger_match == trig_matches[i]; + match_action(trig_matches[i])->setChecked(is_checked); + } + form->addRow(tr("Trigger"), _trigger_bar); + g_variant_unref(gvar); -void LogicSignal::on_trigger_low() -{ - set_trigger('0'); } -void LogicSignal::on_trigger_change() +void LogicSignal::on_trigger() { - set_trigger('c'); + QAction *action; + + match_action(_trigger_match)->setChecked(FALSE); + + action = (QAction *)sender(); + action->setChecked(TRUE); + _trigger_match = action_match(action); + } } // namespace view