projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CursorPair: Paint with ViewItem::paint_fore/paint_back
[pulseview.git]
/
pv
/
view
/
timemarker.cpp
diff --git
a/pv/view/timemarker.cpp
b/pv/view/timemarker.cpp
index eebac024cca0c81608d5452a560544e235081813..ad3830590a8b059a1d3006275c3e812f0dff2e8e 100644
(file)
--- a/
pv/view/timemarker.cpp
+++ b/
pv/view/timemarker.cpp
@@
-80,13
+80,6
@@
void TimeMarker::set_time(double time)
time_changed();
}
time_changed();
}
-void TimeMarker::paint(QPainter &p, const QRect &rect)
-{
- const float x = get_x();
- p.setPen(colour_.darker());
- p.drawLine(QPointF(x, rect.top()), QPointF(x, rect.bottom()));
-}
-
QRectF TimeMarker::label_rect(const QRectF &rect) const
{
const float x = (time_ - view_.offset()) / view_.scale();
QRectF TimeMarker::label_rect(const QRectF &rect) const
{
const float x = (time_ - view_.offset()) / view_.scale();
@@
-158,6
+151,16
@@
void TimeMarker::paint_label(QPainter &p, const QRect &rect)
p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, get_text());
}
p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, get_text());
}
+void TimeMarker::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
+{
+ if (!enabled())
+ return;
+
+ const float x = get_x();
+ p.setPen(colour_.darker());
+ p.drawLine(QPointF(x, pp.top()), QPointF(x, pp.bottom()));
+}
+
pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
{
using pv::widgets::Popup;
pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
{
using pv::widgets::Popup;