X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=5d838506cedb1877ccf3b284b92735ba2cf0025f;hp=325ab6bd301e00e610f51e9997367b0a9cb9cd58;hb=4c8a6a6d03e2a12f67d910a83589072b478114cb;hpb=97904bf71258d3b522b00eb3dcae1efea6bd1298 diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp index 325ab6bd..5d838506 100644 --- a/pv/view/analogsignal.cpp +++ b/pv/view/analogsignal.cpp @@ -100,14 +100,6 @@ void AnalogSignal::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; @@ -119,12 +111,12 @@ void AnalogSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp) const shared_ptr &snapshot = snapshots.front(); - const double pixels_offset = offset / scale; + const double pixels_offset = pp.pixels_offset(); 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; - 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(); const int64_t start_sample = min(max((int64_t)floor(start),