X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Flogicsignal.hpp;h=e066d40340ee97f65c0993fc74a9e73769a70126;hb=20c99cfc69d3c7430817abd9a1f810698deb4a18;hp=10ede729d1b53b630613d56740ec6243339b9649;hpb=eeceee9955e7db4ac777d49d1b7a766069476b08;p=pulseview.git diff --git a/pv/views/trace/logicsignal.hpp b/pv/views/trace/logicsignal.hpp index 10ede729..e066d403 100644 --- a/pv/views/trace/logicsignal.hpp +++ b/pv/views/trace/logicsignal.hpp @@ -17,10 +17,11 @@ * along with this program; if not, see . */ -#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP -#define PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP +#ifndef PULSEVIEW_PV_VIEWS_TRACE_LOGICSIGNAL_HPP +#define PULSEVIEW_PV_VIEWS_TRACE_LOGICSIGNAL_HPP #include +#include #include #include @@ -80,8 +81,8 @@ public: shared_ptr logic_data() const; - virtual void save_settings(QSettings &settings) const; - virtual void restore_settings(QSettings &settings); + virtual std::map save_settings() const; + virtual void restore_settings(std::map settings); /** * Computes the vertical extents of the contents of this row item. @@ -133,12 +134,15 @@ private: static const QPixmap* get_pixmap(const char *path); private Q_SLOTS: + void on_setting_changed(const QString &key, const QVariant &value); + void on_trigger(); void on_signal_height_changed(int height); private: - int signal_height_; + QColor high_fill_color_; + bool show_sampling_points_, fill_high_areas_; shared_ptr device_; @@ -156,10 +160,15 @@ private: static QCache icon_cache_; static QCache pixmap_cache_; + + // --------------------------------------------------------------------------- + // Note: Make sure to update save_settings() and restore_settings() when + // adding a trace-configurable variable here + int signal_height_; }; } // namespace trace } // namespace views } // namespace pv -#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP +#endif // PULSEVIEW_PV_VIEWS_TRACE_LOGICSIGNAL_HPP