From a0b331c6e1cbedf1c673f175e037d9ce07dd2476 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 27 Dec 2019 13:27:33 +0100 Subject: [PATCH] Time Frame Refectoring --- BollingerBands.js | 44 +++++++++++++++++++++--------------------- PercentageBandwidth.js | 42 ++++++++++++++++++++-------------------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index 211c7e0c6..852a1a081 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -14,7 +14,7 @@ finalize: finalize, container: undefined, getContainer: getContainer, - setTimePeriod: setTimePeriod, + setTimeFrame: setTimeFrame, setDatetime: setDatetime, draw: draw, recalculateScale: recalculateScale, @@ -36,14 +36,14 @@ let timeLineCoordinateSystem = newTimeLineCoordinateSystem(); // Needed to be able to plot on the timeline, otherwise not. - let timePeriod; // This will hold the current Time Period the user is at. + let timeFrame; // This will hold the current Time Frame the user is at. let datetime; // This will hold the current Datetime the user is at. let marketFile; // This is the current Market File being plotted. let fileCursor; // This is the current File Cursor being used to retrieve Daily Files. - let marketFiles; // This object will provide the different Market Files at different Time Periods. - let dailyFiles; // This object will provide the different File Cursors at different Time Periods. + let marketFiles; // This object will provide the different Market Files at different Time Frames. + let dailyFiles; // This object will provide the different File Cursors at different Time Frames. /* these are module specific variables: */ @@ -76,7 +76,7 @@ dailyFiles = undefined; datetime = undefined; - timePeriod = undefined; + timeFrame = undefined; marketFile = undefined; fileCursor = undefined; @@ -87,7 +87,7 @@ } } - function initialize(pStorage, pExchange, pMarket, pDatetime, pTimePeriod, callBackFunction) { + function initialize(pStorage, pExchange, pMarket, pDatetime, pTimeFrame, callBackFunction) { try { @@ -97,7 +97,7 @@ dailyFiles = pStorage.dailyFiles[0]; datetime = pDatetime; - timePeriod = pTimePeriod; + timeFrame = pTimeFrame; /* We need a Market File in order to calculate the Y scale, since this scale depends on actual data. */ @@ -107,8 +107,8 @@ /* Now we set the right files according to current Period. */ - marketFile = marketFiles.getFile(pTimePeriod); - fileCursor = dailyFiles.getFileCursor(pTimePeriod); + marketFile = marketFiles.getFile(pTimeFrame); + fileCursor = dailyFiles.getFileCursor(pTimeFrame); /* Listen to the necesary events. */ @@ -162,7 +162,7 @@ function onMarketFilesUpdated() { try { - let newMarketFile = marketFiles.getFile(timePeriod); + let newMarketFile = marketFiles.getFile(timeFrame); if (newMarketFile !== undefined) { marketFile = newMarketFile; recalculate(); @@ -174,7 +174,7 @@ function onDailyFilesUpdated() { try { - let newFileCursor = dailyFiles.getFileCursor(timePeriod); + let newFileCursor = dailyFiles.getFileCursor(timeFrame); if (newFileCursor !== undefined) { fileCursor = newFileCursor; recalculate(); @@ -184,17 +184,17 @@ } } - function setTimePeriod(pTimePeriod) { + function setTimeFrame(pTimeFrame) { try { - if (timePeriod !== pTimePeriod) { + if (timeFrame !== pTimeFrame) { - timePeriod = pTimePeriod; + timeFrame = pTimeFrame; - if (timePeriod >= _1_HOUR_IN_MILISECONDS) { + if (timeFrame >= _1_HOUR_IN_MILISECONDS) { - let newMarketFile = marketFiles.getFile(pTimePeriod); + let newMarketFile = marketFiles.getFile(pTimeFrame); if (newMarketFile !== undefined) { @@ -204,7 +204,7 @@ } else { - let newFileCursor = dailyFiles.getFileCursor(pTimePeriod); + let newFileCursor = dailyFiles.getFileCursor(pTimeFrame); if (newFileCursor !== undefined) { @@ -216,7 +216,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] setTimePeriod -> err = " + err.stack); } + if (ERROR_LOG === true) { logger.write("[ERROR] setTimeFrame -> err = " + err.stack); } } } @@ -262,7 +262,7 @@ try { - if (timePeriod >= _1_HOUR_IN_MILISECONDS) { + if (timeFrame >= _1_HOUR_IN_MILISECONDS) { recalculateUsingMarketFiles(); @@ -288,7 +288,7 @@ if (fileCursor.files.size === 0) { return; } // We need to wait until there are files in the cursor - let daysOnSides = getSideDays(timePeriod); + let daysOnSides = getSideDays(timeFrame); let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, timeLineCoordinateSystem); let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, timeLineCoordinateSystem); @@ -373,7 +373,7 @@ if (marketFile === undefined) { return; } // Initialization not complete yet. - let daysOnSides = getSideDays(timePeriod); + let daysOnSides = getSideDays(timeFrame); let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, timeLineCoordinateSystem); let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, timeLineCoordinateSystem); @@ -584,7 +584,7 @@ rightBodyHeight: bandPoint3.y - bandPoint4.y, topDelta: bandPoint3.y - bandPoint2.y, bottomDelta: bandPoint4.y - bandPoint1.y, - period: timePeriod, + period: timeFrame, innerBand: band }; diff --git a/PercentageBandwidth.js b/PercentageBandwidth.js index 549417b11..5cbc6640f 100644 --- a/PercentageBandwidth.js +++ b/PercentageBandwidth.js @@ -14,7 +14,7 @@ finalize: finalize, container: undefined, getContainer: getContainer, - setTimePeriod: setTimePeriod, + setTimeFrame: setTimeFrame, setDatetime: setDatetime, draw: draw, recalculateScale: recalculateScale, @@ -37,14 +37,14 @@ let plotAreaFrame = newTimeLineCoordinateSystem(); // Used for full frame view. let plotAreaViewport = newTimeLineCoordinateSystem(); // Used for viewport view. - let timePeriod; // This will hold the current Time Period the user is at. + let timeFrame; // This will hold the current Time Frame the user is at. let datetime; // This will hold the current Datetime the user is at. let marketFile; // This is the current Market File being plotted. let fileCursor; // This is the current File Cursor being used to retrieve Daily Files. - let marketFiles; // This object will provide the different Market Files at different Time Periods. - let dailyFiles; // This object will provide the different File Cursors at different Time Periods. + let marketFiles; // This object will provide the different Market Files at different Time Frames. + let dailyFiles; // This object will provide the different File Cursors at different Time Frames. /* these are module specific variables: */ @@ -77,7 +77,7 @@ dailyFiles = undefined; datetime = undefined; - timePeriod = undefined; + timeFrame = undefined; marketFile = undefined; fileCursor = undefined; @@ -88,7 +88,7 @@ } } - function initialize(pStorage, pExchange, pMarket, pDatetime, pTimePeriod, callBackFunction) { + function initialize(pStorage, pExchange, pMarket, pDatetime, pTimeFrame, callBackFunction) { try { @@ -98,7 +98,7 @@ dailyFiles = pStorage.dailyFiles[0]; datetime = pDatetime; - timePeriod = pTimePeriod; + timeFrame = pTimeFrame; /* We need a Market File in order to calculate the Y scale, since this scale depends on actual data. */ @@ -109,8 +109,8 @@ /* Now we set the right files according to current Period. */ - marketFile = marketFiles.getFile(pTimePeriod); - fileCursor = dailyFiles.getFileCursor(pTimePeriod); + marketFile = marketFiles.getFile(pTimeFrame); + fileCursor = dailyFiles.getFileCursor(pTimeFrame); /* Listen to the necesary events. */ @@ -172,7 +172,7 @@ function onMarketFilesUpdated() { try { - let newMarketFile = marketFiles.getFile(timePeriod); + let newMarketFile = marketFiles.getFile(timeFrame); if (newMarketFile !== undefined) { marketFile = newMarketFile; recalculate(); @@ -184,7 +184,7 @@ function onDailyFilesUpdated() { try { - let newFileCursor = dailyFiles.getFileCursor(timePeriod); + let newFileCursor = dailyFiles.getFileCursor(timeFrame); if (newFileCursor !== undefined) { fileCursor = newFileCursor; recalculate(); @@ -194,17 +194,17 @@ } } - function setTimePeriod(pTimePeriod) { + function setTimeFrame(pTimeFrame) { try { - if (timePeriod !== pTimePeriod) { + if (timeFrame !== pTimeFrame) { - timePeriod = pTimePeriod; + timeFrame = pTimeFrame; - if (timePeriod >= _1_HOUR_IN_MILISECONDS) { + if (timeFrame >= _1_HOUR_IN_MILISECONDS) { - let newMarketFile = marketFiles.getFile(pTimePeriod); + let newMarketFile = marketFiles.getFile(pTimeFrame); if (newMarketFile !== undefined) { @@ -214,7 +214,7 @@ } else { - let newFileCursor = dailyFiles.getFileCursor(pTimePeriod); + let newFileCursor = dailyFiles.getFileCursor(pTimeFrame); if (newFileCursor !== undefined) { @@ -226,7 +226,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] setTimePeriod -> err = " + err.stack); } + if (ERROR_LOG === true) { logger.write("[ERROR] setTimeFrame -> err = " + err.stack); } } } @@ -272,7 +272,7 @@ try { - if (timePeriod >= _1_HOUR_IN_MILISECONDS) { + if (timeFrame >= _1_HOUR_IN_MILISECONDS) { recalculateUsingMarketFiles(); @@ -298,7 +298,7 @@ if (fileCursor.files.size === 0) { return; } // We need to wait until there are files in the cursor - let daysOnSides = getSideDays(timePeriod); + let daysOnSides = getSideDays(timeFrame); let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, plotAreaFrame); let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, plotAreaFrame); @@ -383,7 +383,7 @@ if (marketFile === undefined) { return; } // Initialization not complete yet. - let daysOnSides = getSideDays(timePeriod); + let daysOnSides = getSideDays(timeFrame); let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, plotAreaFrame); let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, plotAreaFrame);