X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=19522fb27f0187d05fd3b27dfd5c705045445162;hb=0c0218fd70bde15f2ccd20f39f6d3ddddd3e1691;hp=813bb29eedd94b5af04b3a73a297e3ef2e41f8d8;hpb=0a78bcaf5e2e7c8da02868716609b3410f5a1ab9;p=pulseview.git diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp index 813bb29e..19522fb2 100644 --- a/pv/view/logicsignal.cpp +++ b/pv/view/logicsignal.cpp @@ -28,6 +28,7 @@ #include "pv/sigsession.h" #include "pv/data/logic.h" #include "pv/data/logicsnapshot.h" +#include "pv/view/view.h" using namespace boost; using namespace std; @@ -58,40 +59,76 @@ LogicSignal::LogicSignal(pv::SigSession &session, const sr_probe *const probe, shared_ptr data) : Signal(session, 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) + _separator(NULL), + _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() { } +void LogicSignal::init_context_bar_actions(QWidget *parent) +{ + 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())); +} + +boost::shared_ptr LogicSignal::data() const +{ + return _data; +} + const list LogicSignal::get_context_bar_actions() { GVariant *gvar; list actions; - actions.push_back(&_name_action); + actions.push_back(_name_action); // Add the trigger actions const sr_dev_inst *const sdi = _session.get_device(); @@ -101,20 +138,22 @@ const list LogicSignal::get_context_bar_actions() g_variant_get_string(gvar, NULL); if (trig_types && trig_types[0] != '\0') { - actions.push_back(&_separator); + actions.push_back(_separator); - actions.push_back(&_trigger_none); + actions.push_back(_trigger_none); add_trigger_action(trig_types, 'r', - &_trigger_rising, actions); + _trigger_rising, actions); add_trigger_action(trig_types, '1', - &_trigger_high, actions); + _trigger_high, actions); add_trigger_action(trig_types, 'f', - &_trigger_falling, actions); + _trigger_falling, actions); add_trigger_action(trig_types, '0', - &_trigger_low, actions); + _trigger_low, actions); add_trigger_action(trig_types, 'c', - &_trigger_change, actions); + _trigger_change, actions); + + update_trigger_actions(); } g_variant_unref(gvar); @@ -123,8 +162,13 @@ const list LogicSignal::get_context_bar_actions() return actions; } -void LogicSignal::paint(QPainter &p, int y, int left, int right, - double scale, double offset) +void LogicSignal::paint_back(QPainter &p, int left, int right) +{ + if (_probe->enabled) + paint_axis(p, get_y(), left, right); +} + +void LogicSignal::paint_mid(QPainter &p, int left, int right) { using pv::view::View; @@ -133,15 +177,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; @@ -233,5 +282,67 @@ void LogicSignal::add_trigger_action(const char *trig_types, char type, } } +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; + + const sr_dev_inst *const sdi = _session.get_device(); + const int probe_count = g_slist_length(sdi->probes); + 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