projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce pv::data::SignalBase
[pulseview.git]
/
pv
/
view
/
decodetrace.hpp
diff --git
a/pv/view/decodetrace.hpp
b/pv/view/decodetrace.hpp
index af9151810100f1cf5eadea7dc3f58d60725d3bb5..96332d97b46c8a3842ed1f8fa580ae9a59528ebf 100644
(file)
--- a/
pv/view/decodetrace.hpp
+++ b/
pv/view/decodetrace.hpp
@@
-31,6
+31,7
@@
#include <QSignalMapper>
#include <pv/binding/decoder.hpp>
#include <QSignalMapper>
#include <pv/binding/decoder.hpp>
+#include <pv/data/signalbase.hpp>
#include <pv/data/decode/row.hpp>
struct srd_channel;
#include <pv/data/decode/row.hpp>
struct srd_channel;
@@
-77,13
+78,14
@@
private:
static const int ArrowSize;
static const double EndCapWidth;
static const int ArrowSize;
static const double EndCapWidth;
+ static const int RowTitleMargin;
static const int DrawPadding;
static const QColor Colours[16];
static const QColor OutlineColours[16];
public:
static const int DrawPadding;
static const QColor Colours[16];
static const QColor OutlineColours[16];
public:
- DecodeTrace(pv::Session &session,
+ DecodeTrace(pv::Session &session,
std::shared_ptr<data::SignalBase> signalbase,
std::shared_ptr<pv::data::DecoderStack> decoder_stack,
int index);
std::shared_ptr<pv::data::DecoderStack> decoder_stack,
int index);
@@
-127,21
+129,21
@@
public:
private:
void draw_annotations(std::vector<pv::data::decode::Annotation> annotations,
QPainter &p, int h, const ViewItemPaintParams &pp, int y,
private:
void draw_annotations(std::vector<pv::data::decode::Annotation> annotations,
QPainter &p, int h, const ViewItemPaintParams &pp, int y,
- size_t base_colour);
+ size_t base_colour
, int row_title_width
);
void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
- int
text_height
, const ViewItemPaintParams &pp, int y,
- size_t base_colour) const;
+ 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> a
nnotations
,
QPainter &p, int h, int y, size_t base_colour) const;
void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
QPainter &p, int h, int y, size_t base_colour) const;
void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
-
QColor fill, QColor outline,
int h, double x, int y) const;
+ int h, double x, int y) const;
void draw_range(const pv::data::decode::Annotation &a, QPainter &p,
void draw_range(const pv::data::decode::Annotation &a, QPainter &p,
-
QColor fill, QColor outline, int h, double start
,
-
double end, int y, const ViewItemPaintParams &pp
) const;
+
int h, double start, double end, int y, const ViewItemPaintParams &pp
,
+
int row_title_width
) const;
void draw_error(QPainter &p, const QString &message,
const ViewItemPaintParams &pp);
void draw_error(QPainter &p, const QString &message,
const ViewItemPaintParams &pp);
@@
-195,6
+197,7
@@
private Q_SLOTS:
private:
pv::Session &session_;
private:
pv::Session &session_;
+ std::shared_ptr<data::SignalBase> signalbase_;
std::shared_ptr<pv::data::DecoderStack> decoder_stack_;
uint64_t decode_start_, decode_end_;
std::shared_ptr<pv::data::DecoderStack> decoder_stack_;
uint64_t decode_start_, decode_end_;
@@
-206,8
+209,11
@@
private:
std::vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
std::vector<data::decode::Row> visible_rows_;
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 row_height_, max_visible_rows_;
+ int min_useful_label_width_;
+
QSignalMapper delete_mapper_, show_hide_mapper_;
};
QSignalMapper delete_mapper_, show_hide_mapper_;
};