From 010c1d6f9513a00fbdbca070ccdb8350d49f7858 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 17 Apr 2018 13:54:08 +0200 Subject: [PATCH] Current Candle Panel and Volumes Removed --- .vs/AAWebPlatform/v15/.suo | Bin 91136 -> 76800 bytes AAWebPlatform.njsproj | 4 - Panels/CurrentCandlePanel.js | 303 ----------------------------------- Panels/CurrentVolumePanel.js | 224 -------------------------- TimeMachine.js | 16 +- TimelineChart.js | 6 +- index.html | 2 - server.js | 2 +- 8 files changed, 6 insertions(+), 551 deletions(-) delete mode 100644 Panels/CurrentCandlePanel.js delete mode 100644 Panels/CurrentVolumePanel.js diff --git a/.vs/AAWebPlatform/v15/.suo b/.vs/AAWebPlatform/v15/.suo index 73d06421415e6b41b8eb1c39844753c684cd38ef..e56fa7bb8d5c5d96b259513c90c91336ef6b85b3 100644 GIT binary patch delta 4256 zcmd^?ZBUfg7035HyTFRPEDI_qfn`Nq$pQ<4FNBw6cf|!!SOH@#T1lia3P@lv#t>LE zLu|(+>|XTFbZnxl;X`Ya%HwF;>9i!;PG;InHAy?km)5rV+GwVjsh#Ndf0k#Htxcvc zPCM=Njz7-5=ef_h_n!ZK?p_0LCIsFyOjIwJr_<^5;BF)mfr-}5=Y30*c~^bnqU%@h zP`emXM#&>?DMx6TcuM~?`Nb`L{%9R~KU*Ot-e^Zb5Vjj6C0Z}j{&wCq{j8=Kz$QP(R?dmvp@;h47P%8 zfTQgQ`Z7m%qOnVJbippy>fM@Ms@XlTYe7E9)qHbPibVRg_7kuJU=Rer5I6vy1P8%W z;1GBk41;HQ?jxv-f-w+MdX15q@3a1%ztR7QxRtbGv>e@>pc1g|JcpR>CbU_1*6^!< zb!6SSj|(=Ydj;zE>dt+*u%InPy2oT6)$N8eUiTWb9|WvB2k6wS8`cU~_bQMG zSobpU2w>ggm1D(NcaFiTvF>SL0bu1e0Bq|>WMj0#-R4R&+O1$cVCmWWaL~6zbS4-p zS~Q5Bnmc2hLuwUwaq``rM)9iP2?*Jpxt$8(0a7z=OaJ zia`k|1rAUK%E2m70V=_2um-FJ>p%^72vh_9ersXtfKzL;PeX~^4R+6ZT}|QRGWM-;qUQ6*$!8Xdhd4$eCr&`utr%=)5FI;3obdlnAW{a^eE{5vQ!X6({LfgGxurg_oPtwY5M+&j2#PKG=xtYLRsF=$wwHwE^f_#Z@~uXGt&aG;H*709jU;- zD8qs}+r{|VY;otbDS^EKQNN~39xWq_sDGs+*?~)j18!*i+AF^BHCe`$XX?V*LHIWPX+{4rk~xp-a@PkhiT z(r+b;^tWtcYW89V|M$p9ufS+p5iF07>;(`_KRfE|EI-E4QTNd zBtA$<-`>Igf&F`j-Bq0(gWWQaK{gr)U0YA94P7Zut&TvG@;W&BFJ$SovQ|)Cn_9NJ}P7$_dmiU06!Z$_X2JrF|vk z%H1}4Q`DSJlUr?+CNDUsU7lP?d9vJ2!!#i48>vH@@XJL3*;P;7GOdIx(oswYX;=o$ z`0cx}fy`oA??UVuuYBH25A&IB6esIT;Hj189q`~w%#+XN{%Whv{vXPAo>Ece`|W zDO;TTPLaIcK#6m2*&8Si!+umx`=l3-<(3UpBnp1tB)^$R^JQHkeS1nzB;PKkwVW24 z+~uX~;_4BL$X}g{WhcvP%~*i9%RGG?}$cv{<$mQm5S9Oxg2$ zbZ*?{J9QnpK^e)Q;J-)4f^y{U$|h=(?`@>Tm`Xt=bzJ&kGiBj4ZlK+wr^+Tfm(f|N c6jKTBqW1qQjlX`sI?in$ToUu*lIzj`1@U+>dH?_b delta 7371 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 diff --git a/AAWebPlatform.njsproj b/AAWebPlatform.njsproj index 9d9e8ab6c..a3ab8b703 100644 --- a/AAWebPlatform.njsproj +++ b/AAWebPlatform.njsproj @@ -88,8 +88,6 @@ - - @@ -117,8 +115,6 @@ - - diff --git a/Panels/CurrentCandlePanel.js b/Panels/CurrentCandlePanel.js deleted file mode 100644 index 1b92a8500..000000000 --- a/Panels/CurrentCandlePanel.js +++ /dev/null @@ -1,303 +0,0 @@ - -function newCurrentCandlePanel() { - - var currentCandlePanel = { - onCurrentCandleChanged: onCurrentCandleChanged, - container: undefined, - draw: draw, - getContainer: getContainer, - initialize: initialize - }; - - var container = newContainer(); - container.initialize(); - currentCandlePanel.container = container; - - container.displacement.containerName = "Current Candle Panel"; - container.zoom.containerName = "Current Candle Panel"; - container.frame.containerName = "Current Candle Panel"; - - let currentCandle; - - return currentCandlePanel; - - function initialize() { - - currentCandlePanel.container.frame.width = 250; - currentCandlePanel.container.frame.height = 300; - - currentCandlePanel.container.frame.position.x = viewPort.visibleArea.topRight.x - currentCandlePanel.container.frame.width - 180; - currentCandlePanel.container.frame.position.y = 0; - - - } - - - - function getContainer(point) { - - var container; - - /* First we check if this point is inside this space. */ - - if (this.container.frame.isThisPointHere(point, true) === true) { - - return this.container; - - } else { - - /* This point does not belong to this space. */ - - return undefined; - } - - } - - - function onCurrentCandleChanged(lastCurrentCandle) { - - currentCandle = lastCurrentCandle; - - } - - - function draw() { - - this.container.frame.draw(false, false, true); - - plotCurrentCandleInfo(); - - } - - - function plotCurrentCandleInfo() { - - if (currentCandle === undefined) { return; } - if (currentCandle.innerCandle === undefined) { return; } - - const frameBodyHeight = currentCandlePanel.container.frame.getBodyHeight(); - const frameTitleHeight = currentCandlePanel.container.frame.height - frameBodyHeight; - - const X_AXIS = currentCandlePanel.container.frame.width / 2; - const Y_AXIS = frameTitleHeight + frameBodyHeight / 2; - - var candlePoint1 = { - x: X_AXIS - currentCandle.bodyWidth / 2, - y: Y_AXIS - currentCandle.bodyHeight / 2 - }; - - var candlePoint2 = { - x: X_AXIS + currentCandle.bodyWidth / 2, - y: Y_AXIS - currentCandle.bodyHeight / 2 - }; - - var candlePoint3 = { - x: X_AXIS + currentCandle.bodyWidth / 2, - y: Y_AXIS + currentCandle.bodyHeight / 2 - }; - - var candlePoint4 = { - x: X_AXIS - currentCandle.bodyWidth / 2, - y: Y_AXIS + currentCandle.bodyHeight / 2 - }; - - - var stickPoint1 = { - x: X_AXIS - currentCandle.stickWidth / 2, - y: candlePoint1.y - currentCandle.stickStart - }; - - var stickPoint2 = { - x: X_AXIS + currentCandle.stickWidth / 2, - y: candlePoint1.y - currentCandle.stickStart - }; - - var stickPoint3 = { - x: X_AXIS + currentCandle.stickWidth / 2, - y: candlePoint1.y - currentCandle.stickStart + currentCandle.stickHeight - }; - - var stickPoint4 = { - x: X_AXIS - currentCandle.stickWidth / 2, - y: candlePoint1.y - currentCandle.stickStart + currentCandle.stickHeight - }; - - - /* Extra bounderies due to constrained space */ - - const upperLimit = frameTitleHeight + frameBodyHeight * 0.15; - const downLimit = frameTitleHeight + frameBodyHeight * 0.85; - - if (candlePoint1.y < upperLimit) { - - candlePoint1.y = upperLimit; - candlePoint2.y = upperLimit; - - } - - if (stickPoint1.y < upperLimit) { - - stickPoint1.y = upperLimit; - stickPoint2.y = upperLimit; - - } - - if (candlePoint3.y < upperLimit) { - - candlePoint3.y = upperLimit; - candlePoint4.y = upperLimit; - - } - - if (stickPoint3.y < upperLimit) { - - stickPoint3.y = upperLimit; - stickPoint4.y = upperLimit; - - } - - if (candlePoint1.y > downLimit) { - - candlePoint1.y = downLimit; - candlePoint2.y = downLimit; - - } - - if (stickPoint1.y > downLimit) { - - stickPoint1.y = downLimit; - stickPoint2.y = downLimit; - - } - - if (candlePoint3.y > downLimit) { - - candlePoint3.y = downLimit; - candlePoint4.y = downLimit; - - } - - if (stickPoint3.y > downLimit) { - - stickPoint3.y = downLimit; - stickPoint4.y = downLimit; - - } - - - candlePoint1 = currentCandlePanel.container.frame.frameThisPoint(candlePoint1); - candlePoint2 = currentCandlePanel.container.frame.frameThisPoint(candlePoint2); - candlePoint3 = currentCandlePanel.container.frame.frameThisPoint(candlePoint3); - candlePoint4 = currentCandlePanel.container.frame.frameThisPoint(candlePoint4); - - stickPoint1 = currentCandlePanel.container.frame.frameThisPoint(stickPoint1); - stickPoint2 = currentCandlePanel.container.frame.frameThisPoint(stickPoint2); - stickPoint3 = currentCandlePanel.container.frame.frameThisPoint(stickPoint3); - stickPoint4 = currentCandlePanel.container.frame.frameThisPoint(stickPoint4); - - - - browserCanvasContext.beginPath(); - - browserCanvasContext.moveTo(stickPoint1.x, stickPoint1.y); - browserCanvasContext.lineTo(stickPoint2.x, stickPoint2.y); - browserCanvasContext.lineTo(stickPoint3.x, stickPoint3.y); - browserCanvasContext.lineTo(stickPoint4.x, stickPoint4.y); - - browserCanvasContext.closePath(); - browserCanvasContext.fillStyle = 'rgba(54, 54, 54, 1)'; - browserCanvasContext.fill(); - - browserCanvasContext.lineWidth = 1; - browserCanvasContext.stroke(); - - browserCanvasContext.beginPath(); - - browserCanvasContext.moveTo(candlePoint1.x, candlePoint1.y); - browserCanvasContext.lineTo(candlePoint2.x, candlePoint2.y); - browserCanvasContext.lineTo(candlePoint3.x, candlePoint3.y); - browserCanvasContext.lineTo(candlePoint4.x, candlePoint4.y); - - browserCanvasContext.closePath(); - - const OPACITY = '1'; - - if (currentCandle.innerCandle.direction === 'up') { browserCanvasContext.strokeStyle = 'rgba(27, 105, 7, ' + OPACITY + ')'; } - if (currentCandle.innerCandle.direction === 'down') { browserCanvasContext.strokeStyle = 'rgba(130, 9, 9, ' + OPACITY + ')'; } - if (currentCandle.innerCandle.direction === 'side') { browserCanvasContext.strokeStyle = 'rgba(27, 7, 105, ' + OPACITY + ')'; } - - if (currentCandle.innerCandle.direction === 'up') { browserCanvasContext.fillStyle = 'rgba(64, 217, 26, ' + OPACITY + ')'; } - if (currentCandle.innerCandle.direction === 'down') { browserCanvasContext.fillStyle = 'rgba(219, 18, 18, ' + OPACITY + ')'; } - if (currentCandle.innerCandle.direction === 'side') { browserCanvasContext.fillStyle = 'rgba(64, 26, 217, ' + OPACITY + ')'; } - - browserCanvasContext.fill(); - - browserCanvasContext.lineWidth = 1; - browserCanvasContext.stroke(); - - - browserCanvasContext.beginPath(); - - /* put the labels with the candles values */ - - - - - let y; - - printLabel('High', X_AXIS, frameTitleHeight + frameBodyHeight * 0.05, '1'); - printLabel(currentCandle.innerCandle.max, X_AXIS, frameTitleHeight + frameBodyHeight * 0.10, '0.50'); - - printLabel('Low', X_AXIS, frameTitleHeight + frameBodyHeight * 0.95, '1'); - printLabel(currentCandle.innerCandle.min, X_AXIS, frameTitleHeight + frameBodyHeight * 0.90, '0.50'); - - - y = Y_AXIS - currentCandle.bodyHeight / 2; - - if (y < frameTitleHeight + frameBodyHeight * 0.15) { y = frameTitleHeight + frameBodyHeight * 0.15; } - if (y > frameTitleHeight + frameBodyHeight * 0.80) { y = frameTitleHeight + frameBodyHeight * 0.80; } - - printLabel('Open', X_AXIS * 1 / 2, y , '1'); - printLabel(currentCandle.innerCandle.open, X_AXIS * 1 / 2, y + frameBodyHeight * 0.05, '0.50'); - - y = Y_AXIS + currentCandle.bodyHeight / 2; - - if (y < frameTitleHeight + frameBodyHeight * 0.15) { y = frameTitleHeight + frameBodyHeight * 0.15; } - if (y > frameTitleHeight + frameBodyHeight * 0.80) { y = frameTitleHeight + frameBodyHeight * 0.80; } - - printLabel('Close', X_AXIS * 3 / 2, y , '1'); - printLabel(currentCandle.innerCandle.close, X_AXIS * 3 / 2, y + frameBodyHeight * 0.05, '0.50'); - - - - function printLabel(labelToPrint, x, y, opacity) { - - let labelPoint; - let fontSize = 10; - - browserCanvasContext.font = fontSize + 'px Courier New'; - - let label = '' + labelToPrint; - - let xOffset = label.length / 2 * fontSize * FONT_ASPECT_RATIO; - - labelPoint = { - x: x - xOffset, - y: y - }; - - labelPoint = currentCandlePanel.container.frame.frameThisPoint(labelPoint); - - browserCanvasContext.fillStyle = 'rgba(60, 60, 60, ' + opacity + ')'; - browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y); - - } - - browserCanvasContext.closePath(); - browserCanvasContext.fill(); - - } - - -} - diff --git a/Panels/CurrentVolumePanel.js b/Panels/CurrentVolumePanel.js deleted file mode 100644 index 887eded8b..000000000 --- a/Panels/CurrentVolumePanel.js +++ /dev/null @@ -1,224 +0,0 @@ - -function newCurrentVolumePanel() { - - var currentVolumePanel = { - onCurrentVolumeChanged: onCurrentVolumeChanged, - container: undefined, - draw: draw, - getContainer: getContainer, - initialize: initialize - }; - - var container = newContainer(); - container.initialize(); - currentVolumePanel.container = container; - - container.displacement.containerName = "Current Volume Panel"; - container.zoom.containerName = "Current Volume Panel"; - container.frame.containerName = "Current Volume Panel"; - - let currentVolume; - - return currentVolumePanel; - - function initialize() { - - currentVolumePanel.container.frame.width = 180; - currentVolumePanel.container.frame.height = 300; - - currentVolumePanel.container.frame.position.x = viewPort.visibleArea.topRight.x - currentVolumePanel.container.frame.width; - currentVolumePanel.container.frame.position.y = 0; - - - } - - - - function getContainer(point) { - - var container; - - /* First we check if this point is inside this space. */ - - if (this.container.frame.isThisPointHere(point, true) === true) { - - return this.container; - - } else { - - /* This point does not belong to this space. */ - - return undefined; - } - - } - - - function onCurrentVolumeChanged(lastCurrentVolume) { - - currentVolume = lastCurrentVolume; - - } - - - function draw() { - - this.container.frame.draw(false, false, true); - - plotCurrentVolumeInfo(); - - } - - - function plotCurrentVolumeInfo() { - - if (currentVolume === undefined) { return; } - if (currentVolume.innerVolumeBar === undefined) { return; } - - const frameBodyHeight = currentVolumePanel.container.frame.getBodyHeight(); - const frameTitleHeight = currentVolumePanel.container.frame.height - frameBodyHeight; - - const X_AXIS = currentVolumePanel.container.frame.width / 2; - const Y_AXIS_BUY = frameTitleHeight + frameBodyHeight * 0.85; - const Y_AXIS_SELL = frameTitleHeight + frameBodyHeight * 0.15; - - var buyVolumePoint1 = { - x: X_AXIS - currentVolume.buyInfo.baseWidth / 2, - y: Y_AXIS_BUY - }; - - var buyVolumePoint2 = { - x: X_AXIS - currentVolume.buyInfo.topWidth / 2, - y: Y_AXIS_BUY + currentVolume.buyInfo.height - }; - - var buyVolumePoint3 = { - x: X_AXIS + currentVolume.buyInfo.topWidth / 2, - y: Y_AXIS_BUY + currentVolume.buyInfo.height - }; - - var buyVolumePoint4 = { - x: X_AXIS + currentVolume.buyInfo.baseWidth / 2, - y: Y_AXIS_BUY - }; - - buyVolumePoint1 = currentVolumePanel.container.frame.fitIntoFrame(buyVolumePoint1); - buyVolumePoint2 = currentVolumePanel.container.frame.fitIntoFrame(buyVolumePoint2); - buyVolumePoint3 = currentVolumePanel.container.frame.fitIntoFrame(buyVolumePoint3); - buyVolumePoint4 = currentVolumePanel.container.frame.fitIntoFrame(buyVolumePoint4); - - buyVolumePoint1 = currentVolumePanel.container.frame.frameThisPoint(buyVolumePoint1); - buyVolumePoint2 = currentVolumePanel.container.frame.frameThisPoint(buyVolumePoint2); - buyVolumePoint3 = currentVolumePanel.container.frame.frameThisPoint(buyVolumePoint3); - buyVolumePoint4 = currentVolumePanel.container.frame.frameThisPoint(buyVolumePoint4); - - var sellVolumePoint1 = { - x: X_AXIS - currentVolume.buyInfo.baseWidth / 2, - y: Y_AXIS_SELL - }; - - var sellVolumePoint2 = { - x: X_AXIS - currentVolume.buyInfo.topWidth / 2, - y: Y_AXIS_SELL + currentVolume.sellInfo.height - }; - - var sellVolumePoint3 = { - x: X_AXIS + currentVolume.buyInfo.topWidth / 2, - y: Y_AXIS_SELL + currentVolume.sellInfo.height - }; - - var sellVolumePoint4 = { - x: X_AXIS + currentVolume.buyInfo.baseWidth / 2, - y: Y_AXIS_SELL - }; - - sellVolumePoint1 = currentVolumePanel.container.frame.fitIntoFrame(sellVolumePoint1); - sellVolumePoint2 = currentVolumePanel.container.frame.fitIntoFrame(sellVolumePoint2); - sellVolumePoint3 = currentVolumePanel.container.frame.fitIntoFrame(sellVolumePoint3); - sellVolumePoint4 = currentVolumePanel.container.frame.fitIntoFrame(sellVolumePoint4); - - sellVolumePoint1 = currentVolumePanel.container.frame.frameThisPoint(sellVolumePoint1); - sellVolumePoint2 = currentVolumePanel.container.frame.frameThisPoint(sellVolumePoint2); - sellVolumePoint3 = currentVolumePanel.container.frame.frameThisPoint(sellVolumePoint3); - sellVolumePoint4 = currentVolumePanel.container.frame.frameThisPoint(sellVolumePoint4); - - const OPACITY = '0.40'; - - browserCanvasContext.beginPath(); - - browserCanvasContext.moveTo(buyVolumePoint1.x, buyVolumePoint1.y); - browserCanvasContext.lineTo(buyVolumePoint2.x, buyVolumePoint2.y); - browserCanvasContext.lineTo(buyVolumePoint3.x, buyVolumePoint3.y); - browserCanvasContext.lineTo(buyVolumePoint4.x, buyVolumePoint4.y); - - browserCanvasContext.closePath(); - - browserCanvasContext.strokeStyle = 'rgba(27, 105, 7, ' + OPACITY + ')'; - browserCanvasContext.fillStyle = 'rgba(64, 217, 26, ' + OPACITY + ')'; - - browserCanvasContext.fill(); - - browserCanvasContext.lineWidth = 1; - browserCanvasContext.stroke(); - - - browserCanvasContext.beginPath(); - - browserCanvasContext.moveTo(sellVolumePoint1.x, sellVolumePoint1.y); - browserCanvasContext.lineTo(sellVolumePoint2.x, sellVolumePoint2.y); - browserCanvasContext.lineTo(sellVolumePoint3.x, sellVolumePoint3.y); - browserCanvasContext.lineTo(sellVolumePoint4.x, sellVolumePoint4.y); - - browserCanvasContext.closePath(); - - browserCanvasContext.strokeStyle = 'rgba(130, 9, 9, ' + OPACITY + ')'; - browserCanvasContext.fillStyle = 'rgba(219, 18, 18, ' + OPACITY + ')'; - - browserCanvasContext.fill(); - - browserCanvasContext.lineWidth = 1; - browserCanvasContext.stroke(); - - - /* put the labels with the volumes values */ - - browserCanvasContext.beginPath(); - - printLabel('Buy Volume', X_AXIS, frameTitleHeight + frameBodyHeight * 0.95, '1'); - printLabel(currentVolume.innerVolumeBar.amountBuy, X_AXIS, frameTitleHeight + frameBodyHeight * 0.90, '0.50'); - - printLabel('Sell Volume', X_AXIS, frameTitleHeight + frameBodyHeight * 0.05, '1'); - printLabel(currentVolume.innerVolumeBar.amountSell, X_AXIS, frameTitleHeight + frameBodyHeight * 0.10, '0.50'); - - - function printLabel(labelToPrint, x, y, opacity) { - - let labelPoint; - let fontSize = 10; - - browserCanvasContext.font = fontSize + 'px Courier New'; - - let label = '' + labelToPrint; - - let xOffset = label.length / 2 * fontSize * FONT_ASPECT_RATIO; - - labelPoint = { - x: x - xOffset, - y: y - }; - - labelPoint = currentVolumePanel.container.frame.frameThisPoint(labelPoint); - - browserCanvasContext.fillStyle = 'rgba(60, 60, 60, ' + opacity + ')'; - browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y); - - } - - browserCanvasContext.closePath(); - browserCanvasContext.fill(); - - } - - -} - diff --git a/TimeMachine.js b/TimeMachine.js index 4e614cba1..8932b7b3e 100644 --- a/TimeMachine.js +++ b/TimeMachine.js @@ -22,8 +22,6 @@ function newTimeMachine() { container.zoom.containerName = "Time Machine"; container.frame.containerName = "Time Machine"; - let currentCandlePanel; - let currentVolumePanel; let botsPanel; let orderBookPanel; @@ -37,12 +35,6 @@ function newTimeMachine() { controlPanel.initialize(); this.controlPanel = controlPanel; - currentCandlePanel = newCurrentCandlePanel(); - currentCandlePanel.initialize(); - - currentVolumePanel = newCurrentVolumePanel(); - currentVolumePanel.initialize(); - orderBookPanel = newOrderBookPanel(); orderBookPanel.initialize(); @@ -67,7 +59,7 @@ function newTimeMachine() { timelineChart.container.frame.position.x = timeMachine.container.frame.width / 2 - timelineChart.container.frame.width / 2; timelineChart.container.frame.position.y = timelineChart.container.frame.height * 1.5 * iteration; - timelineChart.initialize(1, INITIAL_DEFAULT_MARKET, currentCandlePanel, currentVolumePanel, botsPanel, orderBookPanel, onDefaultMarketInitialized); + timelineChart.initialize(1, INITIAL_DEFAULT_MARKET, currentCandelPanel, currentVolumePanel, botsPanel, orderBookPanel, onDefaultMarketInitialized); iteration++; @@ -108,7 +100,7 @@ function newTimeMachine() { timelineChart.container.frame.position.x = timeMachine.container.frame.width / 2 - timelineChart.container.frame.width / 2; timelineChart.container.frame.position.y = timelineChart.container.frame.height * 1.5 * iteration; - timelineChart.initialize(1, key, currentCandlePanel, currentVolumePanel, botsPanel, orderBookPanel, finalSteps); + timelineChart.initialize(1, key, currentCandelPanel, currentVolumePanel, botsPanel, orderBookPanel, finalSteps); iteration++; @@ -252,7 +244,7 @@ function newTimeMachine() { this.controlPanel.draw(); - currentCandlePanel.draw(); + currentCandelPanel.draw(); currentVolumePanel.draw(); @@ -281,7 +273,7 @@ function newTimeMachine() { return container; } - container = currentCandlePanel.getContainer(point); + container = currentCandelPanel.getContainer(point); if (container !== undefined) { diff --git a/TimelineChart.js b/TimelineChart.js index 544dd2a62..d759ab12b 100644 --- a/TimelineChart.js +++ b/TimelineChart.js @@ -38,14 +38,12 @@ function newTimelineChart() { let initializationReady = false; - let currentCandlePanel; - let currentVolumePanel; let productsPanel; let orderBookPanel; return thisObject; - function initialize(exchange, market, currentCandlePanelToUse, currentVolumePanelToUse, pProductsPanel, orderBookPanelToUse, callBackFunction) { + function initialize(exchange, market, pProductsPanel, orderBookPanelToUse, callBackFunction) { /* Remember the Products Panel */ @@ -57,8 +55,6 @@ function newTimelineChart() { /* Legacy code to clean */ - currentCandlePanel = currentCandlePanelToUse; - currentVolumePanel = currentVolumePanelToUse; orderBookPanel = orderBookPanelToUse; marketId = market; diff --git a/index.html b/index.html index b9e5f7b63..f92007933 100644 --- a/index.html +++ b/index.html @@ -64,8 +64,6 @@ - -