X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=2597a8f38445959051cadbdeae26ed7eb9f3ef8f;hp=218a959dd422aed5e6560398bb436a85b86317d5;hb=eee89ff865c28854eebdcecbe344f225b9ee366f;hpb=8a2fafcc1401c4021ee700cc932ef34d6c795941 diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp index 218a959d..2597a8f3 100644 --- a/pv/view/analogsignal.cpp +++ b/pv/view/analogsignal.cpp @@ -63,7 +63,7 @@ AnalogSignal::AnalogSignal( scale_index_(0), scale_index_drag_offset_(0) { - colour_ = SignalColours[channel_->index() % countof(SignalColours)]; + set_colour(SignalColours[channel_->index() % countof(SignalColours)]); } AnalogSignal::~AnalogSignal() @@ -105,8 +105,10 @@ void AnalogSignal::scale_handle_drag_release() void AnalogSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp) { - if (channel_->enabled()) + if (channel_->enabled()) { + Trace::paint_back(p, pp); paint_axis(p, pp, get_visual_y()); + } } void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp) @@ -128,7 +130,7 @@ void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp) segments.front(); const double pixels_offset = pp.pixels_offset(); - const double samplerate = segment->samplerate(); + const double samplerate = max(1.0, segment->samplerate()); 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();