X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=303227eb37fed6b2931ed7b7259a03ec816044b6;hp=e29930865f6601eccf8b43986db1f44f9523b090;hb=bb4a0e8e0b337988264e43a368b6ce5950d2d6cd;hpb=7c68ddaee897d069f817c2c0184bd8c1f73d826a diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp index e2993086..303227eb 100644 --- a/pv/view/analogsignal.cpp +++ b/pv/view/analogsignal.cpp @@ -20,18 +20,29 @@ #include -#include +#include +#include -#include "analogsignal.h" -#include "pv/data/analog.h" -#include "pv/data/analogsnapshot.h" +#include "analogsignal.hpp" +#include "pv/data/analog.hpp" +#include "pv/data/analogsegment.hpp" +#include "pv/view/view.hpp" -using namespace boost; -using namespace std; +#include + +using std::max; +using std::make_pair; +using std::min; +using std::shared_ptr; +using std::deque; + +using sigrok::Channel; namespace pv { namespace view { +const int AnalogSignal::NominalHeight = 80; + const QColor AnalogSignal::SignalColours[4] = { QColor(0xC4, 0xA0, 0x00), // Yellow QColor(0x87, 0x20, 0x7A), // Magenta @@ -41,71 +52,99 @@ const QColor AnalogSignal::SignalColours[4] = { const float AnalogSignal::EnvelopeThreshold = 256.0f; -AnalogSignal::AnalogSignal(QString name, shared_ptr data, - int probe_index) : - Signal(name), - _data(data), - _scale(1.0f) +AnalogSignal::AnalogSignal( + pv::Session &session, + shared_ptr channel, + shared_ptr data) : + Signal(session, channel), + data_(data), + scale_(1.0f) +{ + colour_ = SignalColours[channel_->index() % countof(SignalColours)]; +} + +AnalogSignal::~AnalogSignal() +{ +} + +shared_ptr AnalogSignal::data() const +{ + return data_; +} + +shared_ptr AnalogSignal::analog_data() const { - _colour = SignalColours[probe_index % countof(SignalColours)]; + return data_; } void AnalogSignal::set_scale(float scale) { - _scale = scale; + scale_ = scale; +} + +std::pair AnalogSignal::v_extents() const +{ + return make_pair(-NominalHeight / 2, NominalHeight / 2); } -void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale, - double offset) +void AnalogSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp) { - assert(scale > 0); - assert(_data); - assert(right >= left); + if (channel_->enabled()) + paint_axis(p, pp, get_visual_y()); +} + +void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp) +{ + assert(data_); + assert(owner_); - paint_axis(p, y, left, right); + const int y = get_visual_y(); + + if (!channel_->enabled()) + return; - const deque< shared_ptr > &snapshots = - _data->get_snapshots(); - if (snapshots.empty()) + const deque< shared_ptr > &segments = + data_->analog_segments(); + if (segments.empty()) return; - const shared_ptr &snapshot = - snapshots.front(); + const shared_ptr &segment = + segments.front(); - 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 * (right - left); + const double pixels_offset = pp.pixels_offset(); + const double samplerate = segment->samplerate(); + const double start_time = segment->start_time(); + const int64_t last_sample = segment->get_sample_count() - 1; + const double samples_per_pixel = samplerate * pp.scale(); + const double start = samplerate * (pp.offset() - start_time); + const double end = start + samples_per_pixel * pp.width(); 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); if (samples_per_pixel < EnvelopeThreshold) - paint_trace(p, snapshot, y, left, + paint_trace(p, segment, y, pp.left(), start_sample, end_sample, pixels_offset, samples_per_pixel); else - paint_envelope(p, snapshot, y, left, + paint_envelope(p, segment, y, pp.left(), start_sample, end_sample, pixels_offset, samples_per_pixel); } void AnalogSignal::paint_trace(QPainter &p, - const shared_ptr &snapshot, + const shared_ptr &segment, 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 *const samples = snapshot->get_samples(start, end); + const float *const samples = segment->get_samples(start, end); assert(samples); - p.setPen(_colour); + p.setPen(colour_); QPointF *points = new QPointF[sample_count]; QPointF *point = points; @@ -114,31 +153,30 @@ void AnalogSignal::paint_trace(QPainter &p, const float x = (sample / samples_per_pixel - pixels_offset) + left; *point++ = QPointF(x, - y - samples[sample - start] * _scale); + y - samples[sample - start] * scale_); } - p.drawPoints(points, point - points); + p.drawPolyline(points, point - points); delete[] samples; delete[] points; } void AnalogSignal::paint_envelope(QPainter &p, - const shared_ptr &snapshot, + const shared_ptr &segment, int y, int left, const int64_t start, const int64_t end, const double pixels_offset, const double samples_per_pixel) { - using namespace Qt; - using pv::data::AnalogSnapshot; + using pv::data::AnalogSegment; - AnalogSnapshot::EnvelopeSection e; - snapshot->get_envelope_section(e, start, end, samples_per_pixel); + AnalogSegment::EnvelopeSection e; + segment->get_envelope_section(e, start, end, samples_per_pixel); if (e.length < 2) return; - p.setPen(QPen(NoPen)); - p.setBrush(_colour); + p.setPen(QPen(Qt::NoPen)); + p.setBrush(colour_); QRectF *const rects = new QRectF[e.length]; QRectF *rect = rects; @@ -146,13 +184,13 @@ void AnalogSignal::paint_envelope(QPainter &p, 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 = + const AnalogSegment::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; + 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)