X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=eb828a1bfff61c93b58386618e03cb534f6ff850;hb=0aad432c15b1b3dc4d156b7e9d682a96cbe3ff54;hp=53af2643132ee895c65e5bd8df10e4bc655a3061;hpb=03ce95a9bb81c05bae0da9de189d280214db67c3;p=pulseview.git

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 53af2643..eb828a1b 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,7 +44,7 @@ const QColor AnalogSignal::SignalColours[4] = {
 
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
-AnalogSignal::AnalogSignal(pv::SigSession &session, const sr_probe *const probe,
+AnalogSignal::AnalogSignal(pv::SigSession &session, sr_probe *const probe,
 	shared_ptr<data::Analog> data) :
 	Signal(session, probe),
 	_data(data),
@@ -55,6 +57,11 @@ AnalogSignal::~AnalogSignal()
 {
 }
 
+boost::shared_ptr<pv::data::SignalData> AnalogSignal::data() const
+{
+	return _data;
+}
+
 void AnalogSignal::set_scale(float scale)
 {
 	_scale = scale;
@@ -91,7 +98,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;
@@ -146,7 +153,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;
@@ -155,7 +161,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];