X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.hpp;h=1369a76cf24f2c7852cb27d7683cef103b26287e;hb=3a21afa6a5dfc06c17f127960bb0038fd322f213;hp=7fdddf2d16880678f222c845fd306b2ee4ce4e31;hpb=834a4f1bb78a4098c59954500698bdd13060c219;p=pulseview.git

diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index 7fdddf2..1369a76 100644
--- a/pv/view/analogsignal.hpp
+++ b/pv/view/analogsignal.hpp
@@ -25,33 +25,43 @@
 
 #include <memory>
 
+#include <QComboBox>
+
 namespace pv {
 
 namespace data {
 class Analog;
 class AnalogSegment;
+class SignalBase;
 }
 
 namespace view {
 
 class AnalogSignal : public Signal
 {
+	Q_OBJECT
+
 private:
 	static const QColor SignalColours[4];
 	static const QColor GridMajorColor, GridMinorColor;
 
 	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<pv::data::Analog> data);
+		std::shared_ptr<data::SignalBase> base);
 
 	virtual ~AnalogSignal() = default;
 
 	std::shared_ptr<pv::data::SignalData> data() const;
 
-	std::shared_ptr<pv::data::Analog> analog_data() const;
+	virtual void save_settings(QSettings &settings) const;
+
+	virtual void restore_settings(QSettings &settings);
 
 	/**
 	 * Computes the vertical extents of the contents of this row item.
@@ -89,6 +99,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);
 
@@ -105,10 +122,20 @@ private:
 	/**
 	 * Computes the scale factor from the scale index and vdiv settings.
 	 */
+	float get_resolution(int scale_index);
+
 	void update_scale();
 
+protected:
+	void populate_popup_form(QWidget *parent, QFormLayout *form);
+
+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_;