X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=a64cf70f430dc4fd7c8d8d47432c24f593aa63ed;hp=a4474dac8e06a0026b40da41e53b15b3cc7e8bc9;hb=e183f4e328db8bb134652254ba9bf0707dc16c66;hpb=fe08b6e8a85c80ae738757f7d85aa38ef7c4bdc3

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index a4474dac..a64cf70f 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -27,8 +27,10 @@
 #include "pv/data/analogsnapshot.h"
 #include "pv/view/view.h"
 
-using namespace boost;
-using namespace std;
+using boost::shared_ptr;
+using std::max;
+using std::min;
+using std::deque;
 
 namespace pv {
 namespace view {
@@ -42,9 +44,9 @@ const QColor AnalogSignal::SignalColours[4] = {
 
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
-AnalogSignal::AnalogSignal(pv::SigSession &session, const sr_probe *const probe,
-	shared_ptr<data::Analog> data) :
-	Signal(session, probe),
+AnalogSignal::AnalogSignal(shared_ptr<pv::DevInst> dev_inst,
+	const sr_probe *const probe, shared_ptr<data::Analog> data) :
+	Signal(dev_inst, probe),
 	_data(data),
 	_scale(1.0f)
 {
@@ -55,11 +57,14 @@ AnalogSignal::~AnalogSignal()
 {
 }
 
-const list<QAction*> AnalogSignal::get_context_bar_actions()
+shared_ptr<pv::data::SignalData> AnalogSignal::data() const
 {
-	list<QAction*> actions;
-	actions.push_back(_name_action);
-	return actions;
+	return _data;
+}
+
+shared_ptr<pv::data::Analog> AnalogSignal::analog_data() const
+{
+	return _data;
 }
 
 void AnalogSignal::set_scale(float scale)
@@ -98,7 +103,7 @@ void AnalogSignal::paint_mid(QPainter &p, int left, int right)
 		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;
@@ -153,7 +158,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;
@@ -162,7 +166,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];