X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.hpp;h=6d703ec5fe66906ebe69aebed1c575464a447436;hp=eb011e74367df36951046beb5c582a8dd06ef8c1;hb=efdec55aec1a137460fa362a381ed1904182bfed;hpb=f765c3db91d60e9b038ee05f2fa6acc8587d8470

diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp
index eb011e7..6d703ec 100644
--- a/pv/view/decodetrace.hpp
+++ b/pv/view/decodetrace.hpp
@@ -14,12 +14,11 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#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 +30,7 @@
 #include <QSignalMapper>
 
 #include <pv/binding/decoder.hpp>
+#include <pv/data/signalbase.hpp>
 #include <pv/data/decode/row.hpp>
 
 struct srd_channel;
@@ -44,6 +44,7 @@ class Session;
 
 namespace data {
 class DecoderStack;
+class SignalBase;
 
 namespace decode {
 class Annotation;
@@ -56,7 +57,8 @@ namespace widgets {
 class DecoderGroupBox;
 }
 
-namespace view {
+namespace views {
+namespace TraceView {
 
 class DecodeTrace : public Trace
 {
@@ -84,14 +86,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.
@@ -131,10 +134,10 @@ private:
 		size_t base_colour, int row_title_width);
 
 	void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
-		int text_height, const ViewItemPaintParams &pp, int y,
+		int h, const ViewItemPaintParams &pp, int y,
 		size_t base_colour, int row_title_width) const;
 
-	void draw_annotation_block(std::vector<pv::data::decode::Annotation> a,
+	void draw_annotation_block(std::vector<pv::data::decode::Annotation> annotations,
 		QPainter &p, int h, int y, size_t base_colour) const;
 
 	void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
@@ -196,8 +199,8 @@ private Q_SLOTS:
 
 private:
 	pv::Session &session_;
-	std::shared_ptr<pv::data::DecoderStack> decoder_stack_;
 
+	std::vector<data::decode::Row> visible_rows_;
 	uint64_t decode_start_, decode_end_;
 
 	std::list< std::shared_ptr<pv::binding::Decoder> >
@@ -206,14 +209,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