]> sigrok.org Git - pulseview.git/blobdiff - pv/view/analogsignal.cpp
AnalogSignal: Use correct scaling factor for the grid to work
[pulseview.git] / pv / view / analogsignal.cpp
index fe2979b0be8ac36efe3f520bda5d59a9e0abf9a5..b92792d7f6e630f431f8c14430a20bcec89ea3f5 100644 (file)
 
 #include <cassert>
 #include <cmath>
+#include <cstdlib>
+#include <limits>
+
+#include <QApplication>
 
 #include "analogsignal.hpp"
 #include "pv/data/analog.hpp"
@@ -41,8 +45,6 @@ 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
@@ -50,6 +52,9 @@ const QColor AnalogSignal::SignalColours[4] = {
        QColor(0x4E, 0x9A, 0x06)        // Green
 };
 
+const QColor AnalogSignal::GridMajorColor = QColor(0xB0, 0xB0, 0xB0);
+const QColor AnalogSignal::GridMinorColor = QColor(0xD0, 0xD0, 0xD0);
+
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
 AnalogSignal::AnalogSignal(
@@ -58,13 +63,14 @@ AnalogSignal::AnalogSignal(
        shared_ptr<data::Analog> data) :
        Signal(session, channel),
        data_(data),
-       scale_(1.0f)
-{
-       colour_ = SignalColours[channel_->index() % countof(SignalColours)];
-}
-
-AnalogSignal::~AnalogSignal()
+       scale_index_(4), // 20 per div
+       scale_index_drag_offset_(0),
+       div_height_(3 * QFontMetrics(QApplication::font()).height()),
+       vdivs_(1),
+       resolution_(0)
 {
+       set_colour(SignalColours[channel_->index() % countof(SignalColours)]);
+       update_scale();
 }
 
 shared_ptr<pv::data::SignalData> AnalogSignal::data() const
@@ -77,20 +83,42 @@ 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 = vdivs_ * div_height_;
+       return make_pair(-h, h);
 }
 
-std::pair<int, int> AnalogSignal::v_extents() const
+int AnalogSignal::scale_handle_offset() const
+{
+       const int h = vdivs_ * div_height_;
+
+       return ((scale_index_drag_offset_ - scale_index_) *
+               h / 4) - h / 2;
+}
+
+void AnalogSignal::scale_handle_dragged(int offset)
+{
+       const int h = vdivs_ * div_height_;
+
+       scale_index_ = scale_index_drag_offset_ -
+               (offset + h / 2) / (h / 4);
+
+       update_scale();
+}
+
+void AnalogSignal::scale_handle_drag_release()
 {
-       return make_pair(-NominalHeight / 2, NominalHeight / 2);
+       scale_index_drag_offset_ = scale_index_;
+       update_scale();
 }
 
 void AnalogSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
 {
-       if (channel_->enabled())
+       if (channel_->enabled()) {
+               Trace::paint_back(p, pp);
                paint_axis(p, pp, get_visual_y());
+       }
 }
 
 void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
@@ -103,6 +131,8 @@ void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
        if (!channel_->enabled())
                return;
 
+       paint_grid(p, y, pp.left(), pp.right());
+
        const deque< shared_ptr<pv::data::AnalogSegment> > &segments =
                data_->analog_segments();
        if (segments.empty())
@@ -112,16 +142,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)
@@ -134,6 +164,30 @@ void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
                        pixels_offset, samples_per_pixel);
 }
 
+void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right)
+{
+       p.setPen(QPen(GridMajorColor, 0.5, Qt::DashLine));
+       for (int i = 1; i <= vdivs_; i++) {
+               const int dy = i * div_height_;
+               p.drawLine(QLineF(left, y - dy, right, y - dy));
+               p.drawLine(QLineF(left, y + dy, right, y + dy));
+       }
+
+       p.setPen(QPen(GridMinorColor, 0.5, Qt::DashLine));
+       for (int i = 0; i < vdivs_; i++) {
+               const int dy = i * div_height_;
+               const float dy25 = dy + (0.25 * div_height_);
+               const float dy50 = dy + (0.50 * div_height_);
+               const float dy75 = dy + (0.75 * div_height_);
+               p.drawLine(QLineF(left, y - dy25, right, y - dy25));
+               p.drawLine(QLineF(left, y + dy25, right, y + dy25));
+               p.drawLine(QLineF(left, y - dy50, right, y - dy50));
+               p.drawLine(QLineF(left, y + dy50, right, y + dy50));
+               p.drawLine(QLineF(left, y - dy75, right, y - dy75));
+               p.drawLine(QLineF(left, y + dy75, right, y + dy75));
+       }
+}
+
 void AnalogSignal::paint_trace(QPainter &p,
        const shared_ptr<pv::data::AnalogSegment> &segment,
        int y, int left, const int64_t start, const int64_t end,
@@ -181,7 +235,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 =
@@ -193,9 +247,9 @@ void AnalogSignal::paint_envelope(QPainter &p,
                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 +261,18 @@ void AnalogSignal::paint_envelope(QPainter &p,
        delete[] e.samples;
 }
 
+void AnalogSignal::update_scale()
+{
+       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));
+
+       resolution_ = powf(10.0f, d.quot - offset) * seq[d.rem];
+       scale_ = div_height_ / resolution_;
+}
+
 } // namespace view
 } // namespace pv