X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.hpp;h=37b0c1a3ccdae7db9d89db07f2871abf8056473f;hb=4433246b9ef4247ff469ae7307606a6d872c573f;hp=a1b3eeefac0139e916921a167322404acb1c8ab3;hpb=1573bf16ba50d1c023ad3a9ce596f0ab6eaeacff;p=pulseview.git

diff --git a/pv/views/trace/analogsignal.hpp b/pv/views/trace/analogsignal.hpp
index a1b3eee..37b0c1a 100644
--- a/pv/views/trace/analogsignal.hpp
+++ b/pv/views/trace/analogsignal.hpp
@@ -26,6 +26,7 @@
 
 #include <QComboBox>
 #include <QSpinBox>
+#include <QTimer>
 
 using std::pair;
 using std::shared_ptr;
@@ -49,6 +50,7 @@ private:
 	static const QColor SignalColours[4];
 	static const QColor GridMajorColor, GridMinorColor;
 	static const QColor SamplingPointColour;
+	static const QColor ThresholdColor;
 
 	static const int64_t TracePaintBlockSize;
 	static const float EnvelopeThreshold;
@@ -130,6 +132,8 @@ 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,
@@ -144,7 +148,7 @@ private:
 
 	void update_scale();
 
-	void update_conversion_type();
+	void update_conversion_widgets();
 
 	void perform_autoranging(bool keep_divs, bool force_update);
 
@@ -156,18 +160,24 @@ private Q_SLOTS:
 
 	void on_pos_vdivs_changed(int vdivs);
 	void on_neg_vdivs_changed(int vdivs);
+	void on_div_height_changed(int height);
 
 	void on_resolution_changed(int index);
 
 	void on_autoranging_changed(int state);
 
 	void on_conversion_changed(int index);
+	void on_conv_threshold_changed(int index=-1);
+	void on_delayed_conversion_starter();
 
 	void on_display_type_changed(int index);
 
 private:
-	QComboBox *resolution_cb_, *conversion_cb_, *display_type_cb_;
-	QSpinBox *pvdiv_sb_, *nvdiv_sb_;
+	QComboBox *resolution_cb_, *conversion_cb_, *conv_threshold_cb_,
+		*display_type_cb_;
+	QSpinBox *pvdiv_sb_, *nvdiv_sb_, *div_height_sb_;
+
+	QTimer delayed_conversion_starter_;
 
 	float scale_;
 	int scale_index_;
@@ -177,7 +187,6 @@ private:
 	int pos_vdivs_, neg_vdivs_;  // divs per positive/negative side
 	float resolution_; // e.g. 10 for 10 V/div
 
-	data::SignalBase::ConversionType conversion_type_;
 	DisplayType display_type_;
 	bool autoranging_;
 };