X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=3a2ec4862dc5d6ae94432e799fcdf8860b5669b8;hb=bb3030b34e44733036acdfe5b4d4ec0705146831;hp=fb84d70a8e78dc6838678038bcfedd9e88ecb0c1;hpb=7aa09b00585d5214cd91e77f1f1611e69f93d711;p=pulseview.git diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp index fb84d70..3a2ec48 100644 --- a/pv/view/logicsignal.cpp +++ b/pv/view/logicsignal.cpp @@ -20,7 +20,8 @@ #include -#include +#include +#include #include #include @@ -28,13 +29,18 @@ #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 { @@ -58,9 +64,9 @@ const QColor LogicSignal::SignalColours[10] = { QColor(0xEE, 0xEE, 0xEC), // White }; -LogicSignal::LogicSignal(pv::SigSession &session, sr_probe *const probe, - shared_ptr data) : - Signal(session, probe), +LogicSignal::LogicSignal(shared_ptr dev_inst, + const sr_channel *const probe, shared_ptr data) : + Signal(dev_inst, probe), _data(data), _trigger_none(NULL), _trigger_rising(NULL), @@ -69,14 +75,38 @@ LogicSignal::LogicSignal(pv::SigSession &session, sr_probe *const probe, _trigger_low(NULL), _trigger_change(NULL) { + struct sr_trigger *trigger; + struct sr_trigger_stage *stage; + struct sr_trigger_match *match; + const GSList *l, *m; + _colour = SignalColours[probe->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 == _probe) + _trigger_match = match->match; + } + } + } } LogicSignal::~LogicSignal() { } -boost::shared_ptr LogicSignal::logic_data() const +shared_ptr LogicSignal::data() const +{ + return _data; +} + +shared_ptr LogicSignal::logic_data() const { return _data; } @@ -121,7 +151,7 @@ void LogicSignal::paint_mid(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) @@ -145,9 +175,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); @@ -158,7 +186,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); @@ -178,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 - @@ -196,145 +223,118 @@ 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(int match) { - 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 (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::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() +int 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'); + 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::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; + GVariant *gvar; + gsize num_opts; + const int32_t *trig_matches; + unsigned int i; + bool is_checked; - const sr_dev_inst *const sdi = _session.get_device(); - const int probe_count = g_slist_length(sdi->probes); - assert(probe_count > 0); + Signal::populate_popup_form(parent, form); - assert(_probe && _probe->index < probe_count); + if (!(gvar = _dev_inst->list_config(NULL, SR_CONF_TRIGGER_MATCH))) + return; - for (int i = 0; i < probe_count; i++) { - sr_dev_trigger_set(sdi, i, (i == _probe->index) ? - trigger_string : NULL); + _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); - update_trigger_actions(); } -void LogicSignal::on_trigger_none() +void LogicSignal::on_trigger() { - set_trigger('\0'); -} + QAction *action; -void LogicSignal::on_trigger_rising() -{ - set_trigger('r'); -} + match_action(_trigger_match)->setChecked(FALSE); -void LogicSignal::on_trigger_high() -{ - set_trigger('1'); -} - -void LogicSignal::on_trigger_falling() -{ - set_trigger('f'); -} + action = (QAction *)sender(); + action->setChecked(TRUE); + _trigger_match = action_match(action); -void LogicSignal::on_trigger_low() -{ - set_trigger('0'); -} - -void LogicSignal::on_trigger_change() -{ - set_trigger('c'); } } // namespace view