X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.hpp;h=a66fb9e2fcefca99164644ac7ceb7dae75c209a4;hb=7ea2a4ff0765fdad34b84e4b4631d6f3f5588714;hp=a36efce4879ca1c9e5602772ca41972ab2af280a;hpb=2601ce965fc455d23f5a964b84ddd74eb93705c4;p=pulseview.git

diff --git a/pv/views/trace/analogsignal.hpp b/pv/views/trace/analogsignal.hpp
index a36efce4..a66fb9e2 100644
--- a/pv/views/trace/analogsignal.hpp
+++ b/pv/views/trace/analogsignal.hpp
@@ -50,6 +50,9 @@ 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;
@@ -142,6 +145,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,7 +179,7 @@ private Q_SLOTS:
 
 	void on_display_type_changed(int index);
 
-	void on_settingViewShowConversionThresholds_changed(const QVariant new_value);
+	void on_settingViewConversionThresholdDispMode_changed(const QVariant new_value);
 
 private:
 	QComboBox *resolution_cb_, *conversion_cb_, *conv_threshold_cb_,
@@ -190,7 +196,7 @@ private:
 
 	DisplayType display_type_;
 	bool autoranging_;
-	bool show_conversion_thresholds_;
+	int conversion_threshold_disp_mode_;
 };
 
 } // namespace trace