projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TimeMarker: Fixed position of set_time function
[pulseview.git]
/
pv
/
view
/
timemarker.cpp
diff --git
a/pv/view/timemarker.cpp
b/pv/view/timemarker.cpp
index eebac024cca0c81608d5452a560544e235081813..8eed6e7e2b6240c91c9cef368e3873df100b392b 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;
@@
-80,11
+70,14
@@
void TimeMarker::set_time(double time)
time_changed();
}
time_changed();
}
-void TimeMarker::paint(QPainter &p, const QRect &rect)
+float TimeMarker::get_x() const
{
{
- const float x = get_x();
- p.setPen(colour_.darker());
- p.drawLine(QPointF(x, rect.top()), QPointF(x, rect.bottom()));
+ 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
@@
-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;