view/analogsignal: set samplerate to 1.0 if samplerate is not known

[pulseview.git] / pv / view / analogsignal.cpp

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 303227eb37fed6b2931ed7b7259a03ec816044b6..683757d1a52cffc1f781bee07d73ca3b16f8b43c 100644 (file)
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -22,13 +22,15 @@
 
 #include <cassert>
 #include <cmath>
+#include <cstdlib>
+#include <limits>
 
 #include "analogsignal.hpp"
 #include "pv/data/analog.hpp"
 #include "pv/data/analogsegment.hpp"
 #include "pv/view/view.hpp"
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 using std::max;
 using std::make_pair;
@@ -58,7 +60,8 @@ AnalogSignal::AnalogSignal(
        shared_ptr<data::Analog> data) :
        Signal(session, channel),
        data_(data),
-       scale_(1.0f)
+       scale_index_(0),
+       scale_index_drag_offset_(0)
 {
        colour_ = SignalColours[channel_->index() % countof(SignalColours)];
 }
@@ -77,14 +80,27 @@ shared_ptr<pv::data::Analog> AnalogSignal::analog_data() const
        return data_;
 }
 
-void AnalogSignal::set_scale(float scale)
+std::pair<int, int> AnalogSignal::v_extents() const
 {
-       scale_ = scale;
+       const int h = NominalHeight / 2;
+       return make_pair(-h, h);
 }
 
-std::pair<int, int> 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 ViewItemPaintParams &pp)
@@ -112,16 +128,16 @@ void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
                segments.front();
 
        const double pixels_offset = pp.pixels_offset();
-       const double samplerate = segment->samplerate();
-       const double start_time = segment->start_time();
+       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>(),
                (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>(),
                (int64_t)0), last_sample);
 
        if (samples_per_pixel < EnvelopeThreshold)
@@ -139,6 +155,7 @@ void AnalogSignal::paint_trace(QPainter &p,
        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 = segment->get_samples(start, end);
@@ -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);
@@ -169,6 +186,8 @@ void AnalogSignal::paint_envelope(QPainter &p,
 {
        using pv::data::AnalogSegment;
 
+       const float scale = this->scale();
+
        AnalogSegment::EnvelopeSection e;
        segment->get_envelope_section(e, start, end, samples_per_pixel);
 
@@ -181,7 +200,7 @@ 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 AnalogSegment::EnvelopeSample *const s =
@@ -189,13 +208,13 @@ void AnalogSignal::paint_envelope(QPainter &p,
 
                // 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<int>::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