X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=9cc3547d272996a717cb7ebfe36c004a14ef7ce1;hb=dd048a7ec035447c051c7937ce04aca5be065b4e;hp=64633717fb4b8098637901813421df24f83c3d30;hpb=9d28da5ae394e572dedf0ec22c17fd259825e1c9;p=pulseview.git diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp index 64633717..9cc3547d 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 { @@ -55,7 +57,12 @@ AnalogSignal::~AnalogSignal() { } -boost::shared_ptr AnalogSignal::data() const +shared_ptr AnalogSignal::data() const +{ + return _data; +} + +shared_ptr AnalogSignal::analog_data() const { return _data; } @@ -151,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; @@ -160,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];