From 450016e75dfae1871e70661ede4a88f52f25a21f Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 20 Feb 2019 09:28:14 +0100 Subject: [PATCH 01/54] Initial commit --- .gitattributes | 2 + .gitignore | 11 + BollingerBands.js | 709 +++++++++++++++++++++++++++++++++++ BollingerBands.png | Bin 0 -> 10842 bytes BollingerBandsPanel.js | 208 ++++++++++ LICENSE | 661 ++++++++++++++++++++++++++++++++ Plotters-Bollinger-Bands.sln | 25 ++ Project.njsproj | 68 ++++ README.md | 1 + this.plotter.config.json | 20 + 10 files changed, 1705 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 BollingerBands.js create mode 100644 BollingerBands.png create mode 100644 BollingerBandsPanel.js create mode 100644 LICENSE create mode 100644 Plotters-Bollinger-Bands.sln create mode 100644 Project.njsproj create mode 100644 README.md create mode 100644 this.plotter.config.json diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..dfe077042 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Auto detect text files and perform LF normalization +* text=auto diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..82c487bdd --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ + +.vs/* +obj/* + +bin/* + +*.config +*.log +*.cache +node_modules/* + diff --git a/BollingerBands.js b/BollingerBands.js new file mode 100644 index 000000000..cce97f783 --- /dev/null +++ b/BollingerBands.js @@ -0,0 +1,709 @@ +function newAAMastersPlottersBollingerBandsBollingerBands () +{ + + const MODULE_NAME = "Bands Plotter"; + const INFO_LOG = false; + const ERROR_LOG = true; + const INTENSIVE_LOG = false; + const logger = newWebDebugLog(); + logger.fileName = MODULE_NAME; + + let thisObject = { + + // Main functions and properties. + + initialize: initialize, + container: undefined, + getContainer: getContainer, + setTimePeriod: setTimePeriod, + setDatetime: setDatetime, + draw: draw, + recalculateScale: recalculateScale, + + /* Events declared outside the plotter. */ + + onDailyFileLoaded: onDailyFileLoaded, + + // Secondary functions and properties. + + currentBand: undefined + }; + + /* this is part of the module template */ + + let container = newContainer(); // Do not touch this 3 lines, they are just needed. + container.initialize(); + thisObject.container = container; + + 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 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. + + /* these are module specific variables: */ + + let bands = []; // Here we keep the bands to be ploted every time the Draw() function is called by the AAWebPlatform. + + return thisObject; + + function initialize(pStorage, pExchange, pMarket, pDatetime, pTimePeriod, callBackFunction) { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] initialize -> Entering function."); } + + /* Store the information received. */ + + marketFiles = pStorage.marketFiles[0]; + dailyFiles = pStorage.dailyFiles[0]; + + datetime = pDatetime; + timePeriod = pTimePeriod; + + /* We need a Market File in order to calculate the Y scale, since this scale depends on actual data. */ + + marketFile = marketFiles.getFile(ONE_DAY_IN_MILISECONDS); // This file is the one processed faster. + + recalculateScale(); + + /* Now we set the right files according to current Period. */ + + marketFile = marketFiles.getFile(pTimePeriod); + fileCursor = dailyFiles.getFileCursor(pTimePeriod); + + /* 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); + + /* Get ready for plotting. */ + + recalculate(); + + callBackFunction(); + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] initialize -> err.message = " + err.message); } + } + } + + function getContainer(point) { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] getContainer -> Entering function."); } + + let container; + + /* First we check if this point is inside this space. */ + + if (this.container.frame.isThisPointHere(point) === true) { + + return this.container; + + } else { + + /* This point does not belong to this space. */ + + return undefined; + } + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] getContainer -> err.message = " + err.message); } + } + } + + function onFilesUpdated() { + + 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] onFilesUpdated -> err.message = " + err.message); } + } + } + + function setTimePeriod(pTimePeriod) { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] setTimePeriod -> Entering function."); } + + 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(); + } + } + } + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] setTimePeriod -> err.message = " + err.message); } + } + } + + function setDatetime(pDatetime) { + + if (INFO_LOG === true) { logger.write("[INFO] setDatetime -> Entering function."); } + + datetime = pDatetime; + + } + + function onDailyFileLoaded(event) { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] onDailyFileLoaded -> Entering function."); } + + if (event.currentValue === event.totalValue) { + + /* This happens only when all of the files in the cursor have been loaded. */ + + recalculate(); + + } + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] onDailyFileLoaded -> err.message = " + err.message); } + } + } + + function draw() { + + try { + + if (INTENSIVE_LOG === true) { logger.write("[INFO] draw -> Entering function."); } + + this.container.frame.draw(); + + plotChart(); + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] draw -> err.message = " + err.message); } + } + } + + function recalculate() { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] recalculate -> Entering function."); } + + if (timePeriod >= _1_HOUR_IN_MILISECONDS) { + + recalculateUsingMarketFiles(); + + } else { + + recalculateUsingDailyFiles(); + + } + + thisObject.container.eventHandler.raiseEvent("Bands Changed", bands); + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] recalculate -> err.message = " + err.message); } + } + } + + function recalculateUsingDailyFiles() { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] recalculateUsingDailyFiles -> Entering function."); } + + if (fileCursor === undefined) { return; } // We need to wait + + if (fileCursor.files.size === 0) { return; } // We need to wait until there are files in the cursor + + let daysOnSides = getSideDays(timePeriod); + + let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, timeLineCoordinateSystem); + let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, timeLineCoordinateSystem); + + let dateDiff = rightDate.valueOf() - leftDate.valueOf(); + + let farLeftDate = new Date(leftDate.valueOf() - dateDiff * 1.5); + let farRightDate = new Date(rightDate.valueOf() + dateDiff * 1.5); + + let currentDate = new Date(farLeftDate.valueOf()); + + bands = []; + + while (currentDate.valueOf() <= farRightDate.valueOf() + ONE_DAY_IN_MILISECONDS) { + + let stringDate = currentDate.getFullYear() + '-' + pad(currentDate.getMonth() + 1, 2) + '-' + pad(currentDate.getDate(), 2); + + let dailyFile = fileCursor.files.get(stringDate); + + if (dailyFile !== undefined) { + + for (let i = 0; i < dailyFile.length; i++) { + + let band = { + begin: undefined, + end: undefined, + movingAverage: undefined, + standardDeviation: undefined + }; + + band.begin = dailyFile[i][0]; + band.end = dailyFile[i][1]; + band.movingAverage = dailyFile[i][2]; + band.standardDeviation = dailyFile[i][3]; + + if (band.begin >= farLeftDate.valueOf() && band.end <= farRightDate.valueOf()) { + + bands.push(band); + + if (datetime.valueOf() >= band.begin && datetime.valueOf() <= band.end) { + + thisObject.currentBand = band; + thisObject.container.eventHandler.raiseEvent("Current Band Changed", thisObject.currentBand); + + } + } + } + } + + currentDate = new Date(currentDate.valueOf() + ONE_DAY_IN_MILISECONDS); + } + + /* Lests check if all the visible screen is going to be covered by bands. */ + + let lowerEnd = leftDate.valueOf(); + let upperEnd = rightDate.valueOf(); + + if (bands.length > 0) { + + if (bands[0].begin > lowerEnd || bands[bands.length - 1].end < upperEnd) { + + setTimeout(recalculate, 2000); + + //console.log("File missing while calculating bands, scheduling a recalculation in 2 seconds."); + + } + } + + //console.log("Olivia > recalculateUsingDailyFiles > total bands generated : " + bands.length); + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] recalculateUsingDailyFiles -> err.message = " + err.message); } + } + } + + function recalculateUsingMarketFiles() { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] recalculateUsingMarketFiles -> Entering function."); } + + if (marketFile === undefined) { return; } // Initialization not complete yet. + + let daysOnSides = getSideDays(timePeriod); + + let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, timeLineCoordinateSystem); + let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, timeLineCoordinateSystem); + + let dateDiff = rightDate.valueOf() - leftDate.valueOf(); + + leftDate = new Date(leftDate.valueOf() - dateDiff * 1.5); + rightDate = new Date(rightDate.valueOf() + dateDiff * 1.5); + + bands = []; + + for (let i = 0; i < marketFile.length; i++) { + + let band = { + begin: undefined, + end: undefined, + movingAverage: undefined, + standardDeviation: undefined + }; + + band.begin = marketFile[i][0]; + band.end = marketFile[i][1]; + band.movingAverage = marketFile[i][2]; + band.standardDeviation = marketFile[i][3]; + + if (band.begin >= leftDate.valueOf() && band.end <= rightDate.valueOf()) { + + bands.push(band); + + if (datetime.valueOf() >= band.begin && datetime.valueOf() <= band.end) { + + thisObject.currentBand = band; + thisObject.container.eventHandler.raiseEvent("Current Band Changed", thisObject.currentBand); + + } + } + } + + //console.log("Olivia > recalculateUsingMarketFiles > total bands generated : " + bands.length); + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] recalculateUsingMarketFiles -> err.message = " + err.message); } + } + } + + function recalculateScale() { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] recalculateScale -> Entering function."); } + + if (marketFile === undefined) { return; } // We need the market file to be loaded to make the calculation. + + if (timeLineCoordinateSystem.maxValue > 0) { return; } // Already calculated. + + let minValue = { + x: EARLIEST_DATE.valueOf(), + y: 0 + }; + + let maxValue = { + x: MAX_PLOTABLE_DATE.valueOf(), + y: nextPorwerOf10(getMaxRate()) / 4 // TODO: This 4 is temporary + }; + + + timeLineCoordinateSystem.initialize( + minValue, + maxValue, + thisObject.container.frame.width, + thisObject.container.frame.height + ); + + function getMaxRate() { + + if (INFO_LOG === true) { logger.write("[INFO] recalculateScale -> getMaxRate -> Entering function."); } + + let maxValue = 0; + + for (let i = 0; i < marketFile.length; i++) { + + let currentMax = marketFile[i][2]; // 2 = movingAvarage. + + if (maxValue < currentMax) { + maxValue = currentMax; + } + } + + return maxValue; + + } + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] recalculateScale -> err.message = " + err.message); } + } + } + + function plotChart() { + + try { + + if (INTENSIVE_LOG === true) { logger.write("[INFO] plotChart -> Entering function."); } + + let band; + let previousBand; + + if (bands.length > 0) { + + /* Now we calculate and plot the bands */ + + for (let i = 1; i < bands.length; i++) { + + band = bands[i]; + previousBand = bands[i - 1]; + + let bandPoint1 = { + x: band.begin, + y: previousBand.movingAverage - 2 * previousBand.standardDeviation + }; + + let bandPoint2 = { + x: band.begin, + y: previousBand.movingAverage + 2 * previousBand.standardDeviation + }; + + let bandPoint3 = { + x: band.end, + y: band.movingAverage + 2 * band.standardDeviation + }; + + let bandPoint4 = { + x: band.end, + y: band.movingAverage - 2 * band.standardDeviation + }; + + let bandPoint5 = { + x: band.begin, + y: previousBand.movingAverage + }; + + let bandPoint6 = { + x: band.end, + y: band.movingAverage + }; + + bandPoint1 = timeLineCoordinateSystem.transformThisPoint(bandPoint1); + bandPoint2 = timeLineCoordinateSystem.transformThisPoint(bandPoint2); + bandPoint3 = timeLineCoordinateSystem.transformThisPoint(bandPoint3); + bandPoint4 = timeLineCoordinateSystem.transformThisPoint(bandPoint4); + bandPoint5 = timeLineCoordinateSystem.transformThisPoint(bandPoint5); + bandPoint6 = timeLineCoordinateSystem.transformThisPoint(bandPoint6); + + bandPoint1 = transformThisPoint(bandPoint1, thisObject.container); + bandPoint2 = transformThisPoint(bandPoint2, thisObject.container); + bandPoint3 = transformThisPoint(bandPoint3, thisObject.container); + bandPoint4 = transformThisPoint(bandPoint4, thisObject.container); + bandPoint5 = transformThisPoint(bandPoint5, thisObject.container); + bandPoint6 = transformThisPoint(bandPoint6, thisObject.container); + + if (bandPoint2.x < viewPort.visibleArea.bottomLeft.x || bandPoint1.x > viewPort.visibleArea.bottomRight.x) { + continue; + } + + bandPoint1 = viewPort.fitIntoVisibleArea(bandPoint1); + bandPoint2 = viewPort.fitIntoVisibleArea(bandPoint2); + bandPoint3 = viewPort.fitIntoVisibleArea(bandPoint3); + bandPoint4 = viewPort.fitIntoVisibleArea(bandPoint4); + bandPoint5 = viewPort.fitIntoVisibleArea(bandPoint5); + bandPoint6 = viewPort.fitIntoVisibleArea(bandPoint6); + + + + /* First we are drawing a semi-transparent background */ + + browserCanvasContext.beginPath(); + + browserCanvasContext.moveTo(bandPoint1.x, bandPoint1.y); + browserCanvasContext.lineTo(bandPoint2.x, bandPoint2.y); + browserCanvasContext.lineTo(bandPoint3.x, bandPoint3.y); + browserCanvasContext.lineTo(bandPoint4.x, bandPoint4.y); + + browserCanvasContext.closePath(); + + if (datetime !== undefined) { + + let dateValue = datetime.valueOf(); + + if (dateValue >= band.begin && dateValue <= band.end) { + + /* highlight the current band */ + + browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 0.05)'; // Current band accroding to time + + } else { + + browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.PATINATED_TURQUOISE + ', 0.05)'; + } + + } else { + + browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.PATINATED_TURQUOISE + ', 0.05)'; + + } + + if ( + bandPoint1.x < viewPort.visibleArea.topLeft.x + 50 + || + bandPoint1.x > viewPort.visibleArea.bottomRight.x - 50 + ) { + // we leave this bands without fill. + } else { + browserCanvasContext.fill(); + } + + + + + /* Next we are drawing the outter bands lines */ + + browserCanvasContext.beginPath(); + + browserCanvasContext.moveTo(bandPoint1.x, bandPoint1.y); + browserCanvasContext.lineTo(bandPoint4.x, bandPoint4.y); + browserCanvasContext.moveTo(bandPoint2.x, bandPoint2.y); + browserCanvasContext.lineTo(bandPoint3.x, bandPoint3.y); + + browserCanvasContext.closePath(); + + + if (datetime !== undefined) { + + let dateValue = datetime.valueOf(); + + if (dateValue >= band.begin && dateValue <= band.end) { + + /* highlight the current band */ + + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 1)'; // Current band accroding to time + + let currentBand = { + bodyWidth: bandPoint3.x - bandPoint2.x, + leftBodyHeight: bandPoint2.y - bandPoint1.y, + rightBodyHeight: bandPoint3.y - bandPoint4.y, + topDelta: bandPoint3.y - bandPoint2.y, + bottomDelta: bandPoint4.y - bandPoint1.y, + period: timePeriod, + innerBand: band + }; + + thisObject.container.eventHandler.raiseEvent("Current Band Changed", currentBand); + + } else { + + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.PATINATED_TURQUOISE + ', 1)'; + + } + + } else { + + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.PATINATED_TURQUOISE + ', 1)'; + } + + browserCanvasContext.lineWidth = 0.2; + browserCanvasContext.stroke(); + + + + /* Finally we draw the moving average line */ + + browserCanvasContext.beginPath(); + + browserCanvasContext.moveTo(bandPoint5.x, bandPoint5.y); + browserCanvasContext.lineTo(bandPoint6.x, bandPoint6.y); + + browserCanvasContext.closePath(); + + + if (datetime !== undefined) { + + let dateValue = datetime.valueOf(); + + if (dateValue >= band.begin && dateValue <= band.end) { + + /* highlight the current band */ + + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 1)'; // Current band accroding to time + + + } else { + + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.RUSTED_RED + ', 1)'; + + } + + } else { + + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.RUSTED_RED + ', 1)'; + + } + + browserCanvasContext.lineWidth = 0.2; + browserCanvasContext.stroke(); + + + } + } + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] plotChart -> err.message = " + err.message); } + } + } + + + function onZoomChanged(event) { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] onZoomChanged -> Entering function."); } + + recalculate(); + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] onZoomChanged -> err.message = " + err.message); } + } + } + + function onOffsetChanged() { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] onOffsetChanged -> Entering function."); } + + if (Math.random() * 100 > 95) { + + recalculate() + }; + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] onOffsetChanged -> err.message = " + err.message); } + } + } + + function onDragFinished() { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] onDragFinished -> Entering function."); } + + recalculate(); + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] onDragFinished -> err.message = " + err.message); } + } + } +} + diff --git a/BollingerBands.png b/BollingerBands.png new file mode 100644 index 0000000000000000000000000000000000000000..f1e093cd521cba08bf6902c269febdbe7d9e7673 GIT binary patch literal 10842 zcmaL7cT`i&7dDEBQbeT*C=moh354EzFA2?r-a&eo-iu1F(go=d5a|IzlOjls^iBi> zM5H46Z=X_^�aG6DjEhY&R-I03<(O#HDK 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 downLimit) { bandPoint1.y = downLimit; } + if (bandPoint4.y > downLimit) { bandPoint4.y = downLimit; } + + if (bandPoint2.y < upperLimit) { bandPoint2.y = upperLimit; } + if (bandPoint3.y < upperLimit) { bandPoint3.y = upperLimit; } + + bandPoint1 = thisObject.container.frame.frameThisPoint(bandPoint1); + bandPoint2 = thisObject.container.frame.frameThisPoint(bandPoint2); + bandPoint3 = thisObject.container.frame.frameThisPoint(bandPoint3); + bandPoint4 = thisObject.container.frame.frameThisPoint(bandPoint4); + + browserCanvasContext.beginPath(); + + browserCanvasContext.moveTo(bandPoint1.x, bandPoint1.y); + browserCanvasContext.lineTo(bandPoint2.x, bandPoint2.y); + browserCanvasContext.lineTo(bandPoint3.x, bandPoint3.y); + browserCanvasContext.lineTo(bandPoint4.x, bandPoint4.y); + + browserCanvasContext.closePath(); + + const OPACITY = '0.1'; + + browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.PATINATED_TURQUOISE + ', ' + OPACITY + ')'; + + browserCanvasContext.fill(); + + browserCanvasContext.beginPath(); + + browserCanvasContext.moveTo(bandPoint1.x, bandPoint1.y); + browserCanvasContext.lineTo(bandPoint4.x, bandPoint4.y); + browserCanvasContext.moveTo(bandPoint2.x, bandPoint2.y); + browserCanvasContext.lineTo(bandPoint3.x, bandPoint3.y); + + browserCanvasContext.closePath(); + + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.PATINATED_TURQUOISE + ', 1)'; + + browserCanvasContext.lineWidth = 0.2; + browserCanvasContext.stroke(); + + browserCanvasContext.beginPath(); + + browserCanvasContext.moveTo(bandPoint1.x, bandPoint1.y + (bandPoint2.y - bandPoint1.y) / 2); + browserCanvasContext.lineTo(bandPoint4.x, bandPoint4.y - (bandPoint4.y - bandPoint3.y) / 2); + + + browserCanvasContext.closePath(); + + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.RUSTED_RED + ', 1)'; + + browserCanvasContext.lineWidth = 0.2; + browserCanvasContext.stroke(); + + + browserCanvasContext.beginPath(); + + /* put the labels with the bands values */ + + + + + let y; + + printLabel('Moving Average', X_AXIS, frameTitleHeight + frameBodyHeight * 0.05, '1'); + printLabel(currentBand.innerBand.movingAverage, X_AXIS, frameTitleHeight + frameBodyHeight * 0.10, '0.50'); + + printLabel('Standard Deviation', X_AXIS, frameTitleHeight + frameBodyHeight * 0.95, '1'); + printLabel(currentBand.innerBand.standardDeviation, X_AXIS, frameTitleHeight + frameBodyHeight * 0.90, '0.50'); + + function printLabel(labelToPrint, x, y, opacity) { + + let labelPoint; + let fontSize = 10; + + browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY; + + let label = '' + labelToPrint; + if (isNaN(label) === false) { + label = Number(label).toLocaleString(); + } + let xOffset = label.length / 2 * fontSize * FONT_ASPECT_RATIO; + + labelPoint = { + x: x - xOffset, + y: y + }; + + labelPoint = thisObject.container.frame.frameThisPoint(labelPoint); + + browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.DARK + ', ' + opacity + ')'; + browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y); + + } + + browserCanvasContext.closePath(); + browserCanvasContext.fill(); + + } + + +} + diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..dbbe35581 --- /dev/null +++ b/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/Plotters-Bollinger-Bands.sln b/Plotters-Bollinger-Bands.sln new file mode 100644 index 000000000..661fcc076 --- /dev/null +++ b/Plotters-Bollinger-Bands.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2027 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}") = "Project", "Project.njsproj", "{096B35AD-F86F-47B9-A99F-04CA93397DA8}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {096B35AD-F86F-47B9-A99F-04CA93397DA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {096B35AD-F86F-47B9-A99F-04CA93397DA8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {096B35AD-F86F-47B9-A99F-04CA93397DA8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {096B35AD-F86F-47B9-A99F-04CA93397DA8}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {E75EDC9D-66A7-4C54-8EA1-5ADC148CACA8} + EndGlobalSection +EndGlobal diff --git a/Project.njsproj b/Project.njsproj new file mode 100644 index 000000000..6054db760 --- /dev/null +++ b/Project.njsproj @@ -0,0 +1,68 @@ + + + + Debug + 2.0 + {096b35ad-f86f-47b9-a99f-04ca93397da8} + + ShowAllFiles + BollingerBands.js + . + . + {3AF33F2E-1136-4D97-BBB7-1795711AC8B8};{349c5851-65df-11da-9384-00065b846f21};{9092AA53-FB77-4645-B42D-1CCCA6BD08BD} + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + Project + + + + + + + + + + + + + + + + + + + False + True + 0 + / + http://localhost:48022/ + False + True + http://localhost:1337 + False + + + + + + + CurrentPage + True + False + False + False + + + + + + + + + False + False + + + + + \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 000000000..5aa302b7d --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# AAOlivia-Plotter diff --git a/this.plotter.config.json b/this.plotter.config.json new file mode 100644 index 000000000..a5e787874 --- /dev/null +++ b/this.plotter.config.json @@ -0,0 +1,20 @@ +{ + "displayName": "Plotters Bollinger Bands", + "codeName": "PlottersBollingerBands", + "devTeam": "AAMasters", + "modules": [ + { + "codeName": "BollingerBands", + "moduleName": "BollingerBands", + "description": "Plots Bollinger Bands.", + "profilePicture": "BollingerBands.png", + "panels": [ + { + "codeName": "BollingerBandsPanel", + "moduleName": "BollingerBandsPanel", + "event": "Current Band Changed" + } + ] + } + ] +} \ No newline at end of file From 5116b327a348331373ae474dab43a7d5db14eaf3 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 20 Feb 2019 09:35:27 +0100 Subject: [PATCH 02/54] Cleaning --- BollingerBands.png | Bin 10842 -> 0 bytes README.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 BollingerBands.png diff --git a/BollingerBands.png b/BollingerBands.png deleted file mode 100644 index f1e093cd521cba08bf6902c269febdbe7d9e7673..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10842 zcmaL7cT`i&7dDEBQbeT*C=moh354EzFA2?r-a&eo-iu1F(go=d5a|IzlOjls^iBi> zM5H46Z=X_^�aG6DjEhY&R-I03<(O#HDK z$$k8HRH2+6zPbNeT~&$T_PwHkh2T{0q7${NnY1~ac?Q$ zgV|ijJoZ4`FXU>r*6)Onf`HWR1xaeJGRu>=6mDpygK@oZc0vXm3ULy!HeiFW>gWj9 z*7+)HsaC}sOJnhO`d%csb)p7!i$?;t!eGbm7IrO1^Hc#Fdg`m)Ta=Q zC#t;P>?Jfx4E=iExrf`A-t-HVWo4m{vZC+TpO6e8`0rq^kBGLHkK9^4yZbf%7Z*@a z`QvUrH)0qK3*;S~teU&gcJGAwX@3&`+djS;mXrvk*A#}@9U3e(iy(j;(!V6NO;VCJS3V>>EO$dYbMQo?7Ycy8MLCwZw#>iB38YKMuR)BWz$(% z4%2gW;7><~Bo(Il|4LLdHrfc(QYn;~t?1VR88dB5(igYN9q2JV_zAYeO`+L0WN&BO zkD0oTZNas&&q1+#u-rd%Nw~+?z3ezT{p9CqbhriC5*g8GAb;T-9ni4f&u_dey3mS#V)b>IVWY%&3??OTU_4;P?@0!5*JI+RGqtI6IUHn0Z=^Hdh3gi{ z+1}z3&0SA>M* z(+CLJO8H#90ch9ag8iv!Xw z#ISIUu$oI=eK~pe$je@9t$dPZc340{XlQx$hI6mf$p2JtYi0)si-c8P9HLnndK2QLUm81>5F{T1irq9NZEP4?5-|SW%@!|?@v+Zi-0g)Vt z`o_MJE7{@N>)oyoAsLd>eqrmPh8MW=*k_5Ma&WRdw8w9zo0t26xB%qKmy$Qr53S$h z*Rfu?agrk>z%twa!U~wQCBoos?CKdw=-0x7STG{^f~Cywys|fP3tv?CxQUVTy)d*1SC+`n1%Rl^OP-K&%Yg`(%{vg|adR|f0)-@ouFY;JJ>wqpWi=>9c@kI#@p`l$~yhpsi+rD|YdZO}nUe1Yx zEA8f3%6I;fw5gVSZGJO&X!^L6U(#IYrr+Rcpke9@D0LuX_SM1W`0?1viS?u2aQ%j) zy%v{!?exco0`vZ}_RV5f!^}imGn^0Hc%3f(Z+fl5TqYa; zLOp-R2wmNMqu2TCg2n)Ll0eRvphnc-AF_)rAp#GIlV;^Er`<~?YW)P03{r4^W{!#E zOWuxSy03z__w%&g10jQXApUfQ)qgkILmk-noTQ4z14;Y~JFAb`PzF-Tc1?jg$)~F9 z7AbzT%fGHCpE^}?ak%m$PgZQ~{yy5zmZ}(?l%jsE-OH z8Zxr!gGfiZZho;g$h6hr(4(N-{dOI1wX1@+s>zpG^L1i-i#3cF@2|%TF|<9cAGZ*9 zcPoCpamT%Yf}}8IRLVA~5j7;zh|d@BvBi%<&3GppuyNssU1aDQ z+ZyG6bC2r7R9tykXlBvRx}TyxN*mW-<4Q<)y-VkIUR5VmXz+xM3=}raFs*SuUTxX8 z-7rpv&!ZAM9*`NhrRN*T`i2x;Yvd|bq4ck^-*nUv%%e(NFe=WP%w`IexL4MxK;U}; zvG&yf2BzEq(L`>0Tbc?Z%|9~tI2OxU#F&_=ET(+l@fFTFrm4N#yet)1NTfDw)-UO3 z1jd|9x!+0eL2qVQa9TaAxloSqt%T4-`FCndq+#YmH8eiBQYSYbsseyi&)iQ*su^QV z#XOwQ#qj6)gkoo>OOW{_#ZE&u3-G}uB^W{#*uev%x0HNTv*}KLSEOCD6T4WTmabG) z4Zfowk(L%*_T45R=c+9EGcYzb?W1|EdifNsx-))@yyB1=P<$6tH?vJ#C-2k*Cqo|} zdbTo1`mdMaol6UAEC~cK^|=;OKJz+wEWucIh~Vo@Q|*vn=(^~K7ca;Z!Dt2XM}9Kr zxd7Z6ot~9vsuGn_1m2612AV-Lz8p6&%Q@U5@^>-A3U?KA1}hZ6FR%F~J28Y4%%VXLBd{P%V%k&C9q z<|fuYwv=<4Lxb~Ti%2mckAk=riI?o1r`)MxWf;fxKpB*)j@0sM&CFbnP;4O5mnP}{}exqW~L2?=Qe_i<+IZx zF9UFUOt%(P>KYBOm$58TvfL#Zq>KyaM9KSMlevX%;V(|!h5sho8YSi5dil<5fn091z_ndnJg3PTc)@mv}HS zY5!zOMCJvxVS-7#T<-Vao9M9aWUWpGnuzZn8ryq9X&Fy(bN07>t=1=nslcK%V6M&$ zYb+GBZ8i9Yo{&OGI>36r{DXAMQ~Eb5qlk$!v1gIqTnplmwG*Dj~mrO~DVU;FYx$s?13{ zf~J6%1w6$WcJ4m1OesMb$7PNh3!^V#QtLR~%MMLiaXbNt+qo7jJBn7=ys*Kl`y)Gs~-YQ@`_j0E%AS2w5QLhxOdEiv$qDI!rel@rsJm zv~&)Bl440{U7wG`-`Y1tZ`lPt5X|^o&`Je2oeAX<^ z&)Q75Tq1~E2P#fMEz#yFuQqJxVNuf`ob=<@pm;>naia-07{eB(8XLsM_@aRGGb5Vn zjt}DFRNRvZ;Es{Kyxh%CaigGfvtl>DaeB=n?g!}e?7-`Pi8Xosqx^3-M5emFw2v2s zaJ5sgr5;AtUdz<--h5Ose95d(^v@@!ggW^ctJ?LVW&@7=k|1LLVeWOR5{FY({hE*w zZ!*eNV0|5MZ4wqgyU4j`N4;|Xl#^yqTf@9jwpzHe0A8qMLRag39oU|)Ha9`hk7nDiYZRsr?|N*5KO62E>!w?$j-`st;`bupn>*q>4`FZYKb zx{nJ%zlyE3*+~&%c4NObsXa9O6AiHJbmsO_H}{F7X<&r$BU4`wbu=sI2ns)f>fL`6 zRD6vFl0u!^+~mY1iR6Suf5_fU*H&Az?t zmKhNAlR;m%3Vw(E_1A8JZ#OVq@-k( zeT42ANMgC_TtEGjo+7(+{FWuH1XAf|cgOzns2ucvq! zlf2_eT7T^rfAUJ!pIJdjbYKvBY?Brt7m>3$!AZljCHdlgy6rgBtX}hNy|jj9>j=>j zV{ahS0_qHquzt>qzo&+yqiQtw6B4vJ=Z@=6 zHrR2xZ1J1exzohC#hzoGs+FQ_#(x+z%B4S!+DS~-b0RnzkKU@{mn|?T;s?f&m1cB? zD8*q^>&d8uqy*H?L5-F-__cg*zboPgry}vy0eE)!T_8y zw3%VMU~qjyEI~VC5#jigoJ`%s;HzBAbBsWf zozu--0i)d%%IUHv*DMM&ktg@P_zfO=^y>@0-C(P%uAzv$6Dpy}7Ubdh!L3}ga-ti_ zP1bkhV__CM=+l=j$W{KkuK*XOL`4^t>){i*CUv zQWU#IlhlQTSqFyV9Cg7(Ol)73`v5@vSu;FM$hj4Sw9Ag})bvV_M<_=J`5NHZ_=S+g{?p&JsI z^!GH7PBWA+H)!KY=waCPvn1dP3a63r_2lF6THF_!2Oyt7Y-z5sgjQuI)QjRH8CJj= z0oez%s{72%8eR-(mo~KxFD?qOP;>+-{PfOQD9?wZ4j!K|O}Pmh8h_04v{hR`HBcHB zii3EVCB?Q_6z~v^ay9X*TD$P#XU}|99K%of+LDLluaATpP5rESifqW~ zV{F&$uEn~I3q85dlU%BT&I7M&_c2^S#2)JUpDb>G$bQuFp_3Ua$C`HzZ^sE$>%V`A zH~1u~c}ju4ZI?bB@rFypT0yz%yB>beN?QIoHB0LUvYfM! zeH1u~*rMzSrFmSfDNGE)!%c>#XzGRWUW1f~`B@b=>3R%DY)tA0zDKY+m}jt8(htO( zKJ-+uzLD6l&`iz(@a!Gm?}*tS&PxT!Z{w*5%&%@%vZ#4G)oPcDms~u+X_TUQYu#fZ zQPRn>ZakYZK-$gCm>xM#Z1M1)2a+LT7?vb!C)oFFO+~9!)*-%B;7QwaC+Etw!2DsG zG7g=LF?t zWZZlAqWd(s|4Z7@wAt90#b^Ig1hWXQQjjRIW}86m@kYFqqwI1n=KD7 zhyOfoz7_elxNVtY80OlYaIkK7<;4^)djmSa4HXooMu;U%7^e};1nt|drKn!sYJYaT z1(xlwbEs3+d_S4|W;+G}&A1@6r>;jWDKd}519=8h};87t)ZN3jML8BEt_?$l?2cn-j2fO76UTkPmXbbgq5 z>)iM`D@h=jdo*4lZS)Tw^ICRcO}ZjSZHAb{x(}t#EeX-HJ4CLy?LGH@H`~cZ?SH?PRR^`T;JC=mEtD}q0&P5vz1>hk5*4O%(Lnk|fy`k%kyUiv+{=uS zR0f_mx6`n6+f};w?ftP3t)9YY;QM>;jjbggjTZV{jxYH&9HbQhcTXLJcWjX2U<`9t zxvaQsF4HP?w2WePyGrVJ4mmiUFk=aW!1}$}N`@8nJZil>O6pG~x~aw)b*ap$nahQt z&Vi>A4`i{ixwuik&v>6pWG1ixh}@1zKi{`K7z7f0A; zQee5dfiGWH`5pmlZ$=OJ5Hv9qTz%rzv7fjfNnL^Gs0{HaYRauBy$L3K)jPW1aY(qQ zK-vCEP9$-_-P|yJXoJ^c2CP7%EZ4PBIh$#Oy=J7MniPDL4f;0f82Es4zy3jd_ZPqA zilpn|+ChBK=de8ZrZ|jry;gWTPQ|!<)gmEqQ}<&m53%%F=XqY?D==t9y@Wenw^ifI z_3{$wf&ZVU!nna+xP{5a^@3o6mIj<7y$+yiRD+I?MTBBw!@^$xJ-{rMj@6B*y6X7a z9%L)wmWF;cU8az)zOPNhq~ha=Q&ZaebnMwKnMWzaLkS7vm2(?E{5pHlx7!ve#9&JZ z5$BVB*?**GxF77kmmrsH-HPw|155@pFCW*nA%S};@Bc~b46ECU2)sxWQ#lU=9DT*r zHITTokpk(6qvYdl*TnigOdHO&?;^|BBU-sM4t*D0X-D%?`2Knf6a~#7PD80EjYlLr zXjZYHue#e`gx@BdXK`i?v3y}XRU)++=oh&Rmy}yXQ>doET~kmQ2xEW_R$(iL78V#u zs4r1XHTIJFUh31Qumw26V#3ez)kn%@`xGRqifi_dfNy`kDwAFiV@SGPM}Mr}O1e_S zjo)$!e2bi*NvHh#Y)*=9+*J>SMTAP~8ySe&{TmZs1_aG)Q1GJ+_(do*Ab+mwu;b)B zyo5(rtQ|gUnED;eJE~s3RIFR^{mFj9z3J0Ys)fn=+cbo?Xd~T!ku8BrnKG^;7u&n+Qwt~j^aYblH z3pyawspPUZF`*2IA4>WCuQwsIe@0_~q>=Cql;+3zU1Y=5!a<0(R><)u@K>Bfp6`Q{ z2fFF8U^4|;+^R0$FOil7gn+F6leWm5DVq{ZQ3$ERT+_t6fO z>Usr0-+a=`KGSU8;1ecK|39B4Zcb%0bXIU8c{5LP5+w@7^f?9xL(T<{Po@%<{Vc*Z zS@5oP&vkNrn9Es-*|IX~>24HQm6JZyRi8^?e zv>3*;Are{EN2{v-hw2uK8FSz8h)u;+({v1PdP?W1I&){Mw{8v0dHV6@&5CRW-3Rt2 zAl|Irwj`Q9u8GXZD;f4c#K}XwNgb$_t8TtZ? zPv3?T!x1mmZ6V^068iCmEC5VzlbLY`n+MgDk-6PIv8*L_$q#b>j^i?NJTxv=l?mao z4;bkB_b^~HlFmWI={qc;0IF{56jw38xIVg>kIC2^e%w>TPAYAAGi{igXM5W)mYSDc zH1jzHNSd)tg01HtzB;4yX`fDF+B{*xF{gPXh#G=Af46bGCGI*wf`DrhY^;{dZPt+5bLc_1WM{El}LtgYUAuncX;gsK~itd8<7v2|) zcy4-)?VX_OTz4~^GCq4-QMCw3Rze#Ze$37pew1W~0QiG`eK2O4a_0sYHnHsl0LTf! zl!U)p;GgA_@5fsAXhn07$F7qo)m7p2kQ)JpNs3->NwYogfRIUTS3NSc@1Z*Dq@v>R zhz;syC>oZmgJ%EjcYB0Za?3KG|Aqwr)B&+gH30Hu$hswYzsl|P(SaVbweEDszOXzS zVt?9tzMQzn3ejlBD04-w2hu$h1kre?f7pm9y}Ro4Zc31AC6T*q_SOe$udYP0{xL9h zoVrNZP^n#fgDt`O&o-qyw^I-O=q%M5=FmEaGvgzkgP(B}-g@E*uhRXjtD0T_b(i{+ zFCDE1P|Y37OSLPJuYl|Ime4_8CQ4rvJ_|aOZ(DlA6@UENNF-xB##lSbDDYSljG*^0 zI~(9pN?d)BWn@FDSvO_kGN~5ADK1HblFwCFOX+TKV)gl|A z612XQ#u)Uv(Amg_`vE2MBgN6L*T_Z#1Cqd-blbV}fAFXMjKQyLIiF~S?wEL9C*RVO z5*8Om&pyi=LT(PRXJh9FzUSq2fNEXX9gatuaYX0)^mztqV5Rt;U2G7Klm%sfT7)Dq zQxt_^-Cn!^QYnIu+)ye^A23j&`*d+|Z~~g<qnYf!+G5D*2aEUE$@A)U%(V1$mh1ppl6a z3lRnks`iq8MVr6V{!dir_dNYHyAHOboi9)ynkMw7%wEAwb5}qg-FI#K!>Md^SUJt2 z#|O{sg8Mfd&W?#^AyDjt8)fqg_S=ZjttkeBJr)Ia$VL0gMU)NalcvC3`gnXQh?wYR z`f6nlj_)}+(G0nh4#%^_`*I0-5kM*l_kqJv;+3eF7ake_6`?tOh`rZ$SkVf#DV{Ok z#8s619C%;F!#(NR4ADc-9jn zKU9}8v{~5kErmZ{I;}kwE|`ID2>6AbH8_n?YpaF$WFxTRP{m#vF2xIMPyYiJ7Vn^r z2L`7smKeIz(ov4SQrCvi4qdNYvuwo4*<2?Z?@fD{s#j?Ki@!xpk$YmE1MD*2?pjSl;4B~}s!$C3aQ&i2|sVzx5*9Y?2pG~*VxMpgb*fNF$ zIu61o7u(ia2asTVefS<}-K|_fN6$(D|7+;Y< zE7{|nE-f#g$i;0k4;mP!!J(iLz6|Dc^L+ATz;EfaK$Kg*ZAM9s&)c#1kjT}F6$hiUG-~8lQw2a#9woDM56z(%5%Z#gKN2ZgcydSd zSx2>(>*Kkz?jR+IZ*q*1!)CYwqQxxQxoNg#KZtdO<7DJZv>(H%R_Ce*J>pb3#dPA9 zVoc_yaT{flTOj!oM!_c{j+iz1XYP((%3HgT;i^G1kVkc-vn+e>Na3kGz|GZdxOv03 zo}W)md6hd2iv?|>|ACI-o^%e(P# z2Q*6>+Dz)~^Rx<8xG$h_uP~Je?NRURn3uPZ9FoxI^d#0=>9T2Je>$fpU)ljvCMH-y zHZ>I?pL~S%S_|kLrc*a{RDQ#mXB7fp;Y+}n5DF<9PCqk=h?@0IXHo2GgWxwtll6d& z&pse=krV3p`vL^3L4Thp8O8{?cYHGSvxJeEu9UAOa_&eAu(=Vd;+9vgkgMbKJWg!nzz+AhOE2 zW5i^HY&g-s(3r^Yq9p$iXPL8-kiZ_lv&cr z()|ll_~M&1G=sCxGjha_53zqVs5SVhR!6xja=0E@tRqKJnbp5!dZJ9S%n5B?va<JM zaVh}c&E{a$QBR`oBsK}p&gz#+NPU@H*j3qFcnk$HlM}vsA;+c6nYM)bh2-jY#`6^z zN9xGcME4)~vDsc3TL&?sHmzED7JceX4XSUy{u8@of9-s@!j+$XZ%wRt<}>vGzp1^k zXZwuh*0s2!(6+&KNa}ZdXvM!py*roABx$RsX-}9wBx2-x@%Dny3<#~!^Fm_6qf8z2 zsf0c?($XPX>*Pv0`|$>DIV}?s6emkd;}kXgdHMGIiHdjobHECn(ljF8YmLLsBUGz# zmONS0CB5A7G{@%aF7fghikNonymnC%SkxtA6Jp1*Oe3`zAD?@LJ6A4_X`Nz^U5oLp z2Uo{Jj;5y4&-XC?%J}M1hZ`|IJN)Bzn>rn3^;4z_9y@!;2cu6Vh}~JsfO25ic74UK zj?lT6e?-S&N(~Ez1{|pl@gZX}T&?y69cA_4r`KM>5UQ!F|MU-^16Pv}4Bl>e-NpZD zC<>K+Bb80?KrE@ZcxR2AtuzpoNWSmpRIZKYy2Y(fbMsL7N!~!X@CYwV_NpK(|EM#B z0pm35Tm>G9-z*>cL)QFfw-Ybyu!E-HBXaOINdJ6v(otl>7{;0T)Dti(*pq1lAl)Oy=sXuaDa)`CcKbGnaZ*4R@-h)5%Xc&x&`$KQ4cG~$ z?rEAE5WDh&KsY`V010FH$$RJZ7m@Umo=S<&#e24oSkUpu#Z7j0EAmat&Sg!F5eQ+{ z>eiqSteFH&&Mq|<83v)+%jW)hZsRO}eLMikxfZ{RI+D@U#Ij{=wO^UtLryD|M%WUY zp2+bRpwpf*SpOGGHY!wWw%&ydAba+2H!SqegK@_PX}MuoTPH6sB6&JA(x1!V!;cdo)vgoP(elOXUl-?M?ZI(w z&38{Q8ODoiMIp%^-Ulx^DT^@sRJT9{EEyHE`BH^JA78>_uD&w_0h38^{6S6V`xkRc zbWf<{y-hvdtWn^L>*F%M3HyFs>Q-;aommc3lDnz3O^t(ahG&*e@ zW#H$PS_vbVO*?B8`Xyk4(la#QBKRV#R5jYIJaSK>)J`D5?tFJz-I~5XI$=-D=J=iq zW+8Jh70BO4zpnK*Pfv|*@qwwDJoPsSm4L^O3rh)w0silEqQPG18fy>1r%{g>bqRbJ zNZ*AY{cYh)PIzceTqGnt^1R@Z#@TE0FUrIarCASW73H5`D$r<~RF|k4VsW#2C5OzX zXpV53|K=5puXBDLlRfi8z$)w8zJ?!^gC6P)mHF9&?)CEd7U*&&uD3v)oiR=zC)FbO zGszMN_^;n?3&nuYFT#q`EkZ<0jh98Ui)DZ;6oiKWSw)fuHXb-BwEFQyXk2y(F#$e} zHZ<>U3ikXGVH{6E`SsPh`hE3<`AkJ|NhNW~(wtU_Y6VTeoK9=-odMy!sE55R;w}Rl zzMLBE&UYWkS+!YYaj6AN9zTa~32jL3&y##>)z4QfIj6iwIbxT{N5Vma_Gc~FD(awf zMIVQlj_u507j0*<@WXWUv3L`cstx_x^nuV!7@4!Blopf%-=C2ty-(9xFNM#w&h0c; z-bG(!SM2Ku&V&SCE^ms5ouxNE^RYWyK?p3MopW97{lxIzaR&j8@AeUw{alj-S4w&> zY{)cUIpcqvj8jYH08|arHQJ^jbLoVYzS#$lgL>!p1WHOulL1yW3#D`? zhdLl+zINzq!tnl|xnD2FZpCfKc6db$;@kjfZ96=n`)G^h6l)Q@LWq2wHiMJ4^|*C& z`nPKShs$BIY4Vbkf*?;`j!fhp+to8J&_PmnF^#c_0k>WD(4UD#xB=HoSInbGxH3Y}XxD79 zZ;~%z2@3n7s|ScGZD9JkJZraz9K^HU_%e!Y#$qN>NjLIyIlK|k^`$FP-R)Jxk?~$! zcPg3=lKMNYI`qzDHhAmD%nBdIgCjHA_tKF*>L0UDNk}Oe&5}2gGU}%7)werOZ;h{K zHf1{o<~<@w4@n+=`~G+TKy5%!J4+q@f0hqPW~&ziCh;1(^6ELT`r1d8kcZ*kY|&nM zFQxFe{3pl5Xq(VRa{rxl)+c<1KQ$Tte`)fl4axBa=C;Kvw(tZnLgPQf@uAZ3@+Z8b z&%}#?`0$2=<3$PoSLak7{3#P5)%yqqDiR0*1Q~MmzgyQuUa$b)=j&t*kSkBVbAYKC zlTvY{GS)?obc+c7&$J?SYzkr|G@1xCk)_o6#cvio6yQK0Bmn`A8}3`XysZAp^uHyPO! zQ`H~-dyE@A*I14_;$?McHp(gJ^>sPwBa57XsWAD=iD&;PWXc%dIU@-)0}S+OBP>5% z>i$ol=)v%}5tA$JV+xqFa`4x%MO9#a6I(^~;Mc?LZl-Mtnr=K30d}_6-usjE|E!AL z+tUBPMZ1-)K6Pe` Date: Thu, 21 Feb 2019 12:08:59 +0100 Subject: [PATCH 03/54] 2 Plotters Working, reading the same file --- BollingerBands.js | 14 +- PercentageBandwidth.js | 811 +++++++++++++++++++++++++++++++++++++++ this.plotter.config.json | 8 + 3 files changed, 829 insertions(+), 4 deletions(-) create mode 100644 PercentageBandwidth.js diff --git a/BollingerBands.js b/BollingerBands.js index cce97f783..5630c367c 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -286,14 +286,16 @@ let band = { begin: undefined, end: undefined, + close: undefined, movingAverage: undefined, standardDeviation: undefined }; band.begin = dailyFile[i][0]; band.end = dailyFile[i][1]; - band.movingAverage = dailyFile[i][2]; - band.standardDeviation = dailyFile[i][3]; + band.close = dailyFile[i][2]; + band.movingAverage = dailyFile[i][3]; + band.standardDeviation = dailyFile[i][4]; if (band.begin >= farLeftDate.valueOf() && band.end <= farRightDate.valueOf()) { @@ -361,14 +363,16 @@ let band = { begin: undefined, end: undefined, + close: undefined, movingAverage: undefined, standardDeviation: undefined }; band.begin = marketFile[i][0]; band.end = marketFile[i][1]; - band.movingAverage = marketFile[i][2]; - band.standardDeviation = marketFile[i][3]; + band.close = marketFile[i][2]; + band.movingAverage = marketFile[i][3]; + band.standardDeviation = marketFile[i][4]; if (band.begin >= leftDate.valueOf() && band.end <= rightDate.valueOf()) { @@ -462,6 +466,8 @@ band = bands[i]; previousBand = bands[i - 1]; + /* From here we draw the actual Bollinger Bands and lines it contains. */ + let bandPoint1 = { x: band.begin, y: previousBand.movingAverage - 2 * previousBand.standardDeviation diff --git a/PercentageBandwidth.js b/PercentageBandwidth.js new file mode 100644 index 000000000..9dcea97f2 --- /dev/null +++ b/PercentageBandwidth.js @@ -0,0 +1,811 @@ +function newAAMastersPlottersBollingerBandsPercentageBandwidth () { + + const MODULE_NAME = "Bands Plotter"; + const INFO_LOG = false; + const ERROR_LOG = true; + const INTENSIVE_LOG = false; + const logger = newWebDebugLog(); + logger.fileName = MODULE_NAME; + + let thisObject = { + + // Main functions and properties. + + initialize: initialize, + container: undefined, + getContainer: getContainer, + setTimePeriod: setTimePeriod, + setDatetime: setDatetime, + draw: draw, + recalculateScale: recalculateScale, + + /* Events declared outside the plotter. */ + + onDailyFileLoaded: onDailyFileLoaded, + + // Secondary functions and properties. + + currentBand: undefined + }; + + /* this is part of the module template */ + + let container = newContainer(); // Do not touch this 3 lines, they are just needed. + container.initialize(); + thisObject.container = container; + + 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 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. + + /* these are module specific variables: */ + + let bands = []; // Here we keep the bands to be ploted every time the Draw() function is called by the AAWebPlatform. + + return thisObject; + + function initialize(pStorage, pExchange, pMarket, pDatetime, pTimePeriod, callBackFunction) { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] initialize -> Entering function."); } + + /* Store the information received. */ + + marketFiles = pStorage.marketFiles[0]; + dailyFiles = pStorage.dailyFiles[0]; + + datetime = pDatetime; + timePeriod = pTimePeriod; + + /* We need a Market File in order to calculate the Y scale, since this scale depends on actual data. */ + + marketFile = marketFiles.getFile(ONE_DAY_IN_MILISECONDS); // This file is the one processed faster. + + recalculateScaleY(); + recalculateScaleX(); + + /* Now we set the right files according to current Period. */ + + marketFile = marketFiles.getFile(pTimePeriod); + fileCursor = dailyFiles.getFileCursor(pTimePeriod); + + /* 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); + + /* Get ready for plotting. */ + + recalculate(); + + callBackFunction(); + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] initialize -> err.message = " + err.message); } + } + } + + function recalculateScale () { + + recalculateScaleY(); + recalculateScaleX(); + + } + + function getContainer(point) { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] getContainer -> Entering function."); } + + let container; + + /* First we check if this point is inside this space. */ + + if (this.container.frame.isThisPointHere(point) === true) { + + return this.container; + + } else { + + /* This point does not belong to this space. */ + + return undefined; + } + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] getContainer -> err.message = " + err.message); } + } + } + + function onFilesUpdated() { + + 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] onFilesUpdated -> err.message = " + err.message); } + } + } + + function setTimePeriod(pTimePeriod) { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] setTimePeriod -> Entering function."); } + + 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(); + } + } + } + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] setTimePeriod -> err.message = " + err.message); } + } + } + + function setDatetime(pDatetime) { + + if (INFO_LOG === true) { logger.write("[INFO] setDatetime -> Entering function."); } + + datetime = pDatetime; + + } + + function onDailyFileLoaded(event) { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] onDailyFileLoaded -> Entering function."); } + + if (event.currentValue === event.totalValue) { + + /* This happens only when all of the files in the cursor have been loaded. */ + + recalculate(); + + } + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] onDailyFileLoaded -> err.message = " + err.message); } + } + } + + function draw() { + + try { + + if (INTENSIVE_LOG === true) { logger.write("[INFO] draw -> Entering function."); } + + this.container.frame.draw(); + + plotChart(); + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] draw -> err.message = " + err.message); } + } + } + + function recalculate() { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] recalculate -> Entering function."); } + + if (timePeriod >= _1_HOUR_IN_MILISECONDS) { + + recalculateUsingMarketFiles(); + + } else { + + recalculateUsingDailyFiles(); + + } + + thisObject.container.eventHandler.raiseEvent("Bands Changed", bands); + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] recalculate -> err.message = " + err.message); } + } + } + + function recalculateUsingDailyFiles() { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] recalculateUsingDailyFiles -> Entering function."); } + + if (fileCursor === undefined) { return; } // We need to wait + + if (fileCursor.files.size === 0) { return; } // We need to wait until there are files in the cursor + + let daysOnSides = getSideDays(timePeriod); + + let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, plotAreaFrame); + let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, plotAreaFrame); + + let dateDiff = rightDate.valueOf() - leftDate.valueOf(); + + let farLeftDate = new Date(leftDate.valueOf() - dateDiff * 1.5); + let farRightDate = new Date(rightDate.valueOf() + dateDiff * 1.5); + + let currentDate = new Date(farLeftDate.valueOf()); + + bands = []; + + while (currentDate.valueOf() <= farRightDate.valueOf() + ONE_DAY_IN_MILISECONDS) { + + let stringDate = currentDate.getFullYear() + '-' + pad(currentDate.getMonth() + 1, 2) + '-' + pad(currentDate.getDate(), 2); + + let dailyFile = fileCursor.files.get(stringDate); + + if (dailyFile !== undefined) { + + for (let i = 0; i < dailyFile.length; i++) { + + let band = { + begin: undefined, + end: undefined, + close: undefined, + movingAverage: undefined, + standardDeviation: undefined + }; + + band.begin = dailyFile[i][0]; + band.end = dailyFile[i][1]; + band.close = dailyFile[i][2]; + band.movingAverage = dailyFile[i][3]; + band.standardDeviation = dailyFile[i][4]; + + if (band.begin >= farLeftDate.valueOf() && band.end <= farRightDate.valueOf()) { + + bands.push(band); + + if (datetime.valueOf() >= band.begin && datetime.valueOf() <= band.end) { + + thisObject.currentBand = band; + thisObject.container.eventHandler.raiseEvent("Current Band Changed", thisObject.currentBand); + + } + } + } + } + + currentDate = new Date(currentDate.valueOf() + ONE_DAY_IN_MILISECONDS); + } + + /* Lests check if all the visible screen is going to be covered by bands. */ + + let lowerEnd = leftDate.valueOf(); + let upperEnd = rightDate.valueOf(); + + if (bands.length > 0) { + + if (bands[0].begin > lowerEnd || bands[bands.length - 1].end < upperEnd) { + + setTimeout(recalculate, 2000); + + //console.log("File missing while calculating bands, scheduling a recalculation in 2 seconds."); + + } + } + + //console.log("Olivia > recalculateUsingDailyFiles > total bands generated : " + bands.length); + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] recalculateUsingDailyFiles -> err.message = " + err.message); } + } + } + + function recalculateUsingMarketFiles() { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] recalculateUsingMarketFiles -> Entering function."); } + + if (marketFile === undefined) { return; } // Initialization not complete yet. + + let daysOnSides = getSideDays(timePeriod); + + let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, plotAreaFrame); + let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, plotAreaFrame); + + let dateDiff = rightDate.valueOf() - leftDate.valueOf(); + + leftDate = new Date(leftDate.valueOf() - dateDiff * 1.5); + rightDate = new Date(rightDate.valueOf() + dateDiff * 1.5); + + bands = []; + + for (let i = 0; i < marketFile.length; i++) { + + let band = { + begin: undefined, + end: undefined, + close: undefined, + movingAverage: undefined, + standardDeviation: undefined + }; + + band.begin = marketFile[i][0]; + band.end = marketFile[i][1]; + band.close = marketFile[i][2]; + band.movingAverage = marketFile[i][3]; + band.standardDeviation = marketFile[i][4]; + + if (band.begin >= leftDate.valueOf() && band.end <= rightDate.valueOf()) { + + bands.push(band); + + if (datetime.valueOf() >= band.begin && datetime.valueOf() <= band.end) { + + thisObject.currentBand = band; + thisObject.container.eventHandler.raiseEvent("Current Band Changed", thisObject.currentBand); + + } + } + } + + //console.log("Olivia > recalculateUsingMarketFiles > total bands generated : " + bands.length); + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] recalculateUsingMarketFiles -> err.message = " + err.message); } + } + } + + function recalculateScaleX() { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] recalculateScaleX -> Entering function."); } + + var minValue = { + x: EARLIEST_DATE.valueOf() + }; + + var maxValue = { + x: MAX_PLOTABLE_DATE.valueOf() + }; + + plotAreaViewport.initializeX( + minValue, + maxValue, + thisObject.container.frame.width + ); + + plotAreaFrame.initializeX( + minValue, + maxValue, + thisObject.container.frame.width + ); + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] recalculateScaleX -> err.message = " + err.message); } + } + } + + function recalculateScaleY() { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] recalculateScaleY -> Entering function."); } + + var minValue = { + y: 0 + }; + + var maxValue = { + y: 0 + }; + + maxValue.y = 100; + + plotAreaViewport.initializeY( + minValue, + maxValue, + viewPort.visibleArea.bottomRight.y - viewPort.visibleArea.topLeft.y + ); + + plotAreaFrame.initializeY( + minValue, + maxValue, + thisObject.container.frame.height + ); + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] recalculateScaleY -> err.message = " + err.message); } + } + } + + + function plotChart() { + + try { + + if (INTENSIVE_LOG === true) { logger.write("[INFO] plotChart -> Entering function."); } + + let band; + let previousBand; + + if (bands.length > 0) { + + /* This next section is to get ready in order to be able to plot dinamically constrained to the viewport */ + + let visibleHeight = viewPort.visibleArea.bottomRight.y - viewPort.visibleArea.topLeft.y; + + let frameCorner1 = { + x: 0, + y: 0 + }; + + let frameCorner2 = { + x: thisObject.container.frame.width, + y: thisObject.container.frame.height + }; + + /* Now the transformations. */ + + frameCorner1 = transformThisPoint(frameCorner1, thisObject.container.frame.container); + frameCorner2 = transformThisPoint(frameCorner2, thisObject.container.frame.container); + + let frameHeightInViewPort = frameCorner2.y - frameCorner1.y; + let pbChartHeight = 20; + let pbOffset = 100 / 5 * 4; + + /* Now we calculate and plot the bands */ + + for (let i = 1; i < bands.length; i++) { + + band = bands[i]; + previousBand = bands[i - 1]; + + /* Here we will draw the percent bandwidth chart */ + + let lowerBB; + let upperBB; + + lowerBB = band.movingAverage - 2 * band.standardDeviation; + upperBB = band.movingAverage + 2 * band.standardDeviation; + + let currentPercentBandwidth = (band.close - lowerBB) / (upperBB - lowerBB) * pbChartHeight; + if (currentPercentBandwidth > pbChartHeight) { currentPercentBandwidth = pbChartHeight }; + if (currentPercentBandwidth < 0) { currentPercentBandwidth = 0 }; + + lowerBB = previousBand.movingAverage - 2 * previousBand.standardDeviation; + upperBB = previousBand.movingAverage + 2 * previousBand.standardDeviation; + + let previousPercentBandwidth = (previousBand.close - lowerBB) / (upperBB - lowerBB) * pbChartHeight; + if (previousPercentBandwidth > pbChartHeight) { previousPercentBandwidth = pbChartHeight }; + if (previousPercentBandwidth < 0) { previousPercentBandwidth = 0 }; + + let pbPoint1; + let pbPoint2; + let pbPoint3; + let pbPoint4; + let pbPoint5; + let pbPoint6; + + function calculateCoordinates(plot, height) { + + pbPoint1 = { + x: band.begin, + y: previousPercentBandwidth + pbOffset + }; + + pbPoint2 = { + x: band.end, + y: currentPercentBandwidth + pbOffset + }; + + /* Points needed for the lines */ + + pbPoint3 = { + x: 0, + y: 0 * pbChartHeight / 100 + pbOffset + }; + + pbPoint4 = { + x: 0, + y: 30 * pbChartHeight / 100 + pbOffset + }; + + pbPoint5 = { + x: 0, + y: 70 * pbChartHeight / 100 + pbOffset + }; + + pbPoint6 = { + x: 0, + y: 100 * pbChartHeight / 100 + pbOffset + }; + + pbPoint1 = plot.transformThisPoint(pbPoint1); + pbPoint2 = plot.transformThisPoint(pbPoint2); + + pbPoint3 = plot.transformThisPoint(pbPoint3); + pbPoint4 = plot.transformThisPoint(pbPoint4); + pbPoint5 = plot.transformThisPoint(pbPoint5); + pbPoint6 = plot.transformThisPoint(pbPoint6); + + pbPoint1 = transformThisPoint(pbPoint1, thisObject.container); + pbPoint2 = transformThisPoint(pbPoint2, thisObject.container); + + pbPoint3 = transformThisPoint(pbPoint3, thisObject.container); + pbPoint4 = transformThisPoint(pbPoint4, thisObject.container); + pbPoint5 = transformThisPoint(pbPoint5, thisObject.container); + pbPoint6 = transformThisPoint(pbPoint6, thisObject.container); + + if (pbPoint1.x < viewPort.visibleArea.bottomLeft.x || pbPoint2.x > viewPort.visibleArea.bottomRight.x) { + return false; + } + + return true; + + } + + if (calculateCoordinates(plotAreaFrame, thisObject.container.frame.height) === false) { continue; } // We try to see if it fits in the visible area. + + if (frameHeightInViewPort > visibleHeight * 2 / 3) { + + if (calculateCoordinates(plotAreaViewport, visibleHeight) === false) { + continue; + } // We snap t to the view port. + + /* Now we set the real value of y. */ + + pbPoint1.y = viewPort.visibleArea.bottomRight.y - (previousPercentBandwidth + pbOffset) * plotAreaViewport.scale.y; + pbPoint2.y = viewPort.visibleArea.bottomRight.y - (currentPercentBandwidth + pbOffset) * plotAreaViewport.scale.y; + + pbPoint3.y = viewPort.visibleArea.bottomRight.y - (0 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; + pbPoint4.y = viewPort.visibleArea.bottomRight.y - (30 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; + pbPoint5.y = viewPort.visibleArea.bottomRight.y - (70 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; + pbPoint6.y = viewPort.visibleArea.bottomRight.y - (100 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; + + } + + /* Everything must fit within the visible area */ + + pbPoint1 = viewPort.fitIntoVisibleArea(pbPoint1); + pbPoint2 = viewPort.fitIntoVisibleArea(pbPoint2); + + pbPoint3 = viewPort.fitIntoVisibleArea(pbPoint3); + pbPoint4 = viewPort.fitIntoVisibleArea(pbPoint4); + pbPoint5 = viewPort.fitIntoVisibleArea(pbPoint5); + pbPoint6 = viewPort.fitIntoVisibleArea(pbPoint6); + + + /* Now the drawing of the lines */ + + let bgOpacityA = 0.05; + let bgOpacityB = 0.05; + let bgOpacityC = 0.05; + + let fgOpacity = '1'; + + let lineWidthA = 0.2; + let lineWidthB = 0.2; + let lineWidthC = 0.2; + + if (pbPoint1.y > pbPoint4.y || pbPoint2.y > pbPoint4.y) { + bgOpacityA = bgOpacityA * 2; + } + + if (pbPoint1.y < pbPoint5.y || pbPoint2.y < pbPoint5.y) { + bgOpacityC = bgOpacityC * 2; + } + + if (pbPoint1.y >= pbPoint3.y || pbPoint2.y >= pbPoint3.y) { + bgOpacityA = bgOpacityA * 1.5; + lineWidthA = lineWidthA * 2; + } + + if (pbPoint1.y <= pbPoint6.y || pbPoint2.y <= pbPoint6.y) { + bgOpacityC = bgOpacityC * 1.5; + lineWidthC = lineWidthC * 2; + } + + browserCanvasContext.beginPath(); + + browserCanvasContext.moveTo(pbPoint1.x, pbPoint3.y); + browserCanvasContext.lineTo(pbPoint2.x, pbPoint3.y); + browserCanvasContext.lineTo(pbPoint2.x, pbPoint4.y); + browserCanvasContext.lineTo(pbPoint1.x, pbPoint4.y); + + browserCanvasContext.closePath(); + + browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.GOLDEN_ORANGE + ',' + bgOpacityA + ' )'; + browserCanvasContext.fill(); + + browserCanvasContext.beginPath(); + + browserCanvasContext.moveTo(pbPoint1.x, pbPoint4.y); + browserCanvasContext.lineTo(pbPoint2.x, pbPoint4.y); + browserCanvasContext.lineTo(pbPoint2.x, pbPoint5.y); + browserCanvasContext.lineTo(pbPoint1.x, pbPoint5.y); + + browserCanvasContext.closePath(); + + browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', ' + bgOpacityB + ')'; + browserCanvasContext.fill(); + + browserCanvasContext.beginPath(); + + browserCanvasContext.moveTo(pbPoint1.x, pbPoint5.y); + browserCanvasContext.lineTo(pbPoint2.x, pbPoint5.y); + browserCanvasContext.lineTo(pbPoint2.x, pbPoint6.y); + browserCanvasContext.lineTo(pbPoint1.x, pbPoint6.y); + + browserCanvasContext.closePath(); + + browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.GOLDEN_ORANGE + ', ' + bgOpacityC + ')'; + browserCanvasContext.fill(); + + browserCanvasContext.beginPath(); + + browserCanvasContext.moveTo(pbPoint1.x, pbPoint3.y); + browserCanvasContext.lineTo(pbPoint2.x, pbPoint3.y); + + browserCanvasContext.closePath(); + + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.GOLDEN_ORANGE + ', ' + fgOpacity + ')'; + browserCanvasContext.lineWidth = lineWidthA; + browserCanvasContext.stroke(); + + browserCanvasContext.beginPath(); + + browserCanvasContext.moveTo(pbPoint1.x, pbPoint4.y); + browserCanvasContext.lineTo(pbPoint2.x, pbPoint4.y); + browserCanvasContext.moveTo(pbPoint1.x, pbPoint5.y); + browserCanvasContext.lineTo(pbPoint2.x, pbPoint5.y); + + browserCanvasContext.closePath(); + + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.GOLDEN_ORANGE + ', ' + fgOpacity + ')'; + browserCanvasContext.lineWidth = lineWidthB; + browserCanvasContext.stroke(); + + browserCanvasContext.beginPath(); + + browserCanvasContext.moveTo(pbPoint1.x, pbPoint6.y); + browserCanvasContext.lineTo(pbPoint2.x, pbPoint6.y); + + browserCanvasContext.closePath(); + + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.GOLDEN_ORANGE + ', ' + fgOpacity + ')'; + browserCanvasContext.lineWidth = lineWidthC; + browserCanvasContext.stroke(); + + /* Now the drawing of the percentage bandwidth*/ + + browserCanvasContext.beginPath(); + + browserCanvasContext.moveTo(pbPoint1.x, pbPoint1.y); + browserCanvasContext.lineTo(pbPoint2.x, pbPoint2.y); + + browserCanvasContext.closePath(); + + + if (datetime !== undefined) { + + let dateValue = datetime.valueOf(); + + if (dateValue >= band.begin && dateValue <= band.end) { + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 1)'; + } else { + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.GOLDEN_ORANGE + ', 1)'; + } + } else { + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.GOLDEN_ORANGE + ', 1)'; + } + + browserCanvasContext.lineWidth = 0.2; + browserCanvasContext.stroke(); + + } + } + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] plotChart -> err.message = " + err.message); } + } + } + + + function onZoomChanged(event) { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] onZoomChanged -> Entering function."); } + + recalculate(); + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] onZoomChanged -> err.message = " + err.message); } + } + } + + function onOffsetChanged() { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] onOffsetChanged -> Entering function."); } + + if (Math.random() * 100 > 95) { + + recalculate() + }; + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] onOffsetChanged -> err.message = " + err.message); } + } + } + + function onDragFinished() { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] onDragFinished -> Entering function."); } + + recalculate(); + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] onDragFinished -> err.message = " + err.message); } + } + } +} + diff --git a/this.plotter.config.json b/this.plotter.config.json index a5e787874..8edbd9306 100644 --- a/this.plotter.config.json +++ b/this.plotter.config.json @@ -15,6 +15,14 @@ "event": "Current Band Changed" } ] + }, + { + "codeName": "PercentageBandwidth", + "moduleName": "PercentageBandwidth", + "description": "Plots Bollinger Bands.", + "profilePicture": "PercentageBandwidth.png", + "panels": [ + ] } ] } \ No newline at end of file From 425a2fec4177195e01295f690bb9751fd856c282 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 24 Feb 2019 16:55:25 +0100 Subject: [PATCH 04/54] Working Version --- BollingerBands.js | 46 +++++------- BollingerBandsPanel.js | 17 +++-- PercentageBandwidth.js | 161 ++++++++++++++++++++++++++--------------- Project.njsproj | 3 + 4 files changed, 136 insertions(+), 91 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index 5630c367c..67ab26855 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -286,16 +286,16 @@ let band = { begin: undefined, end: undefined, - close: undefined, movingAverage: undefined, - standardDeviation: undefined + standardDeviation: undefined, + deviation: undefined }; band.begin = dailyFile[i][0]; band.end = dailyFile[i][1]; - band.close = dailyFile[i][2]; - band.movingAverage = dailyFile[i][3]; - band.standardDeviation = dailyFile[i][4]; + band.movingAverage = dailyFile[i][2]; + band.standardDeviation = dailyFile[i][3]; + band.deviation = dailyFile[i][4]; if (band.begin >= farLeftDate.valueOf() && band.end <= farRightDate.valueOf()) { @@ -363,16 +363,16 @@ let band = { begin: undefined, end: undefined, - close: undefined, movingAverage: undefined, - standardDeviation: undefined + standardDeviation: undefined, + deviation: undefined }; band.begin = marketFile[i][0]; band.end = marketFile[i][1]; - band.close = marketFile[i][2]; - band.movingAverage = marketFile[i][3]; - band.standardDeviation = marketFile[i][4]; + band.movingAverage = marketFile[i][2]; + band.standardDeviation = marketFile[i][3]; + band.deviation = marketFile[i][4]; if (band.begin >= leftDate.valueOf() && band.end <= rightDate.valueOf()) { @@ -470,22 +470,22 @@ let bandPoint1 = { x: band.begin, - y: previousBand.movingAverage - 2 * previousBand.standardDeviation + y: previousBand.movingAverage - previousBand.deviation }; let bandPoint2 = { x: band.begin, - y: previousBand.movingAverage + 2 * previousBand.standardDeviation + y: previousBand.movingAverage + previousBand.deviation }; let bandPoint3 = { x: band.end, - y: band.movingAverage + 2 * band.standardDeviation + y: band.movingAverage + band.deviation }; let bandPoint4 = { x: band.end, - y: band.movingAverage - 2 * band.standardDeviation + y: band.movingAverage - band.deviation }; let bandPoint5 = { @@ -629,28 +629,20 @@ browserCanvasContext.closePath(); + if (bandPoint5.y > bandPoint6.y) { + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.PATINATED_TURQUOISE + ', 1)'; + } else { + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.RUSTED_RED + ', 1)'; + } if (datetime !== undefined) { let dateValue = datetime.valueOf(); if (dateValue >= band.begin && dateValue <= band.end) { - /* highlight the current band */ - browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 1)'; // Current band accroding to time - - - } else { - - browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.RUSTED_RED + ', 1)'; - } - - } else { - - browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.RUSTED_RED + ', 1)'; - } browserCanvasContext.lineWidth = 0.2; diff --git a/BollingerBandsPanel.js b/BollingerBandsPanel.js index 7f9554d6a..0fce812e2 100644 --- a/BollingerBandsPanel.js +++ b/BollingerBandsPanel.js @@ -146,13 +146,20 @@ function newAAMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () browserCanvasContext.beginPath(); - browserCanvasContext.moveTo(bandPoint1.x, bandPoint1.y + (bandPoint2.y - bandPoint1.y) / 2); - browserCanvasContext.lineTo(bandPoint4.x, bandPoint4.y - (bandPoint4.y - bandPoint3.y) / 2); + let y1 = bandPoint1.y + (bandPoint2.y - bandPoint1.y) / 2; + let y2 = bandPoint4.y - (bandPoint4.y - bandPoint3.y) / 2; + + browserCanvasContext.moveTo(bandPoint1.x, y1); + browserCanvasContext.lineTo(bandPoint4.x, y2); browserCanvasContext.closePath(); - browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.RUSTED_RED + ', 1)'; + if (y1 > y2) { + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.PATINATED_TURQUOISE + ', 1)'; + } else { + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.RUSTED_RED + ', 1)'; + } browserCanvasContext.lineWidth = 0.2; browserCanvasContext.stroke(); @@ -170,8 +177,8 @@ function newAAMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () printLabel('Moving Average', X_AXIS, frameTitleHeight + frameBodyHeight * 0.05, '1'); printLabel(currentBand.innerBand.movingAverage, X_AXIS, frameTitleHeight + frameBodyHeight * 0.10, '0.50'); - printLabel('Standard Deviation', X_AXIS, frameTitleHeight + frameBodyHeight * 0.95, '1'); - printLabel(currentBand.innerBand.standardDeviation, X_AXIS, frameTitleHeight + frameBodyHeight * 0.90, '0.50'); + printLabel('Deviation', X_AXIS, frameTitleHeight + frameBodyHeight * 0.95, '1'); + printLabel(currentBand.innerBand.deviation, X_AXIS, frameTitleHeight + frameBodyHeight * 0.90, '0.50'); function printLabel(labelToPrint, x, y, opacity) { diff --git a/PercentageBandwidth.js b/PercentageBandwidth.js index 9dcea97f2..2e0c25f9a 100644 --- a/PercentageBandwidth.js +++ b/PercentageBandwidth.js @@ -25,7 +25,7 @@ // Secondary functions and properties. - currentBand: undefined + currentPercentageBandwidth: undefined }; /* this is part of the module template */ @@ -48,7 +48,7 @@ /* these are module specific variables: */ - let bands = []; // Here we keep the bands to be ploted every time the Draw() function is called by the AAWebPlatform. + let percentageBandwidthArray = []; // Here we keep the percentageBandwidthArray to be ploted every time the Draw() function is called by the AAWebPlatform. return thisObject; @@ -249,7 +249,7 @@ } - thisObject.container.eventHandler.raiseEvent("Bands Changed", bands); + thisObject.container.eventHandler.raiseEvent("Bands Changed", percentageBandwidthArray); } catch (err) { @@ -279,7 +279,7 @@ let currentDate = new Date(farLeftDate.valueOf()); - bands = []; + percentageBandwidthArray = []; while (currentDate.valueOf() <= farRightDate.valueOf() + ONE_DAY_IN_MILISECONDS) { @@ -291,28 +291,26 @@ for (let i = 0; i < dailyFile.length; i++) { - let band = { + let percentageBandwidth = { begin: undefined, end: undefined, - close: undefined, - movingAverage: undefined, - standardDeviation: undefined + value: undefined, + movingAverage: undefined }; - band.begin = dailyFile[i][0]; - band.end = dailyFile[i][1]; - band.close = dailyFile[i][2]; - band.movingAverage = dailyFile[i][3]; - band.standardDeviation = dailyFile[i][4]; + percentageBandwidth.begin = dailyFile[i][0]; + percentageBandwidth.end = dailyFile[i][1]; + percentageBandwidth.value = dailyFile[i][2]; + percentageBandwidth.movingAverage = dailyFile[i][3]; - if (band.begin >= farLeftDate.valueOf() && band.end <= farRightDate.valueOf()) { + if (percentageBandwidth.begin >= farLeftDate.valueOf() && percentageBandwidth.end <= farRightDate.valueOf()) { - bands.push(band); + percentageBandwidthArray.push(percentageBandwidth); - if (datetime.valueOf() >= band.begin && datetime.valueOf() <= band.end) { + if (datetime.valueOf() >= percentageBandwidth.begin && datetime.valueOf() <= percentageBandwidth.end) { - thisObject.currentBand = band; - thisObject.container.eventHandler.raiseEvent("Current Band Changed", thisObject.currentBand); + thisObject.currentPercentageBandwidth = percentageBandwidth; + thisObject.container.eventHandler.raiseEvent("Current Percentage Bandwidth Changed", thisObject.currentPercentageBandwidth); } } @@ -322,23 +320,23 @@ currentDate = new Date(currentDate.valueOf() + ONE_DAY_IN_MILISECONDS); } - /* Lests check if all the visible screen is going to be covered by bands. */ + /* Lests check if all the visible screen is going to be covered by percentageBandwidthArray. */ let lowerEnd = leftDate.valueOf(); let upperEnd = rightDate.valueOf(); - if (bands.length > 0) { + if (percentageBandwidthArray.length > 0) { - if (bands[0].begin > lowerEnd || bands[bands.length - 1].end < upperEnd) { + if (percentageBandwidthArray[0].begin > lowerEnd || percentageBandwidthArray[percentageBandwidthArray.length - 1].end < upperEnd) { setTimeout(recalculate, 2000); - //console.log("File missing while calculating bands, scheduling a recalculation in 2 seconds."); + //console.log("File missing while calculating percentageBandwidthArray, scheduling a recalculation in 2 seconds."); } } - //console.log("Olivia > recalculateUsingDailyFiles > total bands generated : " + bands.length); + //console.log("Olivia > recalculateUsingDailyFiles > total percentageBandwidthArray generated : " + percentageBandwidthArray.length); } catch (err) { @@ -364,38 +362,36 @@ leftDate = new Date(leftDate.valueOf() - dateDiff * 1.5); rightDate = new Date(rightDate.valueOf() + dateDiff * 1.5); - bands = []; + percentageBandwidthArray = []; for (let i = 0; i < marketFile.length; i++) { - let band = { + let percentageBandwidth = { begin: undefined, end: undefined, - close: undefined, - movingAverage: undefined, - standardDeviation: undefined + value: undefined, + movingAverage: undefined }; - band.begin = marketFile[i][0]; - band.end = marketFile[i][1]; - band.close = marketFile[i][2]; - band.movingAverage = marketFile[i][3]; - band.standardDeviation = marketFile[i][4]; + percentageBandwidth.begin = marketFile[i][0]; + percentageBandwidth.end = marketFile[i][1]; + percentageBandwidth.value = marketFile[i][2]; + percentageBandwidth.movingAverage = marketFile[i][3]; - if (band.begin >= leftDate.valueOf() && band.end <= rightDate.valueOf()) { + if (percentageBandwidth.begin >= leftDate.valueOf() && percentageBandwidth.end <= rightDate.valueOf()) { - bands.push(band); + percentageBandwidthArray.push(percentageBandwidth); - if (datetime.valueOf() >= band.begin && datetime.valueOf() <= band.end) { + if (datetime.valueOf() >= percentageBandwidth.begin && datetime.valueOf() <= percentageBandwidth.end) { - thisObject.currentBand = band; - thisObject.container.eventHandler.raiseEvent("Current Band Changed", thisObject.currentBand); + thisObject.currentPercentageBandwidth = percentageBandwidth; + thisObject.container.eventHandler.raiseEvent("Current Percentage Bandwidth Changed", thisObject.currentPercentageBandwidth); } } } - //console.log("Olivia > recalculateUsingMarketFiles > total bands generated : " + bands.length); + //console.log("Olivia > recalculateUsingMarketFiles > total percentageBandwidthArray generated : " + percentageBandwidthArray.length); } catch (err) { @@ -476,10 +472,10 @@ if (INTENSIVE_LOG === true) { logger.write("[INFO] plotChart -> Entering function."); } - let band; + let percentageBandwidth; let previousBand; - if (bands.length > 0) { + if (percentageBandwidthArray.length > 0) { /* This next section is to get ready in order to be able to plot dinamically constrained to the viewport */ @@ -504,48 +500,44 @@ let pbChartHeight = 20; let pbOffset = 100 / 5 * 4; - /* Now we calculate and plot the bands */ + /* Now we calculate and plot the percentageBandwidthArray */ - for (let i = 1; i < bands.length; i++) { + for (let i = 1; i < percentageBandwidthArray.length; i++) { - band = bands[i]; - previousBand = bands[i - 1]; + percentageBandwidth = percentageBandwidthArray[i]; + previousBand = percentageBandwidthArray[i - 1]; /* Here we will draw the percent bandwidth chart */ - let lowerBB; - let upperBB; - - lowerBB = band.movingAverage - 2 * band.standardDeviation; - upperBB = band.movingAverage + 2 * band.standardDeviation; - - let currentPercentBandwidth = (band.close - lowerBB) / (upperBB - lowerBB) * pbChartHeight; + let currentPercentBandwidth = percentageBandwidth.value * pbChartHeight / 100; if (currentPercentBandwidth > pbChartHeight) { currentPercentBandwidth = pbChartHeight }; if (currentPercentBandwidth < 0) { currentPercentBandwidth = 0 }; - lowerBB = previousBand.movingAverage - 2 * previousBand.standardDeviation; - upperBB = previousBand.movingAverage + 2 * previousBand.standardDeviation; - - let previousPercentBandwidth = (previousBand.close - lowerBB) / (upperBB - lowerBB) * pbChartHeight; + let previousPercentBandwidth = previousBand.value * pbChartHeight / 100; if (previousPercentBandwidth > pbChartHeight) { previousPercentBandwidth = pbChartHeight }; if (previousPercentBandwidth < 0) { previousPercentBandwidth = 0 }; + let currentMovingAverage = percentageBandwidth.movingAverage * pbChartHeight / 100; + let previousMovingAverage = previousBand.movingAverage * pbChartHeight / 100; + let pbPoint1; let pbPoint2; let pbPoint3; let pbPoint4; let pbPoint5; let pbPoint6; + let pbPoint7; + let pbPoint8; function calculateCoordinates(plot, height) { pbPoint1 = { - x: band.begin, + x: percentageBandwidth.begin, y: previousPercentBandwidth + pbOffset }; pbPoint2 = { - x: band.end, + x: percentageBandwidth.end, y: currentPercentBandwidth + pbOffset }; @@ -571,6 +563,18 @@ y: 100 * pbChartHeight / 100 + pbOffset }; + /* Moving Average */ + + pbPoint7 = { + x: percentageBandwidth.begin, + y: previousMovingAverage + pbOffset + }; + + pbPoint8 = { + x: percentageBandwidth.end, + y: currentMovingAverage + pbOffset + }; + pbPoint1 = plot.transformThisPoint(pbPoint1); pbPoint2 = plot.transformThisPoint(pbPoint2); @@ -579,6 +583,9 @@ pbPoint5 = plot.transformThisPoint(pbPoint5); pbPoint6 = plot.transformThisPoint(pbPoint6); + pbPoint7 = plot.transformThisPoint(pbPoint7); + pbPoint8 = plot.transformThisPoint(pbPoint8); + pbPoint1 = transformThisPoint(pbPoint1, thisObject.container); pbPoint2 = transformThisPoint(pbPoint2, thisObject.container); @@ -587,6 +594,9 @@ pbPoint5 = transformThisPoint(pbPoint5, thisObject.container); pbPoint6 = transformThisPoint(pbPoint6, thisObject.container); + pbPoint7 = transformThisPoint(pbPoint7, thisObject.container); + pbPoint8 = transformThisPoint(pbPoint8, thisObject.container); + if (pbPoint1.x < viewPort.visibleArea.bottomLeft.x || pbPoint2.x > viewPort.visibleArea.bottomRight.x) { return false; } @@ -613,6 +623,9 @@ pbPoint5.y = viewPort.visibleArea.bottomRight.y - (70 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; pbPoint6.y = viewPort.visibleArea.bottomRight.y - (100 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; + pbPoint7.y = viewPort.visibleArea.bottomRight.y - (previousMovingAverage + pbOffset) * plotAreaViewport.scale.y; + pbPoint8.y = viewPort.visibleArea.bottomRight.y - (currentMovingAverage + pbOffset) * plotAreaViewport.scale.y; + } /* Everything must fit within the visible area */ @@ -625,6 +638,9 @@ pbPoint5 = viewPort.fitIntoVisibleArea(pbPoint5); pbPoint6 = viewPort.fitIntoVisibleArea(pbPoint6); + pbPoint7 = viewPort.fitIntoVisibleArea(pbPoint7); + pbPoint8 = viewPort.fitIntoVisibleArea(pbPoint8); + /* Now the drawing of the lines */ @@ -741,7 +757,7 @@ let dateValue = datetime.valueOf(); - if (dateValue >= band.begin && dateValue <= band.end) { + if (dateValue >= percentageBandwidth.begin && dateValue <= percentageBandwidth.end) { browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 1)'; } else { browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.GOLDEN_ORANGE + ', 1)'; @@ -753,6 +769,33 @@ browserCanvasContext.lineWidth = 0.2; browserCanvasContext.stroke(); + /* Now the drawing of the moving average*/ + + browserCanvasContext.beginPath(); + + browserCanvasContext.moveTo(pbPoint7.x, pbPoint7.y); + browserCanvasContext.lineTo(pbPoint8.x, pbPoint8.y); + + browserCanvasContext.closePath(); + + if (pbPoint7.y > pbPoint8.y) { + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.PATINATED_TURQUOISE + ', 1)'; + } else { + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.RUSTED_RED + ', 1)'; + } + + if (datetime !== undefined) { + + let dateValue = datetime.valueOf(); + + if (dateValue >= percentageBandwidth.begin && dateValue <= percentageBandwidth.end) { + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 1)'; + } + } + + browserCanvasContext.lineWidth = 0.2; + browserCanvasContext.stroke(); + } } diff --git a/Project.njsproj b/Project.njsproj index 6054db760..e92bfb11e 100644 --- a/Project.njsproj +++ b/Project.njsproj @@ -19,6 +19,9 @@ + + Code + From eeb6d3905508198e595859dbc0cae8e856e35c5f Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 6 Mar 2019 00:47:31 +0100 Subject: [PATCH 05/54] Bandwidth --- PercentageBandwidth.js | 60 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 58 insertions(+), 2 deletions(-) diff --git a/PercentageBandwidth.js b/PercentageBandwidth.js index 2e0c25f9a..34d20286c 100644 --- a/PercentageBandwidth.js +++ b/PercentageBandwidth.js @@ -295,13 +295,15 @@ begin: undefined, end: undefined, value: undefined, - movingAverage: undefined + movingAverage: undefined, + bandwidth: undefined }; percentageBandwidth.begin = dailyFile[i][0]; percentageBandwidth.end = dailyFile[i][1]; percentageBandwidth.value = dailyFile[i][2]; percentageBandwidth.movingAverage = dailyFile[i][3]; + percentageBandwidth.bandwidth = dailyFile[i][4]; if (percentageBandwidth.begin >= farLeftDate.valueOf() && percentageBandwidth.end <= farRightDate.valueOf()) { @@ -370,13 +372,15 @@ begin: undefined, end: undefined, value: undefined, - movingAverage: undefined + movingAverage: undefined, + bandwidth: undefined }; percentageBandwidth.begin = marketFile[i][0]; percentageBandwidth.end = marketFile[i][1]; percentageBandwidth.value = marketFile[i][2]; percentageBandwidth.movingAverage = marketFile[i][3]; + percentageBandwidth.bandwidth = marketFile[i][4]; if (percentageBandwidth.begin >= leftDate.valueOf() && percentageBandwidth.end <= rightDate.valueOf()) { @@ -520,6 +524,9 @@ let currentMovingAverage = percentageBandwidth.movingAverage * pbChartHeight / 100; let previousMovingAverage = previousBand.movingAverage * pbChartHeight / 100; + let currentBandwidth = percentageBandwidth.bandwidth * pbChartHeight / 100; + let previousBandwidth = previousPercentBandwidth.bandwidth * pbChartHeight / 100; + let pbPoint1; let pbPoint2; let pbPoint3; @@ -528,6 +535,7 @@ let pbPoint6; let pbPoint7; let pbPoint8; + let pbPoint9; function calculateCoordinates(plot, height) { @@ -575,6 +583,18 @@ y: currentMovingAverage + pbOffset }; + /* Bandwidth */ + + pbPoint9 = { + x: percentageBandwidth.begin, + y: previousBandwidth + pbOffset + }; + + pbPoint10 = { + x: percentageBandwidth.end, + y: currentBandwidth + pbOffset + }; + pbPoint1 = plot.transformThisPoint(pbPoint1); pbPoint2 = plot.transformThisPoint(pbPoint2); @@ -586,6 +606,9 @@ pbPoint7 = plot.transformThisPoint(pbPoint7); pbPoint8 = plot.transformThisPoint(pbPoint8); + pbPoint9 = plot.transformThisPoint(pbPoint9); + pbPoint10 = plot.transformThisPoint(pbPoint10); + pbPoint1 = transformThisPoint(pbPoint1, thisObject.container); pbPoint2 = transformThisPoint(pbPoint2, thisObject.container); @@ -597,6 +620,9 @@ pbPoint7 = transformThisPoint(pbPoint7, thisObject.container); pbPoint8 = transformThisPoint(pbPoint8, thisObject.container); + pbPoint9 = transformThisPoint(pbPoint9, thisObject.container); + pbPoint10 = transformThisPoint(pbPoint10, thisObject.container); + if (pbPoint1.x < viewPort.visibleArea.bottomLeft.x || pbPoint2.x > viewPort.visibleArea.bottomRight.x) { return false; } @@ -626,6 +652,9 @@ pbPoint7.y = viewPort.visibleArea.bottomRight.y - (previousMovingAverage + pbOffset) * plotAreaViewport.scale.y; pbPoint8.y = viewPort.visibleArea.bottomRight.y - (currentMovingAverage + pbOffset) * plotAreaViewport.scale.y; + pbPoint9.y = viewPort.visibleArea.bottomRight.y - (previousBandwidth + pbOffset) * plotAreaViewport.scale.y; + pbPoint10.y = viewPort.visibleArea.bottomRight.y - (currentBandwidth + pbOffset) * plotAreaViewport.scale.y; + } /* Everything must fit within the visible area */ @@ -641,6 +670,9 @@ pbPoint7 = viewPort.fitIntoVisibleArea(pbPoint7); pbPoint8 = viewPort.fitIntoVisibleArea(pbPoint8); + pbPoint9 = viewPort.fitIntoVisibleArea(pbPoint9); + pbPoint10 = viewPort.fitIntoVisibleArea(pbPoint10); + /* Now the drawing of the lines */ @@ -796,6 +828,30 @@ browserCanvasContext.lineWidth = 0.2; browserCanvasContext.stroke(); + /* Now the drawing of the bandwidth*/ + + browserCanvasContext.beginPath(); + + browserCanvasContext.moveTo(pbPoint9.x, pbPoint9.y); + browserCanvasContext.lineTo(pbPoint10.x, pbPoint10.y); + + browserCanvasContext.closePath(); + + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.GREEN + ', 1)'; + + if (datetime !== undefined) { + + let dateValue = datetime.valueOf(); + + if (dateValue >= percentageBandwidth.begin && dateValue <= percentageBandwidth.end) { + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 1)'; + } + } + + browserCanvasContext.setLineDash([1, 4]) + browserCanvasContext.lineWidth = 1 + browserCanvasContext.stroke() + browserCanvasContext.setLineDash([0, 0]) } } From 7fc7c00a99a5f9bd89cad82e27957f1a84f6ab56 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 6 Mar 2019 00:52:41 +0100 Subject: [PATCH 06/54] Bandwidth --- PercentageBandwidth.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/PercentageBandwidth.js b/PercentageBandwidth.js index 34d20286c..4730e9b48 100644 --- a/PercentageBandwidth.js +++ b/PercentageBandwidth.js @@ -1,4 +1,4 @@ -function newAAMastersPlottersBollingerBandsPercentageBandwidth () { +function newAAMastersPlottersBollingerBandsPercentageBandwidth() { const MODULE_NAME = "Bands Plotter"; const INFO_LOG = false; @@ -97,7 +97,7 @@ } } - function recalculateScale () { + function recalculateScale() { recalculateScaleY(); recalculateScaleX(); @@ -524,8 +524,8 @@ let currentMovingAverage = percentageBandwidth.movingAverage * pbChartHeight / 100; let previousMovingAverage = previousBand.movingAverage * pbChartHeight / 100; - let currentBandwidth = percentageBandwidth.bandwidth * pbChartHeight / 100; - let previousBandwidth = previousPercentBandwidth.bandwidth * pbChartHeight / 100; + let currentBandwidth = percentageBandwidth.bandwidth * 100 * pbChartHeight / 100; + let previousBandwidth = previousBand.bandwidth * 100 * pbChartHeight / 100; let pbPoint1; let pbPoint2; @@ -536,6 +536,7 @@ let pbPoint7; let pbPoint8; let pbPoint9; + let pbPoint10; function calculateCoordinates(plot, height) { @@ -822,8 +823,8 @@ if (dateValue >= percentageBandwidth.begin && dateValue <= percentageBandwidth.end) { browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 1)'; - } - } + } + } browserCanvasContext.lineWidth = 0.2; browserCanvasContext.stroke(); @@ -908,3 +909,4 @@ } } + From 9bc6a7a6964485c23a0c99385add86e24a1a5b39 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 20 Mar 2019 22:45:15 +0100 Subject: [PATCH 07/54] Tab Button --- BollingerBandsPanel.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/BollingerBandsPanel.js b/BollingerBandsPanel.js index 0fce812e2..12a7a9191 100644 --- a/BollingerBandsPanel.js +++ b/BollingerBandsPanel.js @@ -17,6 +17,7 @@ function newAAMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () container.frame.containerName = "Bollinger Band Panel"; let currentBand; + let panelTabButton return thisObject; @@ -28,12 +29,19 @@ function newAAMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () thisObject.container.frame.position.x = viewPort.visibleArea.topRight.x - thisObject.container.frame.width * 3; thisObject.container.frame.position.y = viewPort.visibleArea.bottomLeft.y - thisObject.container.frame.height; + panelTabButton = newPanelTabButton() + panelTabButton.parentContainer = thisObject.container + panelTabButton.container.frame.parentFrame = thisObject.container.frame + panelTabButton.initialize() } function getContainer(point) { var container; + container = panelTabButton.getContainer(point) + if (container !== undefined) { return container } + /* First we check if this point is inside this space. */ if (this.container.frame.isThisPointHere(point, true) === true) { @@ -63,6 +71,7 @@ function newAAMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () plotCurrentBandInfo(); + panelTabButton.draw() } From 82604cdf4ca1162c1aac4fbd0f6cf13dba0ac3c1 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 22 Mar 2019 17:24:28 +0100 Subject: [PATCH 08/54] Saira --- BollingerBandsPanel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BollingerBandsPanel.js b/BollingerBandsPanel.js index 12a7a9191..1ecbd9d21 100644 --- a/BollingerBandsPanel.js +++ b/BollingerBandsPanel.js @@ -194,7 +194,7 @@ function newAAMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () let labelPoint; let fontSize = 10; - browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY; + browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + ' Saira'; let label = '' + labelToPrint; if (isNaN(label) === false) { From c08e5dc1f48ac518e9596c516c69d9c01448c8bb Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 26 Mar 2019 10:02:13 +0100 Subject: [PATCH 09/54] Finalize() function implemented --- BollingerBands.js | 30 ++++++++++++++++++++++++++++++ PercentageBandwidth.js | 30 ++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/BollingerBands.js b/BollingerBands.js index 67ab26855..78e845766 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -13,6 +13,7 @@ // Main functions and properties. initialize: initialize, + finalize: finalize, container: undefined, getContainer: getContainer, setTimePeriod: setTimePeriod, @@ -52,6 +53,35 @@ 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 { diff --git a/PercentageBandwidth.js b/PercentageBandwidth.js index 4730e9b48..c48f3b266 100644 --- a/PercentageBandwidth.js +++ b/PercentageBandwidth.js @@ -12,6 +12,7 @@ // Main functions and properties. initialize: initialize, + finalize: finalize, container: undefined, getContainer: getContainer, setTimePeriod: setTimePeriod, @@ -52,6 +53,35 @@ 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 { From f2ff7d4f15684656f3798021d12e85705a181f05 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 6 Apr 2019 09:48:47 +0200 Subject: [PATCH 10/54] Fixing the scale --- BollingerBands.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BollingerBands.js b/BollingerBands.js index 78e845766..a335d128d 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -442,7 +442,7 @@ let maxValue = { x: MAX_PLOTABLE_DATE.valueOf(), - y: nextPorwerOf10(getMaxRate()) / 4 // TODO: This 4 is temporary + y: nextPorwerOf10(USDT_BTC_HTH) / 4 // TODO: This 4 is temporary }; From bbf44f86b3ee33cf7fb713bba19674dee8fd42a6 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 11 Apr 2019 14:19:16 +0200 Subject: [PATCH 11/54] Adapted to new version of canvas app --- BollingerBands.js | 125 ++++++++++++++++------------------------- PercentageBandwidth.js | 82 ++++++++++++--------------- 2 files changed, 85 insertions(+), 122 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index a335d128d..c8be98be0 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -64,6 +64,7 @@ viewPort.eventHandler.stopListening("Offset Changed", onOffsetChanged); marketFiles.eventHandler.stopListening("Files Updated", onFilesUpdated); canvas.eventHandler.stopListening("Drag Finished", onDragFinished); + thisObject.container.eventHandler.stopListening('Dimmensions Changed') /* Destroyd References */ @@ -78,7 +79,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] finalize -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] finalize -> err = " + err.stack); } } } @@ -118,11 +119,16 @@ recalculate(); + thisObject.container.eventHandler.listenToEvent('Dimmensions Changed', function () { + recalculateScale(); + recalculate(); + }) + callBackFunction(); } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] initialize -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] initialize -> err = " + err.stack); } } } @@ -149,7 +155,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] getContainer -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] getContainer -> err = " + err.stack); } } } @@ -169,7 +175,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] onFilesUpdated -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] onFilesUpdated -> err = " + err.stack); } } } @@ -207,7 +213,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] setTimePeriod -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] setTimePeriod -> err = " + err.stack); } } } @@ -235,7 +241,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] onDailyFileLoaded -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] onDailyFileLoaded -> err = " + err.stack); } } } @@ -251,7 +257,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] draw -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] draw -> err = " + err.stack); } } } @@ -275,7 +281,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] recalculate -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] recalculate -> err = " + err.stack); } } } @@ -364,7 +370,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] recalculateUsingDailyFiles -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] recalculateUsingDailyFiles -> err = " + err.stack); } } } @@ -421,7 +427,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] recalculateUsingMarketFiles -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] recalculateUsingMarketFiles -> err = " + err.stack); } } } @@ -474,7 +480,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] recalculateScale -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] recalculateScale -> err = " + err.stack); } } } @@ -482,7 +488,8 @@ try { - if (INTENSIVE_LOG === true) { logger.write("[INFO] plotChart -> Entering function."); } + let userPosition = getUserPosition() + let userPositionDate = userPosition.point.x let band; let previousBand; @@ -566,26 +573,12 @@ browserCanvasContext.closePath(); - if (datetime !== undefined) { + browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.PATINATED_TURQUOISE + ', 0.05)'; - let dateValue = datetime.valueOf(); - - if (dateValue >= band.begin && dateValue <= band.end) { - - /* highlight the current band */ - - browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 0.05)'; // Current band accroding to time - - } else { - - browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.PATINATED_TURQUOISE + ', 0.05)'; - } - - } else { - - browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.PATINATED_TURQUOISE + ', 0.05)'; - - } + if (userPositionDate >= band.begin && userPositionDate <= band.end) { + /* highlight the current band */ + browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 0.05)'; // Current band accroding to time + } if ( bandPoint1.x < viewPort.visibleArea.topLeft.x + 50 @@ -611,40 +604,27 @@ browserCanvasContext.closePath(); + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.PATINATED_TURQUOISE + ', 1)'; + + if (userPositionDate >= band.begin && userPositionDate <= band.end) { - if (datetime !== undefined) { + /* highlight the current band */ - let dateValue = datetime.valueOf(); + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 1)'; // Current band accroding to time - if (dateValue >= band.begin && dateValue <= band.end) { - - /* highlight the current band */ - - browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 1)'; // Current band accroding to time - - let currentBand = { - bodyWidth: bandPoint3.x - bandPoint2.x, - leftBodyHeight: bandPoint2.y - bandPoint1.y, - rightBodyHeight: bandPoint3.y - bandPoint4.y, - topDelta: bandPoint3.y - bandPoint2.y, - bottomDelta: bandPoint4.y - bandPoint1.y, - period: timePeriod, - innerBand: band - }; - - thisObject.container.eventHandler.raiseEvent("Current Band Changed", currentBand); - - } else { - - browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.PATINATED_TURQUOISE + ', 1)'; - - } - - } else { - - browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.PATINATED_TURQUOISE + ', 1)'; - } + let currentBand = { + bodyWidth: bandPoint3.x - bandPoint2.x, + leftBodyHeight: bandPoint2.y - bandPoint1.y, + rightBodyHeight: bandPoint3.y - bandPoint4.y, + topDelta: bandPoint3.y - bandPoint2.y, + bottomDelta: bandPoint4.y - bandPoint1.y, + period: timePeriod, + innerBand: band + }; + thisObject.container.eventHandler.raiseEvent("Current Band Changed", currentBand); + } + browserCanvasContext.lineWidth = 0.2; browserCanvasContext.stroke(); @@ -665,26 +645,19 @@ browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.RUSTED_RED + ', 1)'; } - if (datetime !== undefined) { - - let dateValue = datetime.valueOf(); - - if (dateValue >= band.begin && dateValue <= band.end) { - /* highlight the current band */ - browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 1)'; // Current band accroding to time - } + if (userPositionDate >= band.begin && userPositionDate <= band.end) { + /* highlight the current band */ + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 1)'; // Current band accroding to time } - + browserCanvasContext.lineWidth = 0.2; browserCanvasContext.stroke(); - - } } } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] plotChart -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] plotChart -> err = " + err.stack); } } } @@ -699,7 +672,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] onZoomChanged -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] onZoomChanged -> err = " + err.stack); } } } @@ -716,7 +689,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] onOffsetChanged -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] onOffsetChanged -> err = " + err.stack); } } } @@ -730,7 +703,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] onDragFinished -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] onDragFinished -> err = " + err.stack); } } } } diff --git a/PercentageBandwidth.js b/PercentageBandwidth.js index c48f3b266..17f532928 100644 --- a/PercentageBandwidth.js +++ b/PercentageBandwidth.js @@ -64,6 +64,7 @@ viewPort.eventHandler.stopListening("Offset Changed", onOffsetChanged); marketFiles.eventHandler.stopListening("Files Updated", onFilesUpdated); canvas.eventHandler.stopListening("Drag Finished", onDragFinished); + thisObject.container.eventHandler.stopListening('Dimmensions Changed') /* Destroyd References */ @@ -78,7 +79,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] finalize -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] finalize -> err = " + err.stack); } } } @@ -119,11 +120,17 @@ recalculate(); + thisObject.container.eventHandler.listenToEvent('Dimmensions Changed', function () { + recalculateScaleY(); + recalculateScaleX(); + recalculate(); + }) + callBackFunction(); } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] initialize -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] initialize -> err = " + err.stack); } } } @@ -157,7 +164,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] getContainer -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] getContainer -> err = " + err.stack); } } } @@ -177,7 +184,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] onFilesUpdated -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] onFilesUpdated -> err = " + err.stack); } } } @@ -215,7 +222,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] setTimePeriod -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] setTimePeriod -> err = " + err.stack); } } } @@ -243,7 +250,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] onDailyFileLoaded -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] onDailyFileLoaded -> err = " + err.stack); } } } @@ -259,7 +266,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] draw -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] draw -> err = " + err.stack); } } } @@ -283,7 +290,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] recalculate -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] recalculate -> err = " + err.stack); } } } @@ -372,7 +379,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] recalculateUsingDailyFiles -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] recalculateUsingDailyFiles -> err = " + err.stack); } } } @@ -429,7 +436,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] recalculateUsingMarketFiles -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] recalculateUsingMarketFiles -> err = " + err.stack); } } } @@ -461,7 +468,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] recalculateScaleX -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] recalculateScaleX -> err = " + err.stack); } } } @@ -495,7 +502,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] recalculateScaleY -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] recalculateScaleY -> err = " + err.stack); } } } @@ -504,7 +511,8 @@ try { - if (INTENSIVE_LOG === true) { logger.write("[INFO] plotChart -> Entering function."); } + let userPosition = getUserPosition() + let userPositionDate = userPosition.point.x let percentageBandwidth; let previousBand; @@ -815,20 +823,12 @@ browserCanvasContext.closePath(); - - if (datetime !== undefined) { - - let dateValue = datetime.valueOf(); - - if (dateValue >= percentageBandwidth.begin && dateValue <= percentageBandwidth.end) { - browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 1)'; - } else { - browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.GOLDEN_ORANGE + ', 1)'; - } - } else { - browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.GOLDEN_ORANGE + ', 1)'; - } - + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.GOLDEN_ORANGE + ', 1)'; + + if (userPositionDate >= percentageBandwidth.begin && userPositionDate <= percentageBandwidth.end) { + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 1)'; + } + browserCanvasContext.lineWidth = 0.2; browserCanvasContext.stroke(); @@ -847,13 +847,8 @@ browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.RUSTED_RED + ', 1)'; } - if (datetime !== undefined) { - - let dateValue = datetime.valueOf(); - - if (dateValue >= percentageBandwidth.begin && dateValue <= percentageBandwidth.end) { - browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 1)'; - } + if (userPositionDate >= percentageBandwidth.begin && userPositionDate <= percentageBandwidth.end) { + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 1)'; } browserCanvasContext.lineWidth = 0.2; @@ -870,15 +865,10 @@ browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.GREEN + ', 1)'; - if (datetime !== undefined) { - - let dateValue = datetime.valueOf(); - - if (dateValue >= percentageBandwidth.begin && dateValue <= percentageBandwidth.end) { - browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 1)'; - } + if (userPositionDate >= percentageBandwidth.begin && userPositionDate <= percentageBandwidth.end) { + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 1)'; } - + browserCanvasContext.setLineDash([1, 4]) browserCanvasContext.lineWidth = 1 browserCanvasContext.stroke() @@ -888,7 +878,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] plotChart -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] plotChart -> err = " + err.stack); } } } @@ -903,7 +893,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] onZoomChanged -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] onZoomChanged -> err = " + err.stack); } } } @@ -920,7 +910,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] onOffsetChanged -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] onOffsetChanged -> err = " + err.stack); } } } @@ -934,7 +924,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] onDragFinished -> err.message = " + err.message); } + if (ERROR_LOG === true) { logger.write("[ERROR] onDragFinished -> err = " + err.stack); } } } } From 11ae5ca0212c2c2109069874ff7f9dc0709ef056 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 17 Apr 2019 20:40:13 +0200 Subject: [PATCH 12/54] Variable Name Standarization --- BollingerBands.js | 2 +- PercentageBandwidth.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index c8be98be0..e55a8cf36 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -442,7 +442,7 @@ if (timeLineCoordinateSystem.maxValue > 0) { return; } // Already calculated. let minValue = { - x: EARLIEST_DATE.valueOf(), + x: MIN_PLOTABLE_DATE.valueOf(), y: 0 }; diff --git a/PercentageBandwidth.js b/PercentageBandwidth.js index 17f532928..07579ceed 100644 --- a/PercentageBandwidth.js +++ b/PercentageBandwidth.js @@ -447,7 +447,7 @@ if (INFO_LOG === true) { logger.write("[INFO] recalculateScaleX -> Entering function."); } var minValue = { - x: EARLIEST_DATE.valueOf() + x: MIN_PLOTABLE_DATE.valueOf() }; var maxValue = { From 54f2c2268e7eb7b103c640d1a0ec8c7730466964 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 24 Apr 2019 20:37:19 +0200 Subject: [PATCH 13/54] EventHandling Improved --- BollingerBands.js | 26 ++++++++++++++++---------- PercentageBandwidth.js | 26 ++++++++++++++++---------- 2 files changed, 32 insertions(+), 20 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index e55a8cf36..54f603b28 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -51,6 +51,12 @@ let bands = []; // Here we keep the bands to be ploted every time the Draw() function is called by the AAWebPlatform. + let zoomChangedEventSubscriptionId + let offsetChangedEventSubscriptionId + let filesUpdatedEventSubscriptionId + let dragFinishedEventSubscriptionId + let dimmensionsChangedEventSubscriptionId + return thisObject; function finalize() { @@ -60,11 +66,11 @@ /* 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); + marketFiles.eventHandler.stopListening(filesUpdatedEventSubscriptionId); + canvas.eventHandler.stopListening(dragFinishedEventSubscriptionId); + thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId) /* Destroyd References */ @@ -110,16 +116,16 @@ /* 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); + filesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onFilesUpdated); + dragFinishedEventSubscriptionId = canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished); /* Get ready for plotting. */ recalculate(); - thisObject.container.eventHandler.listenToEvent('Dimmensions Changed', function () { + dimmensionsChangedEventSubscriptionId = thisObject.container.eventHandler.listenToEvent('Dimmensions Changed', function () { recalculateScale(); recalculate(); }) diff --git a/PercentageBandwidth.js b/PercentageBandwidth.js index 07579ceed..29ce829c9 100644 --- a/PercentageBandwidth.js +++ b/PercentageBandwidth.js @@ -51,6 +51,12 @@ let percentageBandwidthArray = []; // Here we keep the percentageBandwidthArray to be ploted every time the Draw() function is called by the AAWebPlatform. + let zoomChangedEventSubscriptionId + let offsetChangedEventSubscriptionId + let filesUpdatedEventSubscriptionId + let dragFinishedEventSubscriptionId + let dimmensionsChangedEventSubscriptionId + return thisObject; function finalize() { @@ -60,11 +66,11 @@ /* 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); + marketFiles.eventHandler.stopListening(filesUpdatedEventSubscriptionId); + canvas.eventHandler.stopListening(dragFinishedEventSubscriptionId); + thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId) /* Destroyd References */ @@ -111,16 +117,16 @@ /* 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); + filesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onFilesUpdated); + dragFinishedEventSubscriptionId = canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished); /* Get ready for plotting. */ recalculate(); - thisObject.container.eventHandler.listenToEvent('Dimmensions Changed', function () { + dimmensionsChangedEventSubscriptionId = thisObject.container.eventHandler.listenToEvent('Dimmensions Changed', function () { recalculateScaleY(); recalculateScaleX(); recalculate(); From 8a308df3346244ff6550165a015219fdf69c0395 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 28 Apr 2019 08:16:18 +0200 Subject: [PATCH 14/54] Removing INFO LOG and fixing BUG when scaling --- BollingerBands.js | 54 ------------------------------------------ PercentageBandwidth.js | 33 -------------------------- 2 files changed, 87 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index 54f603b28..250cb7b44 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -2,7 +2,6 @@ { const MODULE_NAME = "Bands Plotter"; - const INFO_LOG = false; const ERROR_LOG = true; const INTENSIVE_LOG = false; const logger = newWebDebugLog(); @@ -62,8 +61,6 @@ function finalize() { try { - if (INFO_LOG === true) { logger.write("[INFO] finalize -> Entering function."); } - /* Stop listening to the necesary events. */ viewPort.eventHandler.stopListening(zoomChangedEventSubscriptionId); @@ -93,8 +90,6 @@ try { - if (INFO_LOG === true) { logger.write("[INFO] initialize -> Entering function."); } - /* Store the information received. */ marketFiles = pStorage.marketFiles[0]; @@ -142,8 +137,6 @@ try { - if (INFO_LOG === true) { logger.write("[INFO] getContainer -> Entering function."); } - let container; /* First we check if this point is inside this space. */ @@ -169,8 +162,6 @@ try { - if (INFO_LOG === true) { logger.write("[INFO] onFilesUpdated -> Entering function."); } - let newMarketFile = marketFiles.getFile(timePeriod); if (newMarketFile !== undefined) { @@ -189,8 +180,6 @@ try { - if (INFO_LOG === true) { logger.write("[INFO] setTimePeriod -> Entering function."); } - if (timePeriod !== pTimePeriod) { timePeriod = pTimePeriod; @@ -225,8 +214,6 @@ function setDatetime(pDatetime) { - if (INFO_LOG === true) { logger.write("[INFO] setDatetime -> Entering function."); } - datetime = pDatetime; } @@ -235,8 +222,6 @@ try { - if (INFO_LOG === true) { logger.write("[INFO] onDailyFileLoaded -> Entering function."); } - if (event.currentValue === event.totalValue) { /* This happens only when all of the files in the cursor have been loaded. */ @@ -255,8 +240,6 @@ try { - if (INTENSIVE_LOG === true) { logger.write("[INFO] draw -> Entering function."); } - this.container.frame.draw(); plotChart(); @@ -271,8 +254,6 @@ try { - if (INFO_LOG === true) { logger.write("[INFO] recalculate -> Entering function."); } - if (timePeriod >= _1_HOUR_IN_MILISECONDS) { recalculateUsingMarketFiles(); @@ -295,8 +276,6 @@ try { - if (INFO_LOG === true) { logger.write("[INFO] recalculateUsingDailyFiles -> Entering function."); } - if (fileCursor === undefined) { return; } // We need to wait if (fileCursor.files.size === 0) { return; } // We need to wait until there are files in the cursor @@ -384,8 +363,6 @@ try { - if (INFO_LOG === true) { logger.write("[INFO] recalculateUsingMarketFiles -> Entering function."); } - if (marketFile === undefined) { return; } // Initialization not complete yet. let daysOnSides = getSideDays(timePeriod); @@ -429,8 +406,6 @@ } } - //console.log("Olivia > recalculateUsingMarketFiles > total bands generated : " + bands.length); - } catch (err) { if (ERROR_LOG === true) { logger.write("[ERROR] recalculateUsingMarketFiles -> err = " + err.stack); } @@ -441,10 +416,6 @@ try { - if (INFO_LOG === true) { logger.write("[INFO] recalculateScale -> Entering function."); } - - if (marketFile === undefined) { return; } // We need the market file to be loaded to make the calculation. - if (timeLineCoordinateSystem.maxValue > 0) { return; } // Already calculated. let minValue = { @@ -465,25 +436,6 @@ thisObject.container.frame.height ); - function getMaxRate() { - - if (INFO_LOG === true) { logger.write("[INFO] recalculateScale -> getMaxRate -> Entering function."); } - - let maxValue = 0; - - for (let i = 0; i < marketFile.length; i++) { - - let currentMax = marketFile[i][2]; // 2 = movingAvarage. - - if (maxValue < currentMax) { - maxValue = currentMax; - } - } - - return maxValue; - - } - } catch (err) { if (ERROR_LOG === true) { logger.write("[ERROR] recalculateScale -> err = " + err.stack); } @@ -672,8 +624,6 @@ try { - if (INFO_LOG === true) { logger.write("[INFO] onZoomChanged -> Entering function."); } - recalculate(); } catch (err) { @@ -686,8 +636,6 @@ try { - if (INFO_LOG === true) { logger.write("[INFO] onOffsetChanged -> Entering function."); } - if (Math.random() * 100 > 95) { recalculate() @@ -703,8 +651,6 @@ try { - if (INFO_LOG === true) { logger.write("[INFO] onDragFinished -> Entering function."); } - recalculate(); } catch (err) { diff --git a/PercentageBandwidth.js b/PercentageBandwidth.js index 29ce829c9..2f1e804b8 100644 --- a/PercentageBandwidth.js +++ b/PercentageBandwidth.js @@ -1,7 +1,6 @@ function newAAMastersPlottersBollingerBandsPercentageBandwidth() { const MODULE_NAME = "Bands Plotter"; - const INFO_LOG = false; const ERROR_LOG = true; const INTENSIVE_LOG = false; const logger = newWebDebugLog(); @@ -62,8 +61,6 @@ function finalize() { try { - if (INFO_LOG === true) { logger.write("[INFO] finalize -> Entering function."); } - /* Stop listening to the necesary events. */ viewPort.eventHandler.stopListening(zoomChangedEventSubscriptionId); @@ -93,8 +90,6 @@ try { - if (INFO_LOG === true) { logger.write("[INFO] initialize -> Entering function."); } - /* Store the information received. */ marketFiles = pStorage.marketFiles[0]; @@ -151,8 +146,6 @@ try { - if (INFO_LOG === true) { logger.write("[INFO] getContainer -> Entering function."); } - let container; /* First we check if this point is inside this space. */ @@ -178,8 +171,6 @@ try { - if (INFO_LOG === true) { logger.write("[INFO] onFilesUpdated -> Entering function."); } - let newMarketFile = marketFiles.getFile(timePeriod); if (newMarketFile !== undefined) { @@ -198,8 +189,6 @@ try { - if (INFO_LOG === true) { logger.write("[INFO] setTimePeriod -> Entering function."); } - if (timePeriod !== pTimePeriod) { timePeriod = pTimePeriod; @@ -234,8 +223,6 @@ function setDatetime(pDatetime) { - if (INFO_LOG === true) { logger.write("[INFO] setDatetime -> Entering function."); } - datetime = pDatetime; } @@ -244,8 +231,6 @@ try { - if (INFO_LOG === true) { logger.write("[INFO] onDailyFileLoaded -> Entering function."); } - if (event.currentValue === event.totalValue) { /* This happens only when all of the files in the cursor have been loaded. */ @@ -264,8 +249,6 @@ try { - if (INTENSIVE_LOG === true) { logger.write("[INFO] draw -> Entering function."); } - this.container.frame.draw(); plotChart(); @@ -280,8 +263,6 @@ try { - if (INFO_LOG === true) { logger.write("[INFO] recalculate -> Entering function."); } - if (timePeriod >= _1_HOUR_IN_MILISECONDS) { recalculateUsingMarketFiles(); @@ -304,8 +285,6 @@ try { - if (INFO_LOG === true) { logger.write("[INFO] recalculateUsingDailyFiles -> Entering function."); } - if (fileCursor === undefined) { return; } // We need to wait if (fileCursor.files.size === 0) { return; } // We need to wait until there are files in the cursor @@ -393,8 +372,6 @@ try { - if (INFO_LOG === true) { logger.write("[INFO] recalculateUsingMarketFiles -> Entering function."); } - if (marketFile === undefined) { return; } // Initialization not complete yet. let daysOnSides = getSideDays(timePeriod); @@ -450,8 +427,6 @@ try { - if (INFO_LOG === true) { logger.write("[INFO] recalculateScaleX -> Entering function."); } - var minValue = { x: MIN_PLOTABLE_DATE.valueOf() }; @@ -482,8 +457,6 @@ try { - if (INFO_LOG === true) { logger.write("[INFO] recalculateScaleY -> Entering function."); } - var minValue = { y: 0 }; @@ -893,8 +866,6 @@ try { - if (INFO_LOG === true) { logger.write("[INFO] onZoomChanged -> Entering function."); } - recalculate(); } catch (err) { @@ -907,8 +878,6 @@ try { - if (INFO_LOG === true) { logger.write("[INFO] onOffsetChanged -> Entering function."); } - if (Math.random() * 100 > 95) { recalculate() @@ -924,8 +893,6 @@ try { - if (INFO_LOG === true) { logger.write("[INFO] onDragFinished -> Entering function."); } - recalculate(); } catch (err) { From 12ce8af04e7e97fbb95b4a75d653dd298cabf502 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 12 May 2019 00:44:00 +0200 Subject: [PATCH 15/54] fitFunction Implemented --- BollingerBandsPanel.js | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/BollingerBandsPanel.js b/BollingerBandsPanel.js index 1ecbd9d21..49ac03b7c 100644 --- a/BollingerBandsPanel.js +++ b/BollingerBandsPanel.js @@ -2,6 +2,7 @@ function newAAMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () { var thisObject = { + fitFunction: undefined, onEventRaised: onEventRaised, container: undefined, draw: draw, @@ -32,29 +33,30 @@ function newAAMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () panelTabButton = newPanelTabButton() panelTabButton.parentContainer = thisObject.container panelTabButton.container.frame.parentFrame = thisObject.container.frame + panelTabButton.fitFunction = thisObject.fitFunction panelTabButton.initialize() } function getContainer(point) { - var container; + let container; container = panelTabButton.getContainer(point) if (container !== undefined) { return container } - /* First we check if this point is inside this space. */ + if (thisObject.container.frame.isThisPointHere(point, true) === true) { - if (this.container.frame.isThisPointHere(point, true) === true) { + let checkPoint = { + x: point.x, + y: point.y + } - return this.container; + checkPoint = thisObject.fitFunction(checkPoint) - } else { - - /* This point does not belong to this space. */ - - return undefined; + if (point.x === checkPoint.x && point.y === checkPoint.y) { + return thisObject.container; + } } - } @@ -67,7 +69,7 @@ function newAAMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () function draw() { - this.container.frame.draw(false, false, true); + thisObject.container.frame.draw(false, false, true, thisObject.fitFunction); plotCurrentBandInfo(); @@ -124,6 +126,11 @@ function newAAMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () bandPoint3 = thisObject.container.frame.frameThisPoint(bandPoint3); bandPoint4 = thisObject.container.frame.frameThisPoint(bandPoint4); + bandPoint1 = thisObject.fitFunction(bandPoint1) + bandPoint2 = thisObject.fitFunction(bandPoint2) + bandPoint3 = thisObject.fitFunction(bandPoint3) + bandPoint4 = thisObject.fitFunction(bandPoint4) + browserCanvasContext.beginPath(); browserCanvasContext.moveTo(bandPoint1.x, bandPoint1.y); @@ -209,6 +216,8 @@ function newAAMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () labelPoint = thisObject.container.frame.frameThisPoint(labelPoint); + labelPoint = thisObject.fitFunction(labelPoint) + browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.DARK + ', ' + opacity + ')'; browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y); From 17843c688d1ce7cde2cd466c95db9250f2dc10c8 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 12 May 2019 09:48:47 +0200 Subject: [PATCH 16/54] Title change --- BollingerBandsPanel.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BollingerBandsPanel.js b/BollingerBandsPanel.js index 49ac03b7c..6b3406ebf 100644 --- a/BollingerBandsPanel.js +++ b/BollingerBandsPanel.js @@ -14,8 +14,8 @@ function newAAMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () container.initialize(); thisObject.container = container; - container.displacement.containerName = "Bollinger Band Panel"; - container.frame.containerName = "Bollinger Band Panel"; + container.displacement.containerName = "Bollinger Band"; + container.frame.containerName = "Bollinger Band"; let currentBand; let panelTabButton From b801eb222c274bafd1cf5bcb2ce4f94ad1a5ee47 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 27 Jun 2019 20:03:08 +0200 Subject: [PATCH 17/54] formatting --- BollingerBands.js | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index 250cb7b44..3b264b564 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -1,5 +1,4 @@ -function newAAMastersPlottersBollingerBandsBollingerBands () -{ +function newAAMastersPlottersBollingerBandsBollingerBands() { const MODULE_NAME = "Bands Plotter"; const ERROR_LOG = true; @@ -18,11 +17,11 @@ setTimePeriod: setTimePeriod, setDatetime: setDatetime, draw: draw, - recalculateScale: recalculateScale, + recalculateScale: recalculateScale, /* Events declared outside the plotter. */ - onDailyFileLoaded: onDailyFileLoaded, + onDailyFileLoaded: onDailyFileLoaded, // Secondary functions and properties. @@ -536,7 +535,7 @@ if (userPositionDate >= band.begin && userPositionDate <= band.end) { /* highlight the current band */ browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 0.05)'; // Current band accroding to time - } + } if ( bandPoint1.x < viewPort.visibleArea.topLeft.x + 50 @@ -563,7 +562,7 @@ browserCanvasContext.closePath(); browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.PATINATED_TURQUOISE + ', 1)'; - + if (userPositionDate >= band.begin && userPositionDate <= band.end) { /* highlight the current band */ @@ -581,9 +580,10 @@ }; thisObject.container.eventHandler.raiseEvent("Current Band Changed", currentBand); - } - + } + browserCanvasContext.lineWidth = 0.2; + browserCanvasContext.setLineDash([0, 0]) browserCanvasContext.stroke(); @@ -607,8 +607,9 @@ /* highlight the current band */ browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 1)'; // Current band accroding to time } - + browserCanvasContext.lineWidth = 0.2; + browserCanvasContext.setLineDash([0, 0]) browserCanvasContext.stroke(); } } @@ -660,3 +661,4 @@ } } + From af1c7d02de012612058e144cbc9619dbd3f87427 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 7 Sep 2019 14:16:04 +0200 Subject: [PATCH 18/54] Color Improvement --- PercentageBandwidth.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/PercentageBandwidth.js b/PercentageBandwidth.js index 2f1e804b8..b677ec5a4 100644 --- a/PercentageBandwidth.js +++ b/PercentageBandwidth.js @@ -803,11 +803,11 @@ browserCanvasContext.closePath(); browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.GOLDEN_ORANGE + ', 1)'; - + if (userPositionDate >= percentageBandwidth.begin && userPositionDate <= percentageBandwidth.end) { - browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 1)'; - } - + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.BLACK + ', 1)'; + } + browserCanvasContext.lineWidth = 0.2; browserCanvasContext.stroke(); @@ -827,7 +827,7 @@ } if (userPositionDate >= percentageBandwidth.begin && userPositionDate <= percentageBandwidth.end) { - browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 1)'; + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.BLACK + ', 1)'; } browserCanvasContext.lineWidth = 0.2; @@ -845,9 +845,9 @@ browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.GREEN + ', 1)'; if (userPositionDate >= percentageBandwidth.begin && userPositionDate <= percentageBandwidth.end) { - browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.TITANIUM_YELLOW + ', 1)'; + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.BLACK + ', 1)'; } - + browserCanvasContext.setLineDash([1, 4]) browserCanvasContext.lineWidth = 1 browserCanvasContext.stroke() @@ -903,3 +903,4 @@ } + From 72b04ed01bd074cabd48f8efb5360d86230e0637 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 22 Sep 2019 11:29:03 +0200 Subject: [PATCH 19/54] Daily Files Updated Events now Handled --- BollingerBands.js | 29 +++++++++++++++++++---------- PercentageBandwidth.js | 29 +++++++++++++++++++---------- 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index 3b264b564..81e1158eb 100644 --- a/BollingerBands.js +++ b/BollingerBands.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,21 +160,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); } } } diff --git a/PercentageBandwidth.js b/PercentageBandwidth.js index b677ec5a4..c2b694992 100644 --- a/PercentageBandwidth.js +++ b/PercentageBandwidth.js @@ -52,9 +52,10 @@ let zoomChangedEventSubscriptionId let offsetChangedEventSubscriptionId - let filesUpdatedEventSubscriptionId let dragFinishedEventSubscriptionId let dimmensionsChangedEventSubscriptionId + let marketFilesUpdatedEventSubscriptionId + let dailyFilesUpdatedEventSubscriptionId return thisObject; @@ -65,9 +66,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 */ @@ -114,8 +116,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. */ @@ -167,21 +170,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); } } } From 318ccaa2068e69d7316bb15fef983b115ab9f9c7 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 17 Oct 2019 22:20:10 +0200 Subject: [PATCH 20/54] forced recalculation impleneted --- BollingerBands.js | 9 +++++++-- PercentageBandwidth.js | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index 81e1158eb..211c7e0c6 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -642,12 +642,17 @@ } } - function onOffsetChanged() { + function onOffsetChanged(event) { try { + if (event !== undefined) { + if (event.recalculate === true) { + recalculate() + return + } + } if (Math.random() * 100 > 95) { - recalculate() }; diff --git a/PercentageBandwidth.js b/PercentageBandwidth.js index c2b694992..549417b11 100644 --- a/PercentageBandwidth.js +++ b/PercentageBandwidth.js @@ -883,12 +883,17 @@ } } - function onOffsetChanged() { + function onOffsetChanged(event) { try { + if (event !== undefined) { + if (event.recalculate === true) { + recalculate() + return + } + } if (Math.random() * 100 > 95) { - recalculate() }; From d8db6a2311cf9ef516d5312507633002cfba0ff7 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 26 Dec 2019 10:46:44 +0100 Subject: [PATCH 21/54] Data Mine Refactoring --- this.plotter.config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/this.plotter.config.json b/this.plotter.config.json index 8edbd9306..04b8fe004 100644 --- a/this.plotter.config.json +++ b/this.plotter.config.json @@ -1,7 +1,7 @@ { "displayName": "Plotters Bollinger Bands", "codeName": "PlottersBollingerBands", - "devTeam": "AAMasters", + "dataMine": "AAMasters", "modules": [ { "codeName": "BollingerBands", From a0b331c6e1cbedf1c673f175e037d9ce07dd2476 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 27 Dec 2019 13:27:33 +0100 Subject: [PATCH 22/54] 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); From 4caef830afb1c80b450e54dc055bcd2ffbaac7e5 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 10 Jan 2020 08:06:18 +0100 Subject: [PATCH 23/54] Code Cleaning --- BollingerBandsPanel.js | 1 - 1 file changed, 1 deletion(-) diff --git a/BollingerBandsPanel.js b/BollingerBandsPanel.js index 6b3406ebf..7ca186ff5 100644 --- a/BollingerBandsPanel.js +++ b/BollingerBandsPanel.js @@ -14,7 +14,6 @@ function newAAMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () container.initialize(); thisObject.container = container; - container.displacement.containerName = "Bollinger Band"; container.frame.containerName = "Bollinger Band"; let currentBand; From 0419edd2de798c45c4d875cc3c10623e6c649dea Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 11 Jan 2020 18:39:03 +0100 Subject: [PATCH 24/54] fitfuction and refactoring --- BollingerBands.js | 35 ++++++++++++++++++++++------------- PercentageBandwidth.js | 5 +++-- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index 852a1a081..e3f66228c 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -13,6 +13,7 @@ initialize: initialize, finalize: finalize, container: undefined, + fitFunction: undefined, getContainer: getContainer, setTimeFrame: setTimeFrame, setDatetime: setDatetime, @@ -34,7 +35,7 @@ container.initialize(); thisObject.container = container; - let timeLineCoordinateSystem = newTimeLineCoordinateSystem(); // Needed to be able to plot on the timeline, otherwise not. + let coordinateSystem = newCoordinateSystem(); // Needed to be able to plot on the timeline, otherwise not. 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. @@ -81,6 +82,8 @@ marketFile = undefined; fileCursor = undefined; + thisObject.fitFunction = undefined + } catch (err) { if (ERROR_LOG === true) { logger.write("[ERROR] finalize -> err = " + err.stack); } @@ -290,8 +293,8 @@ let daysOnSides = getSideDays(timeFrame); - let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, timeLineCoordinateSystem); - let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, timeLineCoordinateSystem); + let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, coordinateSystem); + let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, coordinateSystem); let dateDiff = rightDate.valueOf() - leftDate.valueOf(); @@ -375,8 +378,8 @@ let daysOnSides = getSideDays(timeFrame); - let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, timeLineCoordinateSystem); - let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, timeLineCoordinateSystem); + let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, coordinateSystem); + let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, coordinateSystem); let dateDiff = rightDate.valueOf() - leftDate.valueOf(); @@ -424,7 +427,7 @@ try { - if (timeLineCoordinateSystem.maxValue > 0) { return; } // Already calculated. + if (coordinateSystem.maxValue > 0) { return; } // Already calculated. let minValue = { x: MIN_PLOTABLE_DATE.valueOf(), @@ -437,7 +440,7 @@ }; - timeLineCoordinateSystem.initialize( + coordinateSystem.initialize( minValue, maxValue, thisObject.container.frame.width, @@ -501,12 +504,12 @@ y: band.movingAverage }; - bandPoint1 = timeLineCoordinateSystem.transformThisPoint(bandPoint1); - bandPoint2 = timeLineCoordinateSystem.transformThisPoint(bandPoint2); - bandPoint3 = timeLineCoordinateSystem.transformThisPoint(bandPoint3); - bandPoint4 = timeLineCoordinateSystem.transformThisPoint(bandPoint4); - bandPoint5 = timeLineCoordinateSystem.transformThisPoint(bandPoint5); - bandPoint6 = timeLineCoordinateSystem.transformThisPoint(bandPoint6); + bandPoint1 = coordinateSystem.transformThisPoint(bandPoint1); + bandPoint2 = coordinateSystem.transformThisPoint(bandPoint2); + bandPoint3 = coordinateSystem.transformThisPoint(bandPoint3); + bandPoint4 = coordinateSystem.transformThisPoint(bandPoint4); + bandPoint5 = coordinateSystem.transformThisPoint(bandPoint5); + bandPoint6 = coordinateSystem.transformThisPoint(bandPoint6); bandPoint1 = transformThisPoint(bandPoint1, thisObject.container); bandPoint2 = transformThisPoint(bandPoint2, thisObject.container); @@ -526,6 +529,12 @@ bandPoint5 = viewPort.fitIntoVisibleArea(bandPoint5); bandPoint6 = viewPort.fitIntoVisibleArea(bandPoint6); + bandPoint1 = thisObject.fitFunction(bandPoint1); + bandPoint2 = thisObject.fitFunction(bandPoint2); + bandPoint3 = thisObject.fitFunction(bandPoint3); + bandPoint4 = thisObject.fitFunction(bandPoint4); + bandPoint5 = thisObject.fitFunction(bandPoint5); + bandPoint6 = thisObject.fitFunction(bandPoint6); /* First we are drawing a semi-transparent background */ diff --git a/PercentageBandwidth.js b/PercentageBandwidth.js index 5cbc6640f..db9c083d4 100644 --- a/PercentageBandwidth.js +++ b/PercentageBandwidth.js @@ -13,6 +13,7 @@ initialize: initialize, finalize: finalize, container: undefined, + fitFunction: undefined, getContainer: getContainer, setTimeFrame: setTimeFrame, setDatetime: setDatetime, @@ -34,8 +35,8 @@ container.initialize(); thisObject.container = container; - let plotAreaFrame = newTimeLineCoordinateSystem(); // Used for full frame view. - let plotAreaViewport = newTimeLineCoordinateSystem(); // Used for viewport view. + let plotAreaFrame = newCoordinateSystem(); // Used for full frame view. + let plotAreaViewport = newCoordinateSystem(); // Used for viewport view. 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. From 6421a96d44041b9d265e80e8a5cc5a23d4188067 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 15 Jan 2020 08:30:29 +0100 Subject: [PATCH 25/54] Code Cleaning --- BollingerBands.js | 2 +- PercentageBandwidth.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index e3f66228c..ecfb36361 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -90,7 +90,7 @@ } } - function initialize(pStorage, pExchange, pMarket, pDatetime, pTimeFrame, callBackFunction) { + function initialize(pStorage, pDatetime, pTimeFrame, callBackFunction) { try { diff --git a/PercentageBandwidth.js b/PercentageBandwidth.js index db9c083d4..886b40b65 100644 --- a/PercentageBandwidth.js +++ b/PercentageBandwidth.js @@ -89,7 +89,7 @@ } } - function initialize(pStorage, pExchange, pMarket, pDatetime, pTimeFrame, callBackFunction) { + function initialize(pStorage, pDatetime, pTimeFrame, callBackFunction) { try { From bf07bcc14ecf2405d625639b9fdf2f73e89c9b02 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 17 Jan 2020 08:52:20 +0100 Subject: [PATCH 26/54] Standarizing Names --- BollingerBands.js | 6 +++--- BollingerBandsPanel.js | 25 +++++++++++++++++-------- this.plotter.config.json | 2 +- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index ecfb36361..f5a8c14c6 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -336,7 +336,7 @@ if (datetime.valueOf() >= band.begin && datetime.valueOf() <= band.end) { thisObject.currentBand = band; - thisObject.container.eventHandler.raiseEvent("Current Band Changed", thisObject.currentBand); + thisObject.container.eventHandler.raiseEvent("Current Record Changed", thisObject.currentBand); } } @@ -411,7 +411,7 @@ if (datetime.valueOf() >= band.begin && datetime.valueOf() <= band.end) { thisObject.currentBand = band; - thisObject.container.eventHandler.raiseEvent("Current Band Changed", thisObject.currentBand); + thisObject.container.eventHandler.raiseEvent("Current Record Changed", thisObject.currentBand); } } @@ -597,7 +597,7 @@ innerBand: band }; - thisObject.container.eventHandler.raiseEvent("Current Band Changed", currentBand); + thisObject.container.eventHandler.raiseEvent("Current Record Changed", currentBand); } browserCanvasContext.lineWidth = 0.2; diff --git a/BollingerBandsPanel.js b/BollingerBandsPanel.js index 7ca186ff5..a0eaf8ca7 100644 --- a/BollingerBandsPanel.js +++ b/BollingerBandsPanel.js @@ -3,24 +3,33 @@ function newAAMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () var thisObject = { fitFunction: undefined, - onEventRaised: onEventRaised, + onRecordChange: onRecordChange, container: undefined, draw: draw, getContainer: getContainer, - initialize: initialize + initialize: initialize, + finalize: finalize }; - var container = newContainer(); - container.initialize(); - thisObject.container = container; - - container.frame.containerName = "Bollinger Band"; + thisObject.container = newContainer(); + thisObject.container.initialize(); + thisObject.container.frame.containerName = "Bollinger Band"; let currentBand; let panelTabButton return thisObject; + function finalize() { + thisObject.container.finalize() + thisObject.container = undefined + thisObject.fitFunction = undefined + + currentBand = undefined + panelTabButton.finalize() + panelTabButton = undefined + } + function initialize() { thisObject.container.frame.width = UI_PANEL.WIDTH.NORMAL; @@ -59,7 +68,7 @@ function newAAMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () } - function onEventRaised(lastCurrentBand) { + function onRecordChange(lastCurrentBand) { currentBand = lastCurrentBand; diff --git a/this.plotter.config.json b/this.plotter.config.json index 04b8fe004..19c0016e5 100644 --- a/this.plotter.config.json +++ b/this.plotter.config.json @@ -12,7 +12,7 @@ { "codeName": "BollingerBandsPanel", "moduleName": "BollingerBandsPanel", - "event": "Current Band Changed" + "event": "Current Record Changed" } ] }, From e04cd1eb90819588f0861440f6785d43a84a86dc Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 17 Jan 2020 17:49:04 +0100 Subject: [PATCH 27/54] Viewport Related Refactoring --- BollingerBands.js | 12 ++++++------ PercentageBandwidth.js | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index f5a8c14c6..7a3d64677 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -115,8 +115,8 @@ /* Listen to the necesary events. */ - zoomChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Zoom Changed", onZoomChanged); - offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Offset Changed", onOffsetChanged); + zoomChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged); + offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged); dragFinishedEventSubscriptionId = canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished); marketFilesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onMarketFilesUpdated); dailyFilesUpdatedEventSubscriptionId = dailyFiles.eventHandler.listenToEvent("Files Updated", onDailyFilesUpdated); @@ -639,7 +639,7 @@ } - function onZoomChanged(event) { + function onViewportZoomChanged(event) { try { @@ -647,11 +647,11 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] onZoomChanged -> err = " + err.stack); } + if (ERROR_LOG === true) { logger.write("[ERROR] onViewportZoomChanged -> err = " + err.stack); } } } - function onOffsetChanged(event) { + function onViewportPositionChanged(event) { try { @@ -667,7 +667,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] onOffsetChanged -> err = " + err.stack); } + if (ERROR_LOG === true) { logger.write("[ERROR] onViewportPositionChanged -> err = " + err.stack); } } } diff --git a/PercentageBandwidth.js b/PercentageBandwidth.js index 886b40b65..be9f28d2b 100644 --- a/PercentageBandwidth.js +++ b/PercentageBandwidth.js @@ -115,8 +115,8 @@ /* Listen to the necesary events. */ - zoomChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Zoom Changed", onZoomChanged); - offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Offset Changed", onOffsetChanged); + zoomChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged); + offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged); dragFinishedEventSubscriptionId = canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished); marketFilesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onMarketFilesUpdated); dailyFilesUpdatedEventSubscriptionId = dailyFiles.eventHandler.listenToEvent("Files Updated", onDailyFilesUpdated); @@ -872,7 +872,7 @@ } - function onZoomChanged(event) { + function onViewportZoomChanged(event) { try { @@ -880,11 +880,11 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] onZoomChanged -> err = " + err.stack); } + if (ERROR_LOG === true) { logger.write("[ERROR] onViewportZoomChanged -> err = " + err.stack); } } } - function onOffsetChanged(event) { + function onViewportPositionChanged(event) { try { @@ -900,7 +900,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] onOffsetChanged -> err = " + err.stack); } + if (ERROR_LOG === true) { logger.write("[ERROR] onViewportPositionChanged -> err = " + err.stack); } } } From 77953e4f75c0ffbead1c39e43308ec92636fcf54 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 17 Jan 2020 18:46:41 +0100 Subject: [PATCH 28/54] Viewport inside the Chartspace --- BollingerBands.js | 34 +++++++++++------------ BollingerBandsPanel.js | 4 +-- PercentageBandwidth.js | 62 +++++++++++++++++++++--------------------- 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index 7a3d64677..b4d845f1d 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -64,8 +64,8 @@ /* Stop listening to the necesary events. */ - viewPort.eventHandler.stopListening(zoomChangedEventSubscriptionId); - viewPort.eventHandler.stopListening(offsetChangedEventSubscriptionId); + canvas.chartSpace.viewport.eventHandler.stopListening(zoomChangedEventSubscriptionId); + canvas.chartSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId); canvas.eventHandler.stopListening(dragFinishedEventSubscriptionId); thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId) marketFiles.eventHandler.stopListening(marketFilesUpdatedEventSubscriptionId); @@ -115,8 +115,8 @@ /* Listen to the necesary events. */ - zoomChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged); - offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged); + zoomChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged); + offsetChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged); dragFinishedEventSubscriptionId = canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished); marketFilesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onMarketFilesUpdated); dailyFilesUpdatedEventSubscriptionId = dailyFiles.eventHandler.listenToEvent("Files Updated", onDailyFilesUpdated); @@ -293,8 +293,8 @@ let daysOnSides = getSideDays(timeFrame); - let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, coordinateSystem); - let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, coordinateSystem); + let leftDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem); + let rightDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem); let dateDiff = rightDate.valueOf() - leftDate.valueOf(); @@ -378,8 +378,8 @@ let daysOnSides = getSideDays(timeFrame); - let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, coordinateSystem); - let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, coordinateSystem); + let leftDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem); + let rightDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem); let dateDiff = rightDate.valueOf() - leftDate.valueOf(); @@ -518,16 +518,16 @@ bandPoint5 = transformThisPoint(bandPoint5, thisObject.container); bandPoint6 = transformThisPoint(bandPoint6, thisObject.container); - if (bandPoint2.x < viewPort.visibleArea.bottomLeft.x || bandPoint1.x > viewPort.visibleArea.bottomRight.x) { + if (bandPoint2.x < canvas.chartSpace.viewport.visibleArea.bottomLeft.x || bandPoint1.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x) { continue; } - bandPoint1 = viewPort.fitIntoVisibleArea(bandPoint1); - bandPoint2 = viewPort.fitIntoVisibleArea(bandPoint2); - bandPoint3 = viewPort.fitIntoVisibleArea(bandPoint3); - bandPoint4 = viewPort.fitIntoVisibleArea(bandPoint4); - bandPoint5 = viewPort.fitIntoVisibleArea(bandPoint5); - bandPoint6 = viewPort.fitIntoVisibleArea(bandPoint6); + bandPoint1 = canvas.chartSpace.viewport.fitIntoVisibleArea(bandPoint1); + bandPoint2 = canvas.chartSpace.viewport.fitIntoVisibleArea(bandPoint2); + bandPoint3 = canvas.chartSpace.viewport.fitIntoVisibleArea(bandPoint3); + bandPoint4 = canvas.chartSpace.viewport.fitIntoVisibleArea(bandPoint4); + bandPoint5 = canvas.chartSpace.viewport.fitIntoVisibleArea(bandPoint5); + bandPoint6 = canvas.chartSpace.viewport.fitIntoVisibleArea(bandPoint6); bandPoint1 = thisObject.fitFunction(bandPoint1); bandPoint2 = thisObject.fitFunction(bandPoint2); @@ -556,9 +556,9 @@ } if ( - bandPoint1.x < viewPort.visibleArea.topLeft.x + 50 + bandPoint1.x < canvas.chartSpace.viewport.visibleArea.topLeft.x + 50 || - bandPoint1.x > viewPort.visibleArea.bottomRight.x - 50 + bandPoint1.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x - 50 ) { // we leave this bands without fill. } else { diff --git a/BollingerBandsPanel.js b/BollingerBandsPanel.js index a0eaf8ca7..f60929056 100644 --- a/BollingerBandsPanel.js +++ b/BollingerBandsPanel.js @@ -35,8 +35,8 @@ function newAAMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () thisObject.container.frame.width = UI_PANEL.WIDTH.NORMAL; thisObject.container.frame.height = UI_PANEL.HEIGHT.NORMAL; - thisObject.container.frame.position.x = viewPort.visibleArea.topRight.x - thisObject.container.frame.width * 3; - thisObject.container.frame.position.y = viewPort.visibleArea.bottomLeft.y - thisObject.container.frame.height; + thisObject.container.frame.position.x = canvas.chartSpace.viewport.visibleArea.topRight.x - thisObject.container.frame.width * 3; + thisObject.container.frame.position.y = canvas.chartSpace.viewport.visibleArea.bottomLeft.y - thisObject.container.frame.height; panelTabButton = newPanelTabButton() panelTabButton.parentContainer = thisObject.container diff --git a/PercentageBandwidth.js b/PercentageBandwidth.js index be9f28d2b..34bf52b9f 100644 --- a/PercentageBandwidth.js +++ b/PercentageBandwidth.js @@ -65,8 +65,8 @@ /* Stop listening to the necesary events. */ - viewPort.eventHandler.stopListening(zoomChangedEventSubscriptionId); - viewPort.eventHandler.stopListening(offsetChangedEventSubscriptionId); + canvas.chartSpace.viewport.eventHandler.stopListening(zoomChangedEventSubscriptionId); + canvas.chartSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId); canvas.eventHandler.stopListening(dragFinishedEventSubscriptionId); thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId) marketFiles.eventHandler.stopListening(marketFilesUpdatedEventSubscriptionId); @@ -115,8 +115,8 @@ /* Listen to the necesary events. */ - zoomChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged); - offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged); + zoomChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged); + offsetChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged); dragFinishedEventSubscriptionId = canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished); marketFilesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onMarketFilesUpdated); dailyFilesUpdatedEventSubscriptionId = dailyFiles.eventHandler.listenToEvent("Files Updated", onDailyFilesUpdated); @@ -301,8 +301,8 @@ let daysOnSides = getSideDays(timeFrame); - let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, plotAreaFrame); - let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, plotAreaFrame); + let leftDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, plotAreaFrame); + let rightDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, plotAreaFrame); let dateDiff = rightDate.valueOf() - leftDate.valueOf(); @@ -386,8 +386,8 @@ let daysOnSides = getSideDays(timeFrame); - let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, plotAreaFrame); - let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, plotAreaFrame); + let leftDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, plotAreaFrame); + let rightDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, plotAreaFrame); let dateDiff = rightDate.valueOf() - leftDate.valueOf(); @@ -480,7 +480,7 @@ plotAreaViewport.initializeY( minValue, maxValue, - viewPort.visibleArea.bottomRight.y - viewPort.visibleArea.topLeft.y + canvas.chartSpace.viewport.visibleArea.bottomRight.y - canvas.chartSpace.viewport.visibleArea.topLeft.y ); plotAreaFrame.initializeY( @@ -510,7 +510,7 @@ /* This next section is to get ready in order to be able to plot dinamically constrained to the viewport */ - let visibleHeight = viewPort.visibleArea.bottomRight.y - viewPort.visibleArea.topLeft.y; + let visibleHeight = canvas.chartSpace.viewport.visibleArea.bottomRight.y - canvas.chartSpace.viewport.visibleArea.topLeft.y; let frameCorner1 = { x: 0, @@ -651,7 +651,7 @@ pbPoint9 = transformThisPoint(pbPoint9, thisObject.container); pbPoint10 = transformThisPoint(pbPoint10, thisObject.container); - if (pbPoint1.x < viewPort.visibleArea.bottomLeft.x || pbPoint2.x > viewPort.visibleArea.bottomRight.x) { + if (pbPoint1.x < canvas.chartSpace.viewport.visibleArea.bottomLeft.x || pbPoint2.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x) { return false; } @@ -669,37 +669,37 @@ /* Now we set the real value of y. */ - pbPoint1.y = viewPort.visibleArea.bottomRight.y - (previousPercentBandwidth + pbOffset) * plotAreaViewport.scale.y; - pbPoint2.y = viewPort.visibleArea.bottomRight.y - (currentPercentBandwidth + pbOffset) * plotAreaViewport.scale.y; + pbPoint1.y = canvas.chartSpace.viewport.visibleArea.bottomRight.y - (previousPercentBandwidth + pbOffset) * plotAreaViewport.scale.y; + pbPoint2.y = canvas.chartSpace.viewport.visibleArea.bottomRight.y - (currentPercentBandwidth + pbOffset) * plotAreaViewport.scale.y; - pbPoint3.y = viewPort.visibleArea.bottomRight.y - (0 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; - pbPoint4.y = viewPort.visibleArea.bottomRight.y - (30 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; - pbPoint5.y = viewPort.visibleArea.bottomRight.y - (70 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; - pbPoint6.y = viewPort.visibleArea.bottomRight.y - (100 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; + pbPoint3.y = canvas.chartSpace.viewport.visibleArea.bottomRight.y - (0 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; + pbPoint4.y = canvas.chartSpace.viewport.visibleArea.bottomRight.y - (30 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; + pbPoint5.y = canvas.chartSpace.viewport.visibleArea.bottomRight.y - (70 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; + pbPoint6.y = canvas.chartSpace.viewport.visibleArea.bottomRight.y - (100 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; - pbPoint7.y = viewPort.visibleArea.bottomRight.y - (previousMovingAverage + pbOffset) * plotAreaViewport.scale.y; - pbPoint8.y = viewPort.visibleArea.bottomRight.y - (currentMovingAverage + pbOffset) * plotAreaViewport.scale.y; + pbPoint7.y = canvas.chartSpace.viewport.visibleArea.bottomRight.y - (previousMovingAverage + pbOffset) * plotAreaViewport.scale.y; + pbPoint8.y = canvas.chartSpace.viewport.visibleArea.bottomRight.y - (currentMovingAverage + pbOffset) * plotAreaViewport.scale.y; - pbPoint9.y = viewPort.visibleArea.bottomRight.y - (previousBandwidth + pbOffset) * plotAreaViewport.scale.y; - pbPoint10.y = viewPort.visibleArea.bottomRight.y - (currentBandwidth + pbOffset) * plotAreaViewport.scale.y; + pbPoint9.y = canvas.chartSpace.viewport.visibleArea.bottomRight.y - (previousBandwidth + pbOffset) * plotAreaViewport.scale.y; + pbPoint10.y = canvas.chartSpace.viewport.visibleArea.bottomRight.y - (currentBandwidth + pbOffset) * plotAreaViewport.scale.y; } /* Everything must fit within the visible area */ - pbPoint1 = viewPort.fitIntoVisibleArea(pbPoint1); - pbPoint2 = viewPort.fitIntoVisibleArea(pbPoint2); + pbPoint1 = canvas.chartSpace.viewport.fitIntoVisibleArea(pbPoint1); + pbPoint2 = canvas.chartSpace.viewport.fitIntoVisibleArea(pbPoint2); - pbPoint3 = viewPort.fitIntoVisibleArea(pbPoint3); - pbPoint4 = viewPort.fitIntoVisibleArea(pbPoint4); - pbPoint5 = viewPort.fitIntoVisibleArea(pbPoint5); - pbPoint6 = viewPort.fitIntoVisibleArea(pbPoint6); + pbPoint3 = canvas.chartSpace.viewport.fitIntoVisibleArea(pbPoint3); + pbPoint4 = canvas.chartSpace.viewport.fitIntoVisibleArea(pbPoint4); + pbPoint5 = canvas.chartSpace.viewport.fitIntoVisibleArea(pbPoint5); + pbPoint6 = canvas.chartSpace.viewport.fitIntoVisibleArea(pbPoint6); - pbPoint7 = viewPort.fitIntoVisibleArea(pbPoint7); - pbPoint8 = viewPort.fitIntoVisibleArea(pbPoint8); + pbPoint7 = canvas.chartSpace.viewport.fitIntoVisibleArea(pbPoint7); + pbPoint8 = canvas.chartSpace.viewport.fitIntoVisibleArea(pbPoint8); - pbPoint9 = viewPort.fitIntoVisibleArea(pbPoint9); - pbPoint10 = viewPort.fitIntoVisibleArea(pbPoint10); + pbPoint9 = canvas.chartSpace.viewport.fitIntoVisibleArea(pbPoint9); + pbPoint10 = canvas.chartSpace.viewport.fitIntoVisibleArea(pbPoint10); /* Now the drawing of the lines */ From eabd3012e730ecfbd638b61ba9a6e8bef02f0f7d Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 20 Jan 2020 15:29:55 +0100 Subject: [PATCH 29/54] refactoring --- BollingerBands.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BollingerBands.js b/BollingerBands.js index b4d845f1d..e8480e852 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -436,7 +436,7 @@ let maxValue = { x: MAX_PLOTABLE_DATE.valueOf(), - y: nextPorwerOf10(USDT_BTC_HTH) / 4 // TODO: This 4 is temporary + y: nextPorwerOf10(MAX_DEFAULT_RATE_SCALE_VALUE) / 4 // TODO: This 4 is temporary }; From e5ca65a9ee4feb497b16e96964091a6a25cc78f6 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 29 Jan 2020 10:25:15 +0100 Subject: [PATCH 30/54] showPanles functionality implemented --- BollingerBandsPanel.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/BollingerBandsPanel.js b/BollingerBandsPanel.js index f60929056..169451809 100644 --- a/BollingerBandsPanel.js +++ b/BollingerBandsPanel.js @@ -5,6 +5,7 @@ function newAAMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () fitFunction: undefined, onRecordChange: onRecordChange, container: undefined, + isVisible: true, draw: draw, getContainer: getContainer, initialize: initialize, @@ -24,6 +25,7 @@ function newAAMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () thisObject.container.finalize() thisObject.container = undefined thisObject.fitFunction = undefined + thisObject.isVisible = undefined currentBand = undefined panelTabButton.finalize() @@ -46,7 +48,7 @@ function newAAMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () } function getContainer(point) { - + if (thisObject.isVisible !== true) { return } let container; container = panelTabButton.getContainer(point) @@ -76,7 +78,7 @@ function newAAMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () function draw() { - + if (thisObject.isVisible !== true) { return } thisObject.container.frame.draw(false, false, true, thisObject.fitFunction); plotCurrentBandInfo(); From b201a7941a1864e132e2cafe583ef8ab8b1b80e2 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 30 Jan 2020 19:13:16 +0100 Subject: [PATCH 31/54] coordinateSystem going down to Plotters --- BollingerBands.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index e8480e852..9f49ced58 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -17,6 +17,7 @@ getContainer: getContainer, setTimeFrame: setTimeFrame, setDatetime: setDatetime, + setCoordinateSystem: setCoordinateSystem, draw: draw, recalculateScale: recalculateScale, @@ -35,7 +36,7 @@ container.initialize(); thisObject.container = container; - let coordinateSystem = newCoordinateSystem(); // Needed to be able to plot on the timeline, otherwise not. + let coordinateSystem 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. @@ -84,13 +85,15 @@ thisObject.fitFunction = undefined + coordinateSystem = undefined + } catch (err) { if (ERROR_LOG === true) { logger.write("[ERROR] finalize -> err = " + err.stack); } } } - function initialize(pStorage, pDatetime, pTimeFrame, callBackFunction) { + function initialize(pStorage, pDatetime, pTimeFrame, pCoordinateSystem, callBackFunction) { try { @@ -101,13 +104,12 @@ datetime = pDatetime; timeFrame = pTimeFrame; + coordinateSystem = pCoordinateSystem /* We need a Market File in order to calculate the Y scale, since this scale depends on actual data. */ marketFile = marketFiles.getFile(ONE_DAY_IN_MILISECONDS); // This file is the one processed faster. - recalculateScale(); - /* Now we set the right files according to current Period. */ marketFile = marketFiles.getFile(pTimeFrame); @@ -126,7 +128,6 @@ recalculate(); dimmensionsChangedEventSubscriptionId = thisObject.container.eventHandler.listenToEvent('Dimmensions Changed', function () { - recalculateScale(); recalculate(); }) @@ -224,9 +225,11 @@ } function setDatetime(pDatetime) { - datetime = pDatetime; + } + function setCoordinateSystem(pCoordinateSystem) { + coordinateSystem = pCoordinateSystem } function onDailyFileLoaded(event) { From 17972ccedc22342a42fd8c2fb0a1a52806152ad7 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 30 Jan 2020 22:04:42 +0100 Subject: [PATCH 32/54] no more getUserPosition --- BollingerBands.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index 9f49ced58..28d549aa0 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -51,6 +51,7 @@ let bands = []; // Here we keep the bands to be ploted every time the Draw() function is called by the AAWebPlatform. + let onMouseOverEventSuscriptionId let zoomChangedEventSubscriptionId let offsetChangedEventSubscriptionId let dragFinishedEventSubscriptionId @@ -64,7 +65,7 @@ try { /* Stop listening to the necesary events. */ - + thisObject.container.eventHandler.stopListening(onMouseOverEventSuscriptionId) canvas.chartSpace.viewport.eventHandler.stopListening(zoomChangedEventSubscriptionId); canvas.chartSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId); canvas.eventHandler.stopListening(dragFinishedEventSubscriptionId); @@ -122,6 +123,7 @@ dragFinishedEventSubscriptionId = canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished); marketFilesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onMarketFilesUpdated); dailyFilesUpdatedEventSubscriptionId = dailyFiles.eventHandler.listenToEvent("Files Updated", onDailyFilesUpdated); + onMouseOverEventSuscriptionId = thisObject.container.eventHandler.listenToEvent('onMouseOver', onMouseOver) /* Get ready for plotting. */ @@ -139,6 +141,11 @@ } } + function onMouseOver(event) { + let userPosition = getDateFromPoint(event, thisObject.container, coordinateSystem) + userPositionDate = userPosition.valueOf() + } + function getContainer(point) { try { @@ -460,9 +467,6 @@ try { - let userPosition = getUserPosition() - let userPositionDate = userPosition.point.x - let band; let previousBand; From 59fc9845456d42715db984ab3563ddce576048a3 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 31 Jan 2020 11:47:04 +0100 Subject: [PATCH 33/54] events at coordinate system --- BollingerBands.js | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index 28d549aa0..dda60f55c 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -58,7 +58,9 @@ let dimmensionsChangedEventSubscriptionId let marketFilesUpdatedEventSubscriptionId let dailyFilesUpdatedEventSubscriptionId + let scaleChangedEventSubscriptionId + let userPositionDate return thisObject; function finalize() { @@ -86,6 +88,7 @@ thisObject.fitFunction = undefined + finalizeCoordinateSystem() coordinateSystem = undefined } catch (err) { @@ -106,6 +109,7 @@ datetime = pDatetime; timeFrame = pTimeFrame; coordinateSystem = pCoordinateSystem + initializeCoordinateSystem() /* We need a Market File in order to calculate the Y scale, since this scale depends on actual data. */ @@ -141,6 +145,18 @@ } } + function initializeCoordinateSystem() { + scaleChangedEventSubscriptionId = coordinateSystem.eventHandler.listenToEvent('Scale Changed', onScaleChanged) + } + + function finalizeCoordinateSystem() { + coordinateSystem.eventHandler.stopListening(scaleChangedEventSubscriptionId) + } + + function onScaleChanged() { + recalculate(); + } + function onMouseOver(event) { let userPosition = getDateFromPoint(event, thisObject.container, coordinateSystem) userPositionDate = userPosition.valueOf() @@ -236,7 +252,9 @@ } function setCoordinateSystem(pCoordinateSystem) { + finalizeCoordinateSystem() coordinateSystem = pCoordinateSystem + initializeCoordinateSystem() } function onDailyFileLoaded(event) { @@ -339,7 +357,10 @@ band.standardDeviation = dailyFile[i][3]; band.deviation = dailyFile[i][4]; - if (band.begin >= farLeftDate.valueOf() && band.end <= farRightDate.valueOf()) { + if ( + (band.begin >= farLeftDate.valueOf() && band.end <= farRightDate.valueOf()) && + (band.begin >= coordinateSystem.min.x && band.end <= coordinateSystem.max.x) + ) { bands.push(band); @@ -414,7 +435,10 @@ band.standardDeviation = marketFile[i][3]; band.deviation = marketFile[i][4]; - if (band.begin >= leftDate.valueOf() && band.end <= rightDate.valueOf()) { + if ( + (band.begin >= leftDate.valueOf() && band.end <= rightDate.valueOf()) && + (band.begin >= coordinateSystem.min.x && band.end <= coordinateSystem.max.x) + ) { bands.push(band); From 02f519adf675edf713f1fadbe04260ee9b4dd335 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 31 Jan 2020 20:16:23 +0100 Subject: [PATCH 34/54] cleaning --- BollingerBands.js | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index dda60f55c..1cc42b098 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -19,7 +19,6 @@ setDatetime: setDatetime, setCoordinateSystem: setCoordinateSystem, draw: draw, - recalculateScale: recalculateScale, /* Events declared outside the plotter. */ @@ -457,36 +456,6 @@ } } - function recalculateScale() { - - try { - - if (coordinateSystem.maxValue > 0) { return; } // Already calculated. - - let minValue = { - x: MIN_PLOTABLE_DATE.valueOf(), - y: 0 - }; - - let maxValue = { - x: MAX_PLOTABLE_DATE.valueOf(), - y: nextPorwerOf10(MAX_DEFAULT_RATE_SCALE_VALUE) / 4 // TODO: This 4 is temporary - }; - - - coordinateSystem.initialize( - minValue, - maxValue, - thisObject.container.frame.width, - thisObject.container.frame.height - ); - - } catch (err) { - - if (ERROR_LOG === true) { logger.write("[ERROR] recalculateScale -> err = " + err.stack); } - } - } - function plotChart() { try { From 33f3f09e27d697c46884bd7d02e20e1b0fe9cf5b Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 31 Jan 2020 21:02:51 +0100 Subject: [PATCH 35/54] Bands allways inside viewport --- BollingerBands.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/BollingerBands.js b/BollingerBands.js index 1cc42b098..2132ef906 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -522,6 +522,26 @@ continue; } + let diffA = bandPoint2.y - canvas.chartSpace.viewport.visibleArea.bottomLeft.y + if (diffA > 0) { + bandPoint1.y = bandPoint1.y - diffA + bandPoint2.y = bandPoint2.y - diffA + bandPoint3.y = bandPoint3.y - diffA + bandPoint4.y = bandPoint4.y - diffA + bandPoint5.y = bandPoint5.y - diffA + bandPoint6.y = bandPoint6.y - diffA + } + + let diffB = bandPoint1.y - canvas.chartSpace.viewport.visibleArea.topLeft.y + if (diffB < 0) { + bandPoint1.y = bandPoint1.y - diffB + bandPoint2.y = bandPoint2.y - diffB + bandPoint3.y = bandPoint3.y - diffB + bandPoint4.y = bandPoint4.y - diffB + bandPoint5.y = bandPoint5.y - diffB + bandPoint6.y = bandPoint6.y - diffB + } + bandPoint1 = canvas.chartSpace.viewport.fitIntoVisibleArea(bandPoint1); bandPoint2 = canvas.chartSpace.viewport.fitIntoVisibleArea(bandPoint2); bandPoint3 = canvas.chartSpace.viewport.fitIntoVisibleArea(bandPoint3); From 85a743c8b5123f009bdae6ce80f43ca95521d2ad Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 2 Feb 2020 11:55:30 +0100 Subject: [PATCH 36/54] Bug Fixed --- BollingerBands.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index 2132ef906..b233d428e 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -522,7 +522,7 @@ continue; } - let diffA = bandPoint2.y - canvas.chartSpace.viewport.visibleArea.bottomLeft.y + let diffA = bandPoint1.y - canvas.chartSpace.viewport.visibleArea.bottomLeft.y if (diffA > 0) { bandPoint1.y = bandPoint1.y - diffA bandPoint2.y = bandPoint2.y - diffA @@ -532,7 +532,7 @@ bandPoint6.y = bandPoint6.y - diffA } - let diffB = bandPoint1.y - canvas.chartSpace.viewport.visibleArea.topLeft.y + let diffB = bandPoint2.y - canvas.chartSpace.viewport.visibleArea.topLeft.y if (diffB < 0) { bandPoint1.y = bandPoint1.y - diffB bandPoint2.y = bandPoint2.y - diffB From 75f2f703001c2cbbf494761c03075eadd9e51980 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 12 Feb 2020 19:16:51 +0100 Subject: [PATCH 37/54] Refactoring --- BollingerBands.js | 10 +++++----- PercentageBandwidth.js | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index b233d428e..f2209d248 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -157,7 +157,7 @@ } function onMouseOver(event) { - let userPosition = getDateFromPoint(event, thisObject.container, coordinateSystem) + let userPosition = getDateFromPointAtBrowserCanvas(event, thisObject.container, coordinateSystem) userPositionDate = userPosition.valueOf() } @@ -320,8 +320,8 @@ let daysOnSides = getSideDays(timeFrame); - let leftDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem); - let rightDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem); + let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem); + let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem); let dateDiff = rightDate.valueOf() - leftDate.valueOf(); @@ -408,8 +408,8 @@ let daysOnSides = getSideDays(timeFrame); - let leftDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem); - let rightDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem); + let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem); + let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem); let dateDiff = rightDate.valueOf() - leftDate.valueOf(); diff --git a/PercentageBandwidth.js b/PercentageBandwidth.js index 34bf52b9f..50d0c7ace 100644 --- a/PercentageBandwidth.js +++ b/PercentageBandwidth.js @@ -301,8 +301,8 @@ let daysOnSides = getSideDays(timeFrame); - let leftDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, plotAreaFrame); - let rightDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, plotAreaFrame); + let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, plotAreaFrame); + let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, plotAreaFrame); let dateDiff = rightDate.valueOf() - leftDate.valueOf(); @@ -386,8 +386,8 @@ let daysOnSides = getSideDays(timeFrame); - let leftDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, plotAreaFrame); - let rightDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, plotAreaFrame); + let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, plotAreaFrame); + let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, plotAreaFrame); let dateDiff = rightDate.valueOf() - leftDate.valueOf(); From 316d02db66d5de11e812a28b81cd91f8d1791af3 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 14 Feb 2020 07:48:27 +0100 Subject: [PATCH 38/54] autoscale --- BollingerBands.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/BollingerBands.js b/BollingerBands.js index f2209d248..536539572 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -649,6 +649,10 @@ browserCanvasContext.lineWidth = 0.2; browserCanvasContext.setLineDash([0, 0]) browserCanvasContext.stroke(); + + /* Contributing to Auto-Scale*/ + coordinateSystem.reportValue(band.movingAverage + band.deviation) + coordinateSystem.reportValue(band.movingAverage - band.deviation) } } From 9806a7c31afb82bbe106b31db669b3239347fc22 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 14 Feb 2020 21:54:27 +0100 Subject: [PATCH 39/54] for special effect --- BollingerBands.js | 76 ++++++++++++++++++++++-------------------- BollingerBandsPanel.js | 4 +-- PercentageBandwidth.js | 62 +++++++++++++++++----------------- 3 files changed, 72 insertions(+), 70 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index 536539572..d626b8f29 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -67,8 +67,8 @@ /* Stop listening to the necesary events. */ thisObject.container.eventHandler.stopListening(onMouseOverEventSuscriptionId) - canvas.chartSpace.viewport.eventHandler.stopListening(zoomChangedEventSubscriptionId); - canvas.chartSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId); + canvas.chartingSpace.viewport.eventHandler.stopListening(zoomChangedEventSubscriptionId); + canvas.chartingSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId); canvas.eventHandler.stopListening(dragFinishedEventSubscriptionId); thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId) marketFiles.eventHandler.stopListening(marketFilesUpdatedEventSubscriptionId); @@ -121,8 +121,8 @@ /* Listen to the necesary events. */ - zoomChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged); - offsetChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged); + zoomChangedEventSubscriptionId = canvas.chartingSpace.viewport.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged); + offsetChangedEventSubscriptionId = canvas.chartingSpace.viewport.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged); dragFinishedEventSubscriptionId = canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished); marketFilesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onMarketFilesUpdated); dailyFilesUpdatedEventSubscriptionId = dailyFiles.eventHandler.listenToEvent("Files Updated", onDailyFilesUpdated); @@ -320,8 +320,8 @@ let daysOnSides = getSideDays(timeFrame); - let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem); - let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem); + let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem); + let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem); let dateDiff = rightDate.valueOf() - leftDate.valueOf(); @@ -408,8 +408,8 @@ let daysOnSides = getSideDays(timeFrame); - let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem); - let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem); + let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem); + let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem); let dateDiff = rightDate.valueOf() - leftDate.valueOf(); @@ -518,36 +518,38 @@ bandPoint5 = transformThisPoint(bandPoint5, thisObject.container); bandPoint6 = transformThisPoint(bandPoint6, thisObject.container); - if (bandPoint2.x < canvas.chartSpace.viewport.visibleArea.bottomLeft.x || bandPoint1.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x) { + if (bandPoint2.x < canvas.chartingSpace.viewport.visibleArea.bottomLeft.x || bandPoint1.x > canvas.chartingSpace.viewport.visibleArea.bottomRight.x) { continue; } - let diffA = bandPoint1.y - canvas.chartSpace.viewport.visibleArea.bottomLeft.y - if (diffA > 0) { - bandPoint1.y = bandPoint1.y - diffA - bandPoint2.y = bandPoint2.y - diffA - bandPoint3.y = bandPoint3.y - diffA - bandPoint4.y = bandPoint4.y - diffA - bandPoint5.y = bandPoint5.y - diffA - bandPoint6.y = bandPoint6.y - diffA + if (canvas.chartingSpace.viewport.zoomTargetLevel < ZOOM_OUT_THRESHOLD_FOR_PACKING_OBJECTS_AT_THE_BOTTOM_OR_TOP_OF_VIEWPORT) { + let diffA = bandPoint1.y - canvas.chartingSpace.viewport.visibleArea.bottomLeft.y + if (diffA > 0) { + bandPoint1.y = bandPoint1.y - diffA + bandPoint2.y = bandPoint2.y - diffA + bandPoint3.y = bandPoint3.y - diffA + bandPoint4.y = bandPoint4.y - diffA + bandPoint5.y = bandPoint5.y - diffA + bandPoint6.y = bandPoint6.y - diffA + } + + let diffB = bandPoint2.y - canvas.chartingSpace.viewport.visibleArea.topLeft.y + if (diffB < 0) { + bandPoint1.y = bandPoint1.y - diffB + bandPoint2.y = bandPoint2.y - diffB + bandPoint3.y = bandPoint3.y - diffB + bandPoint4.y = bandPoint4.y - diffB + bandPoint5.y = bandPoint5.y - diffB + bandPoint6.y = bandPoint6.y - diffB + } } - let diffB = bandPoint2.y - canvas.chartSpace.viewport.visibleArea.topLeft.y - if (diffB < 0) { - bandPoint1.y = bandPoint1.y - diffB - bandPoint2.y = bandPoint2.y - diffB - bandPoint3.y = bandPoint3.y - diffB - bandPoint4.y = bandPoint4.y - diffB - bandPoint5.y = bandPoint5.y - diffB - bandPoint6.y = bandPoint6.y - diffB - } - - bandPoint1 = canvas.chartSpace.viewport.fitIntoVisibleArea(bandPoint1); - bandPoint2 = canvas.chartSpace.viewport.fitIntoVisibleArea(bandPoint2); - bandPoint3 = canvas.chartSpace.viewport.fitIntoVisibleArea(bandPoint3); - bandPoint4 = canvas.chartSpace.viewport.fitIntoVisibleArea(bandPoint4); - bandPoint5 = canvas.chartSpace.viewport.fitIntoVisibleArea(bandPoint5); - bandPoint6 = canvas.chartSpace.viewport.fitIntoVisibleArea(bandPoint6); + bandPoint1 = canvas.chartingSpace.viewport.fitIntoVisibleArea(bandPoint1); + bandPoint2 = canvas.chartingSpace.viewport.fitIntoVisibleArea(bandPoint2); + bandPoint3 = canvas.chartingSpace.viewport.fitIntoVisibleArea(bandPoint3); + bandPoint4 = canvas.chartingSpace.viewport.fitIntoVisibleArea(bandPoint4); + bandPoint5 = canvas.chartingSpace.viewport.fitIntoVisibleArea(bandPoint5); + bandPoint6 = canvas.chartingSpace.viewport.fitIntoVisibleArea(bandPoint6); bandPoint1 = thisObject.fitFunction(bandPoint1); bandPoint2 = thisObject.fitFunction(bandPoint2); @@ -576,9 +578,9 @@ } if ( - bandPoint1.x < canvas.chartSpace.viewport.visibleArea.topLeft.x + 50 + bandPoint1.x < canvas.chartingSpace.viewport.visibleArea.topLeft.x + 50 || - bandPoint1.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x - 50 + bandPoint1.x > canvas.chartingSpace.viewport.visibleArea.bottomRight.x - 50 ) { // we leave this bands without fill. } else { @@ -651,8 +653,8 @@ browserCanvasContext.stroke(); /* Contributing to Auto-Scale*/ - coordinateSystem.reportValue(band.movingAverage + band.deviation) - coordinateSystem.reportValue(band.movingAverage - band.deviation) + coordinateSystem.reportYValue(band.movingAverage + band.deviation) + coordinateSystem.reportYValue(band.movingAverage - band.deviation) } } diff --git a/BollingerBandsPanel.js b/BollingerBandsPanel.js index 169451809..75c9543d3 100644 --- a/BollingerBandsPanel.js +++ b/BollingerBandsPanel.js @@ -37,8 +37,8 @@ function newAAMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () thisObject.container.frame.width = UI_PANEL.WIDTH.NORMAL; thisObject.container.frame.height = UI_PANEL.HEIGHT.NORMAL; - thisObject.container.frame.position.x = canvas.chartSpace.viewport.visibleArea.topRight.x - thisObject.container.frame.width * 3; - thisObject.container.frame.position.y = canvas.chartSpace.viewport.visibleArea.bottomLeft.y - thisObject.container.frame.height; + thisObject.container.frame.position.x = canvas.chartingSpace.viewport.visibleArea.topRight.x - thisObject.container.frame.width * 3; + thisObject.container.frame.position.y = canvas.chartingSpace.viewport.visibleArea.bottomLeft.y - thisObject.container.frame.height; panelTabButton = newPanelTabButton() panelTabButton.parentContainer = thisObject.container diff --git a/PercentageBandwidth.js b/PercentageBandwidth.js index 50d0c7ace..c7eb5f186 100644 --- a/PercentageBandwidth.js +++ b/PercentageBandwidth.js @@ -65,8 +65,8 @@ /* Stop listening to the necesary events. */ - canvas.chartSpace.viewport.eventHandler.stopListening(zoomChangedEventSubscriptionId); - canvas.chartSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId); + canvas.chartingSpace.viewport.eventHandler.stopListening(zoomChangedEventSubscriptionId); + canvas.chartingSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId); canvas.eventHandler.stopListening(dragFinishedEventSubscriptionId); thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId) marketFiles.eventHandler.stopListening(marketFilesUpdatedEventSubscriptionId); @@ -115,8 +115,8 @@ /* Listen to the necesary events. */ - zoomChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged); - offsetChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged); + zoomChangedEventSubscriptionId = canvas.chartingSpace.viewport.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged); + offsetChangedEventSubscriptionId = canvas.chartingSpace.viewport.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged); dragFinishedEventSubscriptionId = canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished); marketFilesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onMarketFilesUpdated); dailyFilesUpdatedEventSubscriptionId = dailyFiles.eventHandler.listenToEvent("Files Updated", onDailyFilesUpdated); @@ -301,8 +301,8 @@ let daysOnSides = getSideDays(timeFrame); - let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, plotAreaFrame); - let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, plotAreaFrame); + let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, plotAreaFrame); + let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topRight, thisObject.container, plotAreaFrame); let dateDiff = rightDate.valueOf() - leftDate.valueOf(); @@ -386,8 +386,8 @@ let daysOnSides = getSideDays(timeFrame); - let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, plotAreaFrame); - let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, plotAreaFrame); + let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, plotAreaFrame); + let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topRight, thisObject.container, plotAreaFrame); let dateDiff = rightDate.valueOf() - leftDate.valueOf(); @@ -480,7 +480,7 @@ plotAreaViewport.initializeY( minValue, maxValue, - canvas.chartSpace.viewport.visibleArea.bottomRight.y - canvas.chartSpace.viewport.visibleArea.topLeft.y + canvas.chartingSpace.viewport.visibleArea.bottomRight.y - canvas.chartingSpace.viewport.visibleArea.topLeft.y ); plotAreaFrame.initializeY( @@ -510,7 +510,7 @@ /* This next section is to get ready in order to be able to plot dinamically constrained to the viewport */ - let visibleHeight = canvas.chartSpace.viewport.visibleArea.bottomRight.y - canvas.chartSpace.viewport.visibleArea.topLeft.y; + let visibleHeight = canvas.chartingSpace.viewport.visibleArea.bottomRight.y - canvas.chartingSpace.viewport.visibleArea.topLeft.y; let frameCorner1 = { x: 0, @@ -651,7 +651,7 @@ pbPoint9 = transformThisPoint(pbPoint9, thisObject.container); pbPoint10 = transformThisPoint(pbPoint10, thisObject.container); - if (pbPoint1.x < canvas.chartSpace.viewport.visibleArea.bottomLeft.x || pbPoint2.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x) { + if (pbPoint1.x < canvas.chartingSpace.viewport.visibleArea.bottomLeft.x || pbPoint2.x > canvas.chartingSpace.viewport.visibleArea.bottomRight.x) { return false; } @@ -669,37 +669,37 @@ /* Now we set the real value of y. */ - pbPoint1.y = canvas.chartSpace.viewport.visibleArea.bottomRight.y - (previousPercentBandwidth + pbOffset) * plotAreaViewport.scale.y; - pbPoint2.y = canvas.chartSpace.viewport.visibleArea.bottomRight.y - (currentPercentBandwidth + pbOffset) * plotAreaViewport.scale.y; + pbPoint1.y = canvas.chartingSpace.viewport.visibleArea.bottomRight.y - (previousPercentBandwidth + pbOffset) * plotAreaViewport.scale.y; + pbPoint2.y = canvas.chartingSpace.viewport.visibleArea.bottomRight.y - (currentPercentBandwidth + pbOffset) * plotAreaViewport.scale.y; - pbPoint3.y = canvas.chartSpace.viewport.visibleArea.bottomRight.y - (0 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; - pbPoint4.y = canvas.chartSpace.viewport.visibleArea.bottomRight.y - (30 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; - pbPoint5.y = canvas.chartSpace.viewport.visibleArea.bottomRight.y - (70 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; - pbPoint6.y = canvas.chartSpace.viewport.visibleArea.bottomRight.y - (100 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; + pbPoint3.y = canvas.chartingSpace.viewport.visibleArea.bottomRight.y - (0 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; + pbPoint4.y = canvas.chartingSpace.viewport.visibleArea.bottomRight.y - (30 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; + pbPoint5.y = canvas.chartingSpace.viewport.visibleArea.bottomRight.y - (70 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; + pbPoint6.y = canvas.chartingSpace.viewport.visibleArea.bottomRight.y - (100 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; - pbPoint7.y = canvas.chartSpace.viewport.visibleArea.bottomRight.y - (previousMovingAverage + pbOffset) * plotAreaViewport.scale.y; - pbPoint8.y = canvas.chartSpace.viewport.visibleArea.bottomRight.y - (currentMovingAverage + pbOffset) * plotAreaViewport.scale.y; + pbPoint7.y = canvas.chartingSpace.viewport.visibleArea.bottomRight.y - (previousMovingAverage + pbOffset) * plotAreaViewport.scale.y; + pbPoint8.y = canvas.chartingSpace.viewport.visibleArea.bottomRight.y - (currentMovingAverage + pbOffset) * plotAreaViewport.scale.y; - pbPoint9.y = canvas.chartSpace.viewport.visibleArea.bottomRight.y - (previousBandwidth + pbOffset) * plotAreaViewport.scale.y; - pbPoint10.y = canvas.chartSpace.viewport.visibleArea.bottomRight.y - (currentBandwidth + pbOffset) * plotAreaViewport.scale.y; + pbPoint9.y = canvas.chartingSpace.viewport.visibleArea.bottomRight.y - (previousBandwidth + pbOffset) * plotAreaViewport.scale.y; + pbPoint10.y = canvas.chartingSpace.viewport.visibleArea.bottomRight.y - (currentBandwidth + pbOffset) * plotAreaViewport.scale.y; } /* Everything must fit within the visible area */ - pbPoint1 = canvas.chartSpace.viewport.fitIntoVisibleArea(pbPoint1); - pbPoint2 = canvas.chartSpace.viewport.fitIntoVisibleArea(pbPoint2); + pbPoint1 = canvas.chartingSpace.viewport.fitIntoVisibleArea(pbPoint1); + pbPoint2 = canvas.chartingSpace.viewport.fitIntoVisibleArea(pbPoint2); - pbPoint3 = canvas.chartSpace.viewport.fitIntoVisibleArea(pbPoint3); - pbPoint4 = canvas.chartSpace.viewport.fitIntoVisibleArea(pbPoint4); - pbPoint5 = canvas.chartSpace.viewport.fitIntoVisibleArea(pbPoint5); - pbPoint6 = canvas.chartSpace.viewport.fitIntoVisibleArea(pbPoint6); + pbPoint3 = canvas.chartingSpace.viewport.fitIntoVisibleArea(pbPoint3); + pbPoint4 = canvas.chartingSpace.viewport.fitIntoVisibleArea(pbPoint4); + pbPoint5 = canvas.chartingSpace.viewport.fitIntoVisibleArea(pbPoint5); + pbPoint6 = canvas.chartingSpace.viewport.fitIntoVisibleArea(pbPoint6); - pbPoint7 = canvas.chartSpace.viewport.fitIntoVisibleArea(pbPoint7); - pbPoint8 = canvas.chartSpace.viewport.fitIntoVisibleArea(pbPoint8); + pbPoint7 = canvas.chartingSpace.viewport.fitIntoVisibleArea(pbPoint7); + pbPoint8 = canvas.chartingSpace.viewport.fitIntoVisibleArea(pbPoint8); - pbPoint9 = canvas.chartSpace.viewport.fitIntoVisibleArea(pbPoint9); - pbPoint10 = canvas.chartSpace.viewport.fitIntoVisibleArea(pbPoint10); + pbPoint9 = canvas.chartingSpace.viewport.fitIntoVisibleArea(pbPoint9); + pbPoint10 = canvas.chartingSpace.viewport.fitIntoVisibleArea(pbPoint10); /* Now the drawing of the lines */ From 52211b80394f61448501964a020530480c826d89 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 11 Mar 2020 20:59:26 +0100 Subject: [PATCH 40/54] Rafactoring --- BollingerBands.js | 2 +- BollingerBandsPanel.js | 2 +- PercentageBandwidth.js | 2 +- this.plotter.config.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index d626b8f29..684bd9688 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -1,4 +1,4 @@ -function newAAMastersPlottersBollingerBandsBollingerBands() { +function newMastersPlottersBollingerBandsBollingerBands() { const MODULE_NAME = "Bands Plotter"; const ERROR_LOG = true; diff --git a/BollingerBandsPanel.js b/BollingerBandsPanel.js index 75c9543d3..cc3f83088 100644 --- a/BollingerBandsPanel.js +++ b/BollingerBandsPanel.js @@ -1,5 +1,5 @@  -function newAAMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () { +function newMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () { var thisObject = { fitFunction: undefined, diff --git a/PercentageBandwidth.js b/PercentageBandwidth.js index c7eb5f186..0a0661c91 100644 --- a/PercentageBandwidth.js +++ b/PercentageBandwidth.js @@ -1,4 +1,4 @@ -function newAAMastersPlottersBollingerBandsPercentageBandwidth() { +function newMastersPlottersBollingerBandsPercentageBandwidth() { const MODULE_NAME = "Bands Plotter"; const ERROR_LOG = true; diff --git a/this.plotter.config.json b/this.plotter.config.json index 19c0016e5..a0b3faf21 100644 --- a/this.plotter.config.json +++ b/this.plotter.config.json @@ -1,7 +1,7 @@ { "displayName": "Plotters Bollinger Bands", "codeName": "PlottersBollingerBands", - "dataMine": "AAMasters", + "dataMine": "Masters", "modules": [ { "codeName": "BollingerBands", From 5826e391ab999266927fd95658f311f4cd669235 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 16 Mar 2020 08:12:11 +0100 Subject: [PATCH 41/54] Update BollingerBandsPanel.js --- BollingerBandsPanel.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/BollingerBandsPanel.js b/BollingerBandsPanel.js index cc3f83088..4214b0a1b 100644 --- a/BollingerBandsPanel.js +++ b/BollingerBandsPanel.js @@ -17,7 +17,7 @@ function newMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () { thisObject.container.frame.containerName = "Bollinger Band"; let currentBand; - let panelTabButton + let upDownButton return thisObject; @@ -28,8 +28,8 @@ function newMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () { thisObject.isVisible = undefined currentBand = undefined - panelTabButton.finalize() - panelTabButton = undefined + upDownButton.finalize() + upDownButton = undefined } function initialize() { @@ -40,18 +40,18 @@ function newMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () { thisObject.container.frame.position.x = canvas.chartingSpace.viewport.visibleArea.topRight.x - thisObject.container.frame.width * 3; thisObject.container.frame.position.y = canvas.chartingSpace.viewport.visibleArea.bottomLeft.y - thisObject.container.frame.height; - panelTabButton = newPanelTabButton() - panelTabButton.parentContainer = thisObject.container - panelTabButton.container.frame.parentFrame = thisObject.container.frame - panelTabButton.fitFunction = thisObject.fitFunction - panelTabButton.initialize() + upDownButton = newUpDownButton() + upDownButton.parentContainer = thisObject.container + upDownButton.container.frame.parentFrame = thisObject.container.frame + upDownButton.fitFunction = thisObject.fitFunction + upDownButton.initialize() } function getContainer(point) { if (thisObject.isVisible !== true) { return } let container; - container = panelTabButton.getContainer(point) + container = upDownButton.getContainer(point) if (container !== undefined) { return container } if (thisObject.container.frame.isThisPointHere(point, true) === true) { @@ -83,7 +83,7 @@ function newMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () { plotCurrentBandInfo(); - panelTabButton.draw() + upDownButton.draw() } From 9bcf190da45d8d0a56a781c868417b01cd4a6541 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 16 Mar 2020 14:12:45 +0100 Subject: [PATCH 42/54] limits fixed --- BollingerBandsPanel.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/BollingerBandsPanel.js b/BollingerBandsPanel.js index 4214b0a1b..7fe805a5b 100644 --- a/BollingerBandsPanel.js +++ b/BollingerBandsPanel.js @@ -131,6 +131,15 @@ function newMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () { if (bandPoint2.y < upperLimit) { bandPoint2.y = upperLimit; } if (bandPoint3.y < upperLimit) { bandPoint3.y = upperLimit; } + const leftLimit = thisObject.container.frame.width * 0.40; + const rightLimit = thisObject.container.frame.width * 0.60; + + if (bandPoint1.x < leftLimit) { bandPoint1.x = leftLimit; } + if (bandPoint2.x < leftLimit) { bandPoint2.x = leftLimit; } + + if (bandPoint3.x > rightLimit) { bandPoint3.x = rightLimit; } + if (bandPoint4.x > rightLimit) { bandPoint4.x = rightLimit; } + bandPoint1 = thisObject.container.frame.frameThisPoint(bandPoint1); bandPoint2 = thisObject.container.frame.frameThisPoint(bandPoint2); bandPoint3 = thisObject.container.frame.frameThisPoint(bandPoint3); From 57e58990d5f8a64b0cec74f8745382c21f9a7d73 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 16 Mar 2020 14:35:02 +0100 Subject: [PATCH 43/54] bug fixed --- BollingerBandsPanel.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/BollingerBandsPanel.js b/BollingerBandsPanel.js index 7fe805a5b..a6c50a880 100644 --- a/BollingerBandsPanel.js +++ b/BollingerBandsPanel.js @@ -118,8 +118,6 @@ function newMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () { y: Y_AXIS - currentBand.rightBodyHeight / 2 + currentBand.bottomDelta / 4 }; - - /* Extra bounderies due to constrained space */ const upperLimit = frameTitleHeight + frameBodyHeight * 0.15; @@ -222,9 +220,10 @@ function newMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () { browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + ' Saira'; - let label = '' + labelToPrint; + let label = labelToPrint if (isNaN(label) === false) { - label = Number(label).toLocaleString(); + label = dynamicDecimals(labelToPrint) + label = label.toLocaleString(); } let xOffset = label.length / 2 * fontSize * FONT_ASPECT_RATIO; From 330b530145801fc445747e8b8caf7b4561ceb3fa Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 17 Mar 2020 12:41:15 +0100 Subject: [PATCH 44/54] printLabel standarized --- BollingerBandsPanel.js | 47 ++++-------------------------------------- 1 file changed, 4 insertions(+), 43 deletions(-) diff --git a/BollingerBandsPanel.js b/BollingerBandsPanel.js index a6c50a880..cf23bada6 100644 --- a/BollingerBandsPanel.js +++ b/BollingerBandsPanel.js @@ -197,55 +197,16 @@ function newMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () { browserCanvasContext.lineWidth = 0.2; browserCanvasContext.stroke(); - - browserCanvasContext.beginPath(); - /* put the labels with the bands values */ - - - let y; - printLabel('Moving Average', X_AXIS, frameTitleHeight + frameBodyHeight * 0.05, '1'); - printLabel(currentBand.innerBand.movingAverage, X_AXIS, frameTitleHeight + frameBodyHeight * 0.10, '0.50'); + printLabel('Moving Average', X_AXIS, frameTitleHeight + frameBodyHeight * 0.05, '0.60', undefined, undefined, true, thisObject.container, thisObject.fitFunction); + printLabel(currentBand.innerBand.movingAverage, X_AXIS, frameTitleHeight + frameBodyHeight * 0.10, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction); - printLabel('Deviation', X_AXIS, frameTitleHeight + frameBodyHeight * 0.95, '1'); - printLabel(currentBand.innerBand.deviation, X_AXIS, frameTitleHeight + frameBodyHeight * 0.90, '0.50'); - - function printLabel(labelToPrint, x, y, opacity) { - - let labelPoint; - let fontSize = 10; - - browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY + ' Saira'; - - let label = labelToPrint - if (isNaN(label) === false) { - label = dynamicDecimals(labelToPrint) - label = label.toLocaleString(); - } - let xOffset = label.length / 2 * fontSize * FONT_ASPECT_RATIO; - - labelPoint = { - x: x - xOffset, - y: y - }; - - labelPoint = thisObject.container.frame.frameThisPoint(labelPoint); - - labelPoint = thisObject.fitFunction(labelPoint) - - browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.DARK + ', ' + opacity + ')'; - browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y); - - } - - browserCanvasContext.closePath(); - browserCanvasContext.fill(); + printLabel('Deviation', X_AXIS, frameTitleHeight + frameBodyHeight * 0.95, '0.60', undefined, undefined, true, thisObject.container, thisObject.fitFunction); + printLabel(currentBand.innerBand.deviation, X_AXIS, frameTitleHeight + frameBodyHeight * 0.90, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction); } - - } From 7eb3ce7d09c711497aa5ebff308e7a58e6cfc109 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 28 Mar 2020 12:47:30 +0100 Subject: [PATCH 45/54] new properties --- BollingerBands.js | 22 ++++++++++++++++++---- BollingerBandsPanel.js | 21 +++++++++++++++------ 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index 684bd9688..6a7b974ce 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -331,6 +331,7 @@ let currentDate = new Date(farLeftDate.valueOf()); bands = []; + let lastBand while (currentDate.valueOf() <= farRightDate.valueOf() + ONE_DAY_IN_MILISECONDS) { @@ -356,6 +357,14 @@ band.standardDeviation = dailyFile[i][3]; band.deviation = dailyFile[i][4]; + if (lastBand !== undefined) { + if (lastBand.movingAverage > band.movingAverage) { band.direction = "Down" } + if (lastBand.movingAverage < band.movingAverage) { band.direction = "Up" } + if (lastBand.movingAverage === band.movingAverage) { band.direction = "Side" } + } + + lastBand = band + if ( (band.begin >= farLeftDate.valueOf() && band.end <= farRightDate.valueOf()) && (band.begin >= coordinateSystem.min.x && band.end <= coordinateSystem.max.x) @@ -386,13 +395,9 @@ if (bands[0].begin > lowerEnd || bands[bands.length - 1].end < upperEnd) { setTimeout(recalculate, 2000); - - //console.log("File missing while calculating bands, scheduling a recalculation in 2 seconds."); - } } - //console.log("Olivia > recalculateUsingDailyFiles > total bands generated : " + bands.length); } catch (err) { @@ -417,6 +422,7 @@ rightDate = new Date(rightDate.valueOf() + dateDiff * 1.5); bands = []; + let lastBand for (let i = 0; i < marketFile.length; i++) { @@ -434,6 +440,14 @@ band.standardDeviation = marketFile[i][3]; band.deviation = marketFile[i][4]; + if (lastBand !== undefined) { + if (lastBand.movingAverage > band.movingAverage) { band.direction = "Down" } + if (lastBand.movingAverage < band.movingAverage) { band.direction = "Up" } + if (lastBand.movingAverage === band.movingAverage) { band.direction = "Side" } + } + + lastBand = band + if ( (band.begin >= leftDate.valueOf() && band.end <= rightDate.valueOf()) && (band.begin >= coordinateSystem.min.x && band.end <= coordinateSystem.max.x) diff --git a/BollingerBandsPanel.js b/BollingerBandsPanel.js index cf23bada6..a01b74e1d 100644 --- a/BollingerBandsPanel.js +++ b/BollingerBandsPanel.js @@ -120,8 +120,8 @@ function newMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () { /* Extra bounderies due to constrained space */ - const upperLimit = frameTitleHeight + frameBodyHeight * 0.15; - const downLimit = frameTitleHeight + frameBodyHeight * 0.85; + const upperLimit = frameTitleHeight + frameBodyHeight * 0.25; + const downLimit = frameTitleHeight + frameBodyHeight * 0.75; if (bandPoint1.y > downLimit) { bandPoint1.y = downLimit; } if (bandPoint4.y > downLimit) { bandPoint4.y = downLimit; } @@ -201,11 +201,20 @@ function newMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () { let y; - printLabel('Moving Average', X_AXIS, frameTitleHeight + frameBodyHeight * 0.05, '0.60', undefined, undefined, true, thisObject.container, thisObject.fitFunction); - printLabel(currentBand.innerBand.movingAverage, X_AXIS, frameTitleHeight + frameBodyHeight * 0.10, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction); - printLabel('Deviation', X_AXIS, frameTitleHeight + frameBodyHeight * 0.95, '0.60', undefined, undefined, true, thisObject.container, thisObject.fitFunction); - printLabel(currentBand.innerBand.deviation, X_AXIS, frameTitleHeight + frameBodyHeight * 0.90, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction); + if (currentBand.innerBand.direction !== undefined) { + printLabel('Direction', X_AXIS, frameTitleHeight + frameBodyHeight * 0.05, '0.60', undefined, undefined, true, thisObject.container, thisObject.fitFunction); + printLabel(currentBand.innerBand.direction, X_AXIS, frameTitleHeight + frameBodyHeight * 0.10, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction); + } + + printLabel('Moving Average', X_AXIS, frameTitleHeight + frameBodyHeight * 0.15, '0.60', undefined, undefined, true, thisObject.container, thisObject.fitFunction); + printLabel(currentBand.innerBand.movingAverage, X_AXIS, frameTitleHeight + frameBodyHeight * 0.20, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction); + + printLabel('Deviation', X_AXIS, frameTitleHeight + frameBodyHeight * 0.85, '0.60', undefined, undefined, true, thisObject.container, thisObject.fitFunction); + printLabel(currentBand.innerBand.deviation, X_AXIS, frameTitleHeight + frameBodyHeight * 0.80, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction); + + printLabel('Standard Deviation', X_AXIS, frameTitleHeight + frameBodyHeight * 0.95, '0.60', undefined, undefined, true, thisObject.container, thisObject.fitFunction); + printLabel(currentBand.innerBand.standardDeviation, X_AXIS, frameTitleHeight + frameBodyHeight * 0.90, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction); } } From b6dbc3d9123f5fddb81c257c41f99dfa674cefc7 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 10 Oct 2020 12:36:40 +0200 Subject: [PATCH 46/54] Update BollingerBands.js --- BollingerBands.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index 6a7b974ce..cf8e8da67 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -572,7 +572,6 @@ bandPoint5 = thisObject.fitFunction(bandPoint5); bandPoint6 = thisObject.fitFunction(bandPoint6); - /* First we are drawing a semi-transparent background */ browserCanvasContext.beginPath(); @@ -592,9 +591,9 @@ } if ( - bandPoint1.x < canvas.chartingSpace.viewport.visibleArea.topLeft.x + 50 + bandPoint1.x < canvas.chartingSpace.viewport.visibleArea.topLeft.x + 150 || - bandPoint1.x > canvas.chartingSpace.viewport.visibleArea.bottomRight.x - 50 + bandPoint1.x > canvas.chartingSpace.viewport.visibleArea.bottomRight.x - 150 ) { // we leave this bands without fill. } else { From f041666e83604cedc166cee77b5686816847a89b Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 19 Oct 2020 12:07:53 +0200 Subject: [PATCH 47/54] UI Object --- BollingerBands.js | 40 +++++++++++++-------------- BollingerBandsPanel.js | 4 +-- PercentageBandwidth.js | 62 +++++++++++++++++++++--------------------- 3 files changed, 53 insertions(+), 53 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index cf8e8da67..0a18f3832 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -67,8 +67,8 @@ /* Stop listening to the necesary events. */ thisObject.container.eventHandler.stopListening(onMouseOverEventSuscriptionId) - canvas.chartingSpace.viewport.eventHandler.stopListening(zoomChangedEventSubscriptionId); - canvas.chartingSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId); + UI.projects.superalgos.spaces.chartingSpace.viewport.eventHandler.stopListening(zoomChangedEventSubscriptionId); + UI.projects.superalgos.spaces.chartingSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId); canvas.eventHandler.stopListening(dragFinishedEventSubscriptionId); thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId) marketFiles.eventHandler.stopListening(marketFilesUpdatedEventSubscriptionId); @@ -121,8 +121,8 @@ /* Listen to the necesary events. */ - zoomChangedEventSubscriptionId = canvas.chartingSpace.viewport.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged); - offsetChangedEventSubscriptionId = canvas.chartingSpace.viewport.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged); + zoomChangedEventSubscriptionId = UI.projects.superalgos.spaces.chartingSpace.viewport.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged); + offsetChangedEventSubscriptionId = UI.projects.superalgos.spaces.chartingSpace.viewport.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged); dragFinishedEventSubscriptionId = canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished); marketFilesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onMarketFilesUpdated); dailyFilesUpdatedEventSubscriptionId = dailyFiles.eventHandler.listenToEvent("Files Updated", onDailyFilesUpdated); @@ -320,8 +320,8 @@ let daysOnSides = getSideDays(timeFrame); - let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem); - let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem); + let leftDate = getDateFromPointAtBrowserCanvas(UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem); + let rightDate = getDateFromPointAtBrowserCanvas(UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem); let dateDiff = rightDate.valueOf() - leftDate.valueOf(); @@ -413,8 +413,8 @@ let daysOnSides = getSideDays(timeFrame); - let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem); - let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem); + let leftDate = getDateFromPointAtBrowserCanvas(UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem); + let rightDate = getDateFromPointAtBrowserCanvas(UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem); let dateDiff = rightDate.valueOf() - leftDate.valueOf(); @@ -532,12 +532,12 @@ bandPoint5 = transformThisPoint(bandPoint5, thisObject.container); bandPoint6 = transformThisPoint(bandPoint6, thisObject.container); - if (bandPoint2.x < canvas.chartingSpace.viewport.visibleArea.bottomLeft.x || bandPoint1.x > canvas.chartingSpace.viewport.visibleArea.bottomRight.x) { + if (bandPoint2.x < UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.bottomLeft.x || bandPoint1.x > UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.bottomRight.x) { continue; } - if (canvas.chartingSpace.viewport.zoomTargetLevel < ZOOM_OUT_THRESHOLD_FOR_PACKING_OBJECTS_AT_THE_BOTTOM_OR_TOP_OF_VIEWPORT) { - let diffA = bandPoint1.y - canvas.chartingSpace.viewport.visibleArea.bottomLeft.y + if (UI.projects.superalgos.spaces.chartingSpace.viewport.zoomTargetLevel < ZOOM_OUT_THRESHOLD_FOR_PACKING_OBJECTS_AT_THE_BOTTOM_OR_TOP_OF_VIEWPORT) { + let diffA = bandPoint1.y - UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.bottomLeft.y if (diffA > 0) { bandPoint1.y = bandPoint1.y - diffA bandPoint2.y = bandPoint2.y - diffA @@ -547,7 +547,7 @@ bandPoint6.y = bandPoint6.y - diffA } - let diffB = bandPoint2.y - canvas.chartingSpace.viewport.visibleArea.topLeft.y + let diffB = bandPoint2.y - UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topLeft.y if (diffB < 0) { bandPoint1.y = bandPoint1.y - diffB bandPoint2.y = bandPoint2.y - diffB @@ -558,12 +558,12 @@ } } - bandPoint1 = canvas.chartingSpace.viewport.fitIntoVisibleArea(bandPoint1); - bandPoint2 = canvas.chartingSpace.viewport.fitIntoVisibleArea(bandPoint2); - bandPoint3 = canvas.chartingSpace.viewport.fitIntoVisibleArea(bandPoint3); - bandPoint4 = canvas.chartingSpace.viewport.fitIntoVisibleArea(bandPoint4); - bandPoint5 = canvas.chartingSpace.viewport.fitIntoVisibleArea(bandPoint5); - bandPoint6 = canvas.chartingSpace.viewport.fitIntoVisibleArea(bandPoint6); + bandPoint1 = UI.projects.superalgos.spaces.chartingSpace.viewport.fitIntoVisibleArea(bandPoint1); + bandPoint2 = UI.projects.superalgos.spaces.chartingSpace.viewport.fitIntoVisibleArea(bandPoint2); + bandPoint3 = UI.projects.superalgos.spaces.chartingSpace.viewport.fitIntoVisibleArea(bandPoint3); + bandPoint4 = UI.projects.superalgos.spaces.chartingSpace.viewport.fitIntoVisibleArea(bandPoint4); + bandPoint5 = UI.projects.superalgos.spaces.chartingSpace.viewport.fitIntoVisibleArea(bandPoint5); + bandPoint6 = UI.projects.superalgos.spaces.chartingSpace.viewport.fitIntoVisibleArea(bandPoint6); bandPoint1 = thisObject.fitFunction(bandPoint1); bandPoint2 = thisObject.fitFunction(bandPoint2); @@ -591,9 +591,9 @@ } if ( - bandPoint1.x < canvas.chartingSpace.viewport.visibleArea.topLeft.x + 150 + bandPoint1.x < UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topLeft.x + 150 || - bandPoint1.x > canvas.chartingSpace.viewport.visibleArea.bottomRight.x - 150 + bandPoint1.x > UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.bottomRight.x - 150 ) { // we leave this bands without fill. } else { diff --git a/BollingerBandsPanel.js b/BollingerBandsPanel.js index a01b74e1d..b3a6f5bc2 100644 --- a/BollingerBandsPanel.js +++ b/BollingerBandsPanel.js @@ -37,8 +37,8 @@ function newMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () { thisObject.container.frame.width = UI_PANEL.WIDTH.NORMAL; thisObject.container.frame.height = UI_PANEL.HEIGHT.NORMAL; - thisObject.container.frame.position.x = canvas.chartingSpace.viewport.visibleArea.topRight.x - thisObject.container.frame.width * 3; - thisObject.container.frame.position.y = canvas.chartingSpace.viewport.visibleArea.bottomLeft.y - thisObject.container.frame.height; + thisObject.container.frame.position.x = UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topRight.x - thisObject.container.frame.width * 3; + thisObject.container.frame.position.y = UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.bottomLeft.y - thisObject.container.frame.height; upDownButton = newUpDownButton() upDownButton.parentContainer = thisObject.container diff --git a/PercentageBandwidth.js b/PercentageBandwidth.js index 0a0661c91..9f7000ed8 100644 --- a/PercentageBandwidth.js +++ b/PercentageBandwidth.js @@ -65,8 +65,8 @@ /* Stop listening to the necesary events. */ - canvas.chartingSpace.viewport.eventHandler.stopListening(zoomChangedEventSubscriptionId); - canvas.chartingSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId); + UI.projects.superalgos.spaces.chartingSpace.viewport.eventHandler.stopListening(zoomChangedEventSubscriptionId); + UI.projects.superalgos.spaces.chartingSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId); canvas.eventHandler.stopListening(dragFinishedEventSubscriptionId); thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId) marketFiles.eventHandler.stopListening(marketFilesUpdatedEventSubscriptionId); @@ -115,8 +115,8 @@ /* Listen to the necesary events. */ - zoomChangedEventSubscriptionId = canvas.chartingSpace.viewport.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged); - offsetChangedEventSubscriptionId = canvas.chartingSpace.viewport.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged); + zoomChangedEventSubscriptionId = UI.projects.superalgos.spaces.chartingSpace.viewport.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged); + offsetChangedEventSubscriptionId = UI.projects.superalgos.spaces.chartingSpace.viewport.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged); dragFinishedEventSubscriptionId = canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished); marketFilesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onMarketFilesUpdated); dailyFilesUpdatedEventSubscriptionId = dailyFiles.eventHandler.listenToEvent("Files Updated", onDailyFilesUpdated); @@ -301,8 +301,8 @@ let daysOnSides = getSideDays(timeFrame); - let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, plotAreaFrame); - let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topRight, thisObject.container, plotAreaFrame); + let leftDate = getDateFromPointAtBrowserCanvas(UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, plotAreaFrame); + let rightDate = getDateFromPointAtBrowserCanvas(UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topRight, thisObject.container, plotAreaFrame); let dateDiff = rightDate.valueOf() - leftDate.valueOf(); @@ -386,8 +386,8 @@ let daysOnSides = getSideDays(timeFrame); - let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, plotAreaFrame); - let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topRight, thisObject.container, plotAreaFrame); + let leftDate = getDateFromPointAtBrowserCanvas(UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, plotAreaFrame); + let rightDate = getDateFromPointAtBrowserCanvas(UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topRight, thisObject.container, plotAreaFrame); let dateDiff = rightDate.valueOf() - leftDate.valueOf(); @@ -480,7 +480,7 @@ plotAreaViewport.initializeY( minValue, maxValue, - canvas.chartingSpace.viewport.visibleArea.bottomRight.y - canvas.chartingSpace.viewport.visibleArea.topLeft.y + UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.bottomRight.y - UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topLeft.y ); plotAreaFrame.initializeY( @@ -510,7 +510,7 @@ /* This next section is to get ready in order to be able to plot dinamically constrained to the viewport */ - let visibleHeight = canvas.chartingSpace.viewport.visibleArea.bottomRight.y - canvas.chartingSpace.viewport.visibleArea.topLeft.y; + let visibleHeight = UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.bottomRight.y - UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topLeft.y; let frameCorner1 = { x: 0, @@ -651,7 +651,7 @@ pbPoint9 = transformThisPoint(pbPoint9, thisObject.container); pbPoint10 = transformThisPoint(pbPoint10, thisObject.container); - if (pbPoint1.x < canvas.chartingSpace.viewport.visibleArea.bottomLeft.x || pbPoint2.x > canvas.chartingSpace.viewport.visibleArea.bottomRight.x) { + if (pbPoint1.x < UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.bottomLeft.x || pbPoint2.x > UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.bottomRight.x) { return false; } @@ -669,37 +669,37 @@ /* Now we set the real value of y. */ - pbPoint1.y = canvas.chartingSpace.viewport.visibleArea.bottomRight.y - (previousPercentBandwidth + pbOffset) * plotAreaViewport.scale.y; - pbPoint2.y = canvas.chartingSpace.viewport.visibleArea.bottomRight.y - (currentPercentBandwidth + pbOffset) * plotAreaViewport.scale.y; + pbPoint1.y = UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.bottomRight.y - (previousPercentBandwidth + pbOffset) * plotAreaViewport.scale.y; + pbPoint2.y = UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.bottomRight.y - (currentPercentBandwidth + pbOffset) * plotAreaViewport.scale.y; - pbPoint3.y = canvas.chartingSpace.viewport.visibleArea.bottomRight.y - (0 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; - pbPoint4.y = canvas.chartingSpace.viewport.visibleArea.bottomRight.y - (30 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; - pbPoint5.y = canvas.chartingSpace.viewport.visibleArea.bottomRight.y - (70 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; - pbPoint6.y = canvas.chartingSpace.viewport.visibleArea.bottomRight.y - (100 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; + pbPoint3.y = UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.bottomRight.y - (0 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; + pbPoint4.y = UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.bottomRight.y - (30 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; + pbPoint5.y = UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.bottomRight.y - (70 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; + pbPoint6.y = UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.bottomRight.y - (100 * pbChartHeight / 100 + pbOffset) * plotAreaViewport.scale.y; - pbPoint7.y = canvas.chartingSpace.viewport.visibleArea.bottomRight.y - (previousMovingAverage + pbOffset) * plotAreaViewport.scale.y; - pbPoint8.y = canvas.chartingSpace.viewport.visibleArea.bottomRight.y - (currentMovingAverage + pbOffset) * plotAreaViewport.scale.y; + pbPoint7.y = UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.bottomRight.y - (previousMovingAverage + pbOffset) * plotAreaViewport.scale.y; + pbPoint8.y = UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.bottomRight.y - (currentMovingAverage + pbOffset) * plotAreaViewport.scale.y; - pbPoint9.y = canvas.chartingSpace.viewport.visibleArea.bottomRight.y - (previousBandwidth + pbOffset) * plotAreaViewport.scale.y; - pbPoint10.y = canvas.chartingSpace.viewport.visibleArea.bottomRight.y - (currentBandwidth + pbOffset) * plotAreaViewport.scale.y; + pbPoint9.y = UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.bottomRight.y - (previousBandwidth + pbOffset) * plotAreaViewport.scale.y; + pbPoint10.y = UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.bottomRight.y - (currentBandwidth + pbOffset) * plotAreaViewport.scale.y; } /* Everything must fit within the visible area */ - pbPoint1 = canvas.chartingSpace.viewport.fitIntoVisibleArea(pbPoint1); - pbPoint2 = canvas.chartingSpace.viewport.fitIntoVisibleArea(pbPoint2); + pbPoint1 = UI.projects.superalgos.spaces.chartingSpace.viewport.fitIntoVisibleArea(pbPoint1); + pbPoint2 = UI.projects.superalgos.spaces.chartingSpace.viewport.fitIntoVisibleArea(pbPoint2); - pbPoint3 = canvas.chartingSpace.viewport.fitIntoVisibleArea(pbPoint3); - pbPoint4 = canvas.chartingSpace.viewport.fitIntoVisibleArea(pbPoint4); - pbPoint5 = canvas.chartingSpace.viewport.fitIntoVisibleArea(pbPoint5); - pbPoint6 = canvas.chartingSpace.viewport.fitIntoVisibleArea(pbPoint6); + pbPoint3 = UI.projects.superalgos.spaces.chartingSpace.viewport.fitIntoVisibleArea(pbPoint3); + pbPoint4 = UI.projects.superalgos.spaces.chartingSpace.viewport.fitIntoVisibleArea(pbPoint4); + pbPoint5 = UI.projects.superalgos.spaces.chartingSpace.viewport.fitIntoVisibleArea(pbPoint5); + pbPoint6 = UI.projects.superalgos.spaces.chartingSpace.viewport.fitIntoVisibleArea(pbPoint6); - pbPoint7 = canvas.chartingSpace.viewport.fitIntoVisibleArea(pbPoint7); - pbPoint8 = canvas.chartingSpace.viewport.fitIntoVisibleArea(pbPoint8); + pbPoint7 = UI.projects.superalgos.spaces.chartingSpace.viewport.fitIntoVisibleArea(pbPoint7); + pbPoint8 = UI.projects.superalgos.spaces.chartingSpace.viewport.fitIntoVisibleArea(pbPoint8); - pbPoint9 = canvas.chartingSpace.viewport.fitIntoVisibleArea(pbPoint9); - pbPoint10 = canvas.chartingSpace.viewport.fitIntoVisibleArea(pbPoint10); + pbPoint9 = UI.projects.superalgos.spaces.chartingSpace.viewport.fitIntoVisibleArea(pbPoint9); + pbPoint10 = UI.projects.superalgos.spaces.chartingSpace.viewport.fitIntoVisibleArea(pbPoint10); /* Now the drawing of the lines */ From 80dd77543756ba01283d6fb99930c8d337970f45 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 19 Oct 2020 19:12:30 +0200 Subject: [PATCH 48/54] coordinateTransformations --- BollingerBands.js | 12 ++++++------ PercentageBandwidth.js | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index 0a18f3832..19d5840b3 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -525,12 +525,12 @@ bandPoint5 = coordinateSystem.transformThisPoint(bandPoint5); bandPoint6 = coordinateSystem.transformThisPoint(bandPoint6); - bandPoint1 = transformThisPoint(bandPoint1, thisObject.container); - bandPoint2 = transformThisPoint(bandPoint2, thisObject.container); - bandPoint3 = transformThisPoint(bandPoint3, thisObject.container); - bandPoint4 = transformThisPoint(bandPoint4, thisObject.container); - bandPoint5 = transformThisPoint(bandPoint5, thisObject.container); - bandPoint6 = transformThisPoint(bandPoint6, thisObject.container); + bandPoint1 = UI.projects.superalgos.utilities.coordinateTransformations.transformThisPoint(bandPoint1, thisObject.container); + bandPoint2 = UI.projects.superalgos.utilities.coordinateTransformations.transformThisPoint(bandPoint2, thisObject.container); + bandPoint3 = UI.projects.superalgos.utilities.coordinateTransformations.transformThisPoint(bandPoint3, thisObject.container); + bandPoint4 = UI.projects.superalgos.utilities.coordinateTransformations.transformThisPoint(bandPoint4, thisObject.container); + bandPoint5 = UI.projects.superalgos.utilities.coordinateTransformations.transformThisPoint(bandPoint5, thisObject.container); + bandPoint6 = UI.projects.superalgos.utilities.coordinateTransformations.transformThisPoint(bandPoint6, thisObject.container); if (bandPoint2.x < UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.bottomLeft.x || bandPoint1.x > UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.bottomRight.x) { continue; diff --git a/PercentageBandwidth.js b/PercentageBandwidth.js index 9f7000ed8..7c1fa785a 100644 --- a/PercentageBandwidth.js +++ b/PercentageBandwidth.js @@ -524,8 +524,8 @@ /* Now the transformations. */ - frameCorner1 = transformThisPoint(frameCorner1, thisObject.container.frame.container); - frameCorner2 = transformThisPoint(frameCorner2, thisObject.container.frame.container); + frameCorner1 = UI.projects.superalgos.utilities.coordinateTransformations.transformThisPoint(frameCorner1, thisObject.container.frame.container); + frameCorner2 = UI.projects.superalgos.utilities.coordinateTransformations.transformThisPoint(frameCorner2, thisObject.container.frame.container); let frameHeightInViewPort = frameCorner2.y - frameCorner1.y; let pbChartHeight = 20; @@ -637,19 +637,19 @@ pbPoint9 = plot.transformThisPoint(pbPoint9); pbPoint10 = plot.transformThisPoint(pbPoint10); - pbPoint1 = transformThisPoint(pbPoint1, thisObject.container); - pbPoint2 = transformThisPoint(pbPoint2, thisObject.container); + pbPoint1 = UI.projects.superalgos.utilities.coordinateTransformations.transformThisPoint(pbPoint1, thisObject.container); + pbPoint2 = UI.projects.superalgos.utilities.coordinateTransformations.transformThisPoint(pbPoint2, thisObject.container); - pbPoint3 = transformThisPoint(pbPoint3, thisObject.container); - pbPoint4 = transformThisPoint(pbPoint4, thisObject.container); - pbPoint5 = transformThisPoint(pbPoint5, thisObject.container); - pbPoint6 = transformThisPoint(pbPoint6, thisObject.container); + pbPoint3 = UI.projects.superalgos.utilities.coordinateTransformations.transformThisPoint(pbPoint3, thisObject.container); + pbPoint4 = UI.projects.superalgos.utilities.coordinateTransformations.transformThisPoint(pbPoint4, thisObject.container); + pbPoint5 = UI.projects.superalgos.utilities.coordinateTransformations.transformThisPoint(pbPoint5, thisObject.container); + pbPoint6 = UI.projects.superalgos.utilities.coordinateTransformations.transformThisPoint(pbPoint6, thisObject.container); - pbPoint7 = transformThisPoint(pbPoint7, thisObject.container); - pbPoint8 = transformThisPoint(pbPoint8, thisObject.container); + pbPoint7 = UI.projects.superalgos.utilities.coordinateTransformations.transformThisPoint(pbPoint7, thisObject.container); + pbPoint8 = UI.projects.superalgos.utilities.coordinateTransformations.transformThisPoint(pbPoint8, thisObject.container); - pbPoint9 = transformThisPoint(pbPoint9, thisObject.container); - pbPoint10 = transformThisPoint(pbPoint10, thisObject.container); + pbPoint9 = UI.projects.superalgos.utilities.coordinateTransformations.transformThisPoint(pbPoint9, thisObject.container); + pbPoint10 = UI.projects.superalgos.utilities.coordinateTransformations.transformThisPoint(pbPoint10, thisObject.container); if (pbPoint1.x < UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.bottomLeft.x || pbPoint2.x > UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.bottomRight.x) { return false; From edca4ca9a716e95c5d303697a264607b58aa1170 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 19 Oct 2020 19:22:13 +0200 Subject: [PATCH 49/54] dateRateTransformations --- BollingerBands.js | 10 +++++----- PercentageBandwidth.js | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index 19d5840b3..1232f004e 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -157,7 +157,7 @@ } function onMouseOver(event) { - let userPosition = getDateFromPointAtBrowserCanvas(event, thisObject.container, coordinateSystem) + let userPosition = UI.projects.superalgos.utilities.dateRateTransformations.getDateFromPointAtBrowserCanvas(event, thisObject.container, coordinateSystem) userPositionDate = userPosition.valueOf() } @@ -320,8 +320,8 @@ let daysOnSides = getSideDays(timeFrame); - let leftDate = getDateFromPointAtBrowserCanvas(UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem); - let rightDate = getDateFromPointAtBrowserCanvas(UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem); + let leftDate = UI.projects.superalgos.utilities.dateRateTransformations.getDateFromPointAtBrowserCanvas(UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem); + let rightDate = UI.projects.superalgos.utilities.dateRateTransformations.getDateFromPointAtBrowserCanvas(UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem); let dateDiff = rightDate.valueOf() - leftDate.valueOf(); @@ -413,8 +413,8 @@ let daysOnSides = getSideDays(timeFrame); - let leftDate = getDateFromPointAtBrowserCanvas(UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem); - let rightDate = getDateFromPointAtBrowserCanvas(UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem); + let leftDate = UI.projects.superalgos.utilities.dateRateTransformations.getDateFromPointAtBrowserCanvas(UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem); + let rightDate = UI.projects.superalgos.utilities.dateRateTransformations.getDateFromPointAtBrowserCanvas(UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem); let dateDiff = rightDate.valueOf() - leftDate.valueOf(); diff --git a/PercentageBandwidth.js b/PercentageBandwidth.js index 7c1fa785a..c32569874 100644 --- a/PercentageBandwidth.js +++ b/PercentageBandwidth.js @@ -301,8 +301,8 @@ let daysOnSides = getSideDays(timeFrame); - let leftDate = getDateFromPointAtBrowserCanvas(UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, plotAreaFrame); - let rightDate = getDateFromPointAtBrowserCanvas(UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topRight, thisObject.container, plotAreaFrame); + let leftDate = UI.projects.superalgos.utilities.dateRateTransformations.getDateFromPointAtBrowserCanvas(UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, plotAreaFrame); + let rightDate = UI.projects.superalgos.utilities.dateRateTransformations.getDateFromPointAtBrowserCanvas(UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topRight, thisObject.container, plotAreaFrame); let dateDiff = rightDate.valueOf() - leftDate.valueOf(); @@ -386,8 +386,8 @@ let daysOnSides = getSideDays(timeFrame); - let leftDate = getDateFromPointAtBrowserCanvas(UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, plotAreaFrame); - let rightDate = getDateFromPointAtBrowserCanvas(UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topRight, thisObject.container, plotAreaFrame); + let leftDate = UI.projects.superalgos.utilities.dateRateTransformations.getDateFromPointAtBrowserCanvas(UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, plotAreaFrame); + let rightDate = UI.projects.superalgos.utilities.dateRateTransformations.getDateFromPointAtBrowserCanvas(UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.topRight, thisObject.container, plotAreaFrame); let dateDiff = rightDate.valueOf() - leftDate.valueOf(); From 36ac4c18ad17f1b8018bbc5b0564b00a98cb9ffb Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 19 Oct 2020 19:42:04 +0200 Subject: [PATCH 50/54] drawPrint --- BollingerBandsPanel.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/BollingerBandsPanel.js b/BollingerBandsPanel.js index b3a6f5bc2..8e35c41c6 100644 --- a/BollingerBandsPanel.js +++ b/BollingerBandsPanel.js @@ -203,18 +203,18 @@ function newMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () { if (currentBand.innerBand.direction !== undefined) { - printLabel('Direction', X_AXIS, frameTitleHeight + frameBodyHeight * 0.05, '0.60', undefined, undefined, true, thisObject.container, thisObject.fitFunction); - printLabel(currentBand.innerBand.direction, X_AXIS, frameTitleHeight + frameBodyHeight * 0.10, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction); + UI.projects.superalgos.utilities.drawPrint.printLabel('Direction', X_AXIS, frameTitleHeight + frameBodyHeight * 0.05, '0.60', undefined, undefined, true, thisObject.container, thisObject.fitFunction); + UI.projects.superalgos.utilities.drawPrint.printLabel(currentBand.innerBand.direction, X_AXIS, frameTitleHeight + frameBodyHeight * 0.10, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction); } - printLabel('Moving Average', X_AXIS, frameTitleHeight + frameBodyHeight * 0.15, '0.60', undefined, undefined, true, thisObject.container, thisObject.fitFunction); - printLabel(currentBand.innerBand.movingAverage, X_AXIS, frameTitleHeight + frameBodyHeight * 0.20, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction); + UI.projects.superalgos.utilities.drawPrint.printLabel('Moving Average', X_AXIS, frameTitleHeight + frameBodyHeight * 0.15, '0.60', undefined, undefined, true, thisObject.container, thisObject.fitFunction); + UI.projects.superalgos.utilities.drawPrint.printLabel(currentBand.innerBand.movingAverage, X_AXIS, frameTitleHeight + frameBodyHeight * 0.20, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction); - printLabel('Deviation', X_AXIS, frameTitleHeight + frameBodyHeight * 0.85, '0.60', undefined, undefined, true, thisObject.container, thisObject.fitFunction); - printLabel(currentBand.innerBand.deviation, X_AXIS, frameTitleHeight + frameBodyHeight * 0.80, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction); + UI.projects.superalgos.utilities.drawPrint.printLabel('Deviation', X_AXIS, frameTitleHeight + frameBodyHeight * 0.85, '0.60', undefined, undefined, true, thisObject.container, thisObject.fitFunction); + UI.projects.superalgos.utilities.drawPrint.printLabel(currentBand.innerBand.deviation, X_AXIS, frameTitleHeight + frameBodyHeight * 0.80, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction); - printLabel('Standard Deviation', X_AXIS, frameTitleHeight + frameBodyHeight * 0.95, '0.60', undefined, undefined, true, thisObject.container, thisObject.fitFunction); - printLabel(currentBand.innerBand.standardDeviation, X_AXIS, frameTitleHeight + frameBodyHeight * 0.90, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction); + UI.projects.superalgos.utilities.drawPrint.printLabel('Standard Deviation', X_AXIS, frameTitleHeight + frameBodyHeight * 0.95, '0.60', undefined, undefined, true, thisObject.container, thisObject.fitFunction); + UI.projects.superalgos.utilities.drawPrint.printLabel(currentBand.innerBand.standardDeviation, X_AXIS, frameTitleHeight + frameBodyHeight * 0.90, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction); } } From 7f9e2ce31e8bc56a3048e5d4d4cb2e70541490ec Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 20 Oct 2020 13:05:32 +0200 Subject: [PATCH 51/54] Globals Ready --- BollingerBands.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BollingerBands.js b/BollingerBands.js index 1232f004e..4a8683baa 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -536,7 +536,7 @@ continue; } - if (UI.projects.superalgos.spaces.chartingSpace.viewport.zoomTargetLevel < ZOOM_OUT_THRESHOLD_FOR_PACKING_OBJECTS_AT_THE_BOTTOM_OR_TOP_OF_VIEWPORT) { + if (UI.projects.superalgos.spaces.chartingSpace.viewport.zoomTargetLevel < UI.projects.superalgos.globals.zoom.ZOOM_OUT_THRESHOLD_FOR_PACKING_OBJECTS_AT_THE_BOTTOM_OR_TOP_OF_VIEWPORT) { let diffA = bandPoint1.y - UI.projects.superalgos.spaces.chartingSpace.viewport.visibleArea.bottomLeft.y if (diffA > 0) { bandPoint1.y = bandPoint1.y - diffA From 8ee80cc113960848027694e98fbed3f686dbd811 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 26 Oct 2020 14:32:12 +0100 Subject: [PATCH 52/54] Update BollingerBandsPanel.js --- BollingerBandsPanel.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/BollingerBandsPanel.js b/BollingerBandsPanel.js index 8e35c41c6..43aeef252 100644 --- a/BollingerBandsPanel.js +++ b/BollingerBandsPanel.js @@ -1,5 +1,5 @@  -function newMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () { +function newMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel() { var thisObject = { fitFunction: undefined, @@ -203,18 +203,18 @@ function newMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel () { if (currentBand.innerBand.direction !== undefined) { - UI.projects.superalgos.utilities.drawPrint.printLabel('Direction', X_AXIS, frameTitleHeight + frameBodyHeight * 0.05, '0.60', undefined, undefined, true, thisObject.container, thisObject.fitFunction); - UI.projects.superalgos.utilities.drawPrint.printLabel(currentBand.innerBand.direction, X_AXIS, frameTitleHeight + frameBodyHeight * 0.10, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction); + UI.projects.superalgos.utilities.drawPrint.printLabel('Direction', X_AXIS, frameTitleHeight + frameBodyHeight * 0.05, '0.60', undefined, undefined, true, thisObject.container, thisObject.fitFunction); + UI.projects.superalgos.utilities.drawPrint.printLabel(currentBand.innerBand.direction, X_AXIS, frameTitleHeight + frameBodyHeight * 0.10, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction); } UI.projects.superalgos.utilities.drawPrint.printLabel('Moving Average', X_AXIS, frameTitleHeight + frameBodyHeight * 0.15, '0.60', undefined, undefined, true, thisObject.container, thisObject.fitFunction); - UI.projects.superalgos.utilities.drawPrint.printLabel(currentBand.innerBand.movingAverage, X_AXIS, frameTitleHeight + frameBodyHeight * 0.20, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction); + UI.projects.superalgos.utilities.drawPrint.printLabel(currentBand.innerBand.movingAverage, X_AXIS, frameTitleHeight + frameBodyHeight * 0.20, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction, undefined, undefined, 10); UI.projects.superalgos.utilities.drawPrint.printLabel('Deviation', X_AXIS, frameTitleHeight + frameBodyHeight * 0.85, '0.60', undefined, undefined, true, thisObject.container, thisObject.fitFunction); - UI.projects.superalgos.utilities.drawPrint.printLabel(currentBand.innerBand.deviation, X_AXIS, frameTitleHeight + frameBodyHeight * 0.80, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction); + UI.projects.superalgos.utilities.drawPrint.printLabel(currentBand.innerBand.deviation, X_AXIS, frameTitleHeight + frameBodyHeight * 0.80, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction, undefined, undefined, 10); UI.projects.superalgos.utilities.drawPrint.printLabel('Standard Deviation', X_AXIS, frameTitleHeight + frameBodyHeight * 0.95, '0.60', undefined, undefined, true, thisObject.container, thisObject.fitFunction); - UI.projects.superalgos.utilities.drawPrint.printLabel(currentBand.innerBand.standardDeviation, X_AXIS, frameTitleHeight + frameBodyHeight * 0.90, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction); + UI.projects.superalgos.utilities.drawPrint.printLabel(currentBand.innerBand.standardDeviation, X_AXIS, frameTitleHeight + frameBodyHeight * 0.90, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction, undefined, undefined, 10); } } From 4b3b1672d891362e5f78b0998debddb1c0d21c23 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 7 Nov 2020 19:13:51 +0100 Subject: [PATCH 53/54] Bug Fixed --- BollingerBands.js | 2 +- PercentageBandwidth.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BollingerBands.js b/BollingerBands.js index 4a8683baa..3a5950ede 100644 --- a/BollingerBands.js +++ b/BollingerBands.js @@ -335,7 +335,7 @@ while (currentDate.valueOf() <= farRightDate.valueOf() + ONE_DAY_IN_MILISECONDS) { - let stringDate = currentDate.getFullYear() + '-' + pad(currentDate.getMonth() + 1, 2) + '-' + pad(currentDate.getDate(), 2); + let stringDate = currentDate.getUTCFullYear() + '-' + pad(currentDate.getUTCMonth() + 1, 2) + '-' + pad(currentDate.getUTCDate(), 2); let dailyFile = fileCursor.files.get(stringDate); diff --git a/PercentageBandwidth.js b/PercentageBandwidth.js index c32569874..0f38df5b2 100644 --- a/PercentageBandwidth.js +++ b/PercentageBandwidth.js @@ -315,7 +315,7 @@ while (currentDate.valueOf() <= farRightDate.valueOf() + ONE_DAY_IN_MILISECONDS) { - let stringDate = currentDate.getFullYear() + '-' + pad(currentDate.getMonth() + 1, 2) + '-' + pad(currentDate.getDate(), 2); + let stringDate = currentDate.getUTCFullYear() + '-' + pad(currentDate.getUTCMonth() + 1, 2) + '-' + pad(currentDate.getUTCDate(), 2); let dailyFile = fileCursor.files.get(stringDate); From 3ab6dfffe79e2d29bae8ccb4ba79f77fbe7d79d5 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 11 Nov 2020 11:45:33 +0100 Subject: [PATCH 54/54] Panel Improvements --- BollingerBandsPanel.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/BollingerBandsPanel.js b/BollingerBandsPanel.js index 43aeef252..0cf50836d 100644 --- a/BollingerBandsPanel.js +++ b/BollingerBandsPanel.js @@ -201,20 +201,19 @@ function newMastersPlottersBollingerBandsBollingerBandsBollingerBandsPanel() { let y; - if (currentBand.innerBand.direction !== undefined) { - UI.projects.superalgos.utilities.drawPrint.printLabel('Direction', X_AXIS, frameTitleHeight + frameBodyHeight * 0.05, '0.60', undefined, undefined, true, thisObject.container, thisObject.fitFunction); - UI.projects.superalgos.utilities.drawPrint.printLabel(currentBand.innerBand.direction, X_AXIS, frameTitleHeight + frameBodyHeight * 0.10, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction); + UI.projects.superalgos.utilities.drawPrint.printLabel('Direction', undefined, undefined, X_AXIS, frameTitleHeight + frameBodyHeight * 0.05, '0.60', undefined, undefined, 'Center', thisObject.container, thisObject.fitFunction); + UI.projects.superalgos.utilities.drawPrint.printLabel(currentBand.innerBand.direction, undefined, undefined, X_AXIS, frameTitleHeight + frameBodyHeight * 0.10, '1.00', 15, undefined, 'Center', thisObject.container, thisObject.fitFunction); } - UI.projects.superalgos.utilities.drawPrint.printLabel('Moving Average', X_AXIS, frameTitleHeight + frameBodyHeight * 0.15, '0.60', undefined, undefined, true, thisObject.container, thisObject.fitFunction); - UI.projects.superalgos.utilities.drawPrint.printLabel(currentBand.innerBand.movingAverage, X_AXIS, frameTitleHeight + frameBodyHeight * 0.20, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction, undefined, undefined, 10); + UI.projects.superalgos.utilities.drawPrint.printLabel('Moving Average', undefined, undefined, X_AXIS, frameTitleHeight + frameBodyHeight * 0.15, '0.60', undefined, undefined, 'Center', thisObject.container, thisObject.fitFunction); + UI.projects.superalgos.utilities.drawPrint.printLabel(currentBand.innerBand.movingAverage, undefined, undefined, X_AXIS, frameTitleHeight + frameBodyHeight * 0.20, '1.00', 15, undefined, 'Center', thisObject.container, thisObject.fitFunction, undefined, undefined, 10); - UI.projects.superalgos.utilities.drawPrint.printLabel('Deviation', X_AXIS, frameTitleHeight + frameBodyHeight * 0.85, '0.60', undefined, undefined, true, thisObject.container, thisObject.fitFunction); - UI.projects.superalgos.utilities.drawPrint.printLabel(currentBand.innerBand.deviation, X_AXIS, frameTitleHeight + frameBodyHeight * 0.80, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction, undefined, undefined, 10); + UI.projects.superalgos.utilities.drawPrint.printLabel('Deviation', undefined, undefined, X_AXIS, frameTitleHeight + frameBodyHeight * 0.85, '0.60', undefined, undefined, 'Center', thisObject.container, thisObject.fitFunction); + UI.projects.superalgos.utilities.drawPrint.printLabel(currentBand.innerBand.deviation, X_AXIS, frameTitleHeight + frameBodyHeight * 0.80, '1.00', 15, undefined, 'Center', thisObject.container, thisObject.fitFunction, undefined, undefined, 10); - UI.projects.superalgos.utilities.drawPrint.printLabel('Standard Deviation', X_AXIS, frameTitleHeight + frameBodyHeight * 0.95, '0.60', undefined, undefined, true, thisObject.container, thisObject.fitFunction); - UI.projects.superalgos.utilities.drawPrint.printLabel(currentBand.innerBand.standardDeviation, X_AXIS, frameTitleHeight + frameBodyHeight * 0.90, '1.00', 15, undefined, true, thisObject.container, thisObject.fitFunction, undefined, undefined, 10); + UI.projects.superalgos.utilities.drawPrint.printLabel('Standard Deviation', undefined, undefined, X_AXIS, frameTitleHeight + frameBodyHeight * 0.95, '0.60', undefined, undefined, 'Center', thisObject.container, thisObject.fitFunction); + UI.projects.superalgos.utilities.drawPrint.printLabel(currentBand.innerBand.standardDeviation, undefined, undefined, X_AXIS, frameTitleHeight + frameBodyHeight * 0.90, '1.00', 15, undefined, 'Center', thisObject.container, thisObject.fitFunction, undefined, undefined, 10); } }