projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ViewItem: Moved in LabelPadding
[pulseview.git]
/
pv
/
view
/
timemarker.cpp
diff --git
a/pv/view/timemarker.cpp
b/pv/view/timemarker.cpp
index 8eed6e7e2b6240c91c9cef368e3873df100b392b..47ba34559a1dd15fa45fc2ff4d979d6a23f17dab 100644
(file)
--- a/
pv/view/timemarker.cpp
+++ b/
pv/view/timemarker.cpp
@@
-40,7
+40,6
@@
namespace pv {
namespace view {
const int TimeMarker::ArrowSize = 4;
namespace view {
const int TimeMarker::ArrowSize = 4;
-const int TimeMarker::Offset = 1;
TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
TimeItem(view),
TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
TimeItem(view),
@@
-67,7
+66,7
@@
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
}
float TimeMarker::get_x() const
@@
-87,20
+86,20
@@
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(
const QSizeF label_size(
- text_width +
View::
LabelPadding.width() * 2,
- text_height +
View::
LabelPadding.height() * 2);
+ text_width + LabelPadding.width() * 2,
+ text_height + LabelPadding.height() * 2);
const float top = rect.height() - label_size.height() -
const float top = rect.height() - label_size.height() -
- TimeMarker::
Offset - TimeMarker::
ArrowSize - 0.5f;
+ TimeMarker::ArrowSize - 0.5f;
const float height = label_size.height();
return QRectF(x - label_size.width() / 2, top,
label_size.width(), height);
}
const float height = label_size.height();
return QRectF(x - label_size.width() / 2, top,
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
+135,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
+185,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