projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use list_by_type instead of iterator
[pulseview.git]
/
pv
/
view
/
viewwidget.cpp
diff --git
a/pv/view/viewwidget.cpp
b/pv/view/viewwidget.cpp
index cf7376646586f2a88d9eb5d9680808fd407635af..69e345660ab3558cf677ef66a2d7b7083602b65a 100644
(file)
--- a/
pv/view/viewwidget.cpp
+++ b/
pv/view/viewwidget.cpp
@@
-22,7
+22,7
@@
#include <QMouseEvent>
#include <QTouchEvent>
#include <QMouseEvent>
#include <QTouchEvent>
-#include "
row
item.hpp"
+#include "
tracetree
item.hpp"
#include "view.hpp"
#include "viewwidget.hpp"
#include "view.hpp"
#include "viewwidget.hpp"
@@
-51,6
+51,11
@@
void ViewWidget::clear_selection()
update();
}
update();
}
+void ViewWidget::item_hover(const shared_ptr<ViewItem> &item)
+{
+ (void)item;
+}
+
void ViewWidget::item_clicked(const shared_ptr<ViewItem> &item)
{
(void)item;
void ViewWidget::item_clicked(const shared_ptr<ViewItem> &item)
{
(void)item;
@@
-59,9
+64,12
@@
void ViewWidget::item_clicked(const shared_ptr<ViewItem> &item)
bool ViewWidget::accept_drag() const
{
const vector< shared_ptr<TimeItem> > items(view_.time_items());
bool ViewWidget::accept_drag() const
{
const vector< shared_ptr<TimeItem> > items(view_.time_items());
+ const vector< shared_ptr<TraceTreeItem> > trace_tree_items(
+ view_.list_by_type<TraceTreeItem>());
- const bool any_row_items_selected = any_of(view_.begin(), view_.end(),
- [](const shared_ptr<RowItem> &r) { return r->selected(); });
+ const bool any_row_items_selected = any_of(
+ trace_tree_items.begin(), trace_tree_items.end(),
+ [](const shared_ptr<TraceTreeItem> &r) { return r->selected(); });
const bool any_time_items_selected = any_of(items.begin(), items.end(),
[](const shared_ptr<TimeItem> &i) { return i->selected(); });
const bool any_time_items_selected = any_of(items.begin(), items.end(),
[](const shared_ptr<TimeItem> &i) { return i->selected(); });
@@
-69,12
+77,12
@@
bool ViewWidget::accept_drag() const
if (any_row_items_selected && !any_time_items_selected)
{
// Check all the drag items share a common owner
if (any_row_items_selected && !any_time_items_selected)
{
// Check all the drag items share a common owner
-
Row
ItemOwner *item_owner = nullptr;
- for (shared_ptr<
RowItem> r : view_
)
+
TraceTree
ItemOwner *item_owner = nullptr;
+ for (shared_ptr<
TraceTreeItem> r : trace_tree_items
)
if (r->dragging()) {
if (!item_owner)
item_owner = r->owner();
if (r->dragging()) {
if (!item_owner)
item_owner = r->owner();
- else if(item_owner != r->owner())
+ else if
(item_owner != r->owner())
return false;
}
return false;
}
@@
-100,8
+108,10
@@
void ViewWidget::drag_items(const QPoint &delta)
bool item_dragged = false;
// Drag the row items
bool item_dragged = false;
// Drag the row items
- RowItemOwner *item_owner = nullptr;
- for (std::shared_ptr<RowItem> r : view_)
+ TraceTreeItemOwner *item_owner = nullptr;
+ const vector< shared_ptr<TraceTreeItem> > trace_tree_items(
+ view_.list_by_type<TraceTreeItem>());
+ for (shared_ptr<TraceTreeItem> r : trace_tree_items)
if (r->dragging()) {
item_owner = r->owner();
r->drag_by(delta);
if (r->dragging()) {
item_owner = r->owner();
r->drag_by(delta);
@@
-113,7
+123,7
@@
void ViewWidget::drag_items(const QPoint &delta)
if (item_owner) {
item_dragged = true;
item_owner->restack_items();
if (item_owner) {
item_dragged = true;
item_owner->restack_items();
- for (
const auto &r : *item_owner
)
+ for (
shared_ptr<TraceTreeItem> r : trace_tree_items
)
r->animate_to_layout_v_offset();
}
r->animate_to_layout_v_offset();
}
@@
-196,7
+206,7
@@
void ViewWidget::mouse_left_release_event(QMouseEvent *event)
i->drag_release();
if (item_dragging_)
i->drag_release();
if (item_dragging_)
- view_.restack_all_
row
_items();
+ view_.restack_all_
trace_tree
_items();
else
{
if (!ctrl_pressed) {
else
{
if (!ctrl_pressed) {
@@
-256,30
+266,32
@@
void ViewWidget::mouseReleaseEvent(QMouseEvent *event)
mouse_down_item_ = nullptr;
}
mouse_down_item_ = nullptr;
}
-void ViewWidget::mouseMoveEvent(QMouseEvent *e
vent
)
+void ViewWidget::mouseMoveEvent(QMouseEvent *e)
{
{
- assert(e
vent
);
- mouse_point_ = e
vent
->pos();
+ assert(e);
+ mouse_point_ = e->pos();
- if (!(event->buttons() & Qt::LeftButton))
- return;
-
- if (!item_dragging_)
+ if (!e->buttons())
+ item_hover(get_mouse_over_item(e->pos()));
+ else if (e->buttons() & Qt::LeftButton)
{
{
- if ((event->pos() - mouse_down_point_).manhattanLength() <
- QApplication::startDragDistance())
- return;
+ if (!item_dragging_)
+ {
+ if ((e->pos() - mouse_down_point_).manhattanLength() <
+ QApplication::startDragDistance())
+ return;
- if (!accept_drag())
- return;
+
if (!accept_drag())
+
return;
- item_dragging_ = true;
- }
+
item_dragging_ = true;
+
}
- // Do the drag
-
drag_items(event
->pos() - mouse_down_point_);
+
// Do the drag
+
drag_items(e
->pos() - mouse_down_point_);
- update();
+ update();
+ }
}
void ViewWidget::leaveEvent(QEvent*)
}
void ViewWidget::leaveEvent(QEvent*)