X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=f349861f226fe0f1833974b0d9ca9216e6a1466c;hb=f1d9ac673ce644a7e2397bd1c4687083157f4a17;hp=28408eee39db4723497d906ae8a21b02e901427d;hpb=2496bf451ebd50b9ab67a1af9b979761c0fbad49;p=pulseview.git

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 28408ee..f349861 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -104,7 +104,7 @@ View::View(Session &session, QWidget *parent) :
 	tick_period_(0.0),
 	tick_prefix_(0),
 	show_cursors_(false),
-	cursors_(*this),
+	cursors_(new CursorPair(*this)),
 	hover_point_(-1, -1)
 {
 	connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
@@ -121,9 +121,9 @@ View::View(Session &session, QWidget *parent) :
 	connect(&session_, SIGNAL(frame_ended()),
 		this, SLOT(data_updated()));
 
-	connect(cursors_.first().get(), SIGNAL(time_changed()),
+	connect(cursors_->first().get(), SIGNAL(time_changed()),
 		this, SLOT(marker_time_changed()));
-	connect(cursors_.second().get(), SIGNAL(time_changed()),
+	connect(cursors_->second().get(), SIGNAL(time_changed()),
 		this, SLOT(marker_time_changed()));
 
 	connect(header_, SIGNAL(signals_moved()),
@@ -198,8 +198,9 @@ const Viewport* View::viewport() const
 vector< shared_ptr<TimeItem> > View::time_items() const
 {
 	vector< shared_ptr<TimeItem> > items;
-	items.push_back(cursors_.first());
-	items.push_back(cursors_.second());
+	items.push_back(cursors_);
+	items.push_back(cursors_->first());
+	items.push_back(cursors_->second());
 	return items;
 }
 
@@ -357,18 +358,13 @@ void View::show_cursors(bool show)
 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);
+	cursors_->first()->set_time(offset_ + time_width * 0.4);
+	cursors_->second()->set_time(offset_ + time_width * 0.6);
 	cursorheader_->update();
 	viewport_->update();
 }
 
-CursorPair& View::cursors()
-{
-	return cursors_;
-}
-
-const CursorPair& View::cursors() const
+std::shared_ptr<CursorPair> View::cursors() const
 {
 	return cursors_;
 }
@@ -487,11 +483,11 @@ void View::update_scroll()
 
 	// Set the vertical scrollbar
 	verticalScrollBar()->setPageStep(areaSize.height());
+	verticalScrollBar()->setSingleStep(areaSize.height() / 8);
 
 	const pair<int, int> extents = v_extents();
-	const int extra_scroll_height = (extents.second - extents.first) / 4;
-	verticalScrollBar()->setRange(extents.first - extra_scroll_height,
-		extents.first + extra_scroll_height);
+	verticalScrollBar()->setRange(extents.first - (areaSize.height() / 2),
+		extents.second - (areaSize.height() / 2));
 }
 
 void View::update_layout()
@@ -510,16 +506,16 @@ void View::update_layout()
 	update_scroll();
 }
 
-void View::paint_label(QPainter &p, int right, bool hover)
+void View::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
 	(void)p;
-	(void)right;
+	(void)rect;
 	(void)hover;
 }
 
-QRectF View::label_rect(int right)
+QRectF View::label_rect(const QRectF &rect)
 {
-	(void)right;
+	(void)rect;
 	return QRectF();
 }