X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.hpp;h=7e9c081be542b7f08235d73ec88853342320d054;hb=4df7756e87d3acfdd71603c2105c0ef54e58cc85;hp=b5da2dc2400082f8842167fffe398636e4e3331e;hpb=520362f8c4082820193f09e43b27a8c7df2ef011;p=pulseview.git

diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp
index b5da2dc2..7e9c081b 100644
--- a/pv/view/decodetrace.hpp
+++ b/pv/view/decodetrace.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_DECODETRACE_HPP
-#define PULSEVIEW_PV_VIEW_DECODETRACE_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP
 
 #include "trace.hpp"
 
@@ -31,6 +31,7 @@
 #include <QSignalMapper>
 
 #include <pv/binding/decoder.hpp>
+#include <pv/data/signalbase.hpp>
 #include <pv/data/decode/row.hpp>
 
 struct srd_channel;
@@ -44,6 +45,7 @@ class Session;
 
 namespace data {
 class DecoderStack;
+class SignalBase;
 
 namespace decode {
 class Annotation;
@@ -56,7 +58,8 @@ namespace widgets {
 class DecoderGroupBox;
 }
 
-namespace view {
+namespace views {
+namespace TraceView {
 
 class DecodeTrace : public Trace
 {
@@ -84,14 +87,15 @@ private:
 	static const QColor OutlineColours[16];
 
 public:
-	DecodeTrace(pv::Session &session,
-		std::shared_ptr<pv::data::DecoderStack> decoder_stack,
+	DecodeTrace(pv::Session &session, std::shared_ptr<data::SignalBase> signalbase,
 		int index);
 
 	bool enabled() const;
 
 	const std::shared_ptr<pv::data::DecoderStack>& decoder() const;
 
+	std::shared_ptr<data::SignalBase> base() const;
+
 	/**
 	 * Computes the vertical extents of the contents of this row item.
 	 * @return A pair containing the minimum and maximum y-values.
@@ -196,8 +200,9 @@ private Q_SLOTS:
 
 private:
 	pv::Session &session_;
-	std::shared_ptr<pv::data::DecoderStack> decoder_stack_;
+	std::shared_ptr<data::SignalBase> signalbase_;
 
+	std::vector<data::decode::Row> visible_rows_;
 	uint64_t decode_start_, decode_end_;
 
 	std::list< std::shared_ptr<pv::binding::Decoder> >
@@ -206,14 +211,16 @@ private:
 	std::list<ChannelSelector> channel_selectors_;
 	std::vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
 
-	std::vector<data::decode::Row> visible_rows_;
 	std::map<data::decode::Row, int> row_title_widths_;
 	int row_height_, max_visible_rows_;
 
+	int min_useful_label_width_;
+
 	QSignalMapper delete_mapper_, show_hide_mapper_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_DECODETRACE_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP