X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.h;h=3b6f7f4f6ef240bfa0bee86202ab67593cd3ae46;hb=e183f4e328db8bb134652254ba9bf0707dc16c66;hp=86471537abce44236291664b98a1e74084cc187d;hpb=2658961bdef3601e07d494a8ed3d01a8101b68cd;p=pulseview.git

diff --git a/pv/view/analogsignal.h b/pv/view/analogsignal.h
index 8647153..3b6f7f4 100644
--- a/pv/view/analogsignal.h
+++ b/pv/view/analogsignal.h
@@ -18,8 +18,8 @@
  * 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"
 
@@ -29,34 +29,64 @@ 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,
+	AnalogSignal(boost::shared_ptr<pv::DevInst> dev_inst,
+		const sr_probe *const probe,
 		boost::shared_ptr<pv::data::Analog> data);
 
+	virtual ~AnalogSignal();
+
+	boost::shared_ptr<pv::data::SignalData> data() const;
+
+	boost::shared_ptr<pv::data::Analog> analog_data() const;
+
+	void set_scale(float scale);
+
+	/**
+	 * Paints the background 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.
+	 **/
+	void paint_back(QPainter &p, int left, int right);
+
 	/**
-	 * Paints the signal with a QPainter
+	 * Paints the mid-layer of the signal with a QPainter
 	 * @param p the QPainter to paint into.
-	 * @param y the y-coordinate to draw the signal at.
 	 * @param left the x-coordinate of the left edge of the signal.
 	 * @param right the x-coordinate of the right edge of the signal.
-	 * @param scale the scale in seconds per pixel.
-	 * @param offset the time to show at the left hand edge of
-	 *   the view in seconds.
 	 **/
-	void paint(QPainter &p, int y, int left, int right, double scale,
-		double offset);
+	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::data::Analog> _data;
+	float _scale;
 };
 
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_ANALOGSIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H