AnalogSignal: Use Q_OBJECT and implement vdiv selector in dialog

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

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index b340de67edc223f16dd7cbe823a917d4b422788b..1b4e32080e6107ea41041e37795333489d589fa5 100644 (file)
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -26,6 +26,8 @@
 #include <limits>
 
 #include <QApplication>
+#include <QFormLayout>
+#include <QSpinBox>
 
 #include "analogsignal.hpp"
 #include "pv/data/analog.hpp"
@@ -57,18 +59,22 @@ const QColor AnalogSignal::GridMinorColor = QColor(0xD0, 0xD0, 0xD0);
 
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
+const int AnalogSignal::MaximumVDivs = 10;
+
 AnalogSignal::AnalogSignal(
        pv::Session &session,
        shared_ptr<Channel> channel,
        shared_ptr<data::Analog> data) :
        Signal(session, channel),
        data_(data),
-       scale_index_(0),
+       scale_index_(4), // 20 per div
        scale_index_drag_offset_(0),
        div_height_(3 * QFontMetrics(QApplication::font()).height()),
-       vdivs_(1)
+       vdivs_(1),
+       resolution_(0)
 {
        set_colour(SignalColours[channel_->index() % countof(SignalColours)]);
+       update_scale();
 }
 
 shared_ptr<pv::data::SignalData> AnalogSignal::data() const
@@ -101,11 +107,14 @@ void AnalogSignal::scale_handle_dragged(int offset)
 
        scale_index_ = scale_index_drag_offset_ -
                (offset + h / 2) / (h / 4);
+
+       update_scale();
 }
 
 void AnalogSignal::scale_handle_drag_release()
 {
        scale_index_drag_offset_ = scale_index_;
+       update_scale();
 }
 
 void AnalogSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
@@ -188,7 +197,6 @@ 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);
@@ -203,7 +211,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);
@@ -219,8 +227,6 @@ 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);
 
@@ -241,8 +247,8 @@ 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)
@@ -259,15 +265,41 @@ void AnalogSignal::paint_envelope(QPainter &p,
        delete[] e.samples;
 }
 
-float AnalogSignal::scale() const
+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));
-       return powf(10.0f, d.quot - offset) * seq[d.rem];
+
+       resolution_ = powf(10.0f, d.quot - offset) * seq[d.rem];
+       scale_ = div_height_ / resolution_;
 }
 
+void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
+{
+       // Add the standard options
+       Signal::populate_popup_form(parent, form);
+
+       // Add the vdiv settings
+       QSpinBox *vdiv_sb = new QSpinBox(parent);
+       vdiv_sb->setRange(1, MaximumVDivs);
+       vdiv_sb->setValue(vdivs_);
+       connect(vdiv_sb, SIGNAL(valueChanged(int)),
+               this, SLOT(on_vdivs_changed(int)));
+       form->addRow(tr("Number of vertical divs"), vdiv_sb);
+}
+
+void AnalogSignal::on_vdivs_changed(int vdivs)
+{
+       vdivs_ = vdivs;
+
+       if (owner_)
+               owner_->extents_changed(false, true);
+}
+
+
 } // namespace view
 } // namespace pv