From 5d49e3bf9c998a169221b9ffe702b28d922bf47f Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 11 Apr 2019 11:00:06 +0200 Subject: [PATCH] Right Scale working --- Scales/RightScale.js | 11 ++++++++--- TimeMachine.js | 9 +++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Scales/RightScale.js b/Scales/RightScale.js index 8b24475fa..8f72ceda2 100644 --- a/Scales/RightScale.js +++ b/Scales/RightScale.js @@ -10,7 +10,8 @@ container: undefined, draw: draw, getContainer: getContainer, - initialize: initialize + initialize: initialize, + heightPercentage: 100 } const RIGHT_MARGIN = 50 @@ -37,10 +38,14 @@ function onMouseWheel (event) { delta = event.wheelDelta if (delta < 0) { - delta = -0.1 + thisObject.heightPercentage = thisObject.heightPercentage - 10 + if (thisObject.heightPercentage < 10) { thisObject.heightPercentage = 10 } } else { - delta = 0.1 + thisObject.heightPercentage = thisObject.heightPercentage + 10 + if (thisObject.heightPercentage > 100) { thisObject.heightPercentage = 100 } } + event.heightPercentage = thisObject.heightPercentage + thisObject.container.eventHandler.raiseEvent('Height Percentage Changed', event) } function getContainer (point) { diff --git a/TimeMachine.js b/TimeMachine.js index 8123b0369..1d6a040ec 100644 --- a/TimeMachine.js +++ b/TimeMachine.js @@ -72,11 +72,16 @@ function newTimeMachine () { timeScale = newTimeScale() timeScale.initialize() + timeScale.container.eventHandler.listenToEvent('Lenght Percentage Changed', function (event) { + thisObject.container.frame.width = TIME_MACHINE_WIDTH * event.lenghtPercentage / 100 + thisObject.container.eventHandler.raiseEvent('Dimmensions Changed', event) + }) + rigthScale = newRigthScale() rigthScale.initialize() - timeScale.container.eventHandler.listenToEvent('Lenght Percentage Changed', function (event) { - thisObject.container.frame.width = TIME_MACHINE_WIDTH * event.lenghtPercentage / 100 + rigthScale.container.eventHandler.listenToEvent('Height Percentage Changed', function (event) { + thisObject.container.frame.height = TIME_MACHINE_HEIGHT * event.heightPercentage / 100 thisObject.container.eventHandler.raiseEvent('Dimmensions Changed', event) })