X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=264541cf18c09f4ca9e5e7b9aebe4431209c22e4;hp=bf1c4ae511f4f507726e97ab2f726b7b95fb6dc0;hb=744aa24fc5a7084461e4e70595b96f1c3eac65e4;hpb=786b76785856c6cf8f5916c0b8d76a61695762f9

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index bf1c4ae5..264541cf 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -21,7 +21,7 @@
 #include <extdef.h>
 
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 
 #include <QApplication>
 #include <QFormLayout>
@@ -41,10 +41,14 @@ namespace view {
 const QPen Trace::AxisPen(QColor(128, 128, 128, 64));
 const int Trace::LabelHitPadding = 2;
 
+const QColor Trace::DarkBGColour(235, 235, 235);    // Quite light grey
+const QColor Trace::BrightBGColour(245, 245, 245);  // Very light grey
+
 Trace::Trace(QString name) :
 	name_(name),
-	popup_(NULL),
-	popup_form_(NULL)
+	coloured_bg_(true), // Default setting is set in MainWindow::setup_ui()
+	popup_(nullptr),
+	popup_form_(nullptr)
 {
 }
 
@@ -66,6 +70,14 @@ QColor Trace::colour() const
 void Trace::set_colour(QColor colour)
 {
 	colour_ = colour;
+
+	bgcolour_ = colour;
+	bgcolour_.setAlpha(20);
+}
+
+void Trace::set_coloured_bg(bool state)
+{
+	coloured_bg_ = state;
 }
 
 void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
@@ -163,6 +175,25 @@ QRectF Trace::label_rect(const QRectF &rect) const
 		label_size.height());
 }
 
+void Trace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
+{
+	if (coloured_bg_)
+		p.setBrush(bgcolour_);
+	else
+		p.setBrush(bgcolour_state_ ? BrightBGColour : DarkBGColour);
+
+	p.setPen(QPen(Qt::NoPen));
+
+	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)
 {
 	p.setPen(AxisPen);
@@ -212,8 +243,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)
@@ -229,7 +260,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