X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=b0fe95135eb782e9231d98d63dadf398a9cb6fda;hp=d23da5bbf021815a5b668ccfb624ebfb401d9e38;hb=767281c8881e4ed35607cbff4b270dfd55d0ef67;hpb=1b1ec774978b65209ce2b454cbf81da499b797d2 diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp index d23da5bb..b0fe9513 100644 --- a/pv/view/logicsignal.cpp +++ b/pv/view/logicsignal.cpp @@ -23,8 +23,12 @@ #include #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" using namespace boost; using namespace std; @@ -38,7 +42,7 @@ const QColor LogicSignal::EdgeColour(0x80, 0x80, 0x80); const QColor LogicSignal::HighColour(0x00, 0xC0, 0x00); const QColor LogicSignal::LowColour(0xC0, 0x00, 0x00); -const QColor LogicSignal::LogicSignalColours[10] = { +const QColor LogicSignal::SignalColours[10] = { QColor(0x16, 0x19, 0x1A), // Black QColor(0x8F, 0x52, 0x02), // Brown QColor(0xCC, 0x00, 0x00), // Red @@ -51,29 +55,60 @@ const QColor LogicSignal::LogicSignalColours[10] = { QColor(0xEE, 0xEE, 0xEC), // White }; -LogicSignal::LogicSignal(QString name, shared_ptr data, - int probe_index) : - Signal(name), - _probe_index(probe_index), - _data(data) +LogicSignal::LogicSignal(pv::SigSession &session, const sr_probe *const probe, + shared_ptr data) : + Signal(session, probe), + _data(data), + _trigger_none(NULL), + _trigger_rising(NULL), + _trigger_high(NULL), + _trigger_falling(NULL), + _trigger_low(NULL), + _trigger_change(NULL) { - assert(_probe_index >= 0); - _colour = LogicSignalColours[ - _probe_index % countof(LogicSignalColours)]; + _colour = SignalColours[probe->index % countof(SignalColours)]; } -void LogicSignal::paint(QPainter &p, const QRect &rect, double scale, - double offset) +LogicSignal::~LogicSignal() { +} + +boost::shared_ptr LogicSignal::data() const +{ + return _data; +} + +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; + QLineF *line; vector< pair > edges; - assert(scale > 0); + assert(_probe); 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; - const float high_offset = rect.top() + 0.5f; - const float low_offset = rect.bottom() + 0.5f; + const float high_offset = y - View::SignalHeight + 0.5f; + const float low_offset = y + 0.5f; const deque< shared_ptr > &snapshots = _data->get_snapshots(); @@ -83,18 +118,23 @@ void LogicSignal::paint(QPainter &p, const QRect &rect, double scale, const shared_ptr &snapshot = snapshots.front(); + double samplerate = _data->get_samplerate(); + + // Show sample rate as 1Hz when it is unknown + if (samplerate == 0.0) + samplerate = 1.0; + const double pixels_offset = offset / scale; - const double samplerate = _data->get_samplerate(); const double start_time = _data->get_start_time(); const int64_t last_sample = snapshot->get_sample_count() - 1; const double samples_per_pixel = samplerate * scale; const double start = samplerate * (offset - start_time); - const double end = start + samples_per_pixel * rect.width(); + const double end = start + samples_per_pixel * (right - left); 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, _probe->index); assert(edges.size() >= 2); // Paint the edges @@ -106,7 +146,7 @@ void LogicSignal::paint(QPainter &p, const QRect &rect, double scale, edges.begin() + 1; i != edges.end() - 1; i++) { const float x = ((*i).first / samples_per_pixel - - pixels_offset) + rect.left(); + pixels_offset) + left; *line++ = QLineF(x, high_offset, x, low_offset); } @@ -120,10 +160,10 @@ void LogicSignal::paint(QPainter &p, const QRect &rect, double scale, p.setPen(HighColour); paint_caps(p, cap_lines, edges, true, samples_per_pixel, - pixels_offset, rect.left(), high_offset); + pixels_offset, left, high_offset); p.setPen(LowColour); paint_caps(p, cap_lines, edges, false, samples_per_pixel, - pixels_offset, rect.left(), low_offset); + pixels_offset, left, low_offset); delete[] cap_lines; } @@ -148,9 +188,150 @@ void LogicSignal::paint_caps(QPainter &p, QLineF *const lines, p.drawLines(lines, line - lines); } -int LogicSignal::get_nominal_offset(const QRect &rect) const +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 + 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') + { + _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; + + 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() { - return rect.bottom(); + set_trigger('c'); } } // namespace view