diff --git a/ConditionsPanel.js b/ConditionsPanel.js index b09e6994c..e88e4509e 100644 --- a/ConditionsPanel.js +++ b/ConditionsPanel.js @@ -17,6 +17,7 @@ function newAAMastersPlottersTradingSimulationConditionsConditionsPanel() { container.frame.containerName = "Conditions Panel"; let currentRecord; + let panelTabButton return thisObject; @@ -28,12 +29,19 @@ function newAAMastersPlottersTradingSimulationConditionsConditionsPanel() { thisObject.container.frame.position.x = viewPort.visibleArea.topRight.x - UI_PANEL.WIDTH.NORMAL * 3; thisObject.container.frame.position.y = viewPort.visibleArea.topRight.y; + 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 newAAMastersPlottersTradingSimulationConditionsConditionsPanel() { plotCurrentRecordInfo(); + panelTabButton.draw() } diff --git a/TradingSimulation.js b/TradingSimulation.js index 4407d28e3..c4a12c786 100644 --- a/TradingSimulation.js +++ b/TradingSimulation.js @@ -106,7 +106,7 @@ smileyMonkeyEars = loadEmoji("Smiley/Emoji Smiley-86.png"); imageStrategy = loadEmoji("Places/Emoji Orte-90.png"); imageStrategyPhase = loadEmoji("Places/Emoji Orte-91.png"); - imageStopLossPhase = loadEmoji("Nature/Emoji Natur-85.png"); + imageStopLossPhase = loadEmoji("Nature/Emoji Natur-71.png"); imageBuyOrderPhase = loadEmoji("Nature/Emoji Natur-67.png"); function loadEmoji(pPath) { diff --git a/TradingSimulationPanel.js b/TradingSimulationPanel.js index d9884e73a..9f9fb1718 100644 --- a/TradingSimulationPanel.js +++ b/TradingSimulationPanel.js @@ -17,6 +17,7 @@ function newAAMastersPlottersTradingSimulationTradingSimulationTradingSimulation container.frame.containerName = "Simulated Records Panel"; let currentRecord; + let panelTabButton return thisObject; @@ -28,12 +29,19 @@ function newAAMastersPlottersTradingSimulationTradingSimulationTradingSimulation thisObject.container.frame.position.x = viewPort.visibleArea.topRight.x - thisObject.container.frame.width * 1; thisObject.container.frame.position.y = viewPort.visibleArea.topRight.y; + 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 newAAMastersPlottersTradingSimulationTradingSimulationTradingSimulation plotCurrentRecordInfo(); + panelTabButton.draw() }