AnalogSignal: Use setting change handler for threshold display

[pulseview.git] / pv / views / trace / analogsignal.hpp

diff --git a/pv/views/trace/analogsignal.hpp b/pv/views/trace/analogsignal.hpp
index 37b0c1a3ccdae7db9d89db07f2871abf8056473f..a36efce4879ca1c9e5602772ca41972ab2af280a 100644 (file)
--- a/pv/views/trace/analogsignal.hpp
+++ b/pv/views/trace/analogsignal.hpp
@@ -26,7 +26,6 @@
 
 #include <QComboBox>
 #include <QSpinBox>
-#include <QTimer>
 
 using std::pair;
 using std::shared_ptr;
@@ -47,10 +46,14 @@ 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 QColor ThresholdColorLo;
+       static const QColor ThresholdColorNe;
+       static const QColor ThresholdColorHi;
 
        static const int64_t TracePaintBlockSize;
        static const float EnvelopeThreshold;
@@ -132,8 +135,6 @@ 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,
@@ -156,7 +157,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);
@@ -172,13 +173,13 @@ private Q_SLOTS:
 
        void on_display_type_changed(int index);
 
+       void on_settingViewShowConversionThresholds_changed(const QVariant new_value);
+
 private:
        QComboBox *resolution_cb_, *conversion_cb_, *conv_threshold_cb_,
                *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_;
@@ -189,6 +190,7 @@ private:
 
        DisplayType display_type_;
        bool autoranging_;
+       bool show_conversion_thresholds_;
 };
 
 } // namespace trace