X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.h;h=666aec9893aa767e17e739ac7a8b168de1eac104;hp=6e4199acf16f7427382e8aeffee838791d8540e9;hb=cec48d1618edd0f28f21d5351f53692876222e16;hpb=568b90d4fcfb5f67f5fb642a9f0fdb3a54607bf3

diff --git a/pv/view/analogsignal.h b/pv/view/analogsignal.h
index 6e4199ac..666aec98 100644
--- a/pv/view/analogsignal.h
+++ b/pv/view/analogsignal.h
@@ -29,6 +29,7 @@ namespace pv {
 
 namespace data {
 class Analog;
+class AnalogSnapshot;
 }
 
 namespace view {
@@ -38,9 +39,15 @@ class AnalogSignal : public Signal
 private:
 	static const QColor SignalColours[4];
 
+	static const float EnvelopeThreshold;
+
 public:
-	AnalogSignal(QString name,
-		boost::shared_ptr<pv::data::Analog> data, int probe_index);
+	AnalogSignal(const sr_probe *const probe,
+		boost::shared_ptr<pv::data::Analog> data);
+
+	virtual ~AnalogSignal();
+
+	void set_scale(float scale);
 
 	/**
 	 * Paints the signal with a QPainter
@@ -55,8 +62,20 @@ public:
 	void paint(QPainter &p, int y, int left, int right, double scale,
 		double offset);
 
+private:
+	void paint_trace(QPainter &p,
+		const boost::shared_ptr<pv::data::AnalogSnapshot> &snapshot,
+		int y, int left, const int64_t start, const int64_t end,
+		const double pixels_offset, const double samples_per_pixel);
+
+	void paint_envelope(QPainter &p,
+		const boost::shared_ptr<pv::data::AnalogSnapshot> &snapshot,
+		int y, int left, const int64_t start, const int64_t end,
+		const double pixels_offset, const double samples_per_pixel);
+
 private:
 	boost::shared_ptr<pv::data::Analog> _data;
+	float _scale;
 };
 
 } // namespace view