diff --git a/.vs/Plotters-Candles-Volumes/v15/.suo b/.vs/Plotters-Candles-Volumes/v15/.suo index 95cb3d17c..ab22d4d83 100644 Binary files a/.vs/Plotters-Candles-Volumes/v15/.suo and b/.vs/Plotters-Candles-Volumes/v15/.suo differ 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" } ] }