X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=3624ccf0f26b2df1dce6624c95a78d974d69b5bd;hp=0c934cc72cb0f3de8a675332de3115deb86b9ee4;hb=01fd32630269c1cfb99eb2b0d6060d7d19a42475;hpb=640d69ce065e5c5a30e83395b259a63f7e03c779 diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp index 0c934cc..3624ccf 100644 --- a/pv/view/logicsignal.cpp +++ b/pv/view/logicsignal.cpp @@ -28,6 +28,7 @@ #include "pv/sigsession.h" #include "pv/data/logic.h" #include "pv/data/logicsnapshot.h" +#include "pv/view/view.h" using namespace boost; using namespace std; @@ -156,8 +157,7 @@ const list LogicSignal::get_context_bar_actions() return actions; } -void LogicSignal::paint(QPainter &p, int y, int left, int right, - double scale, double offset) +void LogicSignal::paint(QPainter &p, int left, int right) { using pv::view::View; @@ -166,10 +166,17 @@ void LogicSignal::paint(QPainter &p, int y, int left, int right, vector< pair > edges; assert(_probe); - 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;