From e65a2f0f537bd64254e6c3f771f3a854073eb39e Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 22 Sep 2019 11:28:42 +0200 Subject: [PATCH] Daily Files Updated Events now Handled --- Conditions.js | 51 +++++++++++++++++++++++++++---------------- Strategies.js | 52 +++++++++++++++++++++++++++----------------- Trades.js | 51 +++++++++++++++++++++++++++---------------- TradingSimulation.js | 29 +++++++++++++++--------- 4 files changed, 115 insertions(+), 68 deletions(-) diff --git a/Conditions.js b/Conditions.js index 19330e420..959587c73 100644 --- a/Conditions.js +++ b/Conditions.js @@ -53,6 +53,13 @@ let noDefinitionOnFocusErrorDisplayed = false + let zoomChangedEventSubscriptionId + let offsetChangedEventSubscriptionId + let dragFinishedEventSubscriptionId + let dimmensionsChangedEventSubscriptionId + let marketFilesUpdatedEventSubscriptionId + let dailyFilesUpdatedEventSubscriptionId + return thisObject; function finalize() { @@ -62,11 +69,12 @@ /* Stop listening to the necesary events. */ - viewPort.eventHandler.stopListening("Zoom Changed", onZoomChanged); - viewPort.eventHandler.stopListening("Offset Changed", onOffsetChanged); - marketFiles.eventHandler.stopListening("Files Updated", onFilesUpdated); - canvas.eventHandler.stopListening("Drag Finished", onDragFinished); - thisObject.container.eventHandler.stopListening('Dimmensions Changed') + viewPort.eventHandler.stopListening(zoomChangedEventSubscriptionId); + viewPort.eventHandler.stopListening(offsetChangedEventSubscriptionId); + canvas.eventHandler.stopListening(dragFinishedEventSubscriptionId); + thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId) + marketFiles.eventHandler.stopListening(marketFilesUpdatedEventSubscriptionId); + dailyFiles.eventHandler.stopListening(dailyFilesUpdatedEventSubscriptionId); /* Destroyd References */ @@ -112,10 +120,11 @@ /* Listen to the necesary events. */ - viewPort.eventHandler.listenToEvent("Zoom Changed", onZoomChanged); - viewPort.eventHandler.listenToEvent("Offset Changed", onOffsetChanged); - marketFiles.eventHandler.listenToEvent("Files Updated", onFilesUpdated); - canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished); + zoomChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Zoom Changed", onZoomChanged); + offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Offset Changed", onOffsetChanged); + 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. */ @@ -123,7 +132,7 @@ /* Ready for when dimmension changes. */ - thisObject.container.eventHandler.listenToEvent('Dimmensions Changed', function () { + dimmensionsChangedEventSubscriptionId = thisObject.container.eventHandler.listenToEvent('Dimmensions Changed', function () { recalculateScale() recalculate(); }) @@ -163,23 +172,27 @@ } } - function onFilesUpdated() { - + function onMarketFilesUpdated() { try { - - if (INFO_LOG === true) { logger.write("[INFO] onFilesUpdated -> Entering function."); } - 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); } } } diff --git a/Strategies.js b/Strategies.js index 77c5185d9..b868979bf 100644 --- a/Strategies.js +++ b/Strategies.js @@ -49,9 +49,15 @@ /* these are module specific variables: */ let strategies = []; - let strategyImages = []; + let zoomChangedEventSubscriptionId + let offsetChangedEventSubscriptionId + let dragFinishedEventSubscriptionId + let dimmensionsChangedEventSubscriptionId + let marketFilesUpdatedEventSubscriptionId + let dailyFilesUpdatedEventSubscriptionId + return thisObject; function finalize() { @@ -61,11 +67,12 @@ /* Stop listening to the necesary events. */ - viewPort.eventHandler.stopListening("Zoom Changed", onZoomChanged); - viewPort.eventHandler.stopListening("Offset Changed", onOffsetChanged); - marketFiles.eventHandler.stopListening("Files Updated", onFilesUpdated); - canvas.eventHandler.stopListening("Drag Finished", onDragFinished); - thisObject.container.eventHandler.stopListening('Dimmensions Changed') + viewPort.eventHandler.stopListening(zoomChangedEventSubscriptionId); + viewPort.eventHandler.stopListening(offsetChangedEventSubscriptionId); + canvas.eventHandler.stopListening(dragFinishedEventSubscriptionId); + thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId) + marketFiles.eventHandler.stopListening(marketFilesUpdatedEventSubscriptionId); + dailyFiles.eventHandler.stopListening(dailyFilesUpdatedEventSubscriptionId); /* Destroyd References */ @@ -113,10 +120,11 @@ /* Listen to the necesary events. */ - viewPort.eventHandler.listenToEvent("Zoom Changed", onZoomChanged); - viewPort.eventHandler.listenToEvent("Offset Changed", onOffsetChanged); - marketFiles.eventHandler.listenToEvent("Files Updated", onFilesUpdated); - canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished); + zoomChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Zoom Changed", onZoomChanged); + offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Offset Changed", onOffsetChanged); + 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. */ @@ -124,7 +132,7 @@ /* Ready for when dimmension changes. */ - thisObject.container.eventHandler.listenToEvent('Dimmensions Changed', function () { + dimmensionsChangedEventSubscriptionId = thisObject.container.eventHandler.listenToEvent('Dimmensions Changed', function () { recalculateScale() recalculate(); }) @@ -169,23 +177,27 @@ } } - function onFilesUpdated() { - + function onMarketFilesUpdated() { try { - - if (INFO_LOG === true) { logger.write("[INFO] onFilesUpdated -> Entering function."); } - 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); } } } diff --git a/Trades.js b/Trades.js index bf4220182..a1a903e04 100644 --- a/Trades.js +++ b/Trades.js @@ -51,6 +51,13 @@ let trades = []; let headers; + let zoomChangedEventSubscriptionId + let offsetChangedEventSubscriptionId + let dragFinishedEventSubscriptionId + let dimmensionsChangedEventSubscriptionId + let marketFilesUpdatedEventSubscriptionId + let dailyFilesUpdatedEventSubscriptionId + return thisObject; function finalize() { @@ -60,11 +67,12 @@ /* Stop listening to the necesary events. */ - viewPort.eventHandler.stopListening("Zoom Changed", onZoomChanged); - viewPort.eventHandler.stopListening("Offset Changed", onOffsetChanged); - marketFiles.eventHandler.stopListening("Files Updated", onFilesUpdated); - canvas.eventHandler.stopListening("Drag Finished", onDragFinished); - thisObject.container.eventHandler.stopListening('Dimmensions Changed') + viewPort.eventHandler.stopListening(zoomChangedEventSubscriptionId); + viewPort.eventHandler.stopListening(offsetChangedEventSubscriptionId); + canvas.eventHandler.stopListening(dragFinishedEventSubscriptionId); + thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId) + marketFiles.eventHandler.stopListening(marketFilesUpdatedEventSubscriptionId); + dailyFiles.eventHandler.stopListening(dailyFilesUpdatedEventSubscriptionId); /* Destroyd References */ @@ -110,10 +118,11 @@ /* Listen to the necesary events. */ - viewPort.eventHandler.listenToEvent("Zoom Changed", onZoomChanged); - viewPort.eventHandler.listenToEvent("Offset Changed", onOffsetChanged); - marketFiles.eventHandler.listenToEvent("Files Updated", onFilesUpdated); - canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished); + zoomChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Zoom Changed", onZoomChanged); + offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Offset Changed", onOffsetChanged); + 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. */ @@ -121,7 +130,7 @@ /* Ready for when dimmension changes. */ - thisObject.container.eventHandler.listenToEvent('Dimmensions Changed', function () { + dimmensionsChangedEventSubscriptionId = thisObject.container.eventHandler.listenToEvent('Dimmensions Changed', function () { recalculateScale() recalculate(); }) @@ -161,23 +170,27 @@ } } - function onFilesUpdated() { - + function onMarketFilesUpdated() { try { - - if (INFO_LOG === true) { logger.write("[INFO] onFilesUpdated -> Entering function."); } - 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); } } } diff --git a/TradingSimulation.js b/TradingSimulation.js index eaf31f481..a0579d2a2 100644 --- a/TradingSimulation.js +++ b/TradingSimulation.js @@ -55,9 +55,10 @@ let zoomChangedEventSubscriptionId let offsetChangedEventSubscriptionId - let filesUpdatedEventSubscriptionId let dragFinishedEventSubscriptionId let dimmensionsChangedEventSubscriptionId + let marketFilesUpdatedEventSubscriptionId + let dailyFilesUpdatedEventSubscriptionId return thisObject; @@ -68,9 +69,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); /* icons */ @@ -122,8 +124,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. */ @@ -161,21 +164,27 @@ } } - 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); } } }