X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.hpp;h=af29c5e26b41230c533ec9bca6bae4b091d4416a;hb=d37ff80d1d8ef4d63094c07f8009742a356922bb;hp=cf4938a721df410c67cb452e9ba13319c98a96fd;hpb=c6d9cf6582589fd375e67579d42ee914ce6382a1;p=pulseview.git

diff --git a/pv/views/trace/analogsignal.hpp b/pv/views/trace/analogsignal.hpp
index cf4938a..af29c5e 100644
--- a/pv/views/trace/analogsignal.hpp
+++ b/pv/views/trace/analogsignal.hpp
@@ -50,7 +50,13 @@ private:
 	static const QColor SignalColours[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 ThresholdColor;
+	static const QColor ThresholdColorLo;
+	static const QColor ThresholdColorNe;
+	static const QColor ThresholdColorHi;
 
 	static const int64_t TracePaintBlockSize;
 	static const float EnvelopeThreshold;
@@ -132,8 +138,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,
@@ -172,6 +176,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_;
@@ -187,6 +193,7 @@ private:
 
 	DisplayType display_type_;
 	bool autoranging_;
+	int conversion_threshold_disp_mode_;
 };
 
 } // namespace trace