X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=3bdf725df4f4bc52fb739586da259191c5b386e0;hp=d6a4fec6045ad1bf21ee3dd5ee3d01685d43c47c;hb=455bc29ab7bf8acb9b3520f8a59b8365309134ac;hpb=bf0edd2b0cbb5f4bd5d69b0f00bcea7d037e2287

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index d6a4fec6..3bdf725d 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -36,7 +36,8 @@
 #include <pv/widgets/popup.hpp>
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 const QPen Trace::AxisPen(QColor(0, 0, 0, 30*256/100));
 const int Trace::LabelHitPadding = 2;
@@ -45,7 +46,7 @@ const QColor Trace::BrightGrayBGColour = QColor(0, 0, 0, 10*255/100);
 const QColor Trace::DarkGrayBGColour = QColor(0, 0, 0, 15*255/100);
 
 Trace::Trace(std::shared_ptr<data::SignalBase> channel) :
-	channel_(channel),
+	base_(channel),
 	coloured_bg_(true), // Default setting is set in MainWindow::setup_ui()
 	popup_(nullptr),
 	popup_form_(nullptr)
@@ -65,7 +66,7 @@ void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
 	const int y = get_visual_y();
 
-	p.setBrush(channel_->colour());
+	p.setBrush(base_->colour());
 
 	if (!enabled())
 		return;
@@ -96,23 +97,23 @@ void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
 	}
 
 	p.setPen(Qt::transparent);
-	p.setBrush(hover ? channel_->colour().lighter() : channel_->colour());
+	p.setBrush(hover ? base_->colour().lighter() : base_->colour());
 	p.drawPolygon(points, countof(points));
 
-	p.setPen(channel_->colour().lighter());
+	p.setPen(base_->colour().lighter());
 	p.setBrush(Qt::transparent);
 	p.drawPolygon(highlight_points, countof(highlight_points));
 
-	p.setPen(channel_->colour().darker());
+	p.setPen(base_->colour().darker());
 	p.setBrush(Qt::transparent);
 	p.drawPolygon(points, countof(points));
 
 	// Paint the text
-	p.setPen(select_text_colour(channel_->colour()));
+	p.setPen(select_text_colour(base_->colour()));
 	p.setFont(QApplication::font());
 	p.drawText(QRectF(r.x(), r.y(),
 		r.width() - label_arrow_length, r.height()),
-		Qt::AlignCenter | Qt::AlignVCenter, channel_->name());
+		Qt::AlignCenter | Qt::AlignVCenter, base_->name());
 }
 
 QMenu* Trace::create_context_menu(QWidget *parent)
@@ -140,11 +141,9 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent)
 
 QRectF Trace::label_rect(const QRectF &rect) const
 {
-	using pv::view::View;
-
 	QFontMetrics m(QApplication::font());
 	const QSize text_size(
-		m.boundingRect(QRect(), 0, channel_->name()).width(), m.height());
+		m.boundingRect(QRect(), 0, base_->name()).width(), m.height());
 	const QSizeF label_size(
 		text_size.width() + LabelPadding.width() * 2,
 		ceilf((text_size.height() + LabelPadding.height() * 2) / 2) * 2);
@@ -159,7 +158,7 @@ QRectF Trace::label_rect(const QRectF &rect) const
 void Trace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
 {
 	if (coloured_bg_)
-		p.setBrush(channel_->bgcolour());
+		p.setBrush(base_->bgcolour());
 	else
 		p.setBrush(bgcolour_state_ ? BrightGrayBGColour : DarkGrayBGColour);
 
@@ -192,7 +191,7 @@ void Trace::add_colour_option(QWidget *parent, QFormLayout *form)
 	ColourButton *const colour_button = new ColourButton(
 		TracePalette::Rows, TracePalette::Cols, parent);
 	colour_button->set_palette(TracePalette::Colours);
-	colour_button->set_colour(channel_->colour());
+	colour_button->set_colour(base_->colour());
 	connect(colour_button, SIGNAL(selected(const QColor&)),
 		this, SLOT(on_colouredit_changed(const QColor&)));
 
@@ -222,7 +221,7 @@ void Trace::create_popup_form()
 void Trace::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
 	QLineEdit *const name_edit = new QLineEdit(parent);
-	name_edit->setText(channel_->name());
+	name_edit->setText(base_->name());
 	connect(name_edit, SIGNAL(textChanged(const QString&)),
 		this, SLOT(on_nameedit_changed(const QString&)));
 	form->addRow(tr("Name"), name_edit);
@@ -232,12 +231,12 @@ void Trace::populate_popup_form(QWidget *parent, QFormLayout *form)
 
 void Trace::set_name(QString name)
 {
-	channel_->set_name(name);
+	base_->set_name(name);
 }
 
 void Trace::set_colour(QColor colour)
 {
-	channel_->set_colour(colour);
+	base_->set_colour(colour);
 }
 
 void Trace::on_name_changed(const QString &text)
@@ -278,5 +277,6 @@ void Trace::on_colouredit_changed(const QColor &colour)
 	set_colour(colour);
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv