X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=2a732f25daa3f7f16590c8d8e39310e4acc4a295;hb=6a2cc8dd37f6d128ad7e16b9a7a78bb44d5a5aa5;hp=77ac1aa88c343498bfcaf57939b4f0995862b54a;hpb=23e75650eba0491b2636de3cef87f893e38ae6f3;p=pulseview.git

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 77ac1aa..2a732f2 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -80,7 +80,12 @@ QSize Header::extended_size_hint() const
 	return sizeHint() + QSize(ViewItem::HighlightRadius, 0);
 }
 
-shared_ptr<RowItem> Header::get_mouse_over_item(const QPoint &pt)
+vector< shared_ptr<ViewItem> > Header::items()
+{
+	return vector< shared_ptr<ViewItem> >(view_.begin(), view_.end());
+}
+
+shared_ptr<ViewItem> Header::get_mouse_over_item(const QPoint &pt)
 {
 	const QRect r(0, 0, width() - BaselineOffset, height());
 	for (auto &i : view_)
@@ -89,26 +94,6 @@ shared_ptr<RowItem> Header::get_mouse_over_item(const QPoint &pt)
 	return shared_ptr<RowItem>();
 }
 
-void Header::clear_selection()
-{
-	for (auto &i : view_)
-		i->select(false);
-	update();
-}
-
-void Header::show_popup(const shared_ptr<RowItem> &item)
-{
-	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();
-}
-
 void Header::paintEvent(QPaintEvent*)
 {
 	// The trace labels are not drawn with the arrows exactly on the
@@ -138,47 +123,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);
@@ -187,7 +131,7 @@ void Header::mouseLeftReleaseEvent(QMouseEvent *event)
 		QApplication::keyboardModifiers() & Qt::ControlModifier;
 
 	// Unselect everything if control is not pressed
-	const shared_ptr<RowItem> mouse_over =
+	const shared_ptr<ViewItem> mouse_over =
 		get_mouse_over_item(event->pos());
 
 	for (auto &r : view_)
@@ -265,15 +209,9 @@ void Header::mouseMoveEvent(QMouseEvent *event)
 	update();
 }
 
-void Header::leaveEvent(QEvent*)
-{
-	mouse_point_ = QPoint(-1, -1);
-	update();
-}
-
 void Header::contextMenuEvent(QContextMenuEvent *event)
 {
-	const shared_ptr<RowItem> r = get_mouse_over_item(mouse_point_);
+	const shared_ptr<ViewItem> r = get_mouse_over_item(mouse_point_);
 	if (!r)
 		return;
 
@@ -327,8 +265,10 @@ void Header::on_group()
 			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(
-		mouse_down_item_ ? mouse_down_item_ : selected_items.front());
+		mouse_down_item ? mouse_down_item : selected_items.front());
 
 	assert(focus_item);
 	assert(focus_item->owner());