X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=b52d689f22c12d988ef3d2f56499bc0b3e9f4629;hb=149e359e48ede480f3734cfc5c04bd1399d0d4be;hp=8fca4be28b9af9cc059d6e4df04ad47ad853f17f;hpb=333d5bbc0a326e6fa82db44f3e6ba8dd79cafdd8;p=pulseview.git

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 8fca4be..b52d689 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -34,9 +34,9 @@
 #include "view.h"
 #include "viewport.h"
 
-#include "../logicdata.h"
-#include "../logicdatasnapshot.h"
-#include "../sigsession.h"
+#include "pv/sigsession.h"
+#include "pv/data/logic.h"
+#include "pv/data/logicsnapshot.h"
 
 using namespace boost;
 using namespace std;
@@ -75,8 +75,8 @@ View::View(SigSession &session, QWidget *parent) :
 		Cursor(*this, 1.0))),
 	_hover_point(-1, -1)
 {
-	connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
-		this, SLOT(h_scroll_value_changed(int)));
+	connect(horizontalScrollBar(), SIGNAL(sliderMoved(int)),
+		this, SLOT(h_scroll_moved(int)));
 	connect(verticalScrollBar(), SIGNAL(valueChanged(int)),
 		this, SLOT(v_scroll_value_changed(int)));
 
@@ -189,7 +189,7 @@ void View::normalize_layout()
 
 void View::get_scroll_layout(double &length, double &offset) const
 {
-	const shared_ptr<SignalData> sig_data = _session.get_data();
+	const shared_ptr<data::SignalData> sig_data = _session.get_data();
 	if (!sig_data)
 		return;
 
@@ -228,7 +228,7 @@ void View::update_scroll()
 
 void View::reset_signal_layout()
 {
-	int offset = SignalMargin;
+	int offset = SignalMargin + SignalHeight;
 	const vector< shared_ptr<Signal> > sigs(_session.get_signals());
 	BOOST_FOREACH(shared_ptr<Signal> s, sigs) {
 		s->set_v_offset(offset);
@@ -279,7 +279,7 @@ bool View::viewportEvent(QEvent *e)
 	}
 }
 
-void View::resizeEvent(QResizeEvent *e)
+void View::resizeEvent(QResizeEvent*)
 {
 	_ruler->setGeometry(_viewport->x(), 0,
 		_viewport->width(), _viewport->y());
@@ -288,7 +288,7 @@ void View::resizeEvent(QResizeEvent *e)
 	update_scroll();
 }
 
-void View::h_scroll_value_changed(int value)
+void View::h_scroll_moved(int value)
 {
 	const int range = horizontalScrollBar()->maximum();
 	if (range < MaxScrollValue)
@@ -319,11 +319,11 @@ void View::data_updated()
 {
 	// Get the new data length
 	_data_length = 0;
-	shared_ptr<LogicData> sig_data = _session.get_data();
+	shared_ptr<data::Logic> sig_data = _session.get_data();
 	if (sig_data) {
-		deque< shared_ptr<LogicDataSnapshot> > &snapshots =
+		deque< shared_ptr<data::LogicSnapshot> > &snapshots =
 			sig_data->get_snapshots();
-		BOOST_FOREACH(shared_ptr<LogicDataSnapshot> s, snapshots)
+		BOOST_FOREACH(shared_ptr<data::LogicSnapshot> s, snapshots)
 			if (s)
 				_data_length = max(_data_length,
 					s->get_sample_count());