X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=3acf1b5cb03ebf53c8a632075a07f32adfa0f7f3;hp=1ee99cb90595a46a9ff57fceae478d57399cf78b;hb=4c8a6a6d03e2a12f67d910a83589072b478114cb;hpb=97904bf71258d3b522b00eb3dcae1efea6bd1298 diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp index 1ee99cb9..3acf1b5c 100644 --- a/pv/view/logicsignal.cpp +++ b/pv/view/logicsignal.cpp @@ -153,8 +153,6 @@ void LogicSignal::paint_back(QPainter &p, const RowItemPaintParams &pp) void LogicSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp) { - using pv::view::View; - QLineF *line; vector< pair > edges; @@ -165,14 +163,6 @@ void LogicSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp) const int y = get_visual_y(); - const View *const view = owner_->view(); - assert(view); - - const double scale = view->scale(); - assert(scale > 0); - - const double offset = view->offset(); - if (!channel_->enabled()) return; @@ -193,11 +183,11 @@ void LogicSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp) if (samplerate == 0.0) samplerate = 1.0; - const double pixels_offset = offset / scale; + const double pixels_offset = pp.pixels_offset(); 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; - const double start = samplerate * (offset - start_time); + const double samples_per_pixel = samplerate * pp.scale(); + const double start = samplerate * (pp.offset() - start_time); const double end = start + samples_per_pixel * pp.width(); snapshot->get_subsampled_edges(edges,