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 1734921a57c568585c648b177f8ce29019eb1a5e..2e15ca958a1da81af2ebba507328da0b9cb801b6 100644
(file)
--- a/
pv/view/trace.cpp
+++ b/
pv/view/trace.cpp
@@
-21,7
+21,7
@@
#include <extdef.h>
#include <assert.h>
#include <extdef.h>
#include <assert.h>
-#include <
math.
h>
+#include <
cmat
h>
#include <QApplication>
#include <QFormLayout>
#include <QApplication>
#include <QFormLayout>
@@
-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
)
{
}
{
}
@@
-68,7
+68,7
@@
void Trace::set_colour(QColor colour)
colour_ = colour;
}
colour_ = colour;
}
-void Trace::paint_label(QPainter &p,
int righ
t, bool hover)
+void Trace::paint_label(QPainter &p,
const QRect &rec
t, bool hover)
{
const int y = get_visual_y();
{
const int y = get_visual_y();
@@
-77,7
+77,7
@@
void Trace::paint_label(QPainter &p, int right, bool hover)
if (!enabled())
return;
if (!enabled())
return;
- const QRectF r = label_rect(r
igh
t);
+ const QRectF r = label_rect(r
ec
t);
// Paint the label
const float label_arrow_length = r.height() / 2;
// Paint the label
const float label_arrow_length = r.height() / 2;
@@
-115,7
+115,7
@@
void Trace::paint_label(QPainter &p, int right, bool hover)
p.drawPolygon(points, countof(points));
// Paint the text
p.drawPolygon(points, countof(points));
// Paint the text
- p.setPen(
get_text_colour(
));
+ p.setPen(
select_text_colour(colour_
));
p.setFont(QApplication::font());
p.drawText(QRectF(r.x(), r.y(),
r.width() - label_arrow_length, r.height()),
p.setFont(QApplication::font());
p.drawText(QRectF(r.x(), r.y(),
r.width() - label_arrow_length, r.height()),
@@
-124,7
+124,7
@@
void Trace::paint_label(QPainter &p, int right, bool hover)
QMenu* Trace::create_context_menu(QWidget *parent)
{
QMenu* Trace::create_context_menu(QWidget *parent)
{
- QMenu *const menu =
Selectable
Item::create_context_menu(parent);
+ QMenu *const menu =
View
Item::create_context_menu(parent);
return menu;
}
return menu;
}
@@
-134,6
+134,8
@@
pv::widgets::Popup* Trace::create_popup(QWidget *parent)
using pv::widgets::Popup;
popup_ = new Popup(parent);
using pv::widgets::Popup;
popup_ = new Popup(parent);
+ popup_->set_position(parent->mapToGlobal(
+ point(parent->rect())), Popup::Right);
create_popup_form();
create_popup_form();
@@
-143,34
+145,35
@@
pv::widgets::Popup* Trace::create_popup(QWidget *parent)
return popup_;
}
return popup_;
}
-QRectF Trace::label_rect(
int righ
t) const
+QRectF Trace::label_rect(
const QRectF &rec
t) const
{
using pv::view::View;
QFontMetrics m(QApplication::font());
const QSize text_size(
{
using pv::view::View;
QFontMetrics m(QApplication::font());
const QSize text_size(
- m.boundingRect(QRect(), 0, name_).width(),
- m.boundingRect(QRect(), 0, "Tg").height());
+ m.boundingRect(QRect(), 0, name_).width(), m.height());
const QSizeF label_size(
const QSizeF label_size(
- text_size.width() +
View::
LabelPadding.width() * 2,
- ceilf((text_size.height() +
View::
LabelPadding.height() * 2) / 2) * 2);
+ text_size.width() + LabelPadding.width() * 2,
+ ceilf((text_size.height() + LabelPadding.height() * 2) / 2) * 2);
const float half_height = label_size.height() / 2;
return QRectF(
const float half_height = label_size.height() / 2;
return QRectF(
- r
ight
- half_height - label_size.width() - 0.5,
+ r
ect.right()
- half_height - label_size.width() - 0.5,
get_visual_y() + 0.5f - half_height,
label_size.width() + half_height,
label_size.height());
}
get_visual_y() + 0.5f - half_height,
label_size.width() + half_height,
label_size.height());
}
-Q
Color Trace::get_text_colour(
) const
+Q
RectF Trace::hit_box_rect(const ViewItemPaintParams &pp
) const
{
{
- return (colour_.lightness() > 64) ? Qt::black : Qt::white;
+ const float h = QFontMetrics(QApplication::font()).height();
+ return QRectF(pp.left(), get_visual_y() - h / 2.0f,
+ pp.width(), h);
}
}
-void Trace::paint_axis(QPainter &p,
int y, int left, int right
)
+void Trace::paint_axis(QPainter &p,
const ViewItemPaintParams &pp, int y
)
{
p.setPen(AxisPen);
{
p.setPen(AxisPen);
- p.drawLine(QPointF(
left, y + 0.5f), QPointF(right
, y + 0.5f));
+ p.drawLine(QPointF(
pp.left(), y + 0.5f), QPointF(pp.right()
, y + 0.5f));
}
void Trace::add_colour_option(QWidget *parent, QFormLayout *form)
}
void Trace::add_colour_option(QWidget *parent, QFormLayout *form)
@@
-216,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)
@@
-233,7
+236,7
@@
void Trace::on_colour_changed(const QColor &colour)
set_colour(colour);
if (owner_)
set_colour(colour);
if (owner_)
- owner_->appearance_changed(true, false);
+ owner_->
row_item_
appearance_changed(true, false);
}
} // namespace view
}
} // namespace view