Use channel color as the trace background color

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

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index 8e3927848ae64d271619444e2dae89b462d20e5f..05054d4927001c260d271d713ba88bbc14433029 100644 (file)
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -43,8 +43,8 @@ const int Trace::LabelHitPadding = 2;
 
 Trace::Trace(QString name) :
        name_(name),
-       popup_(NULL),
-       popup_form_(NULL)
+       popup_(nullptr),
+       popup_form_(nullptr)
 {
 }
 
@@ -66,6 +66,9 @@ QColor Trace::colour() const
 void Trace::set_colour(QColor colour)
 {
        colour_ = colour;
+
+       bgcolour_ = colour;
+       bgcolour_.setAlpha(20);
 }
 
 void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
@@ -163,11 +166,26 @@ QRectF Trace::label_rect(const QRectF &rect) const
                label_size.height());
 }
 
-QRectF Trace::hit_box_rect(const QRectF &rect) const
+QRectF Trace::hit_box_rect(const ViewItemPaintParams &pp) const
 {
        const float h = QFontMetrics(QApplication::font()).height();
-       return QRectF(rect.left(), get_visual_y() - h / 2.0f,
-               rect.width(), h);
+       return QRectF(pp.left(), get_visual_y() - h / 2.0f,
+               pp.width(), h);
+}
+
+void Trace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
+{
+       p.setPen(QPen(Qt::NoPen));
+       p.setBrush(bgcolour_);
+
+       const std::pair<int, int> extents = v_extents();
+
+       const int x = 0;
+       const int y = get_visual_y() + extents.first;
+       const int w = pp.right() - pp.left();
+       const int h = extents.second - extents.first;
+
+       p.drawRect(x, y, w, h);
 }
 
 void Trace::paint_axis(QPainter &p, const ViewItemPaintParams &pp, int y)
@@ -219,8 +237,8 @@ void Trace::populate_popup_form(QWidget *parent, QFormLayout *form)
 
 void Trace::on_popup_closed()
 {
-       popup_ = NULL;
-       popup_form_ = NULL;
+       popup_ = nullptr;
+       popup_form_ = nullptr;
 }
 
 void Trace::on_text_changed(const QString &text)
@@ -236,7 +254,7 @@ void Trace::on_colour_changed(const QColor &colour)
        set_colour(colour);
 
        if (owner_)
-               owner_->row_item_appearance_changed(true, false);
+               owner_->row_item_appearance_changed(true, true);
 }
 
 } // namespace view