X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=b684210b26667e3fcf7ee30e3447867d1708bb68;hp=b2302e9e8cc75be8dd9a0aaca05d24a0b02e62d2;hb=4145b248aed3dde5ccc02c9b7e389b5cb67c547d;hpb=8d44d030c3923055f2ea81d5334d3a3bce7900c2 diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp index b2302e9e..b684210b 100644 --- a/pv/view/logicsignal.cpp +++ b/pv/view/logicsignal.cpp @@ -23,8 +23,9 @@ #include #include "logicsignal.h" -#include "../logicdata.h" -#include "../logicdatasnapshot.h" +#include "view.h" +#include "pv/data/logic.h" +#include "pv/data/logicsnapshot.h" using namespace boost; using namespace std; @@ -38,7 +39,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,50 +52,102 @@ 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(const sr_probe *const probe, + shared_ptr data) : + Signal(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) { - assert(_probe_index >= 0); - _colour = LogicSignalColours[ - _probe_index % countof(LogicSignalColours)]; + _colour = SignalColours[probe->index % countof(SignalColours)]; + + _separator.setSeparator(true); +} + +LogicSignal::~LogicSignal() +{ +} + +const list LogicSignal::get_context_bar_actions() +{ + list actions; + actions.push_back(&_name_action); + + actions.push_back(&_separator); + + 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); + + return actions; } -void LogicSignal::paint(QPainter &p, const QRect &rect, double scale, - double offset) +void LogicSignal::paint(QPainter &p, int y, int left, int right, + double scale, double offset) { + using pv::view::View; + QLineF *line; vector< pair > edges; + assert(_probe); assert(scale > 0); assert(_data); + assert(right >= left); + + if (!_probe->enabled) + return; - const float high_offset = rect.top() + 0.5f; - const float low_offset = rect.bottom() + 0.5f; + paint_axis(p, y, left, right); - const deque< shared_ptr > &snapshots = + const float high_offset = y - View::SignalHeight + 0.5f; + const float low_offset = y + 0.5f; + + const deque< shared_ptr > &snapshots = _data->get_snapshots(); - if(snapshots.empty()) + if (snapshots.empty()) return; - const shared_ptr &snapshot = + 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 @@ -102,11 +155,11 @@ void LogicSignal::paint(QPainter &p, const QRect &rect, double scale, QLineF *const edge_lines = new QLineF[edge_count]; line = edge_lines; - for(vector::const_iterator i = + for (vector::const_iterator i = 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 +173,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; } @@ -135,9 +188,9 @@ void LogicSignal::paint_caps(QPainter &p, QLineF *const lines, { QLineF *line = lines; - for(vector::const_iterator i = + for (vector::const_iterator i = edges.begin(); i != (edges.end() - 1); i++) - if((*i).second == level) { + if ((*i).second == level) { *line++ = QLineF( ((*i).first / samples_per_pixel - pixels_offset) + x_offset, y_offset, @@ -148,10 +201,5 @@ void LogicSignal::paint_caps(QPainter &p, QLineF *const lines, p.drawLines(lines, line - lines); } -int LogicSignal::get_nominal_offset(const QRect &rect) const -{ - return rect.bottom(); -} - } // namespace view } // namespace pv