projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tracegroup.cpp: Fix a potential unintended integer division.
[pulseview.git]
/
pv
/
views
/
trace
/
decodetrace.hpp
diff --git
a/pv/views/trace/decodetrace.hpp
b/pv/views/trace/decodetrace.hpp
index 04a3b300b9caf8e9681353f1ce14f6109da04dc1..55c3f3b5c47a80edbdff1e4dfab92e723cfda3a8 100644
(file)
--- a/
pv/views/trace/decodetrace.hpp
+++ b/
pv/views/trace/decodetrace.hpp
@@
-33,6
+33,7
@@
#include <QTimer>
#include <pv/binding/decoder.hpp>
#include <QTimer>
#include <pv/binding/decoder.hpp>
+#include <pv/data/decode/annotation.hpp>
#include <pv/data/decode/row.hpp>
#include <pv/data/signalbase.hpp>
#include <pv/data/decode/row.hpp>
#include <pv/data/signalbase.hpp>
@@
-130,14
+131,15
@@
private:
int h, const ViewItemPaintParams &pp, int y,
QColor row_color, int row_title_width) const;
int h, const ViewItemPaintParams &pp, int y,
QColor row_color, int row_title_width) const;
- void draw_annotation_block(vector<pv::data::decode::Annotation> annotations,
+ void draw_annotation_block(qreal start, qreal end,
+ pv::data::decode::Annotation::Class ann_class, bool use_ann_format,
QPainter &p, int h, int y, QColor row_color) const;
void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
QPainter &p, int h, int y, QColor row_color) const;
void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
- int h,
double
x, int y) const;
+ int h,
qreal
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,
- int h,
double start, double
end, int y, const ViewItemPaintParams &pp,
+ int h,
qreal start, qreal
end, int y, const ViewItemPaintParams &pp,
int row_title_width) const;
void draw_error(QPainter &p, const QString &message,
int row_title_width) const;
void draw_error(QPainter &p, const QString &message,
@@
-201,7
+203,6
@@
private:
shared_ptr<data::DecodeSignal> decode_signal_;
vector<data::decode::Row> visible_rows_;
shared_ptr<data::DecodeSignal> decode_signal_;
vector<data::decode::Row> visible_rows_;
- uint64_t decode_start_, decode_end_;
map<QComboBox*, uint16_t> channel_id_map_; // channel selector -> decode channel ID
map<QComboBox*, uint16_t> init_state_map_; // init state selector -> decode channel ID
map<QComboBox*, uint16_t> channel_id_map_; // channel selector -> decode channel ID
map<QComboBox*, uint16_t> init_state_map_; // init state selector -> decode channel ID