X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=683757d1a52cffc1f781bee07d73ca3b16f8b43c;hp=c4d31cb6c689995ca5cd0085006f1cabbca31cbb;hb=69e33a1b71599bbe35176ef7a77b58793a7d6ca2;hpb=1df18f6b6d20abd3f1ede94325b6781bf5038ea9 diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp index c4d31cb6..683757d1 100644 --- a/pv/view/analogsignal.cpp +++ b/pv/view/analogsignal.cpp @@ -22,13 +22,15 @@ #include #include +#include +#include #include "analogsignal.hpp" #include "pv/data/analog.hpp" -#include "pv/data/analogsnapshot.hpp" +#include "pv/data/analogsegment.hpp" #include "pv/view/view.hpp" -#include +#include using std::max; using std::make_pair; @@ -58,7 +60,8 @@ AnalogSignal::AnalogSignal( shared_ptr data) : Signal(session, channel), data_(data), - scale_(1.0f) + scale_index_(0), + scale_index_drag_offset_(0) { colour_ = SignalColours[channel_->index() % countof(SignalColours)]; } @@ -77,23 +80,36 @@ shared_ptr AnalogSignal::analog_data() const return data_; } -void AnalogSignal::set_scale(float scale) +std::pair AnalogSignal::v_extents() const { - scale_ = scale; + const int h = NominalHeight / 2; + return make_pair(-h, h); } -std::pair AnalogSignal::v_extents() const +int AnalogSignal::scale_handle_offset() const +{ + return ((scale_index_drag_offset_ - scale_index_) * + NominalHeight / 4) - NominalHeight / 2; +} + +void AnalogSignal::scale_handle_dragged(int offset) +{ + scale_index_ = scale_index_drag_offset_ - + (offset + NominalHeight / 2) / (NominalHeight / 4); +} + +void AnalogSignal::scale_handle_drag_release() { - return make_pair(-NominalHeight / 2, NominalHeight / 2); + scale_index_drag_offset_ = scale_index_; } -void AnalogSignal::paint_back(QPainter &p, const RowItemPaintParams &pp) +void AnalogSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp) { if (channel_->enabled()) paint_axis(p, pp, get_visual_y()); } -void AnalogSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp) +void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp) { assert(data_); assert(owner_); @@ -103,45 +119,46 @@ void AnalogSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp) if (!channel_->enabled()) return; - const deque< shared_ptr > &snapshots = - data_->analog_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 = pp.pixels_offset(); - 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 samplerate = max(1.0, segment->samplerate()); + const pv::util::Timestamp& 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 pv::util::Timestamp start = samplerate * (pp.offset() - start_time); + const pv::util::Timestamp end = start + samples_per_pixel * pp.width(); - const int64_t start_sample = min(max((int64_t)floor(start), + const int64_t start_sample = min(max(floor(start).convert_to(), (int64_t)0), last_sample); - const int64_t end_sample = min(max((int64_t)ceil(end) + 1, + const int64_t end_sample = min(max((ceil(end) + 1).convert_to(), (int64_t)0), last_sample); if (samples_per_pixel < EnvelopeThreshold) - paint_trace(p, snapshot, y, pp.left(), + paint_trace(p, segment, y, pp.left(), start_sample, end_sample, pixels_offset, samples_per_pixel); else - paint_envelope(p, snapshot, y, pp.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 float scale = this->scale(); 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_); @@ -153,7 +170,7 @@ 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.drawPolyline(points, point - points); @@ -163,14 +180,16 @@ void AnalogSignal::paint_trace(QPainter &p, } 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 pv::data::AnalogSnapshot; + using pv::data::AnalogSegment; + + const float scale = this->scale(); - 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; @@ -181,21 +200,21 @@ void AnalogSignal::paint_envelope(QPainter &p, QRectF *const rects = new QRectF[e.length]; QRectF *rect = rects; - for(uint64_t sample = 0; sample < e.length-1; sample++) { + 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) + if (h >= 0.0f && h <= 1.0f) h = 1.0f; - if(h <= 0.0f && h >= -1.0f) + if (h <= 0.0f && h >= -1.0f) h = -1.0f; *rect++ = QRectF(x, t, 1.0f, h); @@ -207,5 +226,15 @@ void AnalogSignal::paint_envelope(QPainter &p, delete[] e.samples; } +float AnalogSignal::scale() const +{ + const float seq[] = {1.0f, 2.0f, 5.0f}; + const int offset = std::numeric_limits::max() / (2 * countof(seq)); + const std::div_t d = std::div( + (int)(scale_index_ + countof(seq) * offset), + countof(seq)); + return powf(10.0f, d.quot - offset) * seq[d.rem]; +} + } // namespace view } // namespace pv