Rename Trace::channel_ to Trace::base_, including dependencies

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

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index e0add7aaedc64e7a116ea2bc4229dd4e25ab6583..cd57da06b6073e0143f3f859bad2b70a8120a426 100644 (file)
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -36,6 +36,7 @@
 #include "analogsignal.hpp"
 #include "pv/data/analog.hpp"
 #include "pv/data/analogsegment.hpp"
+#include "pv/data/signalbase.hpp"
 #include "pv/view/view.hpp"
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
@@ -46,8 +47,6 @@ using std::min;
 using std::shared_ptr;
 using std::deque;
 
-using sigrok::Channel;
-
 namespace pv {
 namespace view {
 
@@ -72,9 +71,9 @@ const int AnalogSignal::InfoTextMarginBottom = 5;
 
 AnalogSignal::AnalogSignal(
        pv::Session &session,
-       shared_ptr<Channel> channel,
+       shared_ptr<data::SignalBase> base,
        shared_ptr<data::Analog> data) :
-       Signal(session, channel),
+       Signal(session, base),
        data_(data),
        scale_index_(4), // 20 per div
        scale_index_drag_offset_(0),
@@ -82,7 +81,7 @@ AnalogSignal::AnalogSignal(
        vdivs_(1),
        resolution_(0)
 {
-       set_colour(SignalColours[channel_->index() % countof(SignalColours)]);
+       base_->set_colour(SignalColours[base_->index() % countof(SignalColours)]);
        update_scale();
 }
 
@@ -128,7 +127,7 @@ void AnalogSignal::scale_handle_drag_release()
 
 void AnalogSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
 {
-       if (channel_->enabled()) {
+       if (base_->enabled()) {
                Trace::paint_back(p, pp);
                paint_axis(p, pp, get_visual_y());
        }
@@ -141,7 +140,7 @@ void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 
        const int y = get_visual_y();
 
-       if (!channel_->enabled())
+       if (!base_->enabled())
                return;
 
        paint_grid(p, y, pp.left(), pp.right());
@@ -187,7 +186,7 @@ void AnalogSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
        // Show the info section on the right side of the trace
        const QString infotext = QString("%1 V/div").arg(resolution_);
 
-       p.setPen(colour_);
+       p.setPen(base_->colour());
        p.setFont(QApplication::font());
 
        const QRectF bounding_rect = QRectF(pp.left(),
@@ -236,7 +235,7 @@ void AnalogSignal::paint_trace(QPainter &p,
        const float *const samples = segment->get_samples(start, end);
        assert(samples);
 
-       p.setPen(colour_);
+       p.setPen(base_->colour());
 
        QPointF *points = new QPointF[sample_count];
        QPointF *point = points;
@@ -268,7 +267,7 @@ void AnalogSignal::paint_envelope(QPainter &p,
                return;
 
        p.setPen(QPen(Qt::NoPen));
-       p.setBrush(colour_);
+       p.setBrush(base_->colour());
 
        QRectF *const rects = new QRectF[e.length];
        QRectF *rect = rects;
@@ -360,8 +359,11 @@ void AnalogSignal::on_vdivs_changed(int vdivs)
 {
        vdivs_ = vdivs;
 
-       if (owner_)
+       if (owner_) {
+               // Call order is important, otherwise the lazy event handler won't work
                owner_->extents_changed(false, true);
+               owner_->row_item_appearance_changed(false, true);
+       }
 }
 
 void AnalogSignal::on_resolution_changed(int index)