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

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index f7e7ebf2..ea443f23 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -38,11 +38,12 @@
 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 QColor Trace::DarkBGColour(235, 235, 235);    // Quite light grey
-const QColor Trace::BrightBGColour(245, 245, 245);  // Very light grey
+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),
@@ -72,7 +73,7 @@ void Trace::set_colour(QColor colour)
 	colour_ = colour;
 
 	bgcolour_ = colour;
-	bgcolour_.setAlpha(20);
+	bgcolour_.setAlpha(ColourBGAlpha);
 }
 
 void Trace::set_coloured_bg(bool state)
@@ -80,17 +81,6 @@ void Trace::set_coloured_bg(bool state)
 	coloured_bg_ = state;
 }
 
-bool Trace::is_draggable() const
-{
-	const View *const view = owner_->view();
-	assert(view);
-
-	QPoint cursor_pos = view->mapFromGlobal(QCursor::pos());
-
-	// The signal is draggable only in the header area
-	return (cursor_pos.x() <= view->header_size().width());
-}
-
 void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
 	const int y = get_visual_y();
@@ -186,19 +176,12 @@ 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_ ? BrightBGColour : DarkBGColour);
+		p.setBrush(bgcolour_state_ ? BrightGrayBGColour : DarkGrayBGColour);
 
 	p.setPen(QPen(Qt::NoPen));
 
@@ -214,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)