X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=eaa25bccc947dac826d5bddf2eff50ec2fcdd325;hb=f0c0b38f812bfbb2bb1978d40e2ce93f1da3f89d;hp=e29930865f6601eccf8b43986db1f44f9523b090;hpb=7c68ddaee897d069f817c2c0184bd8c1f73d826a;p=pulseview.git

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index e2993086..eaa25bcc 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -20,14 +20,22 @@
 
 #include <extdef.h>
 
-#include <math.h>
+#include <cassert>
+#include <cmath>
 
 #include "analogsignal.h"
 #include "pv/data/analog.h"
 #include "pv/data/analogsnapshot.h"
+#include "pv/view/view.h"
 
-using namespace boost;
-using namespace std;
+#include <libsigrok/libsigrok.hpp>
+
+using std::max;
+using std::min;
+using std::shared_ptr;
+using std::deque;
+
+using sigrok::Channel;
 
 namespace pv {
 namespace view {
@@ -41,13 +49,29 @@ const QColor AnalogSignal::SignalColours[4] = {
 
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
-AnalogSignal::AnalogSignal(QString name, shared_ptr<data::Analog> data,
-	int probe_index) :
-	Signal(name),
+AnalogSignal::AnalogSignal(
+	pv::SigSession &session,
+	shared_ptr<Channel> channel,
+	shared_ptr<data::Analog> data) :
+	Signal(session, channel),
 	_data(data),
 	_scale(1.0f)
 {
-	_colour = SignalColours[probe_index % countof(SignalColours)];
+	_colour = SignalColours[_channel->index() % countof(SignalColours)];
+}
+
+AnalogSignal::~AnalogSignal()
+{
+}
+
+shared_ptr<pv::data::SignalData> AnalogSignal::data() const
+{
+	return _data;
+}
+
+shared_ptr<pv::data::Analog> AnalogSignal::analog_data() const
+{
+	return _data;
 }
 
 void AnalogSignal::set_scale(float scale)
@@ -55,14 +79,30 @@ void AnalogSignal::set_scale(float scale)
 	_scale = scale;
 }
 
-void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale,
-	double offset)
+void AnalogSignal::paint_back(QPainter &p, int left, int right)
+{
+	if (_channel->enabled())
+		paint_axis(p, get_y(), left, right);
+}
+
+void AnalogSignal::paint_mid(QPainter &p, int left, int right)
 {
-	assert(scale > 0);
 	assert(_data);
 	assert(right >= left);
+	assert(_owner);
+
+	const int y = get_y();
 
-	paint_axis(p, y, left, right);
+	const View *const view = _owner->view();
+	assert(view);
+
+	const double scale = view->scale();
+	assert(scale > 0);
+
+	const double offset = view->offset();
+
+	if (!_channel->enabled())
+		return;
 
 	const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
 		_data->get_snapshots();
@@ -73,7 +113,7 @@ void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale,
 		snapshots.front();
 
 	const double pixels_offset = offset / scale;
-	const double samplerate = _data->get_samplerate();
+	const double samplerate = _data->samplerate();
 	const double start_time = _data->get_start_time();
 	const int64_t last_sample = snapshot->get_sample_count() - 1;
 	const double samples_per_pixel = samplerate * scale;
@@ -82,7 +122,7 @@ void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale,
 
 	const int64_t start_sample = min(max((int64_t)floor(start),
 		(int64_t)0), last_sample);
-	const int64_t end_sample = min(max((int64_t)ceil(end),
+	const int64_t end_sample = min(max((int64_t)ceil(end) + 1,
 		(int64_t)0), last_sample);
 
 	if (samples_per_pixel < EnvelopeThreshold)
@@ -117,7 +157,7 @@ void AnalogSignal::paint_trace(QPainter &p,
 			y - samples[sample - start] * _scale);
 	}
 
-	p.drawPoints(points, point - points);
+	p.drawPolyline(points, point - points);
 
 	delete[] samples;
 	delete[] points;
@@ -128,7 +168,6 @@ void AnalogSignal::paint_envelope(QPainter &p,
 	int y, int left, const int64_t start, const int64_t end,
 	const double pixels_offset, const double samples_per_pixel)
 {
-	using namespace Qt;
 	using pv::data::AnalogSnapshot;
 
 	AnalogSnapshot::EnvelopeSection e;
@@ -137,7 +176,7 @@ void AnalogSignal::paint_envelope(QPainter &p,
 	if (e.length < 2)
 		return;
 
-	p.setPen(QPen(NoPen));
+	p.setPen(QPen(Qt::NoPen));
 	p.setBrush(_colour);
 
 	QRectF *const rects = new QRectF[e.length];