alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Timeline] Account for tick size

Browse Source 
Account for tick size in duration reported by TimelineZoomController,
to avoid tick marks being cut off prematurely due to changes for
#936
This commit is contained in:
Victor Woeltjen
2016-05-24 13:02:30 -07:00
parent 3795570938
commit 00534f8af7
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/features/timeline/res/templates/timeline.html
View File

@@ -128,7 +128,7 @@
<div style="overflow: hidden; position: absolute; left: 0; top: 0; right: 0; height: 30px;" mct-scroll-x="scroll.x"> <div style="overflow: hidden; position: absolute; left: 0; top: 0; right: 0; height: 30px;" mct-scroll-x="scroll.x">
<mct-include key="'timeline-ticks'" <mct-include key="'timeline-ticks'"
parameters="{ parameters="{
fullWidth: zoomController.toPixels(zoomController.duration()), fullWidth: timelineController.width(zoomController),
start: scroll.x, start: scroll.x,
width: scroll.width, width: scroll.width,
step: zoomController.toPixels(zoomController.zoom()), step: zoomController.toPixels(zoomController.zoom()),

3
platform/features/timeline/src/controllers/TimelineZoomController.js
View File

@@ -38,7 +38,8 @@ define(
// Round a duration to a larger value, to ensure space for editing // Round a duration to a larger value, to ensure space for editing
function roundDuration(value) { function roundDuration(value) {
// Ensure there's always an extra day or so // Ensure there's always an extra day or so
var sz = zoomLevels[zoomLevels.length - 1]; var tickCount = bounds.width / tickWidth,
sz = zoomLevels[zoomLevels.length - 1] * tickCount;
value *= 1.25; // Add 25% padding to start value *= 1.25; // Add 25% padding to start
return Math.ceil(value / sz) * sz; return Math.ceil(value / sz) * sz;
} }