projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RowItem: Pass rect into label_rect
[pulseview.git]
/
pv
/
view
/
timemarker.cpp
diff --git
a/pv/view/timemarker.cpp
b/pv/view/timemarker.cpp
index 2f129a3297f985bd7222b4c302d98db6e2fe9c4c..34b2699bd6722fe9b5f3b169266f3341eb3eabad 100644
(file)
--- a/
pv/view/timemarker.cpp
+++ b/
pv/view/timemarker.cpp
@@
-43,7
+43,7
@@
const int TimeMarker::ArrowSize = 4;
const int TimeMarker::Offset = 1;
TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
const int TimeMarker::Offset = 1;
TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
-
view_
(view),
+
TimeItem
(view),
colour_(colour),
time_(time),
value_action_(NULL),
colour_(colour),
time_(time),
value_action_(NULL),
@@
-92,16
+92,18
@@
QRectF TimeMarker::get_label_rect(const QRect &rect) const
const float x = (time_ - view_.offset()) / view_.scale();
QFontMetrics m(QApplication::font());
const float x = (time_ - view_.offset()) / view_.scale();
QFontMetrics m(QApplication::font());
- QSize text_size = m.boundingRect(get_text()).size();
+ const float text_width =
+ max(m.boundingRect(get_text()).size().width(), ArrowSize);
+ const float text_height = m.boundingRect("Tg").size().height();
const QSizeF label_size(
const QSizeF label_size(
- text_
size.width()
+ View::LabelPadding.width() * 2,
- text_
size.height()
+ View::LabelPadding.height() * 2);
+ text_
width
+ View::LabelPadding.width() * 2,
+ text_
height
+ View::LabelPadding.height() * 2);
const float top = rect.height() - label_size.height() -
TimeMarker::Offset - TimeMarker::ArrowSize - 0.5f;
const float height = label_size.height();
const float top = rect.height() - label_size.height() -
TimeMarker::Offset - TimeMarker::ArrowSize - 0.5f;
const float height = label_size.height();
- return QRectF(x - label_size.width() / 2
- 0.5f
, top,
+ return QRectF(x - label_size.width() / 2, top,
label_size.width(), height);
}
label_size.width(), height);
}