X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=681386ff6b91f9c69e4f1a84f350b08675551b43;hp=6aeef98a57aa14f474e7b7d0fdcacbae8158a07a;hb=01fd32630269c1cfb99eb2b0d6060d7d19a42475;hpb=640d69ce065e5c5a30e83395b259a63f7e03c779 diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp index 6aeef98a..681386ff 100644 --- a/pv/view/analogsignal.cpp +++ b/pv/view/analogsignal.cpp @@ -25,6 +25,7 @@ #include "analogsignal.h" #include "pv/data/analog.h" #include "pv/data/analogsnapshot.h" +#include "pv/view/view.h" using namespace boost; using namespace std; @@ -66,13 +67,19 @@ void AnalogSignal::set_scale(float scale) _scale = scale; } -void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale, - double offset) +void AnalogSignal::paint(QPainter &p, int left, int right) { - assert(scale > 0); assert(_data); assert(right >= left); + assert(_view); + const int y = _v_offset - _view->v_offset(); + + const double scale = _view->scale(); + assert(scale > 0); + + const double offset = _view->offset(); + if (!_probe->enabled) return;