]> sigrok.org Git - pulseview.git/blobdiff - pv/view/header.cpp
TraceTreeItem: Separated from RowItem
[pulseview.git] / pv / view / header.cpp
index 83985eda68a28f925e41e9641bdc87fa1fde57f9..60d64b2f401f2483aad1226dc00e66d62ca54191 100644 (file)
@@ -54,7 +54,7 @@ namespace view {
 const int Header::Padding = 12;
 const int Header::BaselineOffset = 5;
 
-static bool item_selected(shared_ptr<RowItem> r)
+static bool item_selected(shared_ptr<TraceTreeItem> r)
 {
        return r->selected();
 }
@@ -62,8 +62,6 @@ static bool item_selected(shared_ptr<RowItem> r)
 Header::Header(View &parent) :
        MarginWidget(parent)
 {
-       connect(&view_, SIGNAL(signals_moved()),
-               this, SLOT(on_signals_moved()));
 }
 
 QSize Header::sizeHint() const
@@ -91,14 +89,7 @@ shared_ptr<ViewItem> Header::get_mouse_over_item(const QPoint &pt)
        for (auto &i : view_)
                if (i->enabled() && i->label_rect(r).contains(pt))
                        return i;
-       return shared_ptr<RowItem>();
-}
-
-void Header::clear_selection()
-{
-       for (auto &i : view_)
-               i->select(false);
-       update();
+       return shared_ptr<TraceTreeItem>();
 }
 
 void Header::paintEvent(QPaintEvent*)
@@ -108,21 +99,21 @@ void Header::paintEvent(QPaintEvent*)
        // would be clipped away.
        const QRect rect(0, 0, width() - BaselineOffset, height());
 
-       vector< shared_ptr<RowItem> > row_items(
+       vector< shared_ptr<TraceTreeItem> > items(
                view_.begin(), view_.end());
 
-       stable_sort(row_items.begin(), row_items.end(),
-               [](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
+       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(); });
 
        QPainter painter(this);
        painter.setRenderHint(QPainter::Antialiasing);
 
-       for (const shared_ptr<RowItem> r : row_items)
+       for (const shared_ptr<TraceTreeItem> r : items)
        {
                assert(r);
 
-               const bool highlight = !dragging_ &&
+               const bool highlight = !item_dragging_ &&
                        r->label_rect(rect).contains(mouse_point_);
                r->paint_label(painter, rect, highlight);
        }
@@ -130,133 +121,6 @@ void Header::paintEvent(QPaintEvent*)
        painter.end();
 }
 
-void Header::mouseLeftPressEvent(QMouseEvent *event)
-{
-       (void)event;
-
-       const bool ctrl_pressed =
-               QApplication::keyboardModifiers() & Qt::ControlModifier;
-
-       // Clear selection if control is not pressed and this item is unselected
-       if ((!mouse_down_item_ || !mouse_down_item_->selected()) &&
-               !ctrl_pressed)
-               for (shared_ptr<RowItem> r : view_)
-                       r->select(false);
-
-       // Set the signal selection state if the item has been clicked
-       if (mouse_down_item_) {
-               if (ctrl_pressed)
-                       mouse_down_item_->select(!mouse_down_item_->selected());
-               else
-                       mouse_down_item_->select(true);
-       }
-
-       // Save the offsets of any signals which will be dragged
-       for (const shared_ptr<RowItem> r : view_)
-               if (r->selected())
-                       r->drag();
-
-       selection_changed();
-       update();
-}
-
-void Header::mousePressEvent(QMouseEvent *event)
-{
-       assert(event);
-
-       mouse_down_point_ = event->pos();
-       mouse_down_item_ = get_mouse_over_item(event->pos());
-
-       if (event->button() & Qt::LeftButton)
-               mouseLeftPressEvent(event);
-}
-
-void Header::mouseLeftReleaseEvent(QMouseEvent *event)
-{
-       assert(event);
-
-       const bool ctrl_pressed =
-               QApplication::keyboardModifiers() & Qt::ControlModifier;
-
-       // Unselect everything if control is not pressed
-       const shared_ptr<ViewItem> mouse_over =
-               get_mouse_over_item(event->pos());
-
-       for (auto &r : view_)
-               r->drag_release();
-
-       if (dragging_)
-               view_.restack_all_row_items();
-       else
-       {
-               if (!ctrl_pressed) {
-                       for (shared_ptr<RowItem> r : view_)
-                               if (mouse_down_item_ != r)
-                                       r->select(false);
-
-                       if (mouse_down_item_)
-                               show_popup(mouse_down_item_);
-               }
-       }
-
-       dragging_ = false;
-}
-
-void Header::mouseReleaseEvent(QMouseEvent *event)
-{
-       assert(event);
-       if (event->button() & Qt::LeftButton)
-               mouseLeftReleaseEvent(event);
-
-       mouse_down_item_ = nullptr;
-}
-
-void Header::mouseMoveEvent(QMouseEvent *event)
-{
-       assert(event);
-       mouse_point_ = event->pos();
-
-       if (!(event->buttons() & Qt::LeftButton))
-               return;
-
-       if ((event->pos() - mouse_down_point_).manhattanLength() <
-               QApplication::startDragDistance())
-               return;
-
-       // Check all the drag items share a common owner
-       RowItemOwner *item_owner = nullptr;
-       for (shared_ptr<RowItem> r : view_)
-               if (r->dragging()) {
-                       if (!item_owner)
-                               item_owner = r->owner();
-                       else if(item_owner != r->owner())
-                               return;
-               }
-
-       if (!item_owner)
-               return;
-
-       // Do the drag
-       dragging_ = true;
-
-       const QPoint delta = event->pos() - mouse_down_point_;
-
-       for (std::shared_ptr<RowItem> r : view_)
-               if (r->dragging()) {
-                       r->drag_by(delta);
-
-                       // Ensure the trace is selected
-                       r->select();
-               }
-
-       item_owner->restack_items();
-       for (const auto &r : *item_owner)
-               r->animate_to_layout_v_offset();
-       signals_moved();
-
-       update();
-}
-
 void Header::contextMenuEvent(QContextMenuEvent *event)
 {
        const shared_ptr<ViewItem> r = get_mouse_over_item(mouse_point_);
@@ -286,36 +150,27 @@ void Header::keyPressEvent(QKeyEvent *e)
 {
        assert(e);
 
-       if (e->key() == Qt::Key_Delete)
-       {
-               for (const shared_ptr<RowItem> r : view_)
-                       if (r->selected())
-                               r->delete_pressed();
-       }
-       else if (e->key() == Qt::Key_G && e->modifiers() == Qt::ControlModifier)
+       MarginWidget::keyPressEvent(e);
+
+       if (e->key() == Qt::Key_G && e->modifiers() == Qt::ControlModifier)
                on_group();
        else if (e->key() == Qt::Key_U && e->modifiers() == Qt::ControlModifier)
                on_ungroup();
 }
 
-void Header::on_signals_moved()
-{
-       update();
-}
-
 void Header::on_group()
 {
-       vector< shared_ptr<RowItem> > selected_items(
+       vector< shared_ptr<TraceTreeItem> > selected_items(
                make_filter_iterator(item_selected, view_.begin(), view_.end()),
                make_filter_iterator(item_selected, view_.end(), view_.end()));
        stable_sort(selected_items.begin(), selected_items.end(),
-               [](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
+               [](const shared_ptr<TraceTreeItem> &a, const shared_ptr<TraceTreeItem> &b) {
                        return a->visual_v_offset() < b->visual_v_offset(); });
 
        shared_ptr<TraceGroup> group(new TraceGroup());
-       shared_ptr<RowItem> mouse_down_item(
-               std::dynamic_pointer_cast<RowItem>(mouse_down_item_));
-       shared_ptr<RowItem> focus_item(
+       shared_ptr<TraceTreeItem> mouse_down_item(
+               std::dynamic_pointer_cast<TraceTreeItem>(mouse_down_item_));
+       shared_ptr<TraceTreeItem> focus_item(
                mouse_down_item ? mouse_down_item : selected_items.front());
 
        assert(focus_item);
@@ -327,7 +182,7 @@ void Header::on_group()
                focus_item->v_extents().first);
 
        for (size_t i = 0; i < selected_items.size(); i++) {
-               const shared_ptr<RowItem> &r = selected_items[i];
+               const shared_ptr<TraceTreeItem> &r = selected_items[i];
                assert(r->owner());
                r->owner()->remove_child_item(r);
                group->add_child_item(r);
@@ -343,7 +198,7 @@ void Header::on_ungroup()
        bool restart;
        do {
                restart = false;
-               for (const shared_ptr<RowItem> r : view_) {
+               for (const shared_ptr<TraceTreeItem> r : view_) {
                        const shared_ptr<TraceGroup> tg =
                                dynamic_pointer_cast<TraceGroup>(r);
                        if (tg && tg->selected()) {
@@ -352,7 +207,7 @@ void Header::on_ungroup()
                                break;
                        }
                }
-       } while(restart);
+       } while (restart);
 }
 
 } // namespace view