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()),
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
void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
{
- assert(data_);
+ assert(base_->analog_data());
assert(owner_);
const int y = get_visual_y();
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;