X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftracegroup.cpp;h=140b85187efef4f2309837db938db75a6de82dce;hp=272fc1a1e3b341823e82133c099d4f35f392c617;hb=c373f82810ad9c5376a7370118de9dd587ee0e43;hpb=2b81ae4682ade4109ffa442794de36ceb32045eb

diff --git a/pv/view/tracegroup.cpp b/pv/view/tracegroup.cpp
index 272fc1a1..140b8518 100644
--- a/pv/view/tracegroup.cpp
+++ b/pv/view/tracegroup.cpp
@@ -49,7 +49,7 @@ TraceGroup::~TraceGroup()
 bool TraceGroup::enabled() const
 {
 	return std::any_of(child_items().begin(), child_items().end(),
-		[](const shared_ptr<RowItem> &r) { return r->enabled(); });
+		[](const shared_ptr<ViewItem> &r) { return r->enabled(); });
 }
 
 pv::Session& TraceGroup::session()
@@ -78,12 +78,12 @@ const pv::view::View* TraceGroup::view() const
 
 pair<int, int> TraceGroup::v_extents() const
 {
-	return RowItemOwner::v_extents();
+	return TraceTreeItemOwner::v_extents();
 }
 
-void TraceGroup::paint_label(QPainter &p, int right, bool hover)
+void TraceGroup::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
-	const QRectF r = label_rect(right).adjusted(
+	const QRectF r = label_rect(rect).adjusted(
 		LineThickness / 2, LineThickness / 2,
 		-LineThickness / 2, -LineThickness / 2);
 
@@ -112,15 +112,15 @@ void TraceGroup::paint_label(QPainter &p, int right, bool hover)
 	p.drawPolyline(points, countof(points));
 }
 
-QRectF TraceGroup::label_rect(int right) const
+QRectF TraceGroup::label_rect(const QRectF &rect) const
 {
-	QRectF rect;
-	for (const shared_ptr<RowItem> r : child_items())
+	QRectF child_rect;
+	for (const shared_ptr<ViewItem> r : child_items())
 		if (r && r->enabled())
-			rect = rect.united(r->label_rect(right));
+			child_rect = child_rect.united(r->label_rect(rect));
 
-	return QRectF(rect.x() - Width - Padding, rect.y(),
-		Width, rect.height());
+	return QRectF(child_rect.x() - Width - Padding, child_rect.y(),
+		Width, child_rect.height());
 }
 
 bool TraceGroup::pt_in_label_rect(int left, int right, const QPoint &point)
@@ -147,7 +147,7 @@ QMenu* TraceGroup::create_context_menu(QWidget *parent)
 pv::widgets::Popup* TraceGroup::create_popup(QWidget *parent)
 {
 	(void)parent;
-	return NULL;
+	return nullptr;
 }
 
 int TraceGroup::owner_visual_v_offset() const
@@ -157,12 +157,11 @@ int TraceGroup::owner_visual_v_offset() const
 
 void TraceGroup::restack_items()
 {
-	vector< shared_ptr<RowItem> > items(
-		child_items().begin(), child_items().end());
+	vector<shared_ptr<TraceTreeItem>> items(trace_tree_child_items());
 
 	// Sort by the centre line of the extents
 	stable_sort(items.begin(), items.end(),
-		[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
+		[](const shared_ptr<TraceTreeItem> &a, const shared_ptr<TraceTreeItem> &b) {
 			const auto aext = a->v_extents();
 			const auto bext = b->v_extents();
                         return a->layout_v_offset() +
@@ -172,7 +171,7 @@ void TraceGroup::restack_items()
 		});
 
 	int total_offset = 0;
-	for (shared_ptr<RowItem> r : items) {
+	for (shared_ptr<TraceTreeItem> r : items) {
 		const pair<int, int> extents = r->v_extents();
 		if (extents.first == 0 && extents.second == 0)
 			continue;
@@ -197,11 +196,10 @@ unsigned int TraceGroup::depth() const
 
 void TraceGroup::ungroup()
 {
-	const vector< shared_ptr<RowItem> > items(
-		child_items().begin(), child_items().end());
+	const vector<shared_ptr<TraceTreeItem>> items(trace_tree_child_items());
 	clear_child_items();
 
-	for (shared_ptr<RowItem> r : items)
+	for (shared_ptr<TraceTreeItem> r : items)
 		owner_->add_child_item(r);
 
 	owner_->remove_child_item(shared_from_this());
@@ -212,10 +210,10 @@ void TraceGroup::on_ungroup()
 	ungroup();
 }
 
-void TraceGroup::appearance_changed(bool label, bool content)
+void TraceGroup::row_item_appearance_changed(bool label, bool content)
 {
 	if (owner_)
-		owner_->appearance_changed(label, content);
+		owner_->row_item_appearance_changed(label, content);
 }
 
 void TraceGroup::extents_changed(bool horz, bool vert)