X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=87d3dc1dc095fa7ebd7b1dd2b7dba0bf5c255c8e;hp=e9235e56f2713bfd348f29ab6c3c14112968f81d;hb=e300444978bad69c104ce49c862da53dbe682e50;hpb=d8d724cc987b7edb6a5e4e9d0dc8415f3cca06e9

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index e9235e56..87d3dc1d 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>
@@ -38,13 +38,18 @@
 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),
-	popup_(NULL),
-	popup_form_(NULL)
+	coloured_bg_(true), // Default setting is set in MainWindow::setup_ui()
+	popup_(nullptr),
+	popup_form_(nullptr)
 {
 }
 
@@ -66,9 +71,17 @@ QColor Trace::colour() const
 void Trace::set_colour(QColor colour)
 {
 	colour_ = colour;
+
+	bgcolour_ = colour;
+	bgcolour_.setAlpha(ColourBGAlpha);
+}
+
+void Trace::set_coloured_bg(bool state)
+{
+	coloured_bg_ = state;
 }
 
-void Trace::paint_label(QPainter &p, int right, bool hover)
+void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
 	const int y = get_visual_y();
 
@@ -77,7 +90,7 @@ void Trace::paint_label(QPainter &p, int right, bool hover)
 	if (!enabled())
 		return;
 
-	const QRectF r = label_rect(right);
+	const QRectF r = label_rect(rect);
 
 	// Paint the label
 	const float label_arrow_length = r.height() / 2;
@@ -124,7 +137,7 @@ void Trace::paint_label(QPainter &p, int right, bool hover)
 
 QMenu* Trace::create_context_menu(QWidget *parent)
 {
-	QMenu *const menu = SelectableItem::create_context_menu(parent);
+	QMenu *const menu = ViewItem::create_context_menu(parent);
 
 	return menu;
 }
@@ -134,6 +147,8 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent)
 	using pv::widgets::Popup;
 
 	popup_ = new Popup(parent);
+	popup_->set_position(parent->mapToGlobal(
+		point(parent->rect())), Popup::Right);
 
 	create_popup_form();
 
@@ -143,29 +158,51 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent)
 	return popup_;
 }
 
-QRectF Trace::label_rect(int right) const
+QRectF Trace::label_rect(const QRectF &rect) const
 {
 	using pv::view::View;
 
 	QFontMetrics m(QApplication::font());
 	const QSize text_size(
-		m.boundingRect(QRect(), 0, name_).width(),
-		m.boundingRect(QRect(), 0, "Tg").height());
+		m.boundingRect(QRect(), 0, name_).width(), m.height());
 	const QSizeF label_size(
-		text_size.width() + View::LabelPadding.width() * 2,
-		ceilf((text_size.height() + View::LabelPadding.height() * 2) / 2) * 2);
+		text_size.width() + LabelPadding.width() * 2,
+		ceilf((text_size.height() + LabelPadding.height() * 2) / 2) * 2);
 	const float half_height = label_size.height() / 2;
 	return QRectF(
-		right - half_height - label_size.width() - 0.5,
+		rect.right() - half_height - label_size.width() - 0.5,
 		get_visual_y() + 0.5f - half_height,
 		label_size.width() + half_height,
 		label_size.height());
 }
 
-void Trace::paint_axis(QPainter &p, const RowItemPaintParams &pp, int y)
+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));
+
+	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.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)
@@ -187,10 +224,14 @@ void Trace::create_popup_form()
 	// Clear the layout
 
 	// Transfer the layout and the child widgets to a temporary widget
-	// which then goes out of scope destroying the layout and all the child
-	// widgets.
-	if (popup_form_)
-		QWidget().setLayout(popup_form_);
+	// which we delete after the event was handled. This way, the layout
+	// and all widgets contained therein are deleted after the event was
+	// handled, leaving the parent popup_ time to handle the change.
+	if (popup_form_) {
+		QWidget *suicidal = new QWidget();
+		suicidal->setLayout(popup_form_);
+		suicidal->deleteLater();
+	}
 
 	// Repopulate the popup
 	popup_form_ = new QFormLayout(popup_);
@@ -211,8 +252,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)
@@ -228,7 +269,7 @@ void Trace::on_colour_changed(const QColor &colour)
 	set_colour(colour);
 
 	if (owner_)
-		owner_->appearance_changed(true, false);
+		owner_->row_item_appearance_changed(true, true);
 }
 
 } // namespace view