X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=cc974f5210050729493a368b6e726d06ba86923f;hp=0c934cc72cb0f3de8a675332de3115deb86b9ee4;hb=ab4e1fcb5fc453c811d25038f872f3326f8f846e;hpb=ef8311a4296a2dc85c82b063de61efa4eb7a8404 diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp index 0c934cc7..cc974f52 100644 --- a/pv/view/logicsignal.cpp +++ b/pv/view/logicsignal.cpp @@ -22,15 +22,24 @@ #include +#include +#include + #include "logicsignal.h" #include "view.h" -#include "pv/sigsession.h" -#include "pv/data/logic.h" -#include "pv/data/logicsnapshot.h" +#include +#include +#include +#include +#include -using namespace boost; -using namespace std; +using boost::shared_ptr; +using std::deque; +using std::max; +using std::min; +using std::pair; +using std::vector; namespace pv { namespace view { @@ -54,11 +63,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_probe *const probe, shared_ptr data) : + Signal(dev_inst, probe), _data(data), - _separator(NULL), _trigger_none(NULL), _trigger_rising(NULL), _trigger_high(NULL), @@ -73,91 +81,23 @@ 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 (_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; @@ -166,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; @@ -186,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) @@ -223,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); @@ -256,12 +201,85 @@ 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, list &actions) + QAction *action) { while(*trig_types) if(*trig_types++ == type) { - actions.push_back(action); + _trigger_bar->addAction(action); break; } } @@ -284,7 +302,10 @@ void LogicSignal::set_trigger(char type) const char *const trigger_string = (type != 0) ? trigger_type_string : NULL; - const sr_dev_inst *const sdi = _session.get_device(); + assert(_dev_inst); + const sr_dev_inst *const sdi = _dev_inst->dev_inst(); + assert(sdi); + const int probe_count = g_slist_length(sdi->probes); assert(probe_count > 0);