X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=fbffb2ebb0061b7a05af272d5647fe45c37b229b;hp=cd57da06b6073e0143f3f859bad2b70a8120a426;hb=0aa57689a8abc7eb313de50774b8d0cf271bc61f;hpb=73a25a6e488f1813c1cd12da085a16e4f91ed4da

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index cd57da06..fbffb2eb 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -71,10 +71,8 @@ const int AnalogSignal::InfoTextMarginBottom = 5;
 
 AnalogSignal::AnalogSignal(
 	pv::Session &session,
-	shared_ptr<data::SignalBase> base,
-	shared_ptr<data::Analog> data) :
+	shared_ptr<data::SignalBase> base) :
 	Signal(session, base),
-	data_(data),
 	scale_index_(4), // 20 per div
 	scale_index_drag_offset_(0),
 	div_height_(3 * QFontMetrics(QApplication::font()).height()),
@@ -87,12 +85,7 @@ AnalogSignal::AnalogSignal(
 
 shared_ptr<pv::data::SignalData> AnalogSignal::data() const
 {
-	return data_;
-}
-
-shared_ptr<pv::data::Analog> AnalogSignal::analog_data() const
-{
-	return data_;
+	return base_->analog_data();
 }
 
 std::pair<int, int> AnalogSignal::v_extents() const
@@ -135,7 +128,7 @@ void AnalogSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
 
 void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 {
-	assert(data_);
+	assert(base_->analog_data());
 	assert(owner_);
 
 	const int y = get_visual_y();
@@ -146,7 +139,7 @@ void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 	paint_grid(p, y, pp.left(), pp.right());
 
 	const deque< shared_ptr<pv::data::AnalogSegment> > &segments =
-		data_->analog_segments();
+		base_->analog_data()->analog_segments();
 	if (segments.empty())
 		return;