X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=b1aaae8f2ddbdf26e2724c1b99787d87d7fd8b0d;hp=fc81a4a92668663b26a9cf2ad7fa0113f72258f4;hb=ff008de665c7990d5f3408f918ff090d8e6c60b2;hpb=f65cd27bdbf70644052dd43dac4bbe9403f4dfee

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index fc81a4a9..b1aaae8f 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -145,35 +145,24 @@ std::pair<int, int> LogicSignal::v_extents() const
 	return make_pair(-SignalHeight - SignalMargin, SignalMargin);
 }
 
-void LogicSignal::paint_back(QPainter &p, int left, int right)
+void LogicSignal::paint_back(QPainter &p, const RowItemPaintParams &pp)
 {
 	if (channel_->enabled())
-		paint_axis(p, get_visual_y(), left, right);
+		paint_axis(p, pp, get_visual_y());
 }
 
-void LogicSignal::paint_mid(QPainter &p, int left, int right)
+void LogicSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp)
 {
-	using pv::view::View;
-
 	QLineF *line;
 
 	vector< pair<int64_t, bool> > edges;
 
 	assert(channel_);
 	assert(data_);
-	assert(right >= left);
 	assert(owner_);
 
 	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;
 
@@ -181,25 +170,25 @@ void LogicSignal::paint_mid(QPainter &p, int left, int right)
 	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 end = start + samples_per_pixel * (right - left);
+	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,
 		min(max((int64_t)floor(start), (int64_t)0), last_sample),
@@ -214,7 +203,7 @@ void LogicSignal::paint_mid(QPainter &p, int left, int right)
 
 	for (auto i = edges.cbegin() + 1; i != edges.cend() - 1; i++) {
 		const float x = ((*i).first / samples_per_pixel -
-			pixels_offset) + left;
+			pixels_offset) + pp.left();
 		*line++ = QLineF(x, high_offset, x, low_offset);
 	}
 
@@ -228,18 +217,16 @@ void LogicSignal::paint_mid(QPainter &p, int left, int right)
 
 	p.setPen(HighColour);
 	paint_caps(p, cap_lines, edges, true, samples_per_pixel,
-		pixels_offset, left, high_offset);
+		pixels_offset, pp.left(), high_offset);
 	p.setPen(LowColour);
 	paint_caps(p, cap_lines, edges, false, samples_per_pixel,
-		pixels_offset, left, low_offset);
+		pixels_offset, pp.left(), low_offset);
 
 	delete[] cap_lines;
 }
 
-void LogicSignal::paint_fore(QPainter &p, int left, int right)
+void LogicSignal::paint_fore(QPainter &p, const RowItemPaintParams &pp)
 {
-	(void)left;
-
 	// Draw the trigger marker
 	if (!trigger_match_)
 		return;
@@ -262,7 +249,7 @@ void LogicSignal::paint_fore(QPainter &p, int left, int right)
 		const int pad = TriggerMarkerPadding;
 		const QSize size = pixmap->size();
 		const QPoint point(
-			right - size.width() - pad * 2,
+			pp.right() - size.width() - pad * 2,
 			y - (SignalHeight + size.height()) / 2);
 
 		p.setPen(QPen(Qt::NoPen));