X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=60d64b2f401f2483aad1226dc00e66d62ca54191;hb=af503b104d890a357c736c678bb00296d889c090;hp=49a846e286a594a76db1a74063595c1accdab13a;hpb=2f7982367e8382e05c862de7afc71075ded5f606;p=pulseview.git

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 49a846e..60d64b2 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -54,7 +54,7 @@ namespace view {
 const int Header::Padding = 12;
 const int Header::BaselineOffset = 5;
 
-static bool item_selected(shared_ptr<RowItem> r)
+static bool item_selected(shared_ptr<TraceTreeItem> r)
 {
 	return r->selected();
 }
@@ -62,8 +62,6 @@ static bool item_selected(shared_ptr<RowItem> r)
 Header::Header(View &parent) :
 	MarginWidget(parent)
 {
-	connect(&view_, SIGNAL(signals_moved()),
-		this, SLOT(on_signals_moved()));
 }
 
 QSize Header::sizeHint() const
@@ -91,40 +89,7 @@ shared_ptr<ViewItem> Header::get_mouse_over_item(const QPoint &pt)
 	for (auto &i : view_)
 		if (i->enabled() && i->label_rect(r).contains(pt))
 			return i;
-	return shared_ptr<RowItem>();
-}
-
-bool Header::accept_drag() const
-{
-	// Check all the drag items share a common owner
-	RowItemOwner *item_owner = nullptr;
-	for (shared_ptr<RowItem> r : view_)
-		if (r->dragging()) {
-			if (!item_owner)
-				item_owner = r->owner();
-			else if(item_owner != r->owner())
-				return false;
-		}
-
-	return item_owner;
-}
-
-void Header::drag_items(const QPoint &delta)
-{
-	RowItemOwner *item_owner = nullptr;
-	for (std::shared_ptr<RowItem> r : view_)
-		if (r->dragging()) {
-			item_owner = r->owner();
-			r->drag_by(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();
+	return shared_ptr<TraceTreeItem>();
 }
 
 void Header::paintEvent(QPaintEvent*)
@@ -134,21 +99,21 @@ void Header::paintEvent(QPaintEvent*)
 	// would be clipped away.
 	const QRect rect(0, 0, width() - BaselineOffset, height());
 
-	vector< shared_ptr<RowItem> > row_items(
+	vector< shared_ptr<TraceTreeItem> > items(
 		view_.begin(), view_.end());
 
-	stable_sort(row_items.begin(), row_items.end(),
-		[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
+	stable_sort(items.begin(), items.end(),
+		[](const shared_ptr<TraceTreeItem> &a, const shared_ptr<TraceTreeItem> &b) {
 			return a->visual_v_offset() < b->visual_v_offset(); });
 
 	QPainter painter(this);
 	painter.setRenderHint(QPainter::Antialiasing);
 
-	for (const shared_ptr<RowItem> r : row_items)
+	for (const shared_ptr<TraceTreeItem> r : items)
 	{
 		assert(r);
 
-		const bool highlight = !dragging_ &&
+		const bool highlight = !item_dragging_ &&
 			r->label_rect(rect).contains(mouse_point_);
 		r->paint_label(painter, rect, highlight);
 	}
@@ -193,24 +158,19 @@ void Header::keyPressEvent(QKeyEvent *e)
 		on_ungroup();
 }
 
-void Header::on_signals_moved()
-{
-	update();
-}
-
 void Header::on_group()
 {
-	vector< shared_ptr<RowItem> > selected_items(
+	vector< shared_ptr<TraceTreeItem> > 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) {
+		[](const shared_ptr<TraceTreeItem> &a, const shared_ptr<TraceTreeItem> &b) {
 			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(
+	shared_ptr<TraceTreeItem> mouse_down_item(
+		std::dynamic_pointer_cast<TraceTreeItem>(mouse_down_item_));
+	shared_ptr<TraceTreeItem> focus_item(
 		mouse_down_item ? mouse_down_item : selected_items.front());
 
 	assert(focus_item);
@@ -222,7 +182,7 @@ void Header::on_group()
 		focus_item->v_extents().first);
 
 	for (size_t i = 0; i < selected_items.size(); i++) {
-		const shared_ptr<RowItem> &r = selected_items[i];
+		const shared_ptr<TraceTreeItem> &r = selected_items[i];
 		assert(r->owner());
 		r->owner()->remove_child_item(r);
 		group->add_child_item(r);
@@ -238,7 +198,7 @@ void Header::on_ungroup()
 	bool restart;
 	do {
 		restart = false;
-		for (const shared_ptr<RowItem> r : view_) {
+		for (const shared_ptr<TraceTreeItem> r : view_) {
 			const shared_ptr<TraceGroup> tg =
 				dynamic_pointer_cast<TraceGroup>(r);
 			if (tg && tg->selected()) {
@@ -247,7 +207,7 @@ void Header::on_ungroup()
 				break;
 			}
 		}
-	} while(restart);
+	} while (restart);
 }
 
 } // namespace view