projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DecodeTrace: Don't dereference iterator pointing at end of container.
[pulseview.git]
/
pv
/
view
/
decodetrace.hpp
diff --git
a/pv/view/decodetrace.hpp
b/pv/view/decodetrace.hpp
index 0e2ce1464e2faf337b3fa37c0cf0c5283f5b6d55..5ec7ee7c5337bd1cdf929f70597c26fe9defa78c 100644
(file)
--- a/
pv/view/decodetrace.hpp
+++ b/
pv/view/decodetrace.hpp
@@
-18,8
+18,8
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PULSEVIEW_PV_VIEW_DECODETRACE_H
-#define PULSEVIEW_PV_VIEW_DECODETRACE_H
+#ifndef PULSEVIEW_PV_VIEW_DECODETRACE_H
PP
+#define PULSEVIEW_PV_VIEW_DECODETRACE_H
PP
#include "trace.hpp"
#include "trace.hpp"
@@
-29,7
+29,7
@@
#include <QSignalMapper>
#include <QSignalMapper>
-#include <pv/
prop/binding/decoderoptions
.hpp>
+#include <pv/
binding/decoder
.hpp>
#include <pv/data/decode/row.hpp>
struct srd_channel;
#include <pv/data/decode/row.hpp>
struct srd_channel;
@@
-39,7
+39,7
@@
class QComboBox;
namespace pv {
namespace pv {
-class S
igS
ession;
+class Session;
namespace data {
class DecoderStack;
namespace data {
class DecoderStack;
@@
-82,7
+82,7
@@
private:
static const QColor OutlineColours[16];
public:
static const QColor OutlineColours[16];
public:
- DecodeTrace(pv::S
igS
ession &session,
+ DecodeTrace(pv::Session &session,
std::shared_ptr<pv::data::DecoderStack> decoder_stack,
int index);
std::shared_ptr<pv::data::DecoderStack> decoder_stack,
int index);
@@
-99,26
+99,23
@@
public:
/**
* Paints the background layer of the trace with a QPainter
* @param p the QPainter to paint into.
/**
* Paints the background layer of the trace with a QPainter
* @param p the QPainter to paint into.
- * @param left the x-coordinate of the left edge of the signal.
- * @param right the x-coordinate of the right edge of the signal.
- **/
- void paint_back(QPainter &p, int left, int right);
+ * @param pp the painting parameters object to paint with..
+ */
+ void paint_back(QPainter &p, const ViewItemPaintParams &pp);
/**
* Paints the mid-layer of the trace with a QPainter
* @param p the QPainter to paint into.
/**
* Paints the mid-layer of the trace with a QPainter
* @param p the QPainter to paint into.
- * @param left the x-coordinate of the left edge of the signal
- * @param right the x-coordinate of the right edge of the signal
- **/
- void paint_mid(QPainter &p, int left, int right);
+ * @param pp the painting parameters object to paint with.
+ */
+ void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
/**
* Paints the foreground layer of the trace with a QPainter
* @param p the QPainter to paint into.
/**
* Paints the foreground layer of the trace with a QPainter
* @param p the QPainter to paint into.
- * @param left the x-coordinate of the left edge of the signal
- * @param right the x-coordinate of the right edge of the signal
- **/
- void paint_fore(QPainter &p, int left, int right);
+ * @param pp the painting parameters object to paint with.
+ */
+ void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
void populate_popup_form(QWidget *parent, QFormLayout *form);
void populate_popup_form(QWidget *parent, QFormLayout *form);
@@
-128,19
+125,18
@@
public:
private:
void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
private:
void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
-
QColor text_colour, int text_height, int left, int right
, int y,
+
int text_height, const ViewItemPaintParams &pp
, int y,
size_t base_colour) const;
void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
size_t base_colour) const;
void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
- QColor fill, QColor outline, QColor text_color, int h, double x,
- int y) const;
+ QColor fill, QColor outline, 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,
QColor text_color,
int h, double start,
+ QColor fill, QColor outline, int h, double start,
double end, int y) const;
void draw_error(QPainter &p, const QString &message,
double end, int y) const;
void draw_error(QPainter &p, const QString &message,
-
int left, int right
);
+
const ViewItemPaintParams &pp
);
void draw_unresolved_period(QPainter &p, int h, int left,
int right) const;
void draw_unresolved_period(QPainter &p, int h, int left,
int right) const;
@@
-160,8
+156,6
@@
private:
const QString get_annotation_at_point(const QPoint &point);
const QString get_annotation_at_point(const QPoint &point);
- void hide_hover_annotation();
-
void create_decoder_form(int index,
std::shared_ptr<pv::data::decode::Decoder> &dec,
QWidget *parent, QFormLayout *form);
void create_decoder_form(int index,
std::shared_ptr<pv::data::decode::Decoder> &dec,
QWidget *parent, QFormLayout *form);
@@
-192,19
+186,19
@@
private Q_SLOTS:
void on_show_hide_decoder(int index);
private:
void on_show_hide_decoder(int index);
private:
- pv::S
igS
ession &session_;
+ pv::Session &session_;
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_;
- std::list< std::shared_ptr<pv::
prop::binding::DecoderOptions
> >
+ std::list< std::shared_ptr<pv::
binding::Decoder
> >
bindings_;
std::list<ChannelSelector> channel_selectors_;
std::vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
std::vector<data::decode::Row> visible_rows_;
bindings_;
std::list<ChannelSelector> channel_selectors_;
std::vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
std::vector<data::decode::Row> visible_rows_;
- int
text_height_,
row_height_;
+ int row_height_;
QSignalMapper delete_mapper_, show_hide_mapper_;
};
QSignalMapper delete_mapper_, show_hide_mapper_;
};
@@
-212,4
+206,4
@@
private:
} // namespace view
} // namespace pv
} // namespace view
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_DECODETRACE_H
+#endif // PULSEVIEW_PV_VIEW_DECODETRACE_H
PP