From f3ea7f166dbbc9d1a4b141633fa94a90f0316bc6 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 21 Feb 2018 18:24:04 +0100 Subject: [PATCH] marketFile --- .vs/AAOlivia-Plotter/v15/.suo | Bin 18944 -> 18432 bytes Volumes.js | 19 ++++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.vs/AAOlivia-Plotter/v15/.suo b/.vs/AAOlivia-Plotter/v15/.suo index c2816afbd9687c2847ffd1f37f2a5649369fd19d..c756cd30231ca6277f6569feb8a5aaf61ca9719f 100644 GIT binary patch delta 139 zcmZpe!q_l@ae{#?69W_oFfgzHnT$aE@Bjb*AW`PYjvV$I6G|8-G3Bs4IH%aUxq#^p zGwX$m%MMy>E@ZQ_6a?vj0cjwEee(hP_soJ!AXA`#56CtL3a2p&&Oj1g31lm8Hg`SA F1OS&w9NPc@ delta 122 zcmZpez}PT_ae{#?0}Kc-FbD$Kj6nSF|Ns9WVaCah9QGR%N*E_G<*+17|IfL(fawo2 wt3i`+yZPoqHaknfD3Ee6kUEeJWQ%P+VE>+3&<`dGq*H-d6DaJ!w8#yF0HJ>yGynhq diff --git a/Volumes.js b/Volumes.js index 62a9a993c..8bbeab5e0 100644 --- a/Volumes.js +++ b/Volumes.js @@ -25,6 +25,7 @@ let layerStatus = 'off'; // Since the moduleis a layer, it must handle the different possible layer status. let plotArea = newPlotArea(); // Needed to be able to plot on the timeline, otherwise not. + let plotAreaFrame = newPlotArea(); // This chart uses this extra object. let timePeriod; // This will hold the current Time Period the user is at. let datetime; // This will hold the current Datetime the user is at. @@ -267,11 +268,11 @@ var volume = newVolumeBar(); - volume.begin = (new Date(marketIndex.volumes[i][2])).valueOf(); // TODO ELIMINATE THIS - volume.end = (new Date(marketIndex.volumes[i][3])).valueOf(); + volume.begin = (new Date(marketFile.volumes[i][2])).valueOf(); // TODO ELIMINATE THIS + volume.end = (new Date(marketFile.volumes[i][3])).valueOf(); - volume.amountBuy = marketIndex.volumes[i][0]; - volume.amountSell = marketIndex.volumes[i][1]; + volume.amountBuy = marketFile.volumes[i][0]; + volume.amountSell = marketFile.volumes[i][1]; if (volume.begin >= farLeftDate.valueOf() && volume.end <= farRightDate.valueOf()) { @@ -326,11 +327,11 @@ var volume = newVolumeBar(); - volume.begin = (new Date(marketIndex.volumes[i][2])).valueOf(); // TODO ELIMINATE THIS - volume.end = (new Date(marketIndex.volumes[i][3])).valueOf(); + volume.begin = (new Date(marketFile.volumes[i][2])).valueOf(); // TODO ELIMINATE THIS + volume.end = (new Date(marketFile.volumes[i][3])).valueOf(); - volume.amountBuy = marketIndex.volumes[i][0]; - volume.amountSell = marketIndex.volumes[i][1]; + volume.amountBuy = marketFile.volumes[i][0]; + volume.amountSell = marketFile.volumes[i][1]; if (volume.begin >= leftDate.valueOf() && volume.end <= rightDate.valueOf()) { @@ -384,7 +385,7 @@ let timePeriodRatio = ONE_DAY_IN_MILISECONDS / timePeriod; - maxValue.y = marketIndex.maxVolume() / (timePeriodRatio / 10); + maxValue.y = marketFile.maxVolume() / (timePeriodRatio / 10); plotArea.initializeY( minValue,