X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.hpp;h=1b79161dbdb8143328651baf3a0440283fe3e830;hb=0bb3dd25421a8638afb881d46799a13378d3f00b;hp=215ae0ae95b52d58af1ac1f4a4026491ddcbea27;hpb=9eaa8343da2ee7bb0d7397547ca250a528ccde5a;p=pulseview.git
diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index 215ae0ae..1b79161d 100644
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -17,8 +17,8 @@
* along with this program; if not, see .
*/
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_DECODETRACE_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_DECODETRACE_HPP
#include
#include "trace.hpp"
@@ -29,6 +29,7 @@
#include
#include
+#include
#include
#include
#include
@@ -99,10 +100,6 @@ struct DecodeTraceRow {
QWidget* selector_container;
QCheckBox* row_visibility_checkbox;
vector selectors;
-
- QColor row_color;
- map ann_class_color;
- map ann_class_dark_color;
};
class ContainerWidget : public QWidget
@@ -149,6 +146,12 @@ public:
shared_ptr base() const;
+ /**
+ * Sets the owner this trace in the view trace hierachy.
+ * @param The new owner of the trace.
+ */
+ virtual void set_owner(TraceTreeItemOwner *owner);
+
/**
* Computes the vertical extents of the contents of this row item.
* @return A pair containing the minimum and maximum y-values.
@@ -195,7 +198,7 @@ private:
void draw_annotation(const Annotation* a, QPainter &p,
const ViewItemPaintParams &pp, int y, const DecodeTraceRow& row) const;
- void draw_annotation_block(qreal start, qreal end, Annotation::Class ann_class,
+ void draw_annotation_block(qreal start, qreal end, uint32_t ann_class,
bool use_ann_format, QPainter &p, int y, const DecodeTraceRow& row) const;
void draw_instant(const Annotation* a, QPainter &p, qreal x, int y) const;
@@ -218,9 +221,6 @@ private:
*/
pair get_view_sample_range(int x_start, int x_end) const;
- QColor get_row_color(int row_index) const;
- QColor get_annotation_color(QColor row_color, int annotation_index) const;
-
unsigned int get_row_y(const DecodeTraceRow* row) const;
DecodeTraceRow* get_row_at_point(const QPoint &point);
@@ -257,6 +257,8 @@ private:
private Q_SLOTS:
void on_setting_changed(const QString &key, const QVariant &value);
+ void on_color_changed(const QColor &color);
+
void on_new_annotations();
void on_delayed_trace_update();
void on_decode_reset();
@@ -312,7 +314,7 @@ private:
QPushButton* stack_button_;
unsigned int default_row_height_, annotation_height_;
- unsigned int visible_rows_, max_visible_rows_;
+ unsigned int visible_rows_;
int min_useful_label_width_;
bool always_show_all_rows_, show_hidden_rows_;
@@ -333,4 +335,4 @@ private:
} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_DECODETRACE_HPP