From d2bec1a39bffd4c487842eb4b554956cf5cbc794 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 26 Mar 2019 10:02:57 +0100 Subject: [PATCH] Finalize() function implemented --- Conditions.js | 68 +++++++++++++++++++------------------------- TradingSimulation.js | 42 +++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 38 deletions(-) diff --git a/Conditions.js b/Conditions.js index c921c5c40..be917ba1c 100644 --- a/Conditions.js +++ b/Conditions.js @@ -12,6 +12,7 @@ // Main functions and properties. initialize: initialize, + finalize: finalize, container: undefined, getContainer: getContainer, setTimePeriod: setTimePeriod, @@ -50,18 +51,37 @@ let conditions = []; let headers; - let smileyHappy; - let smileySad; - let smileyGhost; - let smileyMonkeyEyes; - let smileyMonkeyEars; - let imageStrategy; - let imageStrategyPhase; - let imageStopLossPhase; - let imageBuyOrderPhase; - return thisObject; + function finalize() { + try { + + if (INFO_LOG === true) { logger.write("[INFO] finalize -> Entering function."); } + + /* 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); + + /* Destroyd References */ + + marketFiles = undefined; + dailyFiles = undefined; + + datetime = undefined; + timePeriod = undefined; + + marketFile = undefined; + fileCursor = undefined; + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] finalize -> err.message = " + err.message); } + } + } + function initialize(pStorage, pExchange, pMarket, pDatetime, pTimePeriod, callBackFunction) { try { @@ -98,34 +118,6 @@ recalculate(); - /* Loading a few icons */ - - smileyHappy = loadEmoji("Smiley/Emoji Smiley-51.png"); - smileySad = loadEmoji("Smiley/Emoji Smiley-26.png"); - smileyGhost = loadEmoji("Objects/Emoji Objects-12.png"); - smileyMonkeyEyes = loadEmoji("Smiley/Emoji Smiley-85.png"); - smileyMonkeyEars = loadEmoji("Smiley/Emoji Smiley-86.png"); - imageStrategy = loadEmoji("Places/Emoji Orte-90.png"); - imageStrategyPhase = loadEmoji("Places/Emoji Orte-91.png"); - imageStopLossPhase = loadEmoji("Objects/Emoji Objects-55.png"); - imageBuyOrderPhase = loadEmoji("Objects/Emoji Objects-114.png"); - - function loadEmoji(pPath) { - - let newImage; - - newImage = new Image(); - newImage.onload = onImageLoaded; - - function onImageLoaded() { - newImage.isLoaded = true; - } - - newImage.src = window.canvasApp.urlPrefix + "Images/Emoji/" + pPath; - - return newImage; - } - callBackFunction(); } catch (err) { diff --git a/TradingSimulation.js b/TradingSimulation.js index 768c232ee..a80ab4e41 100644 --- a/TradingSimulation.js +++ b/TradingSimulation.js @@ -12,6 +12,7 @@ // Main functions and properties. initialize: initialize, + finalize: finalize, container: undefined, getContainer: getContainer, setTimePeriod: setTimePeriod, @@ -61,6 +62,47 @@ return thisObject; + function finalize() { + try { + + if (INFO_LOG === true) { logger.write("[INFO] finalize -> Entering function."); } + + /* 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); + + /* icons */ + + smileyHappy = undefined; + smileySad = undefined; + smileyGhost = undefined; + smileyMonkeyEyes = undefined; + smileyMonkeyEars = undefined; + imageStrategy = undefined; + imageStrategyPhase = undefined; + imageStopLossPhase = undefined; + imageBuyOrderPhase = undefined; + + /* Destroy References */ + + marketFiles = undefined; + dailyFiles = undefined; + + datetime = undefined; + timePeriod = undefined; + + marketFile = undefined; + fileCursor = undefined; + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] finalize -> err.message = " + err.message); } + } + } + function initialize(pStorage, pExchange, pMarket, pDatetime, pTimePeriod, callBackFunction) { try {