X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.h;h=a9c24b44da7bd13b27896ffc5cdc2e2173f54fad;hp=e20f13c7a9fdb803a285d19c1fd19657f3476513;hb=7c68ddaee897d069f817c2c0184bd8c1f73d826a;hpb=1b1ec774978b65209ce2b454cbf81da499b797d2 diff --git a/pv/view/logicsignal.h b/pv/view/logicsignal.h index e20f13c7..a9c24b44 100644 --- a/pv/view/logicsignal.h +++ b/pv/view/logicsignal.h @@ -42,7 +42,7 @@ private: static const QColor HighColour; static const QColor LowColour; - static const QColor LogicSignalColours[10]; + static const QColor SignalColours[10]; public: LogicSignal(QString name, @@ -52,12 +52,15 @@ public: /** * Paints the signal with a QPainter * @param p the QPainter to paint into. - * @param rect the rectangular area to draw the trace into. + * @param y the y-coordinate to draw the signal at. + * @param left the x-coordinate of the left edge of the signal. + * @param right the x-coordinate of the right edge of the signal. * @param scale the scale in seconds per pixel. * @param offset the time to show at the left hand edge of * the view in seconds. **/ - void paint(QPainter &p, const QRect &rect, double scale, double offset); + void paint(QPainter &p, int y, int left, int right, double scale, + double offset); private: @@ -66,12 +69,6 @@ private: bool level, double samples_per_pixel, double pixels_offset, float x_offset, float y_offset); - /** - * When painting into the rectangle, calculate the y - * offset of the zero point. - **/ - int get_nominal_offset(const QRect &rect) const; - private: int _probe_index; boost::shared_ptr _data;