X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.hpp;h=cf4938a721df410c67cb452e9ba13319c98a96fd;hp=7dc1e0d9de9917135c7e1dbb60747e1fbdfca11f;hb=c6d9cf6582589fd375e67579d42ee914ce6382a1;hpb=52c900ac8626b33cfd55485b4474fb5160524d33 diff --git a/pv/views/trace/analogsignal.hpp b/pv/views/trace/analogsignal.hpp index 7dc1e0d9..cf4938a7 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, @@ -153,7 +156,7 @@ protected: void populate_popup_form(QWidget *parent, QFormLayout *form); private Q_SLOTS: - void on_samples_added(); + void on_min_max_changed(float min, float max); void on_pos_vdivs_changed(int vdivs); void on_neg_vdivs_changed(int vdivs); @@ -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_;