X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.h;h=a7ae455b8598159e47c738a48cc5e8176ace3ed7;hb=7c238e082a6fadc14f90285805f5901cc8f68570;hp=7bc0ed6eb6aaf25d9a605a22c1ab038dec3103a6;hpb=1b1ec774978b65209ce2b454cbf81da499b797d2;p=pulseview.git

diff --git a/pv/view/analogsignal.h b/pv/view/analogsignal.h
index 7bc0ed6e..a7ae455b 100644
--- a/pv/view/analogsignal.h
+++ b/pv/view/analogsignal.h
@@ -18,51 +18,75 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_ANALOGSIGNAL_H
-#define PULSEVIEW_PV_ANALOGSIGNAL_H
+#ifndef PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H
+#define PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H
 
 #include "signal.h"
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace pv {
 
 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::data::Analog> data);
+	AnalogSignal(pv::SigSession &session,
+		std::shared_ptr<sigrok::Channel> channel,
+		std::shared_ptr<pv::data::Analog> data);
+
+	virtual ~AnalogSignal();
+
+	std::shared_ptr<pv::data::SignalData> data() const;
+
+	std::shared_ptr<pv::data::Analog> analog_data() const;
+
+	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 std::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 std::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;
+	std::shared_ptr<pv::data::Analog> _data;
+	float _scale;
 };
 
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_ANALOGSIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H