diff --git a/ChartsSpace/TimeMachine.js b/ChartsSpace/TimeMachine.js index 977f587cd..b081be5de 100644 --- a/ChartsSpace/TimeMachine.js +++ b/ChartsSpace/TimeMachine.js @@ -145,17 +145,13 @@ function newTimeMachine () { timeScaleMouseOverEventSuscriptionId = thisObject.timeScale.container.eventHandler.listenToEvent('onMouseOver', timeScaleMouseOver) function timeScaleMouseOver (event) { - thisObject.rateScale.visible = false - mouse.position.x = event.x - mouse.position.y = event.y + thisObject.container.eventHandler.raiseEvent('onMouseOver', event) } rateScaleMouseOverEventSuscriptionId = thisObject.rateScale.container.eventHandler.listenToEvent('onMouseOver', rateScaleMouseOver) function rateScaleMouseOver (event) { - thisObject.timeScale.visible = false - mouse.position.x = event.x - mouse.position.y = event.y + thisObject.container.eventHandler.raiseEvent('onMouseOver', event) } callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE) } diff --git a/ChartsSpace/TimelineChart.js b/ChartsSpace/TimelineChart.js index 717197973..e00652db6 100644 --- a/ChartsSpace/TimelineChart.js +++ b/ChartsSpace/TimelineChart.js @@ -199,6 +199,8 @@ function newTimelineChart () { function timeFrameScaleMouseOver (event) { mouse.position.x = event.x mouse.position.y = event.y + + saveUserPosition(thisObject.container, timeLineCoordinateSystem, event) } initializationReady = true diff --git a/ChartsSpace/ViewPort.js b/ChartsSpace/ViewPort.js index 1e14c8d18..e9738b66f 100644 --- a/ChartsSpace/ViewPort.js +++ b/ChartsSpace/ViewPort.js @@ -12,7 +12,7 @@ function newViewPort () { let ANIMATION_INCREMENT = 0.25 let TOP_MARGIN = 30 + TOP_SPACE_HEIGHT - let BOTTOM_MARGIN = 30 + COCKPIT_SPACE_HEIGHT + let BOTTOM_MARGIN = 32 + COCKPIT_SPACE_HEIGHT let LEFT_MARGIN = 50 let RIGHT_MARGIN = 50 let MARGINS = { @@ -83,7 +83,7 @@ function newViewPort () { function resize () { TOP_MARGIN = 30 + TOP_SPACE_HEIGHT - BOTTOM_MARGIN = 30 + browserCanvas.height - COCKPIT_SPACE_POSITION + BOTTOM_MARGIN = 32 + browserCanvas.height - COCKPIT_SPACE_POSITION LEFT_MARGIN = 0 RIGHT_MARGIN = 0 MARGINS = { diff --git a/Scales/TimeScale.js b/Scales/TimeScale.js index 9bcae12e8..fb7d75e33 100644 --- a/Scales/TimeScale.js +++ b/Scales/TimeScale.js @@ -15,8 +15,7 @@ function newTimeScale () { } const LENGHT_PERCENTAGE_DEFAULT_VALUE = 5 - const STEP_SIZE = 5 - const MIN_HEIGHT = 50 + const STEP_SIZE = 2.5 thisObject.container = newContainer() thisObject.container.initialize(MODULE_NAME)