Replaced using namespace with using class directives

[pulseview.git] / pv / view / analogsignal.cpp

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 681386ff6b91f9c69e4f1a84f350b08675551b43..eb828a1bfff61c93b58386618e03cb534f6ff850 100644 (file)
--- 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,11 +57,9 @@ AnalogSignal::~AnalogSignal()
 {
 }
 
-const list<QAction*> AnalogSignal::get_context_bar_actions()
+boost::shared_ptr<pv::data::SignalData> AnalogSignal::data() const
 {
-       list<QAction*> actions;
-       actions.push_back(_name_action);
-       return actions;
+       return _data;
 }
 
 void AnalogSignal::set_scale(float scale)
@@ -67,7 +67,13 @@ void AnalogSignal::set_scale(float scale)
        _scale = scale;
 }
 
-void AnalogSignal::paint(QPainter &p, int left, int right)
+void AnalogSignal::paint_back(QPainter &p, int left, int right)
+{
+       if (_probe->enabled)
+               paint_axis(p, get_y(), left, right);
+}
+
+void AnalogSignal::paint_mid(QPainter &p, int left, int right)
 {
        assert(_data);
        assert(right >= left);
@@ -83,8 +89,6 @@ void AnalogSignal::paint(QPainter &p, int left, int right)
        if (!_probe->enabled)
                return;
 
-       paint_axis(p, y, left, right);
-
        const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
                _data->get_snapshots();
        if (snapshots.empty())
@@ -94,7 +98,7 @@ void AnalogSignal::paint(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;
@@ -149,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;
@@ -158,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];