From 58e704d01faa00c0a31722d1d0779fdf911e8225 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 2 Mar 2020 20:35:48 +0100 Subject: [PATCH] Improvement on scales --- Globals.js | 1 + Scales/RateScale.js | 4 ++++ Scales/TimeFrameScale.js | 4 ++++ Scales/TimeScale.js | 4 ++++ 4 files changed, 13 insertions(+) diff --git a/Globals.js b/Globals.js index 61b579d57..5b4aa5751 100644 --- a/Globals.js +++ b/Globals.js @@ -47,6 +47,7 @@ const ZOOM_OUT_THRESHOLD_FOR_CHANGING_TIME_FRAME = 5 // This help regulate when const ZOOM_OUT_THRESHOLD_FOR_PACKING_OBJECTS_AT_THE_BOTTOM_OR_TOP_OF_VIEWPORT = 2 const ZOOM_OUT_THRESHOLD_FOR_PLOTTING_IN_LOW_RESOLUTION = 3 const ZOOM_OUT_THRESHOLD_FOR_DISPLAYING_TIME_MACHINES_ICONIZED = 5 +const ZOOM_OUT_THRESHOLD_FOR_DISPLAYING_SCALES = 3 let FONT_ASPECT_RATIO = 0.32; diff --git a/Scales/RateScale.js b/Scales/RateScale.js index 07b2396a7..a532aea1f 100644 --- a/Scales/RateScale.js +++ b/Scales/RateScale.js @@ -370,6 +370,10 @@ function newRateScale () { thisObject.isVisible = false thisObject.payload.isVisible = false } + + if (canvas.chartingSpace.viewport.zoomTargetLevel < ZOOM_OUT_THRESHOLD_FOR_DISPLAYING_SCALES) { + thisObject.isVisible = false + } } function draw () { diff --git a/Scales/TimeFrameScale.js b/Scales/TimeFrameScale.js index 5015c1e31..05f6fbb38 100644 --- a/Scales/TimeFrameScale.js +++ b/Scales/TimeFrameScale.js @@ -212,6 +212,10 @@ function newTimeFrameScale () { thisObject.isVisible = false thisObject.payload.isVisible = false } + + if (canvas.chartingSpace.viewport.zoomTargetLevel < ZOOM_OUT_THRESHOLD_FOR_DISPLAYING_SCALES) { + thisObject.isVisible = false + } } function onViewportZoomChanged (event) { diff --git a/Scales/TimeScale.js b/Scales/TimeScale.js index f87354e66..62a1220b3 100644 --- a/Scales/TimeScale.js +++ b/Scales/TimeScale.js @@ -245,6 +245,10 @@ function newTimeScale () { thisObject.container.frame.position.x < upCorner.x) { thisObject.isVisible = false } + + if (canvas.chartingSpace.viewport.zoomTargetLevel < ZOOM_OUT_THRESHOLD_FOR_DISPLAYING_SCALES) { + thisObject.isVisible = false + } } function draw () {