X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.hpp;h=3b352f932e7a0c0808d18ff7f4cb48bf30d98f17;hb=561ba3ae052a93fe150a2161fcdc361144e68e4f;hp=a67c4ff37185d1ee63bebf8c6b8c32516a1f9a3c;hpb=cbb50547a69f8a10dd05e8cf8d03fdd679e4442f;p=pulseview.git

diff --git a/pv/views/trace/analogsignal.hpp b/pv/views/trace/analogsignal.hpp
index a67c4ff..3b352f9 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;
@@ -46,9 +47,11 @@ class AnalogSignal : public Signal
 	Q_OBJECT
 
 private:
+	static const QPen AxisPen;
 	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 +133,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 +149,7 @@ private:
 
 	void update_scale();
 
-	void update_conversion_type();
+	void update_conversion_widgets();
 
 	void perform_autoranging(bool keep_divs, bool force_update);
 
@@ -163,13 +168,18 @@ private Q_SLOTS:
 	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_;
+	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_;
 	int scale_index_drag_offset_;
@@ -178,7 +188,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_;
 };