#include "view.h"
#include "signal.h"
+#include "tracegroup.h"
#include "../sigsession.h"
#include <cassert>
#include <algorithm>
+#include <boost/iterator/filter_iterator.hpp>
+
#include <QApplication>
#include <QMenu>
#include <QMouseEvent>
#include <pv/widgets/popup.h>
+using boost::make_filter_iterator;
+using std::dynamic_pointer_cast;
using std::max;
using std::make_pair;
+using std::min;
using std::pair;
using std::shared_ptr;
using std::stable_sort;
const int Header::Padding = 12;
const int Header::BaselineOffset = 5;
+static bool item_selected(shared_ptr<RowItem> r)
+{
+ return r->selected();
+}
+
Header::Header(View &parent) :
MarginWidget(parent),
_dragging(false)
update();
}
-void Header::signals_updated()
-{
- for (shared_ptr<RowItem> r : _view) {
- assert(r);
- connect(r.get(), SIGNAL(appearance_changed()),
- this, SLOT(on_trace_changed()));
- }
-}
-
void Header::show_popup(const shared_ptr<RowItem> &item)
{
using pv::widgets::Popup;
if (!p)
return;
- const QPoint pt(width() - BaselineOffset, item->get_y());
+ const QPoint pt(width() - BaselineOffset, item->get_visual_y());
p->set_position(mapToGlobal(pt), Popup::Right);
p->show();
}
stable_sort(row_items.begin(), row_items.end(),
[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
- return a->v_offset() < b->v_offset(); });
+ return a->visual_v_offset() < b->visual_v_offset(); });
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
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
- const shared_ptr<RowItem> mouse_over =
- get_mouse_over_row_item(event->pos());
- if (!ctrl_pressed && (!mouse_over || !mouse_over->selected()))
+ 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_over) {
+ if (_mouse_down_item) {
if (ctrl_pressed)
- mouse_over->select(!mouse_over->selected());
+ _mouse_down_item->select(!_mouse_down_item->selected());
else
- mouse_over->select(true);
+ _mouse_down_item->select(true);
}
// Save the offsets of any signals which will be dragged
- _mouse_down_point = event->pos();
for (const shared_ptr<RowItem> r : _view)
if (r->selected())
r->drag();
void Header::mousePressEvent(QMouseEvent *event)
{
assert(event);
+
+ _mouse_down_point = event->pos();
+ _mouse_down_item = get_mouse_over_row_item(event->pos());
+
if (event->button() & Qt::LeftButton)
mouseLeftPressEvent(event);
}
r->drag_release();
if (_dragging)
- _view.normalize_layout();
+ _view.restack_all_row_items();
else
{
if (!ctrl_pressed) {
for (shared_ptr<RowItem> r : _view)
- if (mouse_over != r)
+ if (_mouse_down_item != r)
r->select(false);
- if (mouse_over)
- show_popup(mouse_over);
+ if (_mouse_down_item)
+ show_popup(_mouse_down_item);
}
}
assert(event);
if (event->button() & Qt::LeftButton)
mouseLeftReleaseEvent(event);
+
+ _mouse_down_item = nullptr;
}
void Header::mouseMoveEvent(QMouseEvent *event)
for (std::shared_ptr<RowItem> r : _view)
if (r->dragging()) {
- r->set_v_offset(r->drag_point().y() + delta);
+ r->force_to_v_offset(r->drag_point().y() + 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();
if (!r)
return;
- QMenu *const menu = r->create_context_menu(this);
+ QMenu *menu = r->create_context_menu(this);
if (!menu)
- return;
+ menu = new QMenu(this);
+
+ if (std::count_if(_view.begin(), _view.end(), item_selected) > 1)
+ {
+ menu->addSeparator();
+
+ QAction *const group = new QAction(tr("Group"), this);
+ QList<QKeySequence> shortcuts;
+ shortcuts.append(QKeySequence(Qt::ControlModifier | Qt::Key_G));
+ group->setShortcuts(shortcuts);
+ connect(group, SIGNAL(triggered()), this, SLOT(on_group()));
+ menu->addAction(group);
+ }
menu->exec(event->globalPos());
}
update();
}
-void Header::on_trace_changed()
+void Header::on_group()
{
- update();
- geometry_updated();
+ vector< shared_ptr<RowItem> > 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) {
+ return a->visual_v_offset() < b->visual_v_offset(); });
+
+ shared_ptr<TraceGroup> group(new TraceGroup());
+ shared_ptr<RowItem> focus_item(
+ _mouse_down_item ? _mouse_down_item : selected_items.front());
+
+ assert(focus_item);
+ assert(focus_item->owner());
+ focus_item->owner()->add_child_item(group);
+
+ // Set the group v_offset here before reparenting
+ group->force_to_v_offset(focus_item->layout_v_offset() +
+ focus_item->v_extents().first);
+
+ for (size_t i = 0; i < selected_items.size(); i++) {
+ const shared_ptr<RowItem> &r = selected_items[i];
+ assert(r->owner());
+ r->owner()->remove_child_item(r);
+ group->add_child_item(r);
+
+ // Put the items at 1-pixel offsets, so that restack will
+ // stack them in the right order
+ r->set_layout_v_offset(i);
+ }
+}
+
+void Header::on_ungroup()
+{
+ bool restart;
+ do {
+ restart = false;
+ for (const shared_ptr<RowItem> r : _view) {
+ const shared_ptr<TraceGroup> tg =
+ dynamic_pointer_cast<TraceGroup>(r);
+ if (tg && tg->selected()) {
+ tg->ungroup();
+ restart = true;
+ break;
+ }
+ }
+ } while(restart);
}
} // namespace view
projects / pulseview.git / blobdiff