From a42bbb25c680c129c4262e51db4fae13250348e0 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 9 Feb 2020 18:38:36 +0100 Subject: [PATCH] ZOOM_OUT_THRESHOLD --- ChartsSpace/TimeMachine.js | 2 +- Globals.js | 4 +++- Scales/TimeFrameScale.js | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChartsSpace/TimeMachine.js b/ChartsSpace/TimeMachine.js index 4f783a125..16c1b5cf6 100644 --- a/ChartsSpace/TimeMachine.js +++ b/ChartsSpace/TimeMachine.js @@ -391,7 +391,7 @@ function newTimeMachine () { } function panelPhysics () { - if (thisObject.container.frame.isInViewPort() && canvas.chartSpace.viewport.zoomTargetLevel > ZOOM_OUT_THRESHOLD) { + if (thisObject.container.frame.isInViewPort() && canvas.chartSpace.viewport.zoomTargetLevel > ZOOM_OUT_THRESHOLD_FOR_HIDDING_PANELS) { canvas.panelsSpace.makeVisible(thisObject.payload.node.id, 'Layers Panel') canvas.panelsSpace.makeVisible(thisObject.payload.node.id, 'Plotter Panel') } else { diff --git a/Globals.js b/Globals.js index 5fc02bfdc..74e3acce9 100644 --- a/Globals.js +++ b/Globals.js @@ -41,7 +41,9 @@ UI_FONT = { SECONDARY: "Source Code Pro" }; -const ZOOM_OUT_THRESHOLD = 10 // This regulates some behavious changes that happens when the user zoom out below this level. +const ZOOM_OUT_THRESHOLD_FOR_HIDDING_PANELS = 10 // This regulates some behavious changes that happens when the user zoom out below this level. +const ZOOM_OUT_THRESHOLD_FOR_CHANGING_TIME_FRAME = 5 // This help regulate when to change the Time Frame base on the level of zoom out. + let FONT_ASPECT_RATIO = 0.32; diff --git a/Scales/TimeFrameScale.js b/Scales/TimeFrameScale.js index e9695b4c4..3a2b3fd97 100644 --- a/Scales/TimeFrameScale.js +++ b/Scales/TimeFrameScale.js @@ -123,13 +123,13 @@ function newTimeFrameScale () { } function zoomOutPhysics () { - if (thisObject.isVisible === true && previousIsVisible === false) { + if ((thisObject.isVisible === true && previousIsVisible === false) && (canvas.chartSpace.viewport.zoomTargetLevel >= ZOOM_OUT_THRESHOLD_FOR_CHANGING_TIME_FRAME)) { let event = {} event.timeFrame = thisObject.timeFrame thisObject.container.eventHandler.raiseEvent('Time Frame Value Changed', event) previousIsVisible = true } - if (thisObject.isVisible === false && previousIsVisible === true) { + if ((thisObject.isVisible === false && previousIsVisible === true) || (canvas.chartSpace.viewport.zoomTargetLevel < ZOOM_OUT_THRESHOLD_FOR_CHANGING_TIME_FRAME)) { let event = {} event.timeFrame = ONE_DAY_IN_MILISECONDS thisObject.container.eventHandler.raiseEvent('Time Frame Value Changed', event)