X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=5d3ac102164375ae9aae4c5b30284ee89853eb8e;hp=c23f09226cd9bfaa2cbaf3d362eca7065ad69088;hb=35365c66bf6166c5607f1180016528d996a45b66;hpb=fcc00c4d9d3c4e00a3e15bff666e0ceedfa9d0ea diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp index c23f0922..5d3ac102 100644 --- a/pv/view/logicsignal.cpp +++ b/pv/view/logicsignal.cpp @@ -113,7 +113,7 @@ LogicSignal::LogicSignal( { shared_ptr trigger; - colour_ = SignalColours[channel->index() % countof(SignalColours)]; + set_colour(SignalColours[channel->index() % countof(SignalColours)]); /* Populate this channel's trigger setting with whatever we * find in the current session trigger, if anything. */ @@ -163,12 +163,6 @@ void LogicSignal::scale_handle_dragged(int offset) signal_height_ = ((units < 1) ? 1 : units) * font_height; } -void LogicSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp) -{ - if (channel_->enabled()) - paint_axis(p, pp, get_visual_y()); -} - void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp) { QLineF *line; @@ -249,7 +243,7 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp) void LogicSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp) { // Draw the trigger marker - if (!trigger_match_) + if (!trigger_match_ || !channel_->enabled()) return; const int y = get_visual_y();