projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ec39632
)
TimeMarker: Simplified label_rect
author
Joel Holdsworth
<joel@airwebreathe.org.uk>
Sat, 20 Dec 2014 16:34:53 +0000
(16:34 +0000)
committer
Joel Holdsworth
<joel@airwebreathe.org.uk>
Sun, 28 Dec 2014 18:52:53 +0000
(18:52 +0000)
pv/view/timemarker.cpp
patch
|
blob
|
history
diff --git
a/pv/view/timemarker.cpp
b/pv/view/timemarker.cpp
index 47ba34559a1dd15fa45fc2ff4d979d6a23f17dab..614275cf98e04d1d559d211cae6bf9740f595b15 100644
(file)
--- a/
pv/view/timemarker.cpp
+++ b/
pv/view/timemarker.cpp
@@
-81,22
+81,16
@@
QPoint TimeMarker::point() const
QRectF TimeMarker::label_rect(const QRectF &rect) const
{
QRectF TimeMarker::label_rect(const QRectF &rect) const
{
- const float x = (time_ - view_.offset()) / view_.scale();
-
QFontMetrics m(QApplication::font());
QFontMetrics m(QApplication::font());
- const float text_width =
- max(m.boundingRect(get_text()).size().width(), ArrowSize);
- const float text_height = m.height();
-
- const QSizeF label_size(
- text_width + LabelPadding.width() * 2,
- text_height + LabelPadding.height() * 2);
+ const QSizeF text_size(
+ max(m.boundingRect(get_text()).size().width(), ArrowSize),
+ m.height());
+ const QSizeF label_size(text_size + LabelPadding * 2);
const float top = rect.height() - label_size.height() -
TimeMarker::ArrowSize - 0.5f;
const float top = rect.height() - label_size.height() -
TimeMarker::ArrowSize - 0.5f;
- const float
height = label_size.height
();
+ const float
x = (time_ - view_.offset()) / view_.scale
();
- return QRectF(x - label_size.width() / 2, top,
- label_size.width(), height);
+ return QRectF(QPointF(x - label_size.width() / 2, top), label_size);
}
void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
}
void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)