projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f9cb49c
)
Ruler: Prevent ticks from disappearing at high zoom levels
author
Jens Steinhauser
<jens.steinhauser@gmail.com>
Fri, 4 Sep 2015 16:23:02 +0000
(18:23 +0200)
committer
Uwe Hermann
<uwe@hermann-uwe.de>
Fri, 4 Sep 2015 16:42:34 +0000
(18:42 +0200)
pv/view/ruler.cpp
patch
|
blob
|
history
diff --git
a/pv/view/ruler.cpp
b/pv/view/ruler.cpp
index cd72a179cc72a84e46f4e9e65edb82750da42b0b..ab08a32011cdef2aad64f62cb8e2d4aaa8fdb14b 100644
(file)
--- a/
pv/view/ruler.cpp
+++ b/
pv/view/ruler.cpp
@@
-198,8
+198,7
@@
Ruler::TickPositions Ruler::calculate_tick_positions(
{
TickPositions tp;
{
TickPositions tp;
- const double minor_period =
- (major_period / MinorTickSubdivision).convert_to<double>();
+ const pv::util::Timestamp minor_period = major_period / MinorTickSubdivision;
const pv::util::Timestamp first_major_division = floor(offset / major_period);
const pv::util::Timestamp first_minor_division = ceil(offset / minor_period);
const pv::util::Timestamp t0 = first_major_division * major_period;
const pv::util::Timestamp first_major_division = floor(offset / major_period);
const pv::util::Timestamp first_minor_division = ceil(offset / minor_period);
const pv::util::Timestamp t0 = first_major_division * major_period;
@@
-214,7
+213,7
@@
Ruler::TickPositions Ruler::calculate_tick_positions(
x = ((t - offset) / scale).convert_to<double>();
if (division % MinorTickSubdivision == 0) {
x = ((t - offset) / scale).convert_to<double>();
if (division % MinorTickSubdivision == 0) {
- // Recalculate 't' without using 'minor_period' which is
of type double.
+ // Recalculate 't' without using 'minor_period' which is
a fraction
t = t0 + division / MinorTickSubdivision * major_period;
tp.major.emplace_back(x, format_function(t));
} else {
t = t0 + division / MinorTickSubdivision * major_period;
tp.major.emplace_back(x, format_function(t));
} else {