From d383bb09c3465f92b02e2528f96de0b88e979f0b Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 10 Feb 2020 20:00:55 +0100 Subject: [PATCH] Bug Fixes --- ChartsSpace/TimeMachine.js | 4 ++-- Scales/TimeFrameScale.js | 3 ++- Scales/TimeScale.js | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChartsSpace/TimeMachine.js b/ChartsSpace/TimeMachine.js index dda14a48a..9a044f572 100644 --- a/ChartsSpace/TimeMachine.js +++ b/ChartsSpace/TimeMachine.js @@ -230,11 +230,11 @@ function newTimeMachine () { let currentDate = getDateFromPoint(event.mousePosition, thisObject.container, timeMachineCoordinateSystem) let currentRate = getRateFromPoint(event.mousePosition, thisObject.container, timeMachineCoordinateSystem) - thisObject.container.frame.height = TIME_MACHINE_HEIGHT + TIME_MACHINE_HEIGHT * event.scale + // thisObject.container.frame.height = TIME_MACHINE_HEIGHT + TIME_MACHINE_HEIGHT * event.scale recalculateCoordinateSystem() moveToUserPosition(thisObject.container, currentDate, currentRate, timeMachineCoordinateSystem, true, false, event.mousePosition) } else { - thisObject.container.frame.height = TIME_MACHINE_HEIGHT + TIME_MACHINE_HEIGHT * event.scale + // thisObject.container.frame.height = TIME_MACHINE_HEIGHT + TIME_MACHINE_HEIGHT * event.scale recalculateCoordinateSystem() } thisObject.container.eventHandler.raiseEvent('Dimmensions Changed', event) diff --git a/Scales/TimeFrameScale.js b/Scales/TimeFrameScale.js index 3a2b3fd97..d75038abd 100644 --- a/Scales/TimeFrameScale.js +++ b/Scales/TimeFrameScale.js @@ -203,7 +203,8 @@ function newTimeFrameScale () { thisObject.isVisible = true thisObject.payload.isVisible = true if (thisObject.container.frame.position.y + thisObject.container.frame.height > bottonCorner.y || - thisObject.container.frame.position.y - thisObject.container.frame.height * 3 < upCorner.y) { + thisObject.container.frame.position.y - thisObject.container.frame.height * 3 < upCorner.y || + thisObject.container.frame.position.x < upCorner.x) { thisObject.isVisible = false thisObject.payload.isVisible = false } diff --git a/Scales/TimeScale.js b/Scales/TimeScale.js index 7078991d4..881061cca 100644 --- a/Scales/TimeScale.js +++ b/Scales/TimeScale.js @@ -269,7 +269,8 @@ function newTimeScale () { thisObject.isVisible = true if (thisObject.container.frame.position.y + thisObject.container.frame.height * 4 > bottonCorner.y || - thisObject.container.frame.position.y < upCorner.y) { + thisObject.container.frame.position.y < upCorner.y || + thisObject.container.frame.position.x < upCorner.x) { thisObject.isVisible = false } }