X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fviewwidget.cpp;h=ce5c27a83dce2a3c6784dcda17e5d0b2e018b9b7;hb=257211b829052bb5d5fade89f518df47d96923b5;hp=0b3b2fd1e233f962bc9f6b50417109e72582722b;hpb=e9e4e5e7ea46132262fbd53f708dafc039b3b24f;p=pulseview.git
diff --git a/pv/view/viewwidget.cpp b/pv/view/viewwidget.cpp
index 0b3b2fd..ce5c27a 100644
--- a/pv/view/viewwidget.cpp
+++ b/pv/view/viewwidget.cpp
@@ -14,14 +14,14 @@
* 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
#include
+#include
-#include "rowitem.hpp"
+#include "tracetreeitem.hpp"
#include "view.hpp"
#include "viewwidget.hpp"
@@ -30,14 +30,16 @@ using std::shared_ptr;
using std::vector;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
ViewWidget::ViewWidget(View &parent) :
QWidget(&parent),
view_(parent),
- dragging_(false)
+ item_dragging_(false)
{
setFocusPolicy(Qt::ClickFocus);
+ setAttribute(Qt::WA_AcceptTouchEvents, true);
setMouseTracking(true);
}
@@ -46,7 +48,11 @@ void ViewWidget::clear_selection()
const auto items = this->items();
for (auto &i : items)
i->select(false);
- update();
+}
+
+void ViewWidget::item_hover(const shared_ptr &item)
+{
+ (void)item;
}
void ViewWidget::item_clicked(const shared_ptr &item)
@@ -57,59 +63,97 @@ void ViewWidget::item_clicked(const shared_ptr &item)
bool ViewWidget::accept_drag() const
{
const vector< shared_ptr > items(view_.time_items());
+ const vector< shared_ptr > trace_tree_items(
+ view_.list_by_type());
- const bool any_row_items_selected = any_of(view_.begin(), view_.end(),
- [](const shared_ptr &r) { return r->selected(); });
+ const bool any_row_items_selected = any_of(
+ trace_tree_items.begin(), trace_tree_items.end(),
+ [](const shared_ptr &r) { return r->selected(); });
const bool any_time_items_selected = any_of(items.begin(), items.end(),
[](const shared_ptr &i) { return i->selected(); });
- if (any_row_items_selected && !any_time_items_selected)
- {
+ if (any_row_items_selected && !any_time_items_selected) {
// Check all the drag items share a common owner
- RowItemOwner *item_owner = nullptr;
- for (shared_ptr r : view_)
+ TraceTreeItemOwner *item_owner = nullptr;
+ for (shared_ptr r : trace_tree_items)
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 true;
- }
- else if (any_time_items_selected && !any_row_items_selected)
- {
+ } else if (any_time_items_selected && !any_row_items_selected) {
return true;
}
- return false;
+ // A background drag is beginning
+ return true;
+}
+
+bool ViewWidget::mouse_down() const
+{
+ return mouse_down_point_.x() != INT_MIN &&
+ mouse_down_point_.y() != INT_MIN;
}
void ViewWidget::drag_items(const QPoint &delta)
{
+ bool item_dragged = false;
+
// Drag the row items
- RowItemOwner *item_owner = nullptr;
- for (std::shared_ptr r : view_)
+ const vector< shared_ptr > row_items(
+ view_.list_by_type());
+ for (shared_ptr r : row_items)
if (r->dragging()) {
- item_owner = r->owner();
r->drag_by(delta);
// Ensure the trace is selected
r->select();
+
+ item_dragged = true;
}
+ // If an item is being dragged, update the stacking
+ TraceTreeItemOwner *item_owner = nullptr;
+ const vector< shared_ptr > trace_tree_items(
+ view_.list_by_type());
+ for (shared_ptr i : trace_tree_items)
+ if (i->dragging())
+ item_owner = i->owner();
+
if (item_owner) {
item_owner->restack_items();
- for (const auto &r : *item_owner)
- r->animate_to_layout_v_offset();
+ for (shared_ptr i : trace_tree_items)
+ i->animate_to_layout_v_offset();
}
// Drag the time items
const vector< shared_ptr > items(view_.time_items());
for (auto &i : items)
- if (i->dragging())
+ if (i->dragging()) {
i->drag_by(delta);
+ item_dragged = true;
+ }
+
+ // Do the background drag
+ if (!item_dragged)
+ drag_by(delta);
+}
+
+void ViewWidget::drag()
+{
+}
+
+void ViewWidget::drag_by(const QPoint &delta)
+{
+ (void)delta;
+}
+
+void ViewWidget::drag_release()
+{
}
void ViewWidget::mouse_left_press_event(QMouseEvent *event)
@@ -133,13 +177,19 @@ void ViewWidget::mouse_left_press_event(QMouseEvent *event)
}
// Save the offsets of any signals which will be dragged
+ bool item_dragged = false;
const auto items = this->items();
for (auto &i : items)
- if (i->selected())
+ if (i->selected()) {
+ item_dragged = true;
i->drag();
+ }
+
+ // Do the background drag
+ if (!item_dragged)
+ drag();
selection_changed();
- update();
}
void ViewWidget::mouse_left_release_event(QMouseEvent *event)
@@ -157,10 +207,9 @@ void ViewWidget::mouse_left_release_event(QMouseEvent *event)
for (auto &i : items)
i->drag_release();
- if (dragging_)
- view_.restack_all_row_items();
- else
- {
+ if (item_dragging_)
+ view_.restack_all_trace_tree_items();
+ else {
if (!ctrl_pressed) {
for (shared_ptr i : items)
if (mouse_down_item_ != i)
@@ -171,26 +220,58 @@ void ViewWidget::mouse_left_release_event(QMouseEvent *event)
}
}
- dragging_ = false;
+ item_dragging_ = false;
+}
+
+bool ViewWidget::touch_event(QTouchEvent *event)
+{
+ (void)event;
+
+ return false;
+}
+
+bool ViewWidget::event(QEvent *event)
+{
+ switch (event->type()) {
+ case QEvent::TouchBegin:
+ case QEvent::TouchUpdate:
+ case QEvent::TouchEnd:
+ if (touch_event(static_cast(event)))
+ return true;
+ break;
+
+ default:
+ break;
+ }
+
+ return QWidget::event(event);
}
void ViewWidget::mousePressEvent(QMouseEvent *event)
{
assert(event);
- mouse_down_point_ = event->pos();
- mouse_down_item_ = get_mouse_over_item(event->pos());
-
- if (event->button() & Qt::LeftButton)
+ /* Ignore right click events as they will open context menus when
+ * used on trace labels. Those menus prevent ViewWidget::mouseReleaseEvent()
+ * to be triggered upon button release, making mouse_down_item_
+ * hold the last reference to a view item that might have been deleted
+ * from the context menu, preventing it from being freed as intended.
+ */
+ if (event->button() & Qt::LeftButton) {
+ mouse_down_point_ = event->pos();
+ mouse_down_item_ = get_mouse_over_item(event->pos());
mouse_left_press_event(event);
+ }
}
void ViewWidget::mouseReleaseEvent(QMouseEvent *event)
{
assert(event);
+
if (event->button() & Qt::LeftButton)
mouse_left_release_event(event);
+ mouse_down_point_ = QPoint(INT_MIN, INT_MIN);
mouse_down_item_ = nullptr;
}
@@ -199,21 +280,23 @@ void ViewWidget::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;
+ if (!event->buttons())
+ item_hover(get_mouse_over_item(event->pos()));
+ else if (event->buttons() & Qt::LeftButton) {
+ if (!item_dragging_) {
+ if ((event->pos() - mouse_down_point_).manhattanLength() <
+ QApplication::startDragDistance())
+ return;
- if (!accept_drag())
- return;
+ if (!accept_drag())
+ return;
- // Do the drag
- dragging_ = true;
- drag_items(event->pos() - mouse_down_point_);
+ item_dragging_ = true;
+ }
- update();
+ // Do the drag
+ drag_items(event->pos() - mouse_down_point_);
+ }
}
void ViewWidget::leaveEvent(QEvent*)
@@ -222,5 +305,6 @@ void ViewWidget::leaveEvent(QEvent*)
update();
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv