X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.h;h=0b6172f8144884d51b5ba2a918db6bf8106f7d86;hb=68456dab5d519d886cf632cecc01373cc258d83c;hp=b3cafd2f9310cdbeac34e665294c53e22631403d;hpb=aba1dd166b90f3408cd9d2b23b906df081845563;p=pulseview.git

diff --git a/pv/view/analogsignal.h b/pv/view/analogsignal.h
index b3cafd2f..0b6172f8 100644
--- a/pv/view/analogsignal.h
+++ b/pv/view/analogsignal.h
@@ -27,37 +27,58 @@
 
 namespace pv {
 
-class AnalogData;
+namespace data {
+class Analog;
+class AnalogSnapshot;
+}
 
 namespace view {
 
 class AnalogSignal : public Signal
 {
+private:
+	static const QColor SignalColours[4];
+
+	static const float EnvelopeThreshold;
+
 public:
-	AnalogSignal(QString name,
-		boost::shared_ptr<pv::AnalogData> data);
+	AnalogSignal(pv::SigSession &session, 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
+	 * Paints the background layer of the signal with a QPainter
 	 * @param p the QPainter to paint into.
-	 * @param rect the rectangular area to draw the trace into.
-	 * @param scale the scale in seconds per pixel.
-	 * @param offset the time to show at the left hand edge of
-	 *   the view in seconds.
+	 * @param left the x-coordinate of the left edge of the signal.
+	 * @param right the x-coordinate of the right edge of the signal.
 	 **/
-	void paint(QPainter &p, const QRect &rect,
-		double scale, double offset);
-
-private:
+	void paint_back(QPainter &p, int left, int right);
 
 	/**
-	 * When painting into the rectangle, calculate the y
-	 * offset of the zero point.
+	 * Paints the mid-layer of the signal with a QPainter
+	 * @param p the QPainter to paint into.
+	 * @param left the x-coordinate of the left edge of the signal.
+	 * @param right the x-coordinate of the right edge of the signal.
 	 **/
-	int get_nominal_offset(const QRect &rect) const;
+	void paint_mid(QPainter &p, int left, int right);
+
+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::AnalogData> _data;
+	boost::shared_ptr<pv::data::Analog> _data;
+	float _scale;
 };
 
 } // namespace view