From b312fce32ff4abb6e06e57b0581cb2e63c4c4a34 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 20 Feb 2018 14:07:39 +0100 Subject: [PATCH] initializeFileCursorCache --- .vs/AAOlivia-Plotter/v15/.suo | Bin 17920 -> 16896 bytes Candlestick.js | 31 +++++++++++++++++++------------ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/.vs/AAOlivia-Plotter/v15/.suo b/.vs/AAOlivia-Plotter/v15/.suo index 762c3ed89debcff5083218eb54d9a5b139a59e64..299a4f30bac7d46ebc9afd3c02596aabad995a48 100644 GIT binary patch delta 78 zcmZqZVQgq&oM0f!00ROH41z#5BM|@l|NlQom~pZrhyBKc62?hPIjkRU&EN06xsd5M WGi!p?uXR8s+Xf3pqs>b8_m}|fITscH delta 89 zcmZo@VQlDOoM0f!!~g{X3=AwlCL<94`~UwxNR)Z9BZvLQgc8O{OgXFnQR*@7_B!e+23Q@WT(goWdZ;U@f!F5 diff --git a/Candlestick.js b/Candlestick.js index 43fc62ae6..a1dcadf67 100644 --- a/Candlestick.js +++ b/Candlestick.js @@ -43,9 +43,6 @@ fileCache = newFileCache(); fileCache.initialize("AAMasters", "AAOlivia", "Market Candles", "Market Candlesticks", pExchange, pMarket, onFileReady); - fileCursorCache = newFileCursorCache(); - fileCursorCache.initialize("AAMasters", "AAOlivia", "Daily Candles", "Daily Candlesticks", pExchange, pMarket, pDatetime, onFileCursorReady); - function onFileReady() { let newMarketFile = fileCache.getFile(ONE_DAY_IN_MILISECONDS); @@ -54,19 +51,18 @@ marketFile = newMarketFile; - recalculateScale(); // With any of the market files we can calculate the scale. - - layerStatus = chartLayersPanel.getLayerStatus(chartLayersPanel.layerNames.OLIVIA_CANDLES); - - recalculateCandles(); - postitionViewPort(); - - viewPort.eventHandler.listenToEvent("Zoom Changed", onZoomChanged); - canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished); + initializeFileCursorCache(); } } + function initializeFileCursorCache() { + + fileCursorCache = newFileCursorCache(); + fileCursorCache.initialize("AAMasters", "AAOlivia", "Daily Candles", "Daily Candlesticks", pExchange, pMarket, pDatetime, onFileCursorReady); + + } + function onFileCursorReady() { let newFileCursor = fileCursorCache.getFileCursor(pTimePeriod); @@ -80,6 +76,17 @@ if (dailyFile !== undefined) { fileCursor = newFileCursor; + + recalculateScale(); // With any of the market files we can calculate the scale. + + layerStatus = chartLayersPanel.getLayerStatus(chartLayersPanel.layerNames.OLIVIA_CANDLES); + + recalculateCandles(); + postitionViewPort(); + + viewPort.eventHandler.listenToEvent("Zoom Changed", onZoomChanged); + canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished); + callBackFunction(); }