diff --git a/ChartsSpace/TimeMachine.js b/ChartsSpace/TimeMachine.js index ed0bd74a1..1645d2827 100644 --- a/ChartsSpace/TimeMachine.js +++ b/ChartsSpace/TimeMachine.js @@ -408,6 +408,15 @@ function newTimeMachine () { } } + function drawBackground () { + if (thisObject.container.frame.isInViewPort()) { + for (let i = 0; i < thisObject.timelineCharts.length; i++) { + let timelineChart = thisObject.timelineCharts[i] + timelineChart.drawBackground() + } + } + } + function draw () { if (thisObject.container.frame.isInViewPort()) { for (let i = 0; i < thisObject.timelineCharts.length; i++) { @@ -423,15 +432,6 @@ function newTimeMachine () { } } - function drawBackground () { - if (thisObject.container.frame.isInViewPort()) { - for (let i = 0; i < thisObject.timelineCharts.length; i++) { - let timelineChart = thisObject.timelineCharts[i] - timelineChart.drawBackground() - } - } - } - function drawForeground () { if (thisObject.container.frame.isInViewPort()) { for (let i = 0; i < thisObject.timelineCharts.length; i++) { diff --git a/ChartsSpace/TimelineChart.js b/ChartsSpace/TimelineChart.js index 8fdd77296..287792ef6 100644 --- a/ChartsSpace/TimelineChart.js +++ b/ChartsSpace/TimelineChart.js @@ -359,13 +359,6 @@ function newTimelineChart () { } } - function draw () { - if (thisObject.container.frame.isInViewPort()) { - if (thisObject.timeFrameScale !== undefined) { thisObject.timeFrameScale.draw() } - if (thisObject.rateScale !== undefined) { thisObject.rateScale.draw() } - } - } - function drawBackground () { if (thisObject.container.frame.isInViewPort()) { if (window.CHART_ON_FOCUS === '') { @@ -376,6 +369,13 @@ function newTimelineChart () { } } + function draw () { + if (thisObject.container.frame.isInViewPort()) { + if (thisObject.timeFrameScale !== undefined) { thisObject.timeFrameScale.draw() } + if (thisObject.rateScale !== undefined) { thisObject.rateScale.draw() } + } + } + function drawForeground () { if (thisObject.container.frame.isInViewPort()) { if (thisObject.timeFrameScale !== undefined) { thisObject.timeFrameScale.drawForeground() } diff --git a/Scales/Commons.js b/Scales/Commons.js index c935a38a2..db0bb567e 100644 --- a/Scales/Commons.js +++ b/Scales/Commons.js @@ -5,7 +5,7 @@ function drawScaleDisplay (label1, label2, label3, xExtraOffSet1, xExtraOffSet2, let fontSize3 = 10 const RED_LINE_HIGHT = 4 - const OPACITY = 0.75 + const OPACITY = 1 let params = { cornerRadius: 15, diff --git a/Spaces/ChartSpace.js b/Spaces/ChartSpace.js index ada3eb8b5..a4ba0f45b 100644 --- a/Spaces/ChartSpace.js +++ b/Spaces/ChartSpace.js @@ -286,6 +286,15 @@ function newChartSpace () { } } + function drawBackground () { + drawSpaceBackground() + + for (let i = 0; i < thisObject.timeMachines.length; i++) { + let timeMachine = thisObject.timeMachines[thisObject.timeMachines.length - i - 1] + timeMachine.drawBackground() + } + } + function draw () { if (thisObject.visible !== true) { return } drawBackground() @@ -298,15 +307,6 @@ function newChartSpace () { drawForeground() } - function drawBackground () { - drawSpaceBackground() - - for (let i = 0; i < thisObject.timeMachines.length; i++) { - let timeMachine = thisObject.timeMachines[thisObject.timeMachines.length - i - 1] - timeMachine.drawBackground() - } - } - function drawForeground () { for (let i = 0; i < thisObject.timeMachines.length; i++) { let timeMachine = thisObject.timeMachines[thisObject.timeMachines.length - i - 1]