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 eb011e74367df36951046beb5c582a8dd06ef8c1..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;
@@
-84,7
+85,7
@@
private:
static const QColor OutlineColours[16];
public:
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);
@@
-131,10
+132,10
@@
private:
size_t base_colour, int row_title_width);
void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
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;
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,
@@
-196,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_;
@@
-210,6
+212,8
@@
private:
std::map<data::decode::Row, int> row_title_widths_;
int row_height_, max_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_;
};
QSignalMapper delete_mapper_, show_hide_mapper_;
};