AnalogSignal: Split up divs during autoranging if needed

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

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 07fb0ef89fa8ab59c2930c5be11972388377f0cd..2715a386bdf83a37d64e194063b86b23e8c552d8 100644 (file)
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -82,6 +82,12 @@ AnalogSignal::AnalogSignal(
        resolution_(0),
        autoranging_(1)
 {
+       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();
 }
@@ -383,6 +389,12 @@ void AnalogSignal::perform_autoranging(bool force_update)
                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_);
@@ -456,6 +468,17 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
        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;
@@ -500,8 +523,11 @@ void AnalogSignal::on_autoranging_changed(int state)
        if (autoranging_)
                perform_autoranging(true);
 
-       if (owner_)
+       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