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
/
trace.cpp
diff --git
a/pv/view/trace.cpp
b/pv/view/trace.cpp
index 8e3927848ae64d271619444e2dae89b462d20e5f..2e15ca958a1da81af2ebba507328da0b9cb801b6 100644
(file)
--- a/
pv/view/trace.cpp
+++ b/
pv/view/trace.cpp
@@
-43,8
+43,8
@@
const int Trace::LabelHitPadding = 2;
Trace::Trace(QString name) :
name_(name),
Trace::Trace(QString name) :
name_(name),
- popup_(
NULL
),
- popup_form_(
NULL
)
+ popup_(
nullptr
),
+ popup_form_(
nullptr
)
{
}
{
}
@@
-163,11
+163,11
@@
QRectF Trace::label_rect(const QRectF &rect) const
label_size.height());
}
label_size.height());
}
-QRectF Trace::hit_box_rect(const
QRectF &rect
) const
+QRectF Trace::hit_box_rect(const
ViewItemPaintParams &pp
) const
{
const float h = QFontMetrics(QApplication::font()).height();
{
const float h = QFontMetrics(QApplication::font()).height();
- return QRectF(
rect
.left(), get_visual_y() - h / 2.0f,
-
rect
.width(), h);
+ return QRectF(
pp
.left(), get_visual_y() - h / 2.0f,
+
pp
.width(), h);
}
void Trace::paint_axis(QPainter &p, const ViewItemPaintParams &pp, int y)
}
void Trace::paint_axis(QPainter &p, const ViewItemPaintParams &pp, int y)
@@
-219,8
+219,8
@@
void Trace::populate_popup_form(QWidget *parent, QFormLayout *form)
void Trace::on_popup_closed()
{
void Trace::on_popup_closed()
{
- popup_ =
NULL
;
- popup_form_ =
NULL
;
+ popup_ =
nullptr
;
+ popup_form_ =
nullptr
;
}
void Trace::on_text_changed(const QString &text)
}
void Trace::on_text_changed(const QString &text)