X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.h;h=f22d128bc01494c0f2188cbcb963d431cd6c3ac4;hb=4871ed92f2d9e6e514223383ba16e6ad78c81161;hp=5ebf501619e4c6a48473b0f89959b5374ae27520;hpb=f459c5400e067c4389c472b84194d760e7bfd585;p=pulseview.git

diff --git a/pv/view/analogsignal.h b/pv/view/analogsignal.h
index 5ebf501..f22d128 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"
 
@@ -42,25 +42,33 @@ private:
 	static const float EnvelopeThreshold;
 
 public:
-	AnalogSignal(QString name,
-		boost::shared_ptr<pv::data::Analog> data, int probe_index);
+	AnalogSignal(boost::shared_ptr<pv::device::DevInst> dev_inst,
+		const sr_channel *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 signal with a QPainter
+	 * 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 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,
@@ -81,4 +89,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_ANALOGSIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H