X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=ea443f23b91cebf4ddb141b64ae3ef4af705b357;hp=05054d4927001c260d271d713ba88bbc14433029;hb=d55923a65aa672f65f9fe2c30ddbe46beddcaa3a;hpb=99af6802961b0a5ec7ec7d3ff2215c8eb6925ca3

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index 05054d49..ea443f23 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -38,11 +38,16 @@
 namespace pv {
 namespace view {
 
-const QPen Trace::AxisPen(QColor(128, 128, 128, 64));
+const QPen Trace::AxisPen(QColor(0, 0, 0, 30*256/100));
 const int Trace::LabelHitPadding = 2;
 
+const int Trace::ColourBGAlpha = 8*256/100;
+const QColor Trace::BrightGrayBGColour = QColor(0, 0, 0, 10*255/100);
+const QColor Trace::DarkGrayBGColour = QColor(0, 0, 0, 15*255/100);
+
 Trace::Trace(QString name) :
 	name_(name),
+	coloured_bg_(true), // Default setting is set in MainWindow::setup_ui()
 	popup_(nullptr),
 	popup_form_(nullptr)
 {
@@ -68,7 +73,12 @@ void Trace::set_colour(QColor colour)
 	colour_ = colour;
 
 	bgcolour_ = colour;
-	bgcolour_.setAlpha(20);
+	bgcolour_.setAlpha(ColourBGAlpha);
+}
+
+void Trace::set_coloured_bg(bool state)
+{
+	coloured_bg_ = state;
 }
 
 void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
@@ -166,17 +176,14 @@ QRectF Trace::label_rect(const QRectF &rect) const
 		label_size.height());
 }
 
-QRectF Trace::hit_box_rect(const ViewItemPaintParams &pp) const
-{
-	const float h = QFontMetrics(QApplication::font()).height();
-	return QRectF(pp.left(), get_visual_y() - h / 2.0f,
-		pp.width(), h);
-}
-
 void Trace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
 {
+	if (coloured_bg_)
+		p.setBrush(bgcolour_);
+	else
+		p.setBrush(bgcolour_state_ ? BrightGrayBGColour : DarkGrayBGColour);
+
 	p.setPen(QPen(Qt::NoPen));
-	p.setBrush(bgcolour_);
 
 	const std::pair<int, int> extents = v_extents();
 
@@ -190,8 +197,12 @@ void Trace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
 
 void Trace::paint_axis(QPainter &p, const ViewItemPaintParams &pp, int y)
 {
+	p.setRenderHint(QPainter::Antialiasing, false);
+
 	p.setPen(AxisPen);
-	p.drawLine(QPointF(pp.left(), y + 0.5f), QPointF(pp.right(), y + 0.5f));
+	p.drawLine(QPointF(pp.left(), y), QPointF(pp.right(), y));
+
+	p.setRenderHint(QPainter::Antialiasing, true);
 }
 
 void Trace::add_colour_option(QWidget *parent, QFormLayout *form)