X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=b1aaae8f2ddbdf26e2724c1b99787d87d7fd8b0d;hb=ff008de665c7990d5f3408f918ff090d8e6c60b2;hp=af992c6bac175391ffd7a3941f59c1a1ae036266;hpb=3eb29afdb641606c2e2e059289d8cc103d027a25;p=pulseview.git

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index af992c6..b1aaae8 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -148,13 +148,11 @@ std::pair<int, int> LogicSignal::v_extents() const
 void LogicSignal::paint_back(QPainter &p, const RowItemPaintParams &pp)
 {
 	if (channel_->enabled())
-		paint_axis(p, get_visual_y(), pp.left(), pp.right());
+		paint_axis(p, pp, get_visual_y());
 }
 
 void LogicSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp)
 {
-	using pv::view::View;
-
 	QLineF *line;
 
 	vector< pair<int64_t, bool> > edges;
@@ -165,14 +163,6 @@ void LogicSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp)
 
 	const int y = get_visual_y();
 
-	const View *const view = owner_->view();
-	assert(view);
-
-	const double scale = view->scale();
-	assert(scale > 0);
-
-	const double offset = view->offset();
-
 	if (!channel_->enabled())
 		return;
 
@@ -180,24 +170,24 @@ void LogicSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp)
 	const float low_offset = y + 0.5f;
 
 	const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
-		data_->get_snapshots();
+		data_->logic_snapshots();
 	if (snapshots.empty())
 		return;
 
 	const shared_ptr<pv::data::LogicSnapshot> &snapshot =
 		snapshots.front();
 
-	double samplerate = data_->samplerate();
+	double samplerate = snapshot->samplerate();
 
 	// Show sample rate as 1Hz when it is unknown
 	if (samplerate == 0.0)
 		samplerate = 1.0;
 
-	const double pixels_offset = offset / scale;
-	const double start_time = data_->get_start_time();
+	const double pixels_offset = pp.pixels_offset();
+	const double start_time = snapshot->start_time();
 	const int64_t last_sample = snapshot->get_sample_count() - 1;
-	const double samples_per_pixel = samplerate * scale;
-	const double start = samplerate * (offset - start_time);
+	const double samples_per_pixel = samplerate * pp.scale();
+	const double start = samplerate * (pp.offset() - start_time);
 	const double end = start + samples_per_pixel * pp.width();
 
 	snapshot->get_subsampled_edges(edges,