From 5ea6e2621c03d19e4268a1cab7671400c939c454 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 25 Jun 2019 10:18:30 +0200 Subject: [PATCH 1/2] Bug Fixed deleting nodes --- FloatingSpace/StrategyPartConstructor.js | 2 +- StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/FloatingSpace/StrategyPartConstructor.js b/FloatingSpace/StrategyPartConstructor.js index 86d102c93..55f08876e 100644 --- a/FloatingSpace/StrategyPartConstructor.js +++ b/FloatingSpace/StrategyPartConstructor.js @@ -223,7 +223,7 @@ function newStrategyPartConstructor () { { action: 'Delete Parameters', actionFunction: payload.onMenuItemClick, - label: 'Delete Trading System', + label: 'Delete Parameters', visible: false, iconPathOn: 'trash', iconPathOff: 'trash', diff --git a/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js b/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js index ab64cbbe5..c5a69fece 100644 --- a/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js +++ b/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js @@ -44,6 +44,10 @@ function newNodeDeleter () { deleteStrategy(node.strategies[0], rootNodes) } + if (node.parameters !== undefined) { + deleteParameters(node.parameters, rootNodes) + } + completeDeletion(node, rootNodes) destroyPart(node) cleanNode(node) @@ -121,6 +125,9 @@ function newNodeDeleter () { if (node.takePosition !== undefined) { deleteEvent(node.takePosition, rootNodes) } + if (node.positionSize !== undefined) { + deletePositionSize(node.positionSize, rootNodes) + } destroyPart(node) cleanNode(node) } From 4e103cd35c90d21e060c720795ebf9adda2dc545 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 25 Jun 2019 10:53:52 +0200 Subject: [PATCH 2/2] productCard.product.codeName in (productCardsToTurnOff) --- CockpitSpace/RestartSimulation.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CockpitSpace/RestartSimulation.js b/CockpitSpace/RestartSimulation.js index 7bbb426da..c4f428c8c 100644 --- a/CockpitSpace/RestartSimulation.js +++ b/CockpitSpace/RestartSimulation.js @@ -125,12 +125,13 @@ function newRestartSimulation () { } function turnOffProductCards () { + let productCardsToTurnOff = ['Trading-Simulation', 'Simulation-Conditions', 'Simulation-Strategies', 'Simulation-Trades'] for (let i = 0; i < canvas.panelsSpace.panels.length; i++) { let panel = canvas.panelsSpace.panels[i] if (panel.name === 'Products Panel') { for (j = 0; j < panel.productCards.length; j++) { let productCard = panel.productCards[j] - if (productCard.product.relatedToTradingEngine === true && productCard.status !== PRODUCT_CARD_STATUS.OFF) { + if (productCard.product.codeName in (productCardsToTurnOff) && productCard.status !== PRODUCT_CARD_STATUS.OFF) { productCard.turnOff() productCardsToTurnOn.push(productCard) }