X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=6fda499b47d1ac551431f41c48c67e983bf754c0;hp=ae4f11e29eca7195b0bd720c599a262fbfcc5784;hb=1f4caa772cd691da7578816bf3744496c9cde1cf;hpb=9d28da5ae394e572dedf0ec22c17fd259825e1c9 diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp index ae4f11e2..6fda499b 100644 --- a/pv/view/logicsignal.cpp +++ b/pv/view/logicsignal.cpp @@ -20,7 +20,8 @@ #include -#include +#include +#include #include #include @@ -28,13 +29,26 @@ #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 -using namespace boost; -using namespace std; +#include + +using std::deque; +using std::max; +using std::min; +using std::pair; +using std::shared_ptr; +using std::vector; + +using sigrok::Channel; +using sigrok::ConfigKey; +using sigrok::Device; +using sigrok::Error; +using sigrok::Trigger; +using sigrok::TriggerMatchType; namespace pv { namespace view { @@ -58,9 +72,13 @@ const QColor LogicSignal::SignalColours[10] = { QColor(0xEE, 0xEE, 0xEC), // White }; -LogicSignal::LogicSignal(pv::SigSession &session, sr_probe *const probe, +LogicSignal::LogicSignal( + pv::SigSession &session, + shared_ptr device, + shared_ptr channel, shared_ptr data) : - Signal(session, probe), + Signal(session, channel), + _device(device), _data(data), _trigger_none(NULL), _trigger_rising(NULL), @@ -69,26 +87,37 @@ LogicSignal::LogicSignal(pv::SigSession &session, sr_probe *const probe, _trigger_low(NULL), _trigger_change(NULL) { - _colour = SignalColours[probe->index % countof(SignalColours)]; + shared_ptr trigger; + + _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 = nullptr; + if ((trigger = _session.session()->trigger())) + for (auto stage : trigger->stages()) + for (auto match : stage->matches()) + if (match->channel() == _channel) + _trigger_match = match->type(); } LogicSignal::~LogicSignal() { } -boost::shared_ptr LogicSignal::data() const +shared_ptr LogicSignal::data() const { return _data; } -boost::shared_ptr LogicSignal::logic_data() const +shared_ptr LogicSignal::logic_data() const { return _data; } void LogicSignal::paint_back(QPainter &p, int left, int right) { - if (_probe->enabled) + if (_channel->enabled()) paint_axis(p, get_y(), left, right); } @@ -100,19 +129,19 @@ void LogicSignal::paint_mid(QPainter &p, int left, int right) vector< pair > edges; - assert(_probe); + assert(_channel); assert(_data); assert(right >= left); assert(_view); const int y = _v_offset - _view->v_offset(); - + const double scale = _view->scale(); assert(scale > 0); - + const double offset = _view->offset(); - if (!_probe->enabled) + if (!_channel->enabled()) return; const float high_offset = y - View::SignalHeight + 0.5f; @@ -142,7 +171,7 @@ void LogicSignal::paint_mid(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 @@ -150,9 +179,7 @@ void LogicSignal::paint_mid(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); @@ -163,7 +190,7 @@ void LogicSignal::paint_mid(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); @@ -183,8 +210,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 - @@ -201,145 +227,116 @@ void LogicSignal::init_trigger_actions(QWidget *parent) _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_none())); + connect(_trigger_none, SIGNAL(triggered()), this, SLOT(on_trigger())); _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_rising())); + connect(_trigger_rising, SIGNAL(triggered()), this, SLOT(on_trigger())); _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_high())); + connect(_trigger_high, SIGNAL(triggered()), this, SLOT(on_trigger())); _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_falling())); + connect(_trigger_falling, SIGNAL(triggered()), this, SLOT(on_trigger())); _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_low())); + connect(_trigger_low, SIGNAL(triggered()), this, SLOT(on_trigger())); _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_change())); + connect(_trigger_change, SIGNAL(triggered()), this, SLOT(on_trigger())); } -void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form) +QAction* LogicSignal::match_action(const TriggerMatchType *type) { - GVariant *gvar; - - Signal::populate_popup_form(parent, form); - - // Add the trigger actions - const sr_dev_inst *const sdi = _session.get_device(); - if (sr_config_list(sdi->driver, sdi, NULL, SR_CONF_TRIGGER_TYPE, - &gvar) == SR_OK) - { - const char *const trig_types = - g_variant_get_string(gvar, NULL); - - if (trig_types && trig_types[0] != '\0') - { - _trigger_bar = new QToolBar(parent); - - init_trigger_actions(_trigger_bar); - _trigger_bar->addAction(_trigger_none); - add_trigger_action(trig_types, 'r', _trigger_rising); - add_trigger_action(trig_types, '1', _trigger_high); - add_trigger_action(trig_types, 'f', _trigger_falling); - add_trigger_action(trig_types, '0', _trigger_low); - add_trigger_action(trig_types, 'c', _trigger_change); - - update_trigger_actions(); - - form->addRow(tr("Trigger"), _trigger_bar); - } - - g_variant_unref(gvar); + QAction *action; + + action = _trigger_none; + switch (type->id()) { + 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; + default: + assert(0); } -} -void LogicSignal::add_trigger_action(const char *trig_types, char type, - QAction *action) -{ - while(*trig_types) - if(*trig_types++ == type) { - _trigger_bar->addAction(action); - break; - } + return action; } -void LogicSignal::update_trigger_actions() +const TriggerMatchType *LogicSignal::action_match(QAction *action) { - 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'); + if (action == _trigger_low) + return TriggerMatchType::ZERO; + else if (action == _trigger_high) + return TriggerMatchType::ONE; + else if (action == _trigger_rising) + return TriggerMatchType::RISING; + else if (action == _trigger_falling) + return TriggerMatchType::FALLING; + else if (action == _trigger_change) + return TriggerMatchType::EDGE; + else + return nullptr; } -void LogicSignal::set_trigger(char type) +void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form) { - const char trigger_type_string[2] = {type, 0}; - const char *const trigger_string = - (type != 0) ? trigger_type_string : NULL; - - const sr_dev_inst *const sdi = _session.get_device(); - const int probe_count = g_slist_length(sdi->probes); - assert(probe_count > 0); + Glib::VariantContainerBase gvar; + vector trig_types; - assert(_probe && _probe->index < probe_count); + Signal::populate_popup_form(parent, form); - for (int i = 0; i < probe_count; i++) { - sr_dev_trigger_set(sdi, i, (i == _probe->index) ? - trigger_string : NULL); + try { + gvar = _device->config_list(ConfigKey::TRIGGER_MATCH); + } catch (Error e) { + return; } - update_trigger_actions(); -} - -void LogicSignal::on_trigger_none() -{ - set_trigger('\0'); -} + _trigger_bar = new QToolBar(parent); + init_trigger_actions(_trigger_bar); + _trigger_bar->addAction(_trigger_none); + trig_types = + Glib::VariantBase::cast_dynamic>>( + gvar).get(); + for (auto type_id : trig_types) { + auto type = TriggerMatchType::get(type_id); + _trigger_bar->addAction(match_action(type)); + match_action(type)->setChecked(_trigger_match == type); + } + form->addRow(tr("Trigger"), _trigger_bar); -void LogicSignal::on_trigger_rising() -{ - set_trigger('r'); } -void LogicSignal::on_trigger_high() +void LogicSignal::on_trigger() { - set_trigger('1'); -} + QAction *action; -void LogicSignal::on_trigger_falling() -{ - set_trigger('f'); -} + match_action(_trigger_match)->setChecked(false); -void LogicSignal::on_trigger_low() -{ - set_trigger('0'); -} + action = (QAction *)sender(); + action->setChecked(true); + _trigger_match = action_match(action); -void LogicSignal::on_trigger_change() -{ - set_trigger('c'); } } // namespace view