X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodesignal.h;h=673d65499509a409ca1266c5fbcd693ed4d97cd4;hp=e52c7947c1259571d3f997acb3c0812ba3953197;hb=9cef95672622f4ecdb21edef9d81a10c789daf1e;hpb=82c7f64018db2a90f44704e55ba469151522762f

diff --git a/pv/view/decodesignal.h b/pv/view/decodesignal.h
index e52c7947..673d6549 100644
--- a/pv/view/decodesignal.h
+++ b/pv/view/decodesignal.h
@@ -26,29 +26,45 @@
 #include <boost/shared_ptr.hpp>
 
 namespace pv {
+
+namespace data {
+class Decoder;
+}
+
 namespace view {
 
 class DecodeSignal : public Trace
 {
+	Q_OBJECT
+
+private:
+	static const QColor DecodeColours[4];
+
 public:
-	DecodeSignal(pv::SigSession &session, srd_decoder *const dec);
+	DecodeSignal(pv::SigSession &session,
+		boost::shared_ptr<pv::data::Decoder> decoder, int index);
 
 	void init_context_bar_actions(QWidget *parent);
 
 	bool enabled() const;
 
+	void set_view(pv::view::View *view);
+
 	/**
-	 * Paints the trace with a QPainter
+	 * Paints the background layer of the trace 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 trace 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);
 
 	const std::list<QAction*> get_context_bar_actions();
 
@@ -60,8 +76,13 @@ private:
 	 **/
 	int get_nominal_offset(const QRect &rect) const;
 
+private slots:
+	void on_new_decode_data();
+
 private:
-	srd_decoder *const _decoder;
+	boost::shared_ptr<pv::data::Decoder> _decoder;
+
+	uint64_t _decode_start, _decode_end;
 };
 
 } // namespace view