From d6e1739bdc1a5f9968d461a80ee0a19c37cf8207 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 20 Apr 2018 23:00:34 +0200 Subject: [PATCH] Panels Working --- .vs/Plotters-Candles-Volumes/v15/.suo | Bin 30720 -> 31744 bytes CandlePanel.js | 11 ++++------- Candles.js | 2 +- VolumePanel.js | 9 +++------ Volumes.js | 6 +++--- this.plotter.config.json | 10 ++++++---- 6 files changed, 17 insertions(+), 21 deletions(-) diff --git a/.vs/Plotters-Candles-Volumes/v15/.suo b/.vs/Plotters-Candles-Volumes/v15/.suo index 95cb3d17c806527f257e1fd287e316b0816acdea..ab22d4d832e34b890e63946f4c163e1835043a7f 100644 GIT binary patch delta 1429 zcmchWO-NKx6vyAa^PZ#QbDSB+dZUh-PGxG&(?&5hKhmtQ#zY0vDf}QLf>tiluo;5P z%+TJUMJsipT@=o1(ZWnzrl_%V^}UcVk``U~aqhYIf9^f^yz>Gd zNFYMSD~M(Kkeiz4-UMH+yj~(sj^hH^FhB>$E%-tk#of4IMb>bD)!`Bx=)^$3!B1%n zd^2SEQnX#B(1%T1E7oibS`o2pewt==eH14WuIV?iOI*n9CJDxQQOv>lKBQ=UEi>)_ zS`T7|MSBK`svr5w#9Zx))-U55cH+ji-eBB#gE7UQj3Ih1@i^y^SR_GP-+?w4VR>#I ziQ2viZ4#2I`MM^3lb?a}Ok@|5g=8ap5Y!f}>&+XE9=n!@em=4vDL~waj1(f#>85g` znCy-bbgm=A$PKoE;WyEas#eny35j<4H;E-oAe>MUvW1DrzJZ=I``YSiQX{=rn?(}{ zD~Azb>8)?|rJOQs5#SUl5mX`(3RJ$LBW42yCDgyk8fm{)oG zcZ1@p-SUP}63V4irRh3E)%T2*tKIoyLf-u=4 zJal-Bl5QBUdkWRkeK6Oz80Ga+bLz?Z&(t)5eZW4iz(KX|2?>L>{TeJBmtp3NMYXiI z61eEi#;qZE)M5h3mje->nMrwpt7GcQpofPk@6lgDch2Szfpw1ri(PJb)#y~}#{QUs zYEU|>p|I-&ban`MmkXYE{;^ z8;OJR9zf5oTF%W9G7B}*7`#0qTdE=l2c0(IYJ#ui@pS93A66w-JUfqd6Ati8&5+qE z19ewIpw|O^?op+Eo|O*f+wcBfRyE>#K?U}oFk} D!|2tK delta 1223 zcmdUuUr19?9LN2gU2|Kvp*eH9xqpQ$b92|`Y^6EVa)p#i$@~|0IVDJGK`#mApzxs= z_5PlEF&PoPMLQ4#8CvTlgl0YXY7f0<6i5%*?`$Fog}rv*bARXj&cE;XoO_ZRko*EO zO<;J|T*pj_zSa8Ys~^EqP*AYw!U;A3Q}~@-(7Py6LZBKqqpGuj8*k|*Syv(c(7CJ1 zs7EID5PG7KFcF(n4q$h@bXJwh$|+$a%*0RXsGwMhHzdcbD&veK8v>L#OdQS6FjpL- zMgtKf_7WZ%W!dMjvb%+z)Jog(zwDZ8uQqP*UsO0aHea@Em1AyQZqQKGny*iYDq zs{BB?ub3L8gb?na=p@9MxQT;AEg=>VrRKM~Xdj`rpYResLRhIL6r!H2oB+*e=6+)q zW>s5SHnZ(|aRww|O>@-pZzWmKi?b^ta@VkCb*9a2jJF+H0FXG?fg!V;k;LVR0bH$~ zhje8I^i`A*>*TUDjnO>Gkh?13a(l35Yu~X2S8L`Wm`1rXHNHr?5R0G$ULYU(2Ud+&XGnlNHE;=%L%U**Z1 zto#Q%2Oi_6UO)FI?69MUcMfncEr|`b$}*sJ=(9GujQ2VoxZ_G=D5!WxM;a7wAQ*^y zLyDq!hXb)uMTs}YL!lV9L|$MxGKJaG^?c*%TUIC@juThLPikWi|7C%tu}z%5E^oP9 z8LtBahs)O(Ji^xD7EC(g{B`UVVA9@$AL4%Ob@?$o5}=#v#MXojO@r$dJ00Y$h{vnL WZdbo9`rb&f85f5Ra0Y diff --git a/CandlePanel.js b/CandlePanel.js index babd6f50d..13dfed4b8 100644 --- a/CandlePanel.js +++ b/CandlePanel.js @@ -1,8 +1,8 @@  -function newCandlePanel() { +function newAAMastersPlottersCandlesVolumesCandlesCandlePanel() { var currentCandlePanel = { - onCurrentCandleChanged: onCurrentCandleChanged, + onEventRaised: onEventRaised, container: undefined, draw: draw, getContainer: getContainer, @@ -26,14 +26,11 @@ function newCandlePanel() { currentCandlePanel.container.frame.width = 250; currentCandlePanel.container.frame.height = 300; - currentCandlePanel.container.frame.position.x = viewPort.visibleArea.topRight.x - currentCandlePanel.container.frame.width - 180; + currentCandlePanel.container.frame.position.x = viewPort.visibleArea.topRight.x - currentCandlePanel.container.frame.width * 2; currentCandlePanel.container.frame.position.y = 0; - } - - function getContainer(point) { var container; @@ -54,7 +51,7 @@ function newCandlePanel() { } - function onCurrentCandleChanged(lastCurrentCandle) { + function onEventRaised(lastCurrentCandle) { currentCandle = lastCurrentCandle; diff --git a/Candles.js b/Candles.js index 43fe7b6e5..52ebb6905 100644 --- a/Candles.js +++ b/Candles.js @@ -565,7 +565,7 @@ innerCandle: candle }; - thisObject.container.eventHandler.raiseEvent("Current Candle Info Changed", currentCandle); + thisObject.container.eventHandler.raiseEvent("Current Candle Changed", currentCandle); } else { diff --git a/VolumePanel.js b/VolumePanel.js index 4a2d08eb6..0795dd57b 100644 --- a/VolumePanel.js +++ b/VolumePanel.js @@ -1,8 +1,8 @@  -function newVolumePanel() { +function newAAMastersPlottersCandlesVolumesVolumesVolumePanel() { var currentVolumePanel = { - onCurrentVolumeChanged: onCurrentVolumeChanged, + onEventRaised: onEventRaised, container: undefined, draw: draw, getContainer: getContainer, @@ -29,11 +29,8 @@ function newVolumePanel() { currentVolumePanel.container.frame.position.x = viewPort.visibleArea.topRight.x - currentVolumePanel.container.frame.width; currentVolumePanel.container.frame.position.y = 0; - } - - function getContainer(point) { var container; @@ -54,7 +51,7 @@ function newVolumePanel() { } - function onCurrentVolumeChanged(lastCurrentVolume) { + function onEventRaised(lastCurrentVolume) { currentVolume = lastCurrentVolume; diff --git a/Volumes.js b/Volumes.js index 555dd9549..413dd2708 100644 --- a/Volumes.js +++ b/Volumes.js @@ -215,7 +215,7 @@ if (datetime.valueOf() >= volume.begin && datetime.valueOf() <= volume.end) { - thisObject.container.eventHandler.raiseEvent("Current Candle Changed", thisObject.currentCandle); + thisObject.container.eventHandler.raiseEvent("Current Volume Changed", thisObject.currentCandle); } } @@ -610,7 +610,7 @@ if (dateValue >= volume.begin && dateValue <= volume.end) { - browserCanvasContext.fillStyle = 'rgba(255, 233, 31, 0.40)'; // Current candle accroding to time + browserCanvasContext.fillStyle = 'rgba(255, 233, 31, 0.40)'; // Current volume accroding to time } else { @@ -656,7 +656,7 @@ innerVolumeBar: volume }; - thisObject.container.eventHandler.raiseEvent("Current Volume Info Changed", currentVolume); + thisObject.container.eventHandler.raiseEvent("Current Volume Changed", currentVolume); } } diff --git a/this.plotter.config.json b/this.plotter.config.json index 54814ecfd..11e87aa45 100644 --- a/this.plotter.config.json +++ b/this.plotter.config.json @@ -10,8 +10,9 @@ "profilePicture": "Candles.png", "panels": [ { - "codeName": "Current Candle", - "moduleName": "CandlePanel" + "codeName": "CandlePanel", + "moduleName": "CandlePanel", + "event": "Current Candle Changed" } ] }, @@ -22,8 +23,9 @@ "profilePicture": "Volumes.png", "panels": [ { - "codeName": "Current Volume", - "moduleName": "VolumePanel" + "codeName": "VolumePanel", + "moduleName": "VolumePanel", + "event": "Current Volume Changed" } ] }