X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Flogicsignal.cpp;h=28d71d3cbc5070b853842bec03b81d70c23dafa2;hp=fe5572d232d8184ebb25807c0bdc4b9755022232;hb=3b258424833cc681b7f3a0571a00dcc42df6192f;hpb=cef18fc6160f8f5055f2617fbe06eb082c2a7bd5 diff --git a/pv/logicsignal.cpp b/pv/logicsignal.cpp index fe5572d2..28d71d3c 100644 --- a/pv/logicsignal.cpp +++ b/pv/logicsignal.cpp @@ -54,8 +54,8 @@ const QColor LogicSignal::LogicSignalColours[10] = { LogicSignal::LogicSignal(QString name, shared_ptr data, int probe_index) : Signal(name), - _data(data), - _probe_index(probe_index) + _probe_index(probe_index), + _data(data) { assert(_probe_index >= 0); } @@ -125,7 +125,7 @@ void LogicSignal::paint(QPainter &p, const QRect &rect, double scale, delete[] cap_lines; } -int LogicSignal::paint_caps(QPainter &p, QLineF *const lines, +void LogicSignal::paint_caps(QPainter &p, QLineF *const lines, vector< pair > &edges, bool level, double samples_per_pixel, double pixels_offset, int x_offset, int y_offset)