X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=83df7aa4d1eaaa9543add3896e2b6363457ba200;hb=e9e4e5e7ea46132262fbd53f708dafc039b3b24f;hp=feb880e94a0bd0ea477ed225bdae4642c5cef767;hpb=beb897c6c32c8e8dd9eb34d91100ab0569fca5f6;p=pulseview.git

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index feb880e..83df7aa 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -32,6 +32,8 @@
 #include <QMouseEvent>
 
 using std::abs;
+using std::back_inserter;
+using std::copy;
 using std::max;
 using std::min;
 using std::none_of;
@@ -43,19 +45,32 @@ namespace pv {
 namespace view {
 
 Viewport::Viewport(View &parent) :
-	QWidget(&parent),
-	view_(parent),
+	ViewWidget(parent),
 	mouse_down_valid_(false),
 	pinch_zoom_active_(false)
 {
 	setAttribute(Qt::WA_AcceptTouchEvents, true);
 
-	setMouseTracking(true);
 	setAutoFillBackground(true);
 	setBackgroundRole(QPalette::Base);
+}
 
-	connect(&view_, SIGNAL(signals_moved()),
-		this, SLOT(on_signals_moved()));
+shared_ptr<ViewItem> Viewport::get_mouse_over_item(const QPoint &pt)
+{
+	const vector< shared_ptr<ViewItem> > items(this->items());
+	for (auto i = items.rbegin(); i != items.rend(); i++)
+		if ((*i)->enabled() &&
+			(*i)->hit_box_rect(rect()).contains(pt))
+			return *i;
+	return nullptr;
+}
+
+vector< shared_ptr<ViewItem> > Viewport::items()
+{
+	vector< shared_ptr<ViewItem> > items(view_.begin(), view_.end());
+	const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
+	copy(time_items.begin(), time_items.end(), back_inserter(items));
+	return items;
 }
 
 void Viewport::paintEvent(QPaintEvent*)
@@ -221,10 +236,5 @@ bool Viewport::touchEvent(QTouchEvent *event)
 	return true;
 }
 
-void Viewport::on_signals_moved()
-{
-	update();
-}
-
 } // namespace view
 } // namespace pv