Implement autoranging for analog channels

diff --git a/pv/data/analogsegment.cpp b/pv/data/analogsegment.cpp
index d40c40f205d5cac5440585a71834425b2c0d724b..886bd4f58f9a531d5aff113e692352fa7460f742 100644 (file)
--- a/pv/data/analogsegment.cpp
+++ b/pv/data/analogsegment.cpp
@@ -45,7 +45,9 @@ const float AnalogSegment::LogEnvelopeScaleFactor =
 const uint64_t AnalogSegment::EnvelopeDataUnit = 64*1024;      // bytes
 
 AnalogSegment::AnalogSegment(uint64_t samplerate) :
-       Segment(samplerate, sizeof(float))
+       Segment(samplerate, sizeof(float)),
+       min_value_(0),
+       max_value_(0)
 {
        lock_guard<recursive_mutex> lock(mutex_);
        memset(envelope_levels_, 0, sizeof(envelope_levels_));
@@ -88,6 +90,11 @@ const float* AnalogSegment::get_samples(
        return (float*)get_raw_samples(start_sample, (end_sample - start_sample));
 }
 
+const std::pair<float, float> AnalogSegment::get_min_max() const
+{
+       return std::make_pair(min_value_, max_value_);
+}
+
 SegmentAnalogDataIterator* AnalogSegment::begin_sample_iteration(uint64_t start) const
 {
        return (SegmentAnalogDataIterator*)begin_raw_sample_iteration(start);
@@ -170,6 +177,9 @@ void AnalogSegment::append_payload_to_envelope_levels()
                        *max_element(samples, samples + EnvelopeScaleFactor),
                };
 
+               if (sub_sample.min < min_value_) min_value_ = sub_sample.min;
+               if (sub_sample.max > max_value_) max_value_ = sub_sample.max;
+
                continue_raw_sample_iteration(it, EnvelopeScaleFactor);
                *dest_ptr++ = sub_sample;
        }
@@ -202,7 +212,7 @@ void AnalogSegment::append_payload_to_envelope_levels()
 
                        EnvelopeSample sub_sample = *src_ptr++;
                        while (src_ptr < end_src_ptr) {
-                               sub_sample.min = min(sub_sample.min, src_ptr->min);
+                               sub_sample.min = min(sub_sample.min, src_ptr->min);;
                                sub_sample.max = max(sub_sample.max, src_ptr->max);
                                src_ptr++;
                        }

diff --git a/pv/data/analogsegment.hpp b/pv/data/analogsegment.hpp
index 52d37a76c3e67fdfba671ae46030e390940e1355..09ae2c0203dfa65d4c36c8a791754e9379e7804b 100644 (file)
--- a/pv/data/analogsegment.hpp
+++ b/pv/data/analogsegment.hpp
@@ -81,6 +81,8 @@ public:
        const float* get_samples(int64_t start_sample,
                int64_t end_sample) const;
 
+       const std::pair<float, float> get_min_max() const;
+
        SegmentAnalogDataIterator* begin_sample_iteration(uint64_t start) const;
        void continue_sample_iteration(SegmentAnalogDataIterator* it, uint64_t increase) const;
        void end_sample_iteration(SegmentAnalogDataIterator* it) const;
@@ -96,6 +98,8 @@ private:
 private:
        struct Envelope envelope_levels_[ScaleStepCount];
 
+       float min_value_, max_value_;
+
        friend struct AnalogSegmentTest::Basic;
 };
 

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index bf1f9017731f679f73d9a836ea706efc47722557..07fb0ef89fa8ab59c2930c5be11972388377f0cd 100644 (file)
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -25,6 +25,7 @@
 #include <limits>
 
 #include <QApplication>
+#include <QCheckBox>
 #include <QComboBox>
 #include <QFormLayout>
 #include <QGridLayout>
@@ -78,7 +79,8 @@ AnalogSignal::AnalogSignal(
        div_height_(3 * QFontMetrics(QApplication::font()).height()),
        pos_vdivs_(1),
        neg_vdivs_(1),
-       resolution_(0)
+       resolution_(0),
+       autoranging_(1)
 {
        base_->set_colour(SignalColours[base_->index() % countof(SignalColours)]);
        update_scale();
@@ -94,6 +96,7 @@ void AnalogSignal::save_settings(QSettings &settings) const
        settings.setValue("pos_vdivs", pos_vdivs_);
        settings.setValue("neg_vdivs", neg_vdivs_);
        settings.setValue("scale_index", scale_index_);
+       settings.setValue("autoranging", autoranging_);
 }
 
 void AnalogSignal::restore_settings(QSettings &settings)
@@ -108,6 +111,9 @@ void AnalogSignal::restore_settings(QSettings &settings)
                scale_index_ = settings.value("scale_index").toInt();
                update_scale();
        }
+
+       if (settings.contains("autoranging"))
+               autoranging_ = settings.value("autoranging").toBool();
 }
 
 std::pair<int, int> AnalogSignal::v_extents() const
@@ -348,6 +354,53 @@ void AnalogSignal::update_scale()
        scale_ = div_height_ / resolution_;
 }
 
+void AnalogSignal::perform_autoranging(bool force_update)
+{
+       const deque< shared_ptr<pv::data::AnalogSegment> > &segments =
+               base_->analog_data()->analog_segments();
+
+       if (segments.empty())
+               return;
+
+       static double prev_min = 0, prev_max = 0;
+       double min = 0, max = 0;
+
+       for (shared_ptr<pv::data::AnalogSegment> segment : segments) {
+               std::pair<double, double> mm = segment->get_min_max();
+               min = std::min(min, mm.first);
+               max = std::max(max, mm.second);
+       }
+
+       if ((min == prev_min) && (max == prev_max) && !force_update)
+               return;
+
+       prev_min = min;
+       prev_max = max;
+
+       // Use all divs for the positive range if there are no negative values
+       if ((min == 0) && (neg_vdivs_ > 0)) {
+               pos_vdivs_ += neg_vdivs_;
+               neg_vdivs_ = 0;
+       }
+
+       double min_value_per_div;
+       if ((pos_vdivs_ > 0) && (neg_vdivs_ >  0))
+               min_value_per_div = std::max(max / pos_vdivs_, -min / neg_vdivs_);
+       else if (pos_vdivs_ > 0)
+               min_value_per_div = max / pos_vdivs_;
+       else
+               min_value_per_div = -min / neg_vdivs_;
+
+       // Find first scale value that is bigger than the value we need
+       for (int i = MinScaleIndex; i < MaxScaleIndex; i++)
+               if (get_resolution(i) > min_value_per_div) {
+                       scale_index_ = i;
+                       break;
+               }
+
+       update_scale();
+}
+
 void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
        // Add the standard options
@@ -391,6 +444,15 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 
        layout->addRow(tr("Vertical resolution"), vdiv_layout);
 
+       // Add the autoranging checkbox
+       QCheckBox* autoranging_cb = new QCheckBox();
+       autoranging_cb->setCheckState(autoranging_ ? Qt::Checked : Qt::Unchecked);
+
+       connect(autoranging_cb, SIGNAL(stateChanged(int)),
+               this, SLOT(on_autoranging_changed(int)));
+
+       layout->addRow(tr("Autoranging"), autoranging_cb);
+
        form->addRow(layout);
 }
 
@@ -398,6 +460,9 @@ void AnalogSignal::on_pos_vdivs_changed(int vdivs)
 {
        pos_vdivs_ = vdivs;
 
+       if (autoranging_)
+               perform_autoranging(true);
+
        if (owner_) {
                // Call order is important, otherwise the lazy event handler won't work
                owner_->extents_changed(false, true);
@@ -409,6 +474,9 @@ void AnalogSignal::on_neg_vdivs_changed(int vdivs)
 {
        neg_vdivs_ = vdivs;
 
+       if (autoranging_)
+               perform_autoranging(true);
+
        if (owner_) {
                // Call order is important, otherwise the lazy event handler won't work
                owner_->extents_changed(false, true);
@@ -425,6 +493,17 @@ void AnalogSignal::on_resolution_changed(int index)
                owner_->row_item_appearance_changed(false, true);
 }
 
+void AnalogSignal::on_autoranging_changed(int state)
+{
+       autoranging_ = (state == Qt::Checked);
+
+       if (autoranging_)
+               perform_autoranging(true);
+
+       if (owner_)
+               owner_->row_item_appearance_changed(false, true);
+}
+
 } // namespace TraceView
 } // namespace views
 } // namespace pv

diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index 7f0a2568fba3deea455f54bdc738cb46e1dd5ee9..5223338ce5c579d08ebb608fae389ec88b1bb777 100644 (file)
--- a/pv/view/analogsignal.hpp
+++ b/pv/view/analogsignal.hpp
@@ -126,6 +126,8 @@ private:
 
        void update_scale();
 
+       void perform_autoranging(bool force_update = false);
+
 protected:
        void populate_popup_form(QWidget *parent, QFormLayout *form);
 
@@ -135,6 +137,8 @@ private Q_SLOTS:
 
        void on_resolution_changed(int index);
 
+       void on_autoranging_changed(int state);
+
 private:
        QComboBox *resolution_cb_;
 
@@ -145,6 +149,8 @@ private:
        int div_height_;
        int pos_vdivs_, neg_vdivs_;  // divs per positive/negative side
        float resolution_; // e.g. 10 for 10 V/div
+
+       bool autoranging_;
 };
 
 } // namespace TraceView