X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=e319b4fc82a8bb378a5dd345d038cef7e5d0228d;hp=49b96ba390a093326ba770ce80d8e1995ddace60;hb=1d8dca913d07df3a53184e40246eb2e333520e31;hpb=cdf7bea7f0eead18de2616cbfd8697ac0fffb59b

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 49b96ba3..e319b4fc 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -26,6 +26,7 @@
 #include <QEvent>
 #include <QScrollBar>
 
+#include "header.h"
 #include "view.h"
 #include "viewport.h"
 
@@ -45,10 +46,13 @@ const double View::MinScale = 1e-15;
 const int View::LabelMarginWidth = 70;
 const int View::RulerHeight = 30;
 
+const int View::SignalHeight = 50;
+
 View::View(SigSession &session, QWidget *parent) :
 	QAbstractScrollArea(parent),
 	_session(session),
 	_viewport(new Viewport(*this)),
+	_header(new Header(*this)),
 	_data_length(0),
 	_scale(1e-6),
 	_offset(0),
@@ -60,9 +64,16 @@ View::View(SigSession &session, QWidget *parent) :
 		this, SLOT(v_scroll_value_changed(int)));
 	connect(&_session, SIGNAL(data_updated()),
 		this, SLOT(data_updated()));
+
+	setViewportMargins(LabelMarginWidth, 0, 0, 0);
 	setViewport(_viewport);
 }
 
+SigSession& View::session()
+{
+	return _session;
+}
+
 double View::scale() const
 {
 	return _scale;
@@ -145,6 +156,8 @@ bool View::viewportEvent(QEvent *e)
 
 void View::resizeEvent(QResizeEvent *e)
 {
+	_header->setGeometry(0, RulerHeight,
+		_viewport->x(), _viewport->height());
 	update_scroll();
 }
 
@@ -157,6 +170,7 @@ void View::h_scroll_value_changed(int value)
 void View::v_scroll_value_changed(int value)
 {
 	_v_offset = value;
+	_header->update();
 	_viewport->update();
 }