X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=efde2941d9137041b0c3fcfa9b882d3d882c0ff8;hb=e71eb81c946c3524e01eaef9781ccbf170143d0c;hp=0ac6311116610356b12f0663fa0fc933539f801e;hpb=f32905530347e1020d5ce7959123cf797c9a4829;p=pulseview.git

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 0ac63111..efde2941 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -77,11 +77,6 @@ shared_ptr<pv::data::Analog> AnalogSignal::analog_data() const
 	return data_;
 }
 
-void AnalogSignal::set_scale(float scale)
-{
-	scale_ = scale;
-}
-
 std::pair<int, int> AnalogSignal::v_extents() const
 {
 	return make_pair(-NominalHeight / 2, NominalHeight / 2);
@@ -113,15 +108,15 @@ void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 
 	const double pixels_offset = pp.pixels_offset();
 	const double samplerate = segment->samplerate();
-	const double start_time = segment->start_time();
+	const pv::util::Timestamp& start_time = segment->start_time();
 	const int64_t last_sample = segment->get_sample_count() - 1;
 	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();
+	const pv::util::Timestamp start = samplerate * (pp.offset() - start_time);
+	const pv::util::Timestamp end = start + samples_per_pixel * pp.width();
 
-	const int64_t start_sample = min(max((int64_t)floor(start),
+	const int64_t start_sample = min(max(floor(start).convert_to<int64_t>(),
 		(int64_t)0), last_sample);
-	const int64_t end_sample = min(max((int64_t)ceil(end) + 1,
+	const int64_t end_sample = min(max((ceil(end) + 1).convert_to<int64_t>(),
 		(int64_t)0), last_sample);
 
 	if (samples_per_pixel < EnvelopeThreshold)