X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.hpp;h=24d4a21cacb6dae92aba8a37d85fb39f028ce86f;hp=7dc1e0d9de9917135c7e1dbb60747e1fbdfca11f;hb=932bc2461d7b84b084d3a77ccfeb3bdb1a2d0d6c;hpb=52c900ac8626b33cfd55485b4474fb5160524d33 diff --git a/pv/views/trace/analogsignal.hpp b/pv/views/trace/analogsignal.hpp index 7dc1e0d9..24d4a21c 100644 --- a/pv/views/trace/analogsignal.hpp +++ b/pv/views/trace/analogsignal.hpp @@ -26,7 +26,6 @@ #include #include -#include using std::pair; using std::shared_ptr; @@ -47,9 +46,11 @@ class AnalogSignal : public Signal Q_OBJECT private: + static const QPen AxisPen; static const QColor SignalColours[4]; static const QColor GridMajorColor, GridMinorColor; static const QColor SamplingPointColour; + static const QColor ThresholdColor; static const int64_t TracePaintBlockSize; static const float EnvelopeThreshold; @@ -131,6 +132,8 @@ private: int y, int left, const int64_t start, const int64_t end, const double pixels_offset, const double samples_per_pixel); + void paint_conversion_thresholds(QPainter &p, ViewItemPaintParams &pp); + void paint_logic_mid(QPainter &p, ViewItemPaintParams &pp); void paint_logic_caps(QPainter &p, QLineF *const lines, @@ -174,8 +177,6 @@ private: *display_type_cb_; QSpinBox *pvdiv_sb_, *nvdiv_sb_, *div_height_sb_; - QTimer delayed_conversion_starter_; - float scale_; int scale_index_; int scale_index_drag_offset_;