Change namespace for the trace view and implement ViewBase

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

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 58c21e596c7ab9ace1beb392a5510b270609dddf..4ad28cf1ca7529932c88e86d1f9041439cf88c9d 100644 (file)
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -49,7 +49,8 @@ using std::stable_sort;
 using std::vector;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 const int Header::Padding = 12;
 const int Header::BaselineOffset = 5;
@@ -92,9 +93,9 @@ shared_ptr<ViewItem> Header::get_mouse_over_item(const QPoint &pt)
        const QRect r(0, 0, width() - BaselineOffset, height());
        const vector<shared_ptr<TraceTreeItem>> items(
                view_.list_by_type<TraceTreeItem>());
-       for (auto &i : items)
-               if (i->enabled() && i->label_rect(r).contains(pt))
-                       return i;
+       for (auto i = items.rbegin(); i != items.rend(); i++)
+               if ((*i)->enabled() && (*i)->label_rect(r).contains(pt))
+                       return *i;
        return shared_ptr<TraceTreeItem>();
 }
 
@@ -105,18 +106,17 @@ void Header::paintEvent(QPaintEvent*)
        // would be clipped away.
        const QRect rect(0, 0, width() - BaselineOffset, height());
 
-       vector< shared_ptr<TraceTreeItem> > items(
-               view_.list_by_type<TraceTreeItem>());
+       vector< shared_ptr<RowItem> > items(
+               view_.list_by_type<RowItem>());
 
        stable_sort(items.begin(), items.end(),
-               [](const shared_ptr<TraceTreeItem> &a, const shared_ptr<TraceTreeItem> &b) {
-                       return a->visual_v_offset() < b->visual_v_offset(); });
+               [](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
+                       return a->point(QRect()).y() < b->point(QRect()).y(); });
 
        QPainter painter(this);
        painter.setRenderHint(QPainter::Antialiasing);
 
-       for (const shared_ptr<TraceTreeItem> r : items)
-       {
+       for (const shared_ptr<RowItem> r : items) {
                assert(r);
 
                const bool highlight = !item_dragging_ &&
@@ -154,15 +154,15 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
        menu->exec(event->globalPos());
 }
 
-void Header::keyPressEvent(QKeyEvent *e)
+void Header::keyPressEvent(QKeyEvent *event)
 {
-       assert(e);
+       assert(event);
 
-       MarginWidget::keyPressEvent(e);
+       MarginWidget::keyPressEvent(event);
 
-       if (e->key() == Qt::Key_G && e->modifiers() == Qt::ControlModifier)
+       if (event->key() == Qt::Key_G && event->modifiers() == Qt::ControlModifier)
                on_group();
-       else if (e->key() == Qt::Key_U && e->modifiers() == Qt::ControlModifier)
+       else if (event->key() == Qt::Key_U && event->modifiers() == Qt::ControlModifier)
                on_ungroup();
 }
 
@@ -219,5 +219,6 @@ void Header::on_ungroup()
        } while (restart);
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv