From 66a44f2c77c1fd0ffc1a5c7eaffccf639d58248c Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 27 May 2019 15:18:36 +0200 Subject: [PATCH] Bug Fixed while deleting node detached --- FloatingSpace/StrategyPart.js | 13 +++- .../FunctionLibraries/AttachDetach.js | 70 +++++++++++++++++++ .../FunctionLibraries/NodeDeleter.js | 51 +++++++++++--- StrategySpace/Workspace/Workspace.js | 22 +++--- 4 files changed, 133 insertions(+), 23 deletions(-) diff --git a/FloatingSpace/StrategyPart.js b/FloatingSpace/StrategyPart.js index 43c576769..8c0b390a6 100644 --- a/FloatingSpace/StrategyPart.js +++ b/FloatingSpace/StrategyPart.js @@ -250,6 +250,18 @@ function newStrategyPart () { let floatingObject = nearby[1] let nearbyNode = floatingObject.payload.node if (compatibleType.indexOf(nearbyNode.type) >= 0) { + /* Discard objects with busy coonection ports */ + if (thisObject.payload.node.type === 'Trigger Stage' && nearbyNode.triggerStage !== undefined) { continue } + if (thisObject.payload.node.type === 'Open Stage' && nearbyNode.openStage !== undefined) { continue } + if (thisObject.payload.node.type === 'Manage Stage' && nearbyNode.manageStage !== undefined) { continue } + if (thisObject.payload.node.type === 'Close Stage' && nearbyNode.closeStage !== undefined) { continue } + if (thisObject.payload.node.type === 'Take Position Event' && nearbyNode.sellPoint !== undefined) { continue } + if (thisObject.payload.node.type === 'Trigger Off Event' && nearbyNode.exitPoint !== undefined) { continue } + if (thisObject.payload.node.type === 'Trigger On Event' && nearbyNode.entryPoint !== undefined) { continue } + if (thisObject.payload.node.type === 'Initial Definition' && nearbyNode.initialDefinition !== undefined) { continue } + if (thisObject.payload.node.type === 'Stop' && nearbyNode.stopLoss !== undefined) { continue } + if (thisObject.payload.node.type === 'Take Profit' && nearbyNode.buyOrder !== undefined) { continue } + /* Discard Phases without partent */ if (thisObject.payload.node.type === 'Phase' && nearbyNode.type === 'Phase' && nearbyNode.payload.parentNode === undefined) { continue } if (foundCompatible === false) { if (distance < thisObject.container.frame.radius * 1.5 + floatingObject.container.frame.radius * 1.5) { @@ -719,4 +731,3 @@ function newStrategyPart () { } } } - diff --git a/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js b/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js index 0fdfd241c..ef9a05547 100644 --- a/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js +++ b/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js @@ -131,6 +131,76 @@ function newAttachDetach () { completeAttachment(node, rootNodes) } break + case 'Trigger Stage': { + node.payload.parentNode = attachToNode + node.payload.chainParent = attachToNode + node.payload.parentNode.triggerStage = node + completeAttachment(node, rootNodes) + } + break + case 'Open Stage': { + node.payload.parentNode = attachToNode + node.payload.chainParent = attachToNode + node.payload.parentNode.openStage = node + completeAttachment(node, rootNodes) + } + break + case 'Manage Stage': { + node.payload.parentNode = attachToNode + node.payload.chainParent = attachToNode + node.payload.parentNode.manageStage = node + completeAttachment(node, rootNodes) + } + break + case 'Close Stage': { + node.payload.parentNode = attachToNode + node.payload.chainParent = attachToNode + node.payload.parentNode.closeStage = node + completeAttachment(node, rootNodes) + } + break + case 'Initial Definition': { + node.payload.parentNode = attachToNode + node.payload.chainParent = attachToNode + node.payload.parentNode.initialDefinition = node + completeAttachment(node, rootNodes) + } + break + case 'Trigger On Event': { + node.payload.parentNode = attachToNode + node.payload.chainParent = attachToNode + node.payload.parentNode.entryPoint = node + completeAttachment(node, rootNodes) + } + break + case 'Trigger Off Event': { + node.payload.parentNode = attachToNode + node.payload.chainParent = attachToNode + node.payload.parentNode.exitPoint = node + completeAttachment(node, rootNodes) + } + break + case 'Take Position': { + node.payload.parentNode = attachToNode + node.payload.chainParent = attachToNode + node.payload.parentNode.sellPoint = node + completeAttachment(node, rootNodes) + } + break + case 'Stop': { + node.payload.parentNode = attachToNode + node.payload.chainParent = attachToNode + node.payload.parentNode.stopLoss = node + completeAttachment(node, rootNodes) + } + break + case 'Take Profit': { + node.payload.parentNode = attachToNode + node.payload.chainParent = attachToNode + node.payload.parentNode.buyOrder = node + completeAttachment(node, rootNodes) + } + break case 'Phase': { switch (attachToNode.type) { case 'Stop': { diff --git a/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js b/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js index 5b3f4d30b..73d9c4017 100644 --- a/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js +++ b/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js @@ -19,7 +19,7 @@ function newNodeDeleter () { canvas.floatingSpace.strategyPartConstructor.destroyStrategyPart(node.payload) } - function deleteStrategy (node) { + function deleteStrategy (node, rootNodes) { let payload = node.payload if (payload.parentNode !== undefined) { for (let j = 0; j < payload.parentNode.strategies.length; j++) { @@ -28,6 +28,8 @@ function newNodeDeleter () { payload.parentNode.strategies.splice(j, 1) } } + } else { + completeDeletion(node, rootNodes) } if (node.triggerStage !== undefined) { deleteTriggerStage(node.triggerStage) @@ -45,10 +47,12 @@ function newNodeDeleter () { cleanNode(node) } - function deleteTriggerStage (node) { + function deleteTriggerStage (node, rootNodes) { let payload = node.payload if (payload.parentNode !== undefined) { payload.parentNode.triggerStage = undefined + } else { + completeDeletion(node, rootNodes) } if (node.entryPoint !== undefined) { deleteEvent(node.entryPoint) @@ -63,10 +67,12 @@ function newNodeDeleter () { cleanNode(node) } - function deleteOpenStage (node) { + function deleteOpenStage (node, rootNodes) { let payload = node.payload if (payload.parentNode !== undefined) { payload.parentNode.openStage = undefined + } else { + completeDeletion(node, rootNodes) } if (node.initialDefinition !== undefined) { deleteInitialDefinition(node.initialDefinition) @@ -75,10 +81,12 @@ function newNodeDeleter () { cleanNode(node) } - function deleteManageStage (node) { + function deleteManageStage (node, rootNodes) { let payload = node.payload if (payload.parentNode !== undefined) { payload.parentNode.manageStage = undefined + } else { + completeDeletion(node, rootNodes) } if (node.stopLoss !== undefined) { deleteManagedItem(node.stopLoss) @@ -90,26 +98,30 @@ function newNodeDeleter () { cleanNode(node) } - function deleteCloseStage (node) { + function deleteCloseStage (node, rootNodes) { let payload = node.payload if (payload.parentNode !== undefined) { payload.parentNode.closeStage = undefined + } else { + completeDeletion(node, rootNodes) } destroyPart(node) cleanNode(node) } - function deleteInitialDefinition (node) { + function deleteInitialDefinition (node, rootNodes) { let payload = node.payload if (payload.parentNode !== undefined) { payload.parentNode.initialDefinition = undefined + } else { + completeDeletion(node, rootNodes) } destroyPart(node) cleanNode(node) } - function deleteEvent (node) { + function deleteEvent (node, rootNodes) { let payload = node.payload if (payload.parentNode !== undefined) { switch (node.type) { @@ -126,6 +138,8 @@ function newNodeDeleter () { break } } + } else { + completeDeletion(node, rootNodes) } while (node.situations.length > 0) { @@ -135,7 +149,7 @@ function newNodeDeleter () { cleanNode(node) } - function deleteManagedItem (node) { + function deleteManagedItem (node, rootNodes) { let payload = node.payload if (payload.parentNode !== undefined) { switch (node.type) { @@ -148,6 +162,8 @@ function newNodeDeleter () { break } } + } else { + completeDeletion(node, rootNodes) } while (node.phases.length > 0) { @@ -157,7 +173,7 @@ function newNodeDeleter () { cleanNode(node) } - function deletePhase (node) { + function deletePhase (node, rootNodes) { let payload = node.payload if (payload.parentNode !== undefined) { for (let k = 0; k < payload.parentNode.phases.length; k++) { @@ -185,12 +201,13 @@ function newNodeDeleter () { deleteSituation(situation) } node.situations = [] + completeDeletion(node, rootNodes) destroyPart(node) cleanNode(node) } } - function deleteSituation (node) { + function deleteSituation (node, rootNodes) { let payload = node.payload if (payload.parentNode !== undefined) { for (let j = 0; j < payload.parentNode.situations.length; j++) { @@ -213,12 +230,13 @@ function newNodeDeleter () { deleteCondition(condition) } node.conditions = [] + completeDeletion(node, rootNodes) destroyPart(node) cleanNode(node) } } - function deleteCondition (node) { + function deleteCondition (node, rootNodes) { let payload = node.payload if (payload.parentNode !== undefined) { for (let i = 0; i < payload.parentNode.conditions.length; i++) { @@ -231,11 +249,22 @@ function newNodeDeleter () { } } } else { + completeDeletion(node, rootNodes) destroyPart(node) cleanNode(node) } } + function completeDeletion (node, rootNodes) { + for (let i = 0; i < rootNodes.length; i++) { + let rootNode = rootNodes[i] + if (rootNode.id === node.id) { + rootNodes.splice(i, 1) + return + } + } + } + function cleanNode (node) { node.payload.targetPosition.x = undefined node.payload.targetPosition.y = undefined diff --git a/StrategySpace/Workspace/Workspace.js b/StrategySpace/Workspace/Workspace.js index 9d15d2ce1..a292a2c65 100644 --- a/StrategySpace/Workspace/Workspace.js +++ b/StrategySpace/Workspace/Workspace.js @@ -175,47 +175,47 @@ function newWorkspace () { } break case 'Delete Strategy': { - functionLibraryNodeDeleter.deleteStrategy(payload.node) + functionLibraryNodeDeleter.deleteStrategy(payload.node, rootNodes) break } case 'Delete Trigger Stage': { - functionLibraryNodeDeleter.deleteTriggerStage(payload.node) + functionLibraryNodeDeleter.deleteTriggerStage(payload.node, rootNodes) break } case 'Delete Open Stage': { - functionLibraryNodeDeleter.deleteOpenStage(payload.node) + functionLibraryNodeDeleter.deleteOpenStage(payload.node, rootNodes) break } case 'Delete Manage Stage': { - functionLibraryNodeDeleter.deleteManageStage(payload.node) + functionLibraryNodeDeleter.deleteManageStage(payload.node, rootNodes) break } case 'Delete Close Stage': { - functionLibraryNodeDeleter.deleteCloseStage(payload.node) + functionLibraryNodeDeleter.deleteCloseStage(payload.node, rootNodes) break } case 'Delete Initial Definition': { - functionLibraryNodeDeleter.deleteInitialDefinition(payload.node) + functionLibraryNodeDeleter.deleteInitialDefinition(payload.node, rootNodes) break } case 'Delete Event': { - functionLibraryNodeDeleter.deleteEvent(payload.node) + functionLibraryNodeDeleter.deleteEvent(payload.node, rootNodes) break } case 'Delete Managed Item': { - functionLibraryNodeDeleter.deleteManagedItem(payload.node) + functionLibraryNodeDeleter.deleteManagedItem(payload.node, rootNodes) break } case 'Delete Phase': { - functionLibraryNodeDeleter.deletePhase(payload.node) + functionLibraryNodeDeleter.deletePhase(payload.node, rootNodes) break } case 'Delete Situation': { - functionLibraryNodeDeleter.deleteSituation(payload.node) + functionLibraryNodeDeleter.deleteSituation(payload.node, rootNodes) break } case 'Delete Condition': { - functionLibraryNodeDeleter.deleteCondition(payload.node) + functionLibraryNodeDeleter.deleteCondition(payload.node, rootNodes) break } default: