X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=11026883bab1a7842dba1483c1c58c8b0650cb72;hp=0ebfea1e6d532b94c959569aaf5f1e9d03e601d4;hb=50f97924a2de49393de617a891190f053825454f;hpb=d9aecf1fcd9af471db3b59de7efc65b9632a6d79

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 0ebfea1e..11026883 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -30,6 +30,7 @@
 #include <QMouseEvent>
 #include <QScrollBar>
 
+#include "cursorheader.h"
 #include "decodetrace.h"
 #include "header.h"
 #include "ruler.h"
@@ -41,8 +42,6 @@
 #include "pv/data/logic.h"
 #include "pv/data/logicsnapshot.h"
 
-using boost::shared_ptr;
-using boost::weak_ptr;
 using pv::data::SignalData;
 using std::deque;
 using std::list;
@@ -51,7 +50,9 @@ using std::make_pair;
 using std::min;
 using std::pair;
 using std::set;
+using std::shared_ptr;
 using std::vector;
+using std::weak_ptr;
 
 namespace pv {
 namespace view {
@@ -74,6 +75,7 @@ View::View(SigSession &session, QWidget *parent) :
 	_session(session),
 	_viewport(new Viewport(*this)),
 	_ruler(new Ruler(*this)),
+	_cursorheader(new CursorHeader(*this)),
 	_header(new Header(*this)),
 	_scale(1e-6),
 	_offset(0),
@@ -90,6 +92,8 @@ View::View(SigSession &session, QWidget *parent) :
 
 	connect(&_session, SIGNAL(signals_changed()),
 		this, SLOT(signals_changed()));
+	connect(&_session, SIGNAL(capture_state_changed(int)),
+		this, SLOT(data_updated()));
 	connect(&_session, SIGNAL(data_received()),
 		this, SLOT(data_updated()));
 	connect(&_session, SIGNAL(frame_ended()),
@@ -106,24 +110,29 @@ View::View(SigSession &session, QWidget *parent) :
 		this, SLOT(on_signals_moved()));
 
 	connect(_header, SIGNAL(selection_changed()),
-		_ruler, SLOT(clear_selection()));
-	connect(_ruler, SIGNAL(selection_changed()),
+		_cursorheader, SLOT(clear_selection()));
+	connect(_cursorheader, SIGNAL(selection_changed()),
 		_header, SLOT(clear_selection()));
 
 	connect(_header, SIGNAL(selection_changed()),
 		this, SIGNAL(selection_changed()));
-	connect(_ruler, SIGNAL(selection_changed()),
+	connect(_cursorheader, SIGNAL(selection_changed()),
 		this, SIGNAL(selection_changed()));
 
 	setViewport(_viewport);
 
 	_viewport->installEventFilter(this);
 	_ruler->installEventFilter(this);
+	_cursorheader->installEventFilter(this);
 	_header->installEventFilter(this);
 
 	// Trigger the initial event manually. The default device has signals
 	// which were created before this object came into being
 	signals_changed();
+
+	// make sure the transparent widgets are on the top
+	_cursorheader->raise();
+	_header->raise();
 }
 
 SigSession& View::session()
@@ -213,6 +222,7 @@ void View::set_scale_offset(double scale, double offset)
 
 	update_scroll();
 	_ruler->update();
+	_cursorheader->update();
 	_viewport->update();
 	scale_offset_changed();
 }
@@ -305,7 +315,7 @@ bool View::cursors_shown() const
 void View::show_cursors(bool show)
 {
 	_show_cursors = show;
-	_ruler->update();
+	_cursorheader->update();
 	_viewport->update();
 }
 
@@ -314,7 +324,7 @@ void View::centre_cursors()
 	const double time_width = _scale * _viewport->width();
 	_cursors.first()->set_time(_offset + time_width * 0.4);
 	_cursors.second()->set_time(_offset + time_width * 0.6);
-	_ruler->update();
+	_cursorheader->update();
 	_viewport->update();
 }
 
@@ -405,12 +415,17 @@ void View::update_scroll()
 
 void View::update_layout()
 {
-	setViewportMargins(_header->sizeHint().width(),
+	setViewportMargins(
+		_header->sizeHint().width() - pv::view::Header::BaselineOffset,
 		_ruler->sizeHint().height(), 0, 0);
 	_ruler->setGeometry(_viewport->x(), 0,
 		_viewport->width(), _viewport->y());
+	_cursorheader->setGeometry(
+		_viewport->x(),
+		_ruler->sizeHint().height() - _cursorheader->sizeHint().height() / 2,
+		_viewport->width(), _cursorheader->sizeHint().height());
 	_header->setGeometry(0, _viewport->y(),
-		_viewport->x(), _viewport->height());
+		_header->sizeHint().width(), _viewport->height());
 	update_scroll();
 }
 
@@ -430,7 +445,7 @@ bool View::eventFilter(QObject *object, QEvent *event)
 		const QMouseEvent *const mouse_event = (QMouseEvent*)event;
 		if (object == _viewport)
 			_hover_point = mouse_event->pos();
-		else if (object == _ruler)
+		else if (object == _ruler || object == _cursorheader)
 			_hover_point = QPoint(mouse_event->x(), 0);
 		else if (object == _header)
 			_hover_point = QPoint(0, mouse_event->y());
@@ -456,6 +471,9 @@ bool View::viewportEvent(QEvent *e)
 	case QEvent::MouseButtonDblClick:
 	case QEvent::MouseMove:
 	case QEvent::Wheel:
+	case QEvent::TouchBegin:
+	case QEvent::TouchUpdate:
+	case QEvent::TouchEnd:
 		return false;
 
 	default:
@@ -483,6 +501,7 @@ void View::h_scroll_value_changed(int value)
 	}
 
 	_ruler->update();
+	_cursorheader->update();
 	_viewport->update();
 }
 
@@ -518,7 +537,7 @@ void View::data_updated()
 
 void View::marker_time_changed()
 {
-	_ruler->update();
+	_cursorheader->update();
 	_viewport->update();
 }