Show sampling points in analog traces.

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

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index bf1f9017731f679f73d9a836ea706efc47722557..3c3e5d0571a36a896c91441fe9ef27321bd83cbe 100644 (file)
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -25,6 +25,7 @@
 #include <limits>
 
 #include <QApplication>
 #include <limits>
 
 #include <QApplication>

+#include <QCheckBox>

 #include <QComboBox>
 #include <QFormLayout>
 #include <QGridLayout>
 #include <QComboBox>
 #include <QFormLayout>
 #include <QGridLayout>


@@ -37,6 +38,7 @@
 #include "pv/data/analogsegment.hpp"
 #include "pv/data/signalbase.hpp"
 #include "pv/view/view.hpp"
 #include "pv/data/analogsegment.hpp"
 #include "pv/data/signalbase.hpp"
 #include "pv/view/view.hpp"

+#include "pv/globalsettings.hpp"

 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 


@@ -60,6 +62,8 @@ const QColor AnalogSignal::SignalColours[4] = {
 const QColor AnalogSignal::GridMajorColor = QColor(0, 0, 0, 40*256/100);
 const QColor AnalogSignal::GridMinorColor = QColor(0, 0, 0, 20*256/100);
 
 const QColor AnalogSignal::GridMajorColor = QColor(0, 0, 0, 40*256/100);
 const QColor AnalogSignal::GridMinorColor = QColor(0, 0, 0, 20*256/100);
 

+const QColor AnalogSignal::SamplingPointColour(0x77, 0x77, 0x77);
+

 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
 const int AnalogSignal::MaximumVDivs = 10;
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
 const int AnalogSignal::MaximumVDivs = 10;


@@ -78,8 +82,15 @@ AnalogSignal::AnalogSignal(
        div_height_(3 * QFontMetrics(QApplication::font()).height()),
        pos_vdivs_(1),
        neg_vdivs_(1),
        div_height_(3 * QFontMetrics(QApplication::font()).height()),
        pos_vdivs_(1),
        neg_vdivs_(1),

-       resolution_(0)
+       resolution_(0),
+       autoranging_(true)

 {
 {

+       pv::data::Analog* analog_data =
+               dynamic_cast<pv::data::Analog*>(data().get());
+
+       connect(analog_data, SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
+               this, SLOT(on_samples_added()));
+

        base_->set_colour(SignalColours[base_->index() % countof(SignalColours)]);
        update_scale();
 }
        base_->set_colour(SignalColours[base_->index() % countof(SignalColours)]);
        update_scale();
 }


@@ -94,6 +105,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("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)
 }
 
 void AnalogSignal::restore_settings(QSettings &settings)


@@ -108,6 +120,9 @@ void AnalogSignal::restore_settings(QSettings &settings)
                scale_index_ = settings.value("scale_index").toInt();
                update_scale();
        }
                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
 }
 
 std::pair<int, int> AnalogSignal::v_extents() const


@@ -265,24 +280,42 @@ void AnalogSignal::paint_trace(QPainter &p,
 {
        p.setPen(base_->colour());
 
 {
        p.setPen(base_->colour());
 

-       QPointF *points = new QPointF[end - start];
+       const int64_t points_count = end - start;
+
+       QPointF *points = new QPointF[points_count];

        QPointF *point = points;
 
        QPointF *point = points;
 

+       QRectF *const sampling_points = new QRectF[points_count];
+       QRectF *sampling_point = sampling_points;
+

        pv::data::SegmentAnalogDataIterator* it =
                segment->begin_sample_iteration(start);
 
        pv::data::SegmentAnalogDataIterator* it =
                segment->begin_sample_iteration(start);
 

+       const int w = 2;

        for (int64_t sample = start; sample != end; sample++) {
                const float x = (sample / samples_per_pixel -
                        pixels_offset) + left;
 
                *point++ = QPointF(x, y - *((float*)it->value) * scale_);
        for (int64_t sample = start; sample != end; sample++) {
                const float x = (sample / samples_per_pixel -
                        pixels_offset) + left;
 
                *point++ = QPointF(x, y - *((float*)it->value) * scale_);

+               *sampling_point++ = QRectF(x - (w / 2), y - *((float*)it->value) * scale_ - (w / 2), w, w);
+

                segment->continue_sample_iteration(it, 1);
        }
        segment->end_sample_iteration(it);
 
                segment->continue_sample_iteration(it, 1);
        }
        segment->end_sample_iteration(it);
 

-       p.drawPolyline(points, point - points);
+       p.drawPolyline(points, points_count);
+
+       // Paint the sampling points if enabled
+       GlobalSettings settings;
+       const bool show_sampling_points =
+               settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool();
+       if (show_sampling_points) {
+               p.setPen(SamplingPointColour);
+               p.drawRects(sampling_points, points_count);
+       }

 
        delete[] points;
 
        delete[] points;

+       delete[] sampling_points;

 }
 
 void AnalogSignal::paint_envelope(QPainter &p,
 }
 
 void AnalogSignal::paint_envelope(QPainter &p,


@@ -348,6 +381,59 @@ void AnalogSignal::update_scale()
        scale_ = div_height_ / resolution_;
 }
 
        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;
+       }
+
+       // Split up the divs if there are negative values but no negative divs
+       if ((min < 0) && (neg_vdivs_ == 0)) {
+               neg_vdivs_ = pos_vdivs_ / 2;
+               pos_vdivs_ -= neg_vdivs_;
+       }
+
+       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
 void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
        // Add the standard options


@@ -391,13 +477,36 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 
        layout->addRow(tr("Vertical resolution"), vdiv_layout);
 
 
        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);
 }
 
        form->addRow(layout);
 }
 

+void AnalogSignal::on_samples_added()
+{
+       perform_autoranging();
+
+       if (owner_) {
+               // Call order is important, otherwise the lazy event handler won't work
+               owner_->extents_changed(false, true);
+               owner_->row_item_appearance_changed(false, true);
+       }
+}
+

 void AnalogSignal::on_pos_vdivs_changed(int vdivs)
 {
        pos_vdivs_ = vdivs;
 
 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);
        if (owner_) {
                // Call order is important, otherwise the lazy event handler won't work
                owner_->extents_changed(false, true);


@@ -409,6 +518,9 @@ void AnalogSignal::on_neg_vdivs_changed(int vdivs)
 {
        neg_vdivs_ = 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);
        if (owner_) {
                // Call order is important, otherwise the lazy event handler won't work
                owner_->extents_changed(false, true);


@@ -425,6 +537,20 @@ void AnalogSignal::on_resolution_changed(int index)
                owner_->row_item_appearance_changed(false, true);
 }
 
                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_) {
+               // Call order is important, otherwise the lazy event handler won't work
+               owner_->extents_changed(false, true);
+               owner_->row_item_appearance_changed(false, true);
+       }
+}
+

 } // namespace TraceView
 } // namespace views
 } // namespace pv
 } // namespace TraceView
 } // namespace views
 } // namespace pv