RowItemPaintParams: Bundled scale and offset

[pulseview.git] / pv / view / analogsignal.cpp

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 8a19cc210180abeedaedeb6305e96942b046686a..5d838506cedb1877ccf3b284b92735ba2cf0025f 100644 (file)
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -87,28 +87,19 @@ std::pair<int, int> AnalogSignal::v_extents() const
        return make_pair(-NominalHeight / 2, NominalHeight / 2);
 }
 
-void AnalogSignal::paint_back(QPainter &p, int left, int right)
+void AnalogSignal::paint_back(QPainter &p, const RowItemPaintParams &pp)
 {
        if (channel_->enabled())
-               paint_axis(p, get_visual_y(), left, right);
+               paint_axis(p, pp, get_visual_y());
 }
 
-void AnalogSignal::paint_mid(QPainter &p, int left, int right)
+void AnalogSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp)
 {
        assert(data_);
-       assert(right >= left);
        assert(owner_);
 
        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;
 
@@ -120,13 +111,13 @@ void AnalogSignal::paint_mid(QPainter &p, int left, int right)
        const shared_ptr<pv::data::AnalogSnapshot> &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 end = start + samples_per_pixel * (right - left);
+       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),
                (int64_t)0), last_sample);
@@ -134,11 +125,11 @@ void AnalogSignal::paint_mid(QPainter &p, int left, int right)
                (int64_t)0), last_sample);
 
        if (samples_per_pixel < EnvelopeThreshold)
-               paint_trace(p, snapshot, y, left,
+               paint_trace(p, snapshot, y, pp.left(),
                        start_sample, end_sample,
                        pixels_offset, samples_per_pixel);
        else
-               paint_envelope(p, snapshot, y, left,
+               paint_envelope(p, snapshot, y, pp.left(),
                        start_sample, end_sample,
                        pixels_offset, samples_per_pixel);
 }