X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.hpp;fp=pv%2Fview%2Fanalogsignal.hpp;h=5283a2c5e569d949ad9112da048432eeb7c87120;hb=a970015f3aac1e13a5ed2e19a60ac304b1397d1c;hp=a27f669681659f61c84cb7a7c737d00a5b17752a;hpb=12ea3616767553ee0a615f14bbcb8ec614589e34;p=pulseview.git

diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index a27f669..5283a2c 100644
--- a/pv/view/analogsignal.hpp
+++ b/pv/view/analogsignal.hpp
@@ -55,6 +55,12 @@ private:
 	static const int MaxScaleIndex, MinScaleIndex;
 	static const int InfoTextMarginRight, InfoTextMarginBottom;
 
+	enum DisplayType {
+		DisplayAnalog = 0,
+		DisplayConverted = 1,
+		DisplayBoth = 2
+	};
+
 public:
 	AnalogSignal(pv::Session &session, shared_ptr<data::SignalBase> base);
 
@@ -144,8 +150,10 @@ private Q_SLOTS:
 
 	void on_autoranging_changed(int state);
 
+	void on_conversion_changed(int index);
+
 private:
-	QComboBox *resolution_cb_;
+	QComboBox *resolution_cb_, *conversion_cb_, *display_type_cb_;
 
 	float scale_;
 	int scale_index_;
@@ -155,6 +163,8 @@ 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_;
 };