AnalogSignal/LogicSignal: Internally cache settings used for painting

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

diff --git a/pv/views/trace/analogsignal.hpp b/pv/views/trace/analogsignal.hpp
index 60acc2eb68ccebe0eba775bc3c141122f02eac20..fd724492c80e306dcabdf164fa3cd9b11f4789c2 100644 (file)
--- a/pv/views/trace/analogsignal.hpp
+++ b/pv/views/trace/analogsignal.hpp
@@ -22,6 +22,7 @@
 
 #include <memory>
 
+#include <QColor>
 #include <QComboBox>
 #include <QSpinBox>
 
@@ -86,8 +87,6 @@ public:
         */
        pair<int, int> v_extents() const;
 
-       virtual void on_setting_changed(const QString &key, const QVariant &value);
-
        /**
         * Paints the background layer of the signal with a QPainter
         * @param p the QPainter to paint into.
@@ -161,6 +160,8 @@ protected:
        virtual void hover_point_changed(const QPoint &hp);
 
 private Q_SLOTS:
+       virtual void on_setting_changed(const QString &key, const QVariant &value);
+
        void on_min_max_changed(float min, float max);
 
        void on_pos_vdivs_changed(int vdivs);
@@ -177,8 +178,6 @@ private Q_SLOTS:
 
        void on_display_type_changed(int index);
 
-       void on_settingViewConversionThresholdDispMode_changed(const QVariant new_value);
-
 private:
        QComboBox *resolution_cb_, *conversion_cb_, *conv_threshold_cb_,
                *display_type_cb_;
@@ -189,7 +188,11 @@ private:
 
        int div_height_;
        int pos_vdivs_, neg_vdivs_;  // divs per positive/negative side
-       float resolution_; // e.g. 10 for 10 V/div
+       float resolution_;  // e.g. 10 for 10 V/div
+
+       bool show_analog_minor_grid_;
+       QColor high_fill_color_;
+       bool show_sampling_points_, fill_high_areas_;
 
        DisplayType display_type_;
        bool autoranging_;