X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.hpp;h=6afc394227170c99151acc9d8220daa3fed63def;hp=af29c5e26b41230c533ec9bca6bae4b091d4416a;hb=641574bcc118be0b6dc3a65039ab3497f9d7241a;hpb=d37ff80d1d8ef4d63094c07f8009742a356922bb

diff --git a/pv/views/trace/analogsignal.hpp b/pv/views/trace/analogsignal.hpp
index af29c5e2..6afc3942 100644
--- a/pv/views/trace/analogsignal.hpp
+++ b/pv/views/trace/analogsignal.hpp
@@ -20,13 +20,14 @@
 #ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
 #define PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
 
-#include "signal.hpp"
-
 #include <memory>
 
 #include <QComboBox>
 #include <QSpinBox>
 
+#include <pv/globalsettings.hpp>
+#include <pv/views/trace/signal.hpp>
+
 using std::pair;
 using std::shared_ptr;
 
@@ -41,18 +42,18 @@ class SignalBase;
 namespace views {
 namespace trace {
 
-class AnalogSignal : public Signal
+class AnalogSignal : public Signal, public GlobalSettingsInterface
 {
 	Q_OBJECT
 
 private:
 	static const QPen AxisPen;
-	static const QColor SignalColours[4];
+	static const QColor SignalColors[4];
 	static const QColor GridMajorColor, GridMinorColor;
-	static const QColor SamplingPointColour;
-	static const QColor SamplingPointColourLo;
-	static const QColor SamplingPointColourNe;
-	static const QColor SamplingPointColourHi;
+	static const QColor SamplingPointColor;
+	static const QColor SamplingPointColorLo;
+	static const QColor SamplingPointColorNe;
+	static const QColor SamplingPointColorHi;
 	static const QColor ThresholdColor;
 	static const QColor ThresholdColorLo;
 	static const QColor ThresholdColorNe;
@@ -74,7 +75,7 @@ private:
 public:
 	AnalogSignal(pv::Session &session, shared_ptr<data::SignalBase> base);
 
-	virtual ~AnalogSignal() = default;
+	~AnalogSignal();
 
 	shared_ptr<pv::data::SignalData> data() const;
 
@@ -104,6 +105,8 @@ public:
 	 */
 	void scale_handle_drag_release();
 
+	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.
@@ -145,6 +148,9 @@ private:
 		bool level, double samples_per_pixel, double pixels_offset,
 		float x_offset, float y_offset);
 
+	shared_ptr<pv::data::AnalogSegment> get_analog_segment_to_paint() const;
+	shared_ptr<pv::data::LogicSegment> get_logic_segment_to_paint() const;
+
 	/**
 	 * Computes the scale factor from the scale index and vdiv settings.
 	 */