TraceTreeItem: Separated from RowItem

[pulseview.git] / pv / view / tracegroup.cpp

diff --git a/pv/view/tracegroup.cpp b/pv/view/tracegroup.cpp
index 16b9d0cc80e7a9da9869342e6fac5bf189151476..87f1ff3dcab20fac2c065a5daadb0525534e56f8 100644 (file)
--- a/pv/view/tracegroup.cpp
+++ b/pv/view/tracegroup.cpp
@@ -26,7 +26,7 @@
 #include <QMenu>
 #include <QPainter>
 
-#include "tracegroup.h"
+#include "tracegroup.hpp"
 
 using std::pair;
 using std::shared_ptr;
@@ -49,16 +49,16 @@ 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<TraceTreeItem> &r) { return r->enabled(); });
 }
 
-pv::SigSession& TraceGroup::session()
+pv::Session& TraceGroup::session()
 {
        assert(owner_);
        return owner_->session();
 }
 
-const pv::SigSession& TraceGroup::session() const
+const pv::Session& TraceGroup::session() const
 {
        assert(owner_);
        return owner_->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<TraceTreeItem> 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,12 @@ int TraceGroup::owner_visual_v_offset() const
 
 void TraceGroup::restack_items()
 {
-       vector< shared_ptr<RowItem> > items(
+       vector< shared_ptr<TraceTreeItem> > items(
                child_items().begin(), child_items().end());
 
        // 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 +172,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 +197,11 @@ unsigned int TraceGroup::depth() const
 
 void TraceGroup::ungroup()
 {
-       const vector< shared_ptr<RowItem> > items(
+       const vector< shared_ptr<TraceTreeItem> > items(
                child_items().begin(), child_items().end());
        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 +212,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)