X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=04f0a7fb84b97207b09a63f9143abe36293f54ae;hp=07fb0ef89fa8ab59c2930c5be11972388377f0cd;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=73e377feaaf01e790c87a4a0c918a36e87a9a6b9

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 07fb0ef..04f0a7f 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -38,14 +38,19 @@
 #include "pv/data/analogsegment.hpp"
 #include "pv/data/signalbase.hpp"
 #include "pv/view/view.hpp"
+#include "pv/globalsettings.hpp"
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
+using std::deque;
+using std::div;
+using std::div_t;
 using std::max;
 using std::make_pair;
 using std::min;
+using std::numeric_limits;
+using std::pair;
 using std::shared_ptr;
-using std::deque;
 
 namespace pv {
 namespace views {
@@ -61,6 +66,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::SamplingPointColour(0x77, 0x77, 0x77);
+
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
 const int AnalogSignal::MaximumVDivs = 10;
@@ -80,8 +87,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();
 }
@@ -116,7 +129,7 @@ void AnalogSignal::restore_settings(QSettings &settings)
 		autoranging_ = settings.value("autoranging").toBool();
 }
 
-std::pair<int, int> AnalogSignal::v_extents() const
+pair<int, int> AnalogSignal::v_extents() const
 {
 	const int ph = pos_vdivs_ * div_height_;
 	const int nh = neg_vdivs_ * div_height_;
@@ -271,24 +284,43 @@ 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;
 
+	QRectF *const sampling_points = new QRectF[points_count];
+	QRectF *sampling_point = sampling_points;
+
 	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_);
+		*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);
 
-	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 && (samples_per_pixel < 0.25)) {
+		p.setPen(SamplingPointColour);
+		p.drawRects(sampling_points, points_count);
+	}
 
 	delete[] points;
+	delete[] sampling_points;
 }
 
 void AnalogSignal::paint_envelope(QPainter &p,
@@ -340,9 +372,8 @@ float AnalogSignal::get_resolution(int scale_index)
 {
 	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),
+	const int offset = numeric_limits<int>::max() / (2 * countof(seq));
+	const div_t d = div((int)(scale_index + countof(seq) * offset),
 		countof(seq));
 
 	return powf(10.0f, d.quot - offset) * seq[d.rem];
@@ -366,7 +397,7 @@ void AnalogSignal::perform_autoranging(bool force_update)
 	double min = 0, max = 0;
 
 	for (shared_ptr<pv::data::AnalogSegment> segment : segments) {
-		std::pair<double, double> mm = segment->get_min_max();
+		pair<double, double> mm = segment->get_min_max();
 		min = std::min(min, mm.first);
 		max = std::max(max, mm.second);
 	}
@@ -383,6 +414,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 +493,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 +548,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