diff --git a/ChartsSpace/ChartUtilities.js b/ChartsSpace/ChartUtilities.js index 369974660..4139c96e1 100644 --- a/ChartsSpace/ChartUtilities.js +++ b/ChartsSpace/ChartUtilities.js @@ -62,8 +62,7 @@ function getTransparenceFactor (timeFrame) { } function recalculatePeriod (zoomLevel) { - // console.log(" recalculatePeriod > " + zoomLevel); - + console.log('NEW ZOOM LEVEL', zoomLevel) if (zoomLevel > 400) { return _1_MINUTE_IN_MILISECONDS } @@ -116,23 +115,23 @@ function recalculatePeriod (zoomLevel) { return _2_HOURS_IN_MILISECONDS } - if (zoomLevel > 90) { + if (zoomLevel > 80) { return _3_HOURS_IN_MILISECONDS } - if (zoomLevel > 70) { + if (zoomLevel > 50) { return _4_HOURS_IN_MILISECONDS } - if (zoomLevel > 50) { + if (zoomLevel > 35) { return _6_HOURS_IN_MILISECONDS } - if (zoomLevel > 30) { + if (zoomLevel > 20) { return _8_HOURS_IN_MILISECONDS } - if (zoomLevel > 15) { + if (zoomLevel > 10) { return _12_HOURS_IN_MILISECONDS } diff --git a/ChartsSpace/TimelineChart.js b/ChartsSpace/TimelineChart.js index e0eec99f7..e46f04557 100644 --- a/ChartsSpace/TimelineChart.js +++ b/ChartsSpace/TimelineChart.js @@ -283,8 +283,7 @@ function newTimelineChart () { center = timelineChartCoordinateSystem.unInverseTransform(center, thisObject.container.frame.height) } - let newDate = new Date(0) - newDate.setUTCSeconds(center.x) + let newDate = new Date(center.x) datetime = newDate diff --git a/ChartsSpace/ViewPort.js b/ChartsSpace/ViewPort.js index ef25bfd50..7a66442cf 100644 --- a/ChartsSpace/ViewPort.js +++ b/ChartsSpace/ViewPort.js @@ -361,7 +361,7 @@ function newViewport () { function newZoomLevel (level) { thisObject.zoomLevel = level thisObject.zoomTargetLevel = level - // INITIAL_TIME_PERIOD = recalculatePeriod(level) + INITIAL_TIME_PERIOD = recalculatePeriod(level) saveObjectState() ANIMATION_INCREMENT = 0 diff --git a/Scales/TimeFrameScale.js b/Scales/TimeFrameScale.js index fb09442fc..1a2b08412 100644 --- a/Scales/TimeFrameScale.js +++ b/Scales/TimeFrameScale.js @@ -275,7 +275,7 @@ function newTimeFrameScale () { let timeFrameArray = timeFramesMasterArray[filePeriodIndex] thisObject.timeFrame = timeFrameArray[timeFrameIndex][0] timeFrameLabel = timeFrameArray[timeFrameIndex][1] - + console.log('NEW TIME FRAME LABEL', timeFrameLabel) let event = {} event.timeFrame = thisObject.timeFrame thisObject.container.eventHandler.raiseEvent('Time Frame Changed', event)