X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=0b4426475d6e52a36e7f87f96a58933e144a903c;hp=b684210b26667e3fcf7ee30e3447867d1708bb68;hb=4871ed92f2d9e6e514223383ba16e6ad78c81161;hpb=4145b248aed3dde5ccc02c9b7e389b5cb67c547d diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp index b684210b..0b442647 100644 --- a/pv/view/logicsignal.cpp +++ b/pv/view/logicsignal.cpp @@ -22,13 +22,24 @@ #include +#include +#include + #include "logicsignal.h" #include "view.h" -#include "pv/data/logic.h" -#include "pv/data/logicsnapshot.h" -using namespace boost; -using namespace std; +#include +#include +#include +#include +#include + +using boost::shared_ptr; +using std::deque; +using std::max; +using std::min; +using std::pair; +using std::vector; namespace pv { namespace view { @@ -52,57 +63,41 @@ const QColor LogicSignal::SignalColours[10] = { QColor(0xEE, 0xEE, 0xEC), // White }; -LogicSignal::LogicSignal(const sr_probe *const probe, - shared_ptr data) : - Signal(probe), +LogicSignal::LogicSignal(shared_ptr dev_inst, + const sr_channel *const probe, shared_ptr data) : + Signal(dev_inst, probe), _data(data), - _separator(this), - _icon_trigger_none(":/icons/trigger-none.svg"), - _trigger_none(_icon_trigger_none, tr("No trigger"), this), - _icon_trigger_rising(":/icons/trigger-rising.svg"), - _trigger_rising(_icon_trigger_rising, - tr("Trigger on rising edge"), this), - _icon_trigger_high(":/icons/trigger-high.svg"), - _trigger_high(_icon_trigger_high, - tr("Trigger on high level"), this), - _icon_trigger_falling(":/icons/trigger-falling.svg"), - _trigger_falling(_icon_trigger_falling, - tr("Trigger on falling edge"), this), - _icon_trigger_low(":/icons/trigger-low.svg"), - _trigger_low(_icon_trigger_low, - tr("Trigger on low level"), this), - _icon_trigger_change(":/icons/trigger-change.svg"), - _trigger_change(_icon_trigger_change, - tr("Trigger on rising or falling edge"), this) + _trigger_none(NULL), + _trigger_rising(NULL), + _trigger_high(NULL), + _trigger_falling(NULL), + _trigger_low(NULL), + _trigger_change(NULL) { _colour = SignalColours[probe->index % countof(SignalColours)]; - - _separator.setSeparator(true); } LogicSignal::~LogicSignal() { } -const list LogicSignal::get_context_bar_actions() +shared_ptr LogicSignal::data() const { - list actions; - actions.push_back(&_name_action); - - actions.push_back(&_separator); + return _data; +} - actions.push_back(&_trigger_none); - actions.push_back(&_trigger_rising); - actions.push_back(&_trigger_high); - actions.push_back(&_trigger_falling); - actions.push_back(&_trigger_low); - actions.push_back(&_trigger_change); +shared_ptr LogicSignal::logic_data() const +{ + return _data; +} - return actions; +void LogicSignal::paint_back(QPainter &p, int left, int right) +{ + if (_probe->enabled) + paint_axis(p, get_y(), left, right); } -void LogicSignal::paint(QPainter &p, int y, int left, int right, - double scale, double offset) +void LogicSignal::paint_mid(QPainter &p, int left, int right) { using pv::view::View; @@ -111,15 +106,20 @@ void LogicSignal::paint(QPainter &p, int y, int left, int right, vector< pair > edges; assert(_probe); - assert(scale > 0); 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) return; - paint_axis(p, y, left, right); - const float high_offset = y - View::SignalHeight + 0.5f; const float low_offset = y + 0.5f; @@ -131,7 +131,7 @@ void LogicSignal::paint(QPainter &p, int y, 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) @@ -168,7 +168,7 @@ void LogicSignal::paint(QPainter &p, int y, 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); @@ -201,5 +201,153 @@ void LogicSignal::paint_caps(QPainter &p, QLineF *const lines, p.drawLines(lines, line - lines); } +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())); + + _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())); + + _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())); + + _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())); + + _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())); + + _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())); +} + +void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form) +{ + GVariant *gvar; + + Signal::populate_popup_form(parent, form); + + // Add the trigger actions + assert(_dev_inst); + if ((gvar = _dev_inst->list_config(NULL, SR_CONF_TRIGGER_TYPE))) + { + 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); + } +} + +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; + } +} + +void LogicSignal::update_trigger_actions() +{ + 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'); +} + +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; + + assert(_dev_inst); + const sr_dev_inst *const sdi = _dev_inst->dev_inst(); + assert(sdi); + + const int probe_count = g_slist_length(sdi->channels); + assert(probe_count > 0); + + assert(_probe && _probe->index < probe_count); + + for (int i = 0; i < probe_count; i++) { + sr_dev_trigger_set(sdi, i, (i == _probe->index) ? + trigger_string : NULL); + } + + update_trigger_actions(); +} + +void LogicSignal::on_trigger_none() +{ + set_trigger('\0'); +} + +void LogicSignal::on_trigger_rising() +{ + set_trigger('r'); +} + +void LogicSignal::on_trigger_high() +{ + set_trigger('1'); +} + +void LogicSignal::on_trigger_falling() +{ + set_trigger('f'); +} + +void LogicSignal::on_trigger_low() +{ + set_trigger('0'); +} + +void LogicSignal::on_trigger_change() +{ + set_trigger('c'); +} + } // namespace view } // namespace pv