X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=7be804d0760a194dec0f63a476fc85c2f2c51588;hp=c94e2d613d2ef7c25f9b5319a93d133c9e30f866;hb=c1a6513b912e90ebcca2dba4453aa03fbddcfb58;hpb=7ff0145fbf19de010232ea5edadea5df6c28ed8e
diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index c94e2d61..7be804d0 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -14,18 +14,19 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
-#include "header.h"
-#include "view.h"
+#include "header.hpp"
+#include "view.hpp"
-#include "signal.h"
-#include "../sigsession.h"
+#include "signal.hpp"
+#include "tracegroup.hpp"
-#include
#include
+#include
+
+#include
#include
#include
@@ -33,265 +34,182 @@
#include
#include
-#include
+#include
+#include
+
+using boost::make_filter_iterator;
-using std::max;
-using std::make_pair;
-using std::pair;
+using std::count_if;
+using std::dynamic_pointer_cast;
using std::shared_ptr;
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;
-Header::Header(View &parent) :
- MarginWidget(parent),
- _dragging(false)
+static bool item_selected(shared_ptr r)
{
- setFocusPolicy(Qt::ClickFocus);
- setMouseTracking(true);
+ return r->selected();
+}
- connect(&_view, SIGNAL(signals_moved()),
- this, SLOT(on_signals_moved()));
+Header::Header(View &parent) :
+ MarginWidget(parent)
+{
}
QSize Header::sizeHint() const
{
QRectF max_rect(-Padding, 0, Padding, 0);
- for (auto &i : _view)
+ const vector> items(
+ view_.list_by_type());
+ for (auto &i : items)
if (i->enabled())
- max_rect = max_rect.united(i->label_rect(0));
- return QSize(max_rect.width() + Padding + BaselineOffset, 0);
+ max_rect = max_rect.united(i->label_rect(QRect()));
+ return QSize(max_rect.width() + Padding, 0);
}
-shared_ptr Header::get_mouse_over_row_item(const QPoint &pt)
+QSize Header::extended_size_hint() const
{
- const int w = width() - BaselineOffset;
- for (auto &i : _view)
- if (i->enabled() && i->label_rect(w).contains(pt))
- return i;
- return shared_ptr();
+ return sizeHint() + QSize(ViewItem::HighlightRadius, 0);
}
-void Header::clear_selection()
+vector< shared_ptr > Header::items()
{
- for (auto &i : _view)
- i->select(false);
- update();
+ const vector> items(
+ view_.list_by_type());
+ return vector< shared_ptr >(items.begin(), items.end());
}
-void Header::show_popup(const shared_ptr &item)
+shared_ptr Header::get_mouse_over_item(const QPoint &pt)
{
- using pv::widgets::Popup;
-
- Popup *const p = item->create_popup(&_view);
- if (!p)
- return;
-
- const QPoint pt(width() - BaselineOffset, item->get_visual_y());
- p->set_position(mapToGlobal(pt), Popup::Right);
- p->show();
+ const QRect r(0, 0, width(), height());
+ const vector> items(
+ view_.list_by_type());
+ for (auto i = items.rbegin(); i != items.rend(); i++)
+ if ((*i)->enabled() && (*i)->label_rect(r).contains(pt))
+ return *i;
+ return shared_ptr();
}
void Header::paintEvent(QPaintEvent*)
{
- // The trace labels are not drawn with the arrows exactly on the
- // left edge of the widget, because then the selection shadow
- // would be clipped away.
- const int w = width() - BaselineOffset;
+ const QRect rect(0, 0, width(), height());
- vector< shared_ptr > row_items(
- _view.begin(), _view.end());
+ vector< shared_ptr > items(view_.list_by_type());
- stable_sort(row_items.begin(), row_items.end(),
+ stable_sort(items.begin(), items.end(),
[](const shared_ptr &a, const shared_ptr &b) {
- return a->visual_v_offset() < b->visual_v_offset(); });
+ return a->point(QRect()).y() < b->point(QRect()).y(); });
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
- for (const shared_ptr r : row_items)
- {
+ for (const shared_ptr r : items) {
assert(r);
- const bool highlight = !_dragging &&
- r->label_rect(w).contains(_mouse_point);
- r->paint_label(painter, w, highlight);
+ const bool highlight = !item_dragging_ &&
+ r->label_rect(rect).contains(mouse_point_);
+ r->paint_label(painter, rect, highlight);
}
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 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 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_row_item(event->pos());
-
- if (event->button() & Qt::LeftButton)
- mouseLeftPressEvent(event);
-}
-
-void Header::mouseLeftReleaseEvent(QMouseEvent *event)
+void Header::contextMenuEvent(QContextMenuEvent *event)
{
- assert(event);
-
- const bool ctrl_pressed =
- QApplication::keyboardModifiers() & Qt::ControlModifier;
-
- // Unselect everything if control is not pressed
- const shared_ptr mouse_over =
- get_mouse_over_row_item(event->pos());
-
- for (auto &r : _view)
- r->drag_release();
-
- if (_dragging)
- _view.restack_all_row_items();
- else
- {
- if (!ctrl_pressed) {
- for (shared_ptr r : _view)
- if (_mouse_down_item != r)
- r->select(false);
+ const shared_ptr r = get_mouse_over_item(mouse_point_);
+ if (!r)
+ return;
- if (_mouse_down_item)
- show_popup(_mouse_down_item);
- }
+ QMenu *menu = r->create_context_menu(this);
+ if (!menu)
+ menu = new QMenu(this);
+
+ const vector< shared_ptr > items(
+ view_.list_by_type());
+ if (count_if(items.begin(), items.end(), item_selected) > 1) {
+ menu->addSeparator();
+
+ QAction *const group = new QAction(tr("Group"), this);
+ QList shortcuts;
+ shortcuts.append(QKeySequence(Qt::ControlModifier | Qt::Key_G));
+ group->setShortcuts(shortcuts);
+ connect(group, SIGNAL(triggered()), this, SLOT(on_group()));
+ menu->addAction(group);
}
- _dragging = false;
-}
-
-void Header::mouseReleaseEvent(QMouseEvent *event)
-{
- assert(event);
- if (event->button() & Qt::LeftButton)
- mouseLeftReleaseEvent(event);
-
- _mouse_down_item = nullptr;
+ menu->exec(event->globalPos());
}
-void Header::mouseMoveEvent(QMouseEvent *event)
+void Header::keyPressEvent(QKeyEvent *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 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 int delta = event->pos().y() - _mouse_down_point.y();
-
- for (std::shared_ptr r : _view)
- if (r->dragging()) {
- r->force_to_v_offset(r->drag_point().y() + delta);
- // Ensure the trace is selected
- r->select();
- }
+ MarginWidget::keyPressEvent(event);
- item_owner->restack_items();
- for (const auto &r : *item_owner)
- r->animate_to_layout_v_offset();
- signals_moved();
-
- update();
-}
-
-void Header::leaveEvent(QEvent*)
-{
- _mouse_point = QPoint(-1, -1);
- update();
+ if (event->key() == Qt::Key_G && event->modifiers() == Qt::ControlModifier)
+ on_group();
+ else if (event->key() == Qt::Key_U && event->modifiers() == Qt::ControlModifier)
+ on_ungroup();
}
-void Header::contextMenuEvent(QContextMenuEvent *event)
+void Header::on_group()
{
- const shared_ptr r = get_mouse_over_row_item(_mouse_point);
- if (!r)
- return;
-
- QMenu *const menu = r->create_context_menu(this);
- if (!menu)
- return;
-
- menu->exec(event->globalPos());
-}
+ const vector< shared_ptr > items(
+ view_.list_by_type());
+ vector< shared_ptr > selected_items(
+ make_filter_iterator(item_selected, items.begin(), items.end()),
+ make_filter_iterator(item_selected, items.end(), items.end()));
+ stable_sort(selected_items.begin(), selected_items.end(),
+ [](const shared_ptr &a, const shared_ptr &b) {
+ return a->visual_v_offset() < b->visual_v_offset(); });
-void Header::keyPressEvent(QKeyEvent *e)
-{
- assert(e);
-
- switch (e->key())
- {
- case Qt::Key_Delete:
- {
- for (const shared_ptr r : _view)
- if (r->selected())
- r->delete_pressed();
- break;
- }
+ shared_ptr group(new TraceGroup());
+ shared_ptr mouse_down_item(
+ dynamic_pointer_cast(mouse_down_item_));
+ shared_ptr 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 &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_signals_moved()
+void Header::on_ungroup()
{
- update();
+ bool restart;
+ do {
+ restart = false;
+ const vector< shared_ptr > groups(
+ view_.list_by_type());
+ for (const shared_ptr tg : groups)
+ if (tg->selected()) {
+ tg->ungroup();
+ restart = true;
+ break;
+ }
+ } while (restart);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv