X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=a64cf70f430dc4fd7c8d8d47432c24f593aa63ed;hp=126ecb1f0b1330515c774f2f69fce673b3268ab4;hb=e183f4e328db8bb134652254ba9bf0707dc16c66;hpb=a8acb46e05a84d7487e2cf7c914ba82215f812cc diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp index 126ecb1f..a64cf70f 100644 --- a/pv/view/analogsignal.cpp +++ b/pv/view/analogsignal.cpp @@ -23,73 +23,179 @@ #include #include "analogsignal.h" -#include "../analogdata.h" -#include "../analogdatasnapshot.h" +#include "pv/data/analog.h" +#include "pv/data/analogsnapshot.h" +#include "pv/view/view.h" -using namespace boost; -using namespace std; +using boost::shared_ptr; +using std::max; +using std::min; +using std::deque; namespace pv { namespace view { -AnalogSignal::AnalogSignal(QString name, shared_ptr data) : - Signal(name), - _data(data) +const QColor AnalogSignal::SignalColours[4] = { + QColor(0xC4, 0xA0, 0x00), // Yellow + QColor(0x87, 0x20, 0x7A), // Magenta + QColor(0x20, 0x4A, 0x87), // Blue + QColor(0x4E, 0x9A, 0x06) // Green +}; + +const float AnalogSignal::EnvelopeThreshold = 256.0f; + +AnalogSignal::AnalogSignal(shared_ptr dev_inst, + const sr_probe *const probe, shared_ptr data) : + Signal(dev_inst, probe), + _data(data), + _scale(1.0f) { - _colour = Qt::blue; + _colour = SignalColours[probe->index % countof(SignalColours)]; } -void AnalogSignal::paint(QPainter &p, const QRect &rect, double scale, - double offset) +AnalogSignal::~AnalogSignal() +{ +} + +shared_ptr AnalogSignal::data() const +{ + return _data; +} + +shared_ptr AnalogSignal::analog_data() const +{ + return _data; +} + +void AnalogSignal::set_scale(float scale) +{ + _scale = scale; +} + +void AnalogSignal::paint_back(QPainter &p, int left, int right) +{ + if (_probe->enabled) + paint_axis(p, get_y(), left, right); +} + +void AnalogSignal::paint_mid(QPainter &p, int left, int right) { - 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(); - const deque< shared_ptr > &snapshots = + if (!_probe->enabled) + return; + + const deque< shared_ptr > &snapshots = _data->get_snapshots(); if (snapshots.empty()) return; - const shared_ptr &snapshot = + const shared_ptr &snapshot = snapshots.front(); const double pixels_offset = offset / scale; - const double samplerate = _data->get_samplerate(); + const double samplerate = _data->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); const int64_t start_sample = min(max((int64_t)floor(start), (int64_t)0), last_sample); - const int64_t end_sample = min(max((int64_t)ceil(end), + const int64_t end_sample = min(max((int64_t)ceil(end) + 1, (int64_t)0), last_sample); - const int y_offset = rect.center().y(); + if (samples_per_pixel < EnvelopeThreshold) + paint_trace(p, snapshot, y, left, + start_sample, end_sample, + pixels_offset, samples_per_pixel); + else + paint_envelope(p, snapshot, y, left, + start_sample, end_sample, + pixels_offset, samples_per_pixel); +} + +void AnalogSignal::paint_trace(QPainter &p, + const shared_ptr &snapshot, + int y, int left, const int64_t start, const int64_t end, + const double pixels_offset, const double samples_per_pixel) +{ + const int64_t sample_count = end - start; - const float* samples = snapshot->get_samples(); + const float *const samples = snapshot->get_samples(start, end); assert(samples); - QPointF *points = new QPointF[end_sample - start_sample]; + p.setPen(_colour); + + QPointF *points = new QPointF[sample_count]; QPointF *point = points; - for (int64_t sample = start_sample; - sample != end_sample; sample++) { + for (int64_t sample = start; sample != end; sample++) { const float x = (sample / samples_per_pixel - - pixels_offset) + rect.left(); - const float y = samples[sample] + y_offset; - *point++ = QPointF(x, y); + pixels_offset) + left; + *point++ = QPointF(x, + y - samples[sample - start] * _scale); } - p.drawPoints(points, point - points); + p.drawPolyline(points, point - points); + delete[] samples; delete[] points; } -int AnalogSignal::get_nominal_offset(const QRect &rect) const +void AnalogSignal::paint_envelope(QPainter &p, + const shared_ptr &snapshot, + int y, int left, const int64_t start, const int64_t end, + const double pixels_offset, const double samples_per_pixel) { - return rect.center().y(); + using pv::data::AnalogSnapshot; + + AnalogSnapshot::EnvelopeSection e; + snapshot->get_envelope_section(e, start, end, samples_per_pixel); + + if (e.length < 2) + return; + + p.setPen(QPen(Qt::NoPen)); + p.setBrush(_colour); + + QRectF *const rects = new QRectF[e.length]; + QRectF *rect = rects; + + for(uint64_t sample = 0; sample < e.length-1; sample++) { + const float x = ((e.scale * sample + e.start) / + samples_per_pixel - pixels_offset) + left; + const AnalogSnapshot::EnvelopeSample *const s = + e.samples + sample; + + // We overlap this sample with the next so that vertical + // gaps do not appear during steep rising or falling edges + const float b = y - max(s->max, (s+1)->min) * _scale; + const float t = y - min(s->min, (s+1)->max) * _scale; + + float h = b - t; + if(h >= 0.0f && h <= 1.0f) + h = 1.0f; + if(h <= 0.0f && h >= -1.0f) + h = -1.0f; + + *rect++ = QRectF(x, t, 1.0f, h); + } + + p.drawRects(rects, e.length); + + delete[] rects; + delete[] e.samples; } } // namespace view