From bbdf49fef645e7d12cce51641f04e71c836e8ece Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 22 Sep 2019 11:29:21 +0200 Subject: [PATCH] Daily Files Updated Events now Handled --- Candles.js | 47 +++++++++++++++++++---------------------------- Volumes.js | 33 +++++++++++++++++++++------------ 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Candles.js b/Candles.js index c5fef30d0..4109cffad 100644 --- a/Candles.js +++ b/Candles.js @@ -51,9 +51,10 @@ let zoomChangedEventSubscriptionId let offsetChangedEventSubscriptionId - let filesUpdatedEventSubscriptionId let dragFinishedEventSubscriptionId let dimmensionsChangedEventSubscriptionId + let marketFilesUpdatedEventSubscriptionId + let dailyFilesUpdatedEventSubscriptionId return thisObject; @@ -64,9 +65,10 @@ viewPort.eventHandler.stopListening(zoomChangedEventSubscriptionId); viewPort.eventHandler.stopListening(offsetChangedEventSubscriptionId); - marketFiles.eventHandler.stopListening(filesUpdatedEventSubscriptionId); canvas.eventHandler.stopListening(dragFinishedEventSubscriptionId); thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId) + marketFiles.eventHandler.stopListening(marketFilesUpdatedEventSubscriptionId); + dailyFiles.eventHandler.stopListening(dailyFilesUpdatedEventSubscriptionId); /* Destroyd References */ @@ -112,8 +114,9 @@ zoomChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Zoom Changed", onZoomChanged); offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Offset Changed", onOffsetChanged); - filesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onFilesUpdated); dragFinishedEventSubscriptionId = canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished); + marketFilesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onMarketFilesUpdated); + dailyFilesUpdatedEventSubscriptionId = dailyFiles.eventHandler.listenToEvent("Files Updated", onDailyFilesUpdated); /* Get ready for plotting. */ @@ -157,48 +160,46 @@ } } - function onFilesUpdated() { - + function onMarketFilesUpdated() { try { - let newMarketFile = marketFiles.getFile(timePeriod); - if (newMarketFile !== undefined) { - marketFile = newMarketFile; recalculate(); } - } catch (err) { + if (ERROR_LOG === true) { logger.write("[ERROR] onMarketFilesUpdated -> err = " + err.stack); } + } + } - if (ERROR_LOG === true) { logger.write("[ERROR] onFilesUpdated -> err = " + err.stack); } + function onDailyFilesUpdated() { + try { + let newFileCursor = dailyFiles.getFileCursor(timePeriod); + if (newFileCursor !== undefined) { + fileCursor = newFileCursor; + recalculate(); + } + } catch (err) { + if (ERROR_LOG === true) { logger.write("[ERROR] onDailyFilesUpdated -> err = " + err.stack); } } } function setTimePeriod(pTimePeriod) { try { - if (timePeriod !== pTimePeriod) { - timePeriod = pTimePeriod; if (timePeriod >= _1_HOUR_IN_MILISECONDS) { - let newMarketFile = marketFiles.getFile(pTimePeriod); - if (newMarketFile !== undefined) { - marketFile = newMarketFile; recalculate(); } } else { - let newFileCursor = dailyFiles.getFileCursor(pTimePeriod); - if (newFileCursor !== undefined) { - fileCursor = newFileCursor; recalculate(); } @@ -452,18 +453,10 @@ let upperEnd = rightDate.valueOf(); if (candles.length > 0) { - if (candles[0].begin > lowerEnd || candles[candles.length - 1].end < upperEnd) { - setTimeout(recalculate, 2000); - - //console.log("File missing while calculating candles, scheduling a recalculation in 2 seconds."); - } } - - //console.log("Olivia > recalculateUsingDailyFiles > total candles generated : " + candles.length); - } catch (err) { if (ERROR_LOG === true) { logger.write("[ERROR] recalculateUsingDailyFiles -> err = " + err.stack); } @@ -526,8 +519,6 @@ } } - //console.log("Olivia > recalculateUsingMarketFiles > total candles generated : " + candles.length); - } catch (err) { if (ERROR_LOG === true) { logger.write("[ERROR] recalculateUsingMarketFiles -> err = " + err.stack); } diff --git a/Volumes.js b/Volumes.js index 7420a8c8d..f94b8322a 100644 --- a/Volumes.js +++ b/Volumes.js @@ -49,9 +49,10 @@ let zoomChangedEventSubscriptionId let offsetChangedEventSubscriptionId - let filesUpdatedEventSubscriptionId let dragFinishedEventSubscriptionId let dimmensionsChangedEventSubscriptionId + let marketFilesUpdatedEventSubscriptionId + let dailyFilesUpdatedEventSubscriptionId return thisObject; @@ -62,9 +63,10 @@ viewPort.eventHandler.stopListening(zoomChangedEventSubscriptionId); viewPort.eventHandler.stopListening(offsetChangedEventSubscriptionId); - marketFiles.eventHandler.stopListening(filesUpdatedEventSubscriptionId); canvas.eventHandler.stopListening(dragFinishedEventSubscriptionId); thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId) + marketFiles.eventHandler.stopListening(marketFilesUpdatedEventSubscriptionId); + dailyFiles.eventHandler.stopListening(dailyFilesUpdatedEventSubscriptionId); /* Destroyd References */ @@ -108,8 +110,9 @@ zoomChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Zoom Changed", onZoomChanged); offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Offset Changed", onOffsetChanged); - filesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onFilesUpdated); dragFinishedEventSubscriptionId = canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished); + marketFilesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onMarketFilesUpdated); + dailyFilesUpdatedEventSubscriptionId = dailyFiles.eventHandler.listenToEvent("Files Updated", onDailyFilesUpdated); /* Get ready for plotting. */ @@ -164,25 +167,31 @@ } } - function onFilesUpdated() { - + function onMarketFilesUpdated() { try { - let newMarketFile = marketFiles.getFile(timePeriod); - if (newMarketFile !== undefined) { - marketFile = newMarketFile; - recalculateScaleX(); recalculate(); recalculateScaleY(); - } - } catch (err) { + if (ERROR_LOG === true) { logger.write("[ERROR] onMarketFilesUpdated -> err = " + err.stack); } + } + } - if (ERROR_LOG === true) { logger.write("[ERROR] onFilesUpdated -> err = " + err.stack); } + function onDailyFilesUpdated() { + try { + let newFileCursor = dailyFiles.getFileCursor(timePeriod); + if (newFileCursor !== undefined) { + fileCursor = newFileCursor; + recalculateScaleX(); + recalculate(); + recalculateScaleY(); + } + } catch (err) { + if (ERROR_LOG === true) { logger.write("[ERROR] onDailyFilesUpdated -> err = " + err.stack); } } }