X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.hpp;h=601ae110d0403fb9c54745dff5e156a030f9f828;hp=07de4eb436541cbc281a22d3df85dbcf7e84fa4a;hb=bf0edd2b0cbb5f4bd5d69b0f00bcea7d037e2287;hpb=4cffac16f3fb0ced3450c7df9c02b2d35bcd01e1

diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index 07de4eb..601ae11 100644
--- a/pv/view/analogsignal.hpp
+++ b/pv/view/analogsignal.hpp
@@ -25,11 +25,14 @@
 
 #include <memory>
 
+#include <QComboBox>
+
 namespace pv {
 
 namespace data {
 class Analog;
 class AnalogSegment;
+class SignalBase;
 }
 
 namespace view {
@@ -45,10 +48,12 @@ private:
 	static const float EnvelopeThreshold;
 
 	static const int MaximumVDivs;
+	static const int MaxScaleIndex, MinScaleIndex;
+	static const int InfoTextMarginRight, InfoTextMarginBottom;
 
 public:
 	AnalogSignal(pv::Session &session,
-		std::shared_ptr<sigrok::Channel> channel,
+		std::shared_ptr<data::SignalBase> channel,
 		std::shared_ptr<pv::data::Analog> data);
 
 	virtual ~AnalogSignal() = default;
@@ -93,6 +98,13 @@ public:
 	 */
 	void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
 
+	/**
+	 * Paints the foreground layer of the item with a QPainter
+	 * @param p the QPainter to paint into.
+	 * @param pp the painting parameters object to paint with.
+	 */
+	void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
+
 private:
 	void paint_grid(QPainter &p, int y, int left, int right);
 
@@ -109,6 +121,8 @@ private:
 	/**
 	 * Computes the scale factor from the scale index and vdiv settings.
 	 */
+	float get_resolution(int scale_index);
+
 	void update_scale();
 
 protected:
@@ -117,9 +131,13 @@ protected:
 private Q_SLOTS:
 	void on_vdivs_changed(int vdivs);
 
+	void on_resolution_changed(int index);
+
 private:
 	std::shared_ptr<pv::data::Analog> data_;
 
+	QComboBox *resolution_cb_;
+
 	float scale_;
 	int scale_index_;
 	int scale_index_drag_offset_;