X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.hpp;h=6afc394227170c99151acc9d8220daa3fed63def;hb=641574bcc118be0b6dc3a65039ab3497f9d7241a;hp=536fc8a61714b6bf323f4a991b934389022b962c;hpb=1d150cd6ea6d9c465d607377bba435a065f104cd;p=pulseview.git

diff --git a/pv/views/trace/analogsignal.hpp b/pv/views/trace/analogsignal.hpp
index 536fc8a..6afc394 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,15 +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 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;
@@ -71,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;
 
@@ -101,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.
@@ -142,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.
 	 */
@@ -173,6 +182,8 @@ 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_;
@@ -188,6 +199,7 @@ private:
 
 	DisplayType display_type_;
 	bool autoranging_;
+	int conversion_threshold_disp_mode_;
 };
 
 } // namespace trace