projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
View: Determine time unit and use it in other classes
[pulseview.git]
/
pv
/
view
/
ruler.cpp
diff --git
a/pv/view/ruler.cpp
b/pv/view/ruler.cpp
index bd106b974c695e19d78a7abdad3adf887ba0e1fb..3ec75fc307ed7df0ec6d0b2e9a132510e32d2996 100644
(file)
--- a/
pv/view/ruler.cpp
+++ b/
pv/view/ruler.cpp
@@
-122,7
+122,7
@@
void Ruler::paintEvent(QPaintEvent*)
// Draw a major tick
p.drawText(x, ValueMargin, 0, text_height,
AlignCenter | AlignTop | TextDontClip,
// Draw a major tick
p.drawText(x, ValueMargin, 0, text_height,
AlignCenter | AlignTop | TextDontClip,
-
pv::util::format_time(t, prefix
));
+
util::format_time(t, prefix, view_.time_unit()
));
p.drawLine(QPointF(x, major_tick_y1),
QPointF(x, ruler_height));
}
p.drawLine(QPointF(x, major_tick_y1),
QPointF(x, ruler_height));
}
@@
-148,7
+148,7
@@
void Ruler::paintEvent(QPaintEvent*)
// Draw the items
const vector< shared_ptr<TimeItem> > items(view_.time_items());
for (auto &i : items) {
// Draw the items
const vector< shared_ptr<TimeItem> > items(view_.time_items());
for (auto &i : items) {
- const bool highlight = !dragging_ &&
+ const bool highlight = !
item_
dragging_ &&
i->label_rect(r).contains(mouse_point_);
i->paint_label(p, r, highlight);
}
i->label_rect(r).contains(mouse_point_);
i->paint_label(p, r, highlight);
}