projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced use of QFontMetrics::boundingRect with height() and ascent()
[pulseview.git]
/
pv
/
view
/
timemarker.cpp
diff --git
a/pv/view/timemarker.cpp
b/pv/view/timemarker.cpp
index ad3830590a8b059a1d3006275c3e812f0dff2e8e..4b8d2b527a5992dc43c4e58f15c68d02dcf0312d 100644
(file)
--- a/
pv/view/timemarker.cpp
+++ b/
pv/view/timemarker.cpp
@@
-57,16
+57,6
@@
double TimeMarker::time() const
return time_;
}
return time_;
}
-float TimeMarker::get_x() const
-{
- return (time_ - view_.offset()) / view_.scale();
-}
-
-QPoint TimeMarker::point() const
-{
- return QPoint(get_x(), 0);
-}
-
void TimeMarker::set_time(double time)
{
time_ = time;
void TimeMarker::set_time(double time)
{
time_ = time;
@@
-77,7
+67,17
@@
void TimeMarker::set_time(double time)
updating_value_widget_ = false;
}
updating_value_widget_ = false;
}
- time_changed();
+ view_.time_item_appearance_changed(true, true);
+}
+
+float TimeMarker::get_x() const
+{
+ return (time_ - view_.offset()) / view_.scale();
+}
+
+QPoint TimeMarker::point() const
+{
+ return QPoint(get_x(), 0);
}
QRectF TimeMarker::label_rect(const QRectF &rect) const
}
QRectF TimeMarker::label_rect(const QRectF &rect) const
@@
-87,7
+87,7
@@
QRectF TimeMarker::label_rect(const QRectF &rect) const
QFontMetrics m(QApplication::font());
const float text_width =
max(m.boundingRect(get_text()).size().width(), ArrowSize);
QFontMetrics m(QApplication::font());
const float text_width =
max(m.boundingRect(get_text()).size().width(), ArrowSize);
- const float text_height = m.
boundingRect("Tg").size().
height();
+ const float text_height = m.height();
const QSizeF label_size(
text_width + View::LabelPadding.width() * 2,
const QSizeF label_size(
text_width + View::LabelPadding.width() * 2,
@@
-100,7
+100,7
@@
QRectF TimeMarker::label_rect(const QRectF &rect) const
label_size.width(), height);
}
label_size.width(), height);
}
-void TimeMarker::paint_label(QPainter &p, const QRect &rect)
+void TimeMarker::paint_label(QPainter &p, const QRect &rect
, bool hover
)
{
if (!enabled())
return;
{
if (!enabled())
return;
@@
-136,7
+136,7
@@
void TimeMarker::paint_label(QPainter &p, const QRect &rect)
}
p.setPen(Qt::transparent);
}
p.setPen(Qt::transparent);
- p.setBrush(colour_);
+ p.setBrush(
hover ? colour_.lighter() :
colour_);
p.drawPolygon(points, countof(points));
p.setPen(colour_.lighter());
p.drawPolygon(points, countof(points));
p.setPen(colour_.lighter());
@@
-186,10
+186,8
@@
pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
void TimeMarker::on_value_changed(double value)
{
void TimeMarker::on_value_changed(double value)
{
- if (!updating_value_widget_) {
- time_ = value;
- time_changed();
- }
+ if (!updating_value_widget_)
+ set_time(value);
}
} // namespace view
}
} // namespace view