X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=c393bc7cdc00adc9a5b0062530e53cfba1a98a02;hb=76ce6c7ae29059774c36bee27f6e09bfec94b358;hp=07fb0ef89fa8ab59c2930c5be11972388377f0cd;hpb=73e377feaaf01e790c87a4a0c918a36e87a9a6b9;p=pulseview.git

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 07fb0ef8..c393bc7c 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -80,8 +80,14 @@ AnalogSignal::AnalogSignal(
 	pos_vdivs_(1),
 	neg_vdivs_(1),
 	resolution_(0),
-	autoranging_(1)
+	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();
 }
@@ -271,7 +277,9 @@ void AnalogSignal::paint_trace(QPainter &p,
 {
 	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;
 
 	pv::data::SegmentAnalogDataIterator* it =
@@ -286,7 +294,7 @@ void AnalogSignal::paint_trace(QPainter &p,
 	}
 	segment->end_sample_iteration(it);
 
-	p.drawPolyline(points, point - points);
+	p.drawPolyline(points, points_count);
 
 	delete[] points;
 }
@@ -383,6 +391,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 +470,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 +525,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