projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ViewItem: Use drag_point() with drag_by()
[pulseview.git]
/
pv
/
view
/
trace.cpp
diff --git
a/pv/view/trace.cpp
b/pv/view/trace.cpp
index df6bd63d041ec74a4228919ea4383afb2c982ae4..df5a954b43a216f66d7cb11c5799464d882a3fe4 100644
(file)
--- a/
pv/view/trace.cpp
+++ b/
pv/view/trace.cpp
@@
-124,7
+124,7
@@
void Trace::paint_label(QPainter &p, const QRect &rect, 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;
}
@@
-149,11
+149,10
@@
QRectF Trace::label_rect(const QRectF &rect) const
QFontMetrics m(QApplication::font());
const QSize text_size(
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(
rect.right() - half_height - label_size.width() - 0.5,
const float half_height = label_size.height() / 2;
return QRectF(
rect.right() - half_height - label_size.width() - 0.5,
@@
-162,7
+161,7
@@
QRectF Trace::label_rect(const QRectF &rect) const
label_size.height());
}
label_size.height());
}
-void Trace::paint_axis(QPainter &p, const
Ro
wItemPaintParams &pp, int y)
+void Trace::paint_axis(QPainter &p, const
Vie
wItemPaintParams &pp, int y)
{
p.setPen(AxisPen);
p.drawLine(QPointF(pp.left(), y + 0.5f), QPointF(pp.right(), y + 0.5f));
{
p.setPen(AxisPen);
p.drawLine(QPointF(pp.left(), y + 0.5f), QPointF(pp.right(), y + 0.5f));
@@
-228,7
+227,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