X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=5d838506cedb1877ccf3b284b92735ba2cf0025f;hp=eb828a1bfff61c93b58386618e03cb534f6ff850;hb=4c8a6a6d03e2a12f67d910a83589072b478114cb;hpb=819f4c25391a9c74d3d2f528d462142d5c4aad4d

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index eb828a1b..5d838506 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -20,21 +20,29 @@
 
 #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"
+#include "analogsignal.hpp"
+#include "pv/data/analog.hpp"
+#include "pv/data/analogsnapshot.hpp"
+#include "pv/view/view.hpp"
+
+#include <libsigrok/libsigrok.hpp>
 
-using boost::shared_ptr;
 using std::max;
+using std::make_pair;
 using std::min;
+using std::shared_ptr;
 using std::deque;
 
+using sigrok::Channel;
+
 namespace pv {
 namespace view {
 
+const int AnalogSignal::NominalHeight = 80;
+
 const QColor AnalogSignal::SignalColours[4] = {
 	QColor(0xC4, 0xA0, 0x00),	// Yellow
 	QColor(0x87, 0x20, 0x7A),	// Magenta
@@ -44,66 +52,72 @@ const QColor AnalogSignal::SignalColours[4] = {
 
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
-AnalogSignal::AnalogSignal(pv::SigSession &session, sr_probe *const probe,
+AnalogSignal::AnalogSignal(
+	pv::Session &session,
+	shared_ptr<Channel> channel,
 	shared_ptr<data::Analog> data) :
-	Signal(session, probe),
-	_data(data),
-	_scale(1.0f)
+	Signal(session, channel),
+	data_(data),
+	scale_(1.0f)
 {
-	_colour = SignalColours[probe->index % countof(SignalColours)];
+	colour_ = SignalColours[channel_->index() % countof(SignalColours)];
 }
 
 AnalogSignal::~AnalogSignal()
 {
 }
 
-boost::shared_ptr<pv::data::SignalData> AnalogSignal::data() const
+shared_ptr<pv::data::SignalData> AnalogSignal::data() const
 {
-	return _data;
+	return data_;
 }
 
-void AnalogSignal::set_scale(float scale)
+shared_ptr<pv::data::Analog> AnalogSignal::analog_data() const
 {
-	_scale = scale;
+	return data_;
 }
 
-void AnalogSignal::paint_back(QPainter &p, int left, int right)
+void AnalogSignal::set_scale(float scale)
 {
-	if (_probe->enabled)
-		paint_axis(p, get_y(), left, right);
+	scale_ = scale;
 }
 
-void AnalogSignal::paint_mid(QPainter &p, int left, int right)
+std::pair<int, int> AnalogSignal::v_extents() const
 {
-	assert(_data);
-	assert(right >= left);
+	return make_pair(-NominalHeight / 2, NominalHeight / 2);
+}
 
-	assert(_view);
-	const int y = _v_offset - _view->v_offset();
+void AnalogSignal::paint_back(QPainter &p, const RowItemPaintParams &pp)
+{
+	if (channel_->enabled())
+		paint_axis(p, pp, get_visual_y());
+}
 
-	const double scale = _view->scale();
-	assert(scale > 0);
+void AnalogSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp)
+{
+	assert(data_);
+	assert(owner_);
 
-	const double offset = _view->offset();
+	const int y = get_visual_y();
 
-	if (!_probe->enabled)
+	if (!channel_->enabled())
 		return;
 
 	const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
-		_data->get_snapshots();
+		data_->get_snapshots();
 	if (snapshots.empty())
 		return;
 
 	const shared_ptr<pv::data::AnalogSnapshot> &snapshot =
 		snapshots.front();
 
-	const double pixels_offset = offset / scale;
-	const double samplerate = _data->samplerate();
-	const double start_time = _data->get_start_time();
+	const double pixels_offset = pp.pixels_offset();
+	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;
-	const double start = samplerate * (offset - start_time);
-	const double end = start + samples_per_pixel * (right - left);
+	const double samples_per_pixel = samplerate * pp.scale();
+	const double start = samplerate * (pp.offset() - start_time);
+	const double end = start + samples_per_pixel * pp.width();
 
 	const int64_t start_sample = min(max((int64_t)floor(start),
 		(int64_t)0), last_sample);
@@ -111,11 +125,11 @@ void AnalogSignal::paint_mid(QPainter &p, int left, int right)
 		(int64_t)0), last_sample);
 
 	if (samples_per_pixel < EnvelopeThreshold)
-		paint_trace(p, snapshot, y, left,
+		paint_trace(p, snapshot, y, pp.left(),
 			start_sample, end_sample,
 			pixels_offset, samples_per_pixel);
 	else
-		paint_envelope(p, snapshot, y, left,
+		paint_envelope(p, snapshot, y, pp.left(),
 			start_sample, end_sample,
 			pixels_offset, samples_per_pixel);
 }
@@ -130,7 +144,7 @@ void AnalogSignal::paint_trace(QPainter &p,
 	const float *const samples = snapshot->get_samples(start, end);
 	assert(samples);
 
-	p.setPen(_colour);
+	p.setPen(colour_);
 
 	QPointF *points = new QPointF[sample_count];
 	QPointF *point = points;
@@ -139,7 +153,7 @@ void AnalogSignal::paint_trace(QPainter &p,
 		const float x = (sample / samples_per_pixel -
 			pixels_offset) + left;
 		*point++ = QPointF(x,
-			y - samples[sample - start] * _scale);
+			y - samples[sample - start] * scale_);
 	}
 
 	p.drawPolyline(points, point - points);
@@ -162,7 +176,7 @@ void AnalogSignal::paint_envelope(QPainter &p,
 		return;
 
 	p.setPen(QPen(Qt::NoPen));
-	p.setBrush(_colour);
+	p.setBrush(colour_);
 
 	QRectF *const rects = new QRectF[e.length];
 	QRectF *rect = rects;
@@ -175,8 +189,8 @@ void AnalogSignal::paint_envelope(QPainter &p,
 
 		// We overlap this sample with the next so that vertical
 		// gaps do not appear during steep rising or falling edges
-		const float b = y - max(s->max, (s+1)->min) * _scale;
-		const float t = y - min(s->min, (s+1)->max) * _scale;
+		const float b = y - max(s->max, (s+1)->min) * scale_;
+		const float t = y - min(s->min, (s+1)->max) * scale_;
 
 		float h = b - t;
 		if(h >= 0.0f && h <= 1.0f)