From 21e3de95abbc86324c33447ca7ce7d252dba6e4b Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 26 Oct 2019 19:25:17 +0200 Subject: [PATCH] Sensor Refactoring --- FloatingSpace/UiObject.js | 6 +++--- FloatingSpace/UiObjectConstructor.js | 6 +++--- FloatingSpace/UiObjectTitle.js | 2 +- Spaces/StrategySpace.js | 2 +- .../Workspace/FunctionLibraries/AttachDetach.js | 4 ++-- .../Workspace/FunctionLibraries/NodeChildren.js | 2 +- .../Workspace/FunctionLibraries/NodeDeleter.js | 6 +++--- StrategySpace/Workspace/FunctionLibraries/OnFocus.js | 2 +- .../Workspace/FunctionLibraries/PartsFromNodes.js | 10 +++++----- .../Workspace/FunctionLibraries/ProtocolNode.js | 2 +- .../Workspace/FunctionLibraries/ShortcutKeys.js | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/FloatingSpace/UiObject.js b/FloatingSpace/UiObject.js index 9b77df044..60f5e36a3 100644 --- a/FloatingSpace/UiObject.js +++ b/FloatingSpace/UiObject.js @@ -295,7 +295,7 @@ function newUiObject () { compatibleType = '->' + 'Task Manager' + '->' compatibleSubType = undefined break - case 'Sensor': + case 'Sensor Bot Instance': compatibleType = '->' + 'Task' + '->' compatibleSubType = undefined break @@ -310,7 +310,7 @@ function newUiObject () { case 'Process': switch (thisObject.payload.node.subType) { case 'Sensor Process': { - compatibleType = '->' + 'Sensor' + '->' + compatibleType = '->' + 'Sensor Bot Instance' + '->' break } case 'Indicator Process': { @@ -423,7 +423,7 @@ function newUiObject () { if (compatibleType.indexOf('->' + nearbyNode.type + '->') >= 0) { /* Discard objects with busy coonection ports */ if (thisObject.payload.node.type === 'Task' && nearbyNode.task !== undefined) { continue } - if (thisObject.payload.node.type === 'Sensor' && nearbyNode.bot !== undefined) { continue } + if (thisObject.payload.node.type === 'Sensor Bot Instance' && nearbyNode.bot !== undefined) { continue } if (thisObject.payload.node.type === 'Indicator' && nearbyNode.bot !== undefined) { continue } if (thisObject.payload.node.type === 'Trading Engine' && nearbyNode.bot !== undefined) { continue } if (thisObject.payload.node.type === 'Process' && nearbyNode.process !== undefined) { continue } diff --git a/FloatingSpace/UiObjectConstructor.js b/FloatingSpace/UiObjectConstructor.js index daa477232..5548c237f 100644 --- a/FloatingSpace/UiObjectConstructor.js +++ b/FloatingSpace/UiObjectConstructor.js @@ -775,7 +775,7 @@ function newUiObjectConstructor () { actionFunction: payload.onMenuItemClick, label: 'Add Sensor', visible: true, - relatedUiObject: 'Sensor', + relatedUiObject: 'Sensor Bot Instance', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -840,7 +840,7 @@ function newUiObjectConstructor () { ) break } - case 'Sensor': { + case 'Sensor Bot Instance': { uiObject.codeEditor = newCodeEditor() uiObject.codeEditor.isVisibleFunction = uiObject.isVisibleFunction uiObject.codeEditor.initialize() @@ -3234,7 +3234,7 @@ function newUiObjectConstructor () { level_3() break } - case 'Sensor': { + case 'Sensor Bot Instance': { level_3() break } diff --git a/FloatingSpace/UiObjectTitle.js b/FloatingSpace/UiObjectTitle.js index b2d784818..f7ac667b1 100644 --- a/FloatingSpace/UiObjectTitle.js +++ b/FloatingSpace/UiObjectTitle.js @@ -82,7 +82,7 @@ function newUiObjectTitle () { case 'Task': { break } - case 'Sensor': { + case 'Sensor Bot Instance': { thisObject.allwaysVisible = true break } diff --git a/Spaces/StrategySpace.js b/Spaces/StrategySpace.js index 608dd3e75..b35581d92 100644 --- a/Spaces/StrategySpace.js +++ b/Spaces/StrategySpace.js @@ -49,7 +49,7 @@ function newStrategySpace () { ['Layer', 'attractive'], ['Task Manager', 'task'], ['Task', 'timeline'], - ['Sensor', 'bot-sensor'], + ['Sensor Bot Instance', 'bot-sensor'], ['Indicator', 'bot-indicator'], ['Trading Engine', 'trading-engine'], ['Process', 'process'], diff --git a/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js b/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js index 43a73a8b5..8a23cacc7 100644 --- a/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js +++ b/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js @@ -135,7 +135,7 @@ function newAttachDetach () { completeDetachment(node, rootNodes) return } - case 'Sensor': { + case 'Sensor Bot Instance': { node.payload.parentNode.bot = undefined completeDetachment(node, rootNodes) return @@ -423,7 +423,7 @@ function newAttachDetach () { completeAttachment(node, rootNodes) } break - case 'Sensor': { + case 'Sensor Bot Instance': { node.payload.parentNode = attachToNode node.payload.chainParent = attachToNode node.payload.parentNode.bot = node diff --git a/StrategySpace/Workspace/FunctionLibraries/NodeChildren.js b/StrategySpace/Workspace/FunctionLibraries/NodeChildren.js index 2a2ff97c3..3436023fc 100644 --- a/StrategySpace/Workspace/FunctionLibraries/NodeChildren.js +++ b/StrategySpace/Workspace/FunctionLibraries/NodeChildren.js @@ -38,7 +38,7 @@ function newNodeChildren () { case 'Task': { return countChildrenTask(parentNode, childNode) } - case 'Sensor': { + case 'Sensor Bot Instance': { return countChildrenSensor(parentNode, childNode) } case 'Indicator': { diff --git a/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js b/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js index 5fa3c3137..4df67afe2 100644 --- a/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js +++ b/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js @@ -101,7 +101,7 @@ function newNodeDeleter () { deleteTask(rootNode, rootNodes) break } - case 'Sensor': { + case 'Sensor Bot Instance': { deleteBot(rootNode, rootNodes) break } @@ -1024,7 +1024,7 @@ function newNodeDeleter () { if (node.phases !== undefined) { while (node.phases.length > 0) { - deletePhase(node.phases[0]) + deletePhase(node.phases[0], rootNodes) } } @@ -1103,7 +1103,7 @@ function newNodeDeleter () { if (node.conditions !== undefined) { while (node.conditions.length > 0) { let condition = node.conditions[0] - deleteCondition(condition) + deleteCondition(condition, rootNodes) } } diff --git a/StrategySpace/Workspace/FunctionLibraries/OnFocus.js b/StrategySpace/Workspace/FunctionLibraries/OnFocus.js index 77fa1621a..de2854820 100644 --- a/StrategySpace/Workspace/FunctionLibraries/OnFocus.js +++ b/StrategySpace/Workspace/FunctionLibraries/OnFocus.js @@ -546,7 +546,7 @@ function newOnFocus () { return } } - case 'Sensor': { + case 'Sensor Bot Instance': { let child for (let m = 0; m < node.processes.length; m++) { child = getNodeThatIsOnFocus(node.processes[m]) diff --git a/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js b/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js index 14d5e0167..a223ff74d 100644 --- a/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js +++ b/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js @@ -465,8 +465,8 @@ function newPartsFromNodes () { } return } - case 'Sensor': { - createPart('Sensor', node.name, node, parentNode, chainParent, 'Sensor') + case 'Sensor Bot Instance': { + createPart('Sensor Bot Instance', node.name, node, parentNode, chainParent, 'Sensor Bot Instance') for (let m = 0; m < node.processes.length; m++) { let process = node.processes[m] createPartFromNode(process, node, node) @@ -492,7 +492,7 @@ function newPartsFromNodes () { case 'Process': { if (parentNode !== undefined) { switch (parentNode.type) { - case 'Sensor': { + case 'Sensor Bot Instance': { node.subType = 'Sensor Process' break } @@ -679,7 +679,7 @@ function newPartsFromNodes () { processes: [], code: '{}' } - createPart('Sensor', '', node.bot, node, node) + createPart('Sensor Bot Instance', '', node.bot, node, node) } return node.bot } @@ -713,7 +713,7 @@ function newPartsFromNodes () { } switch (node.type) { - case 'Sensor': { + case 'Sensor Bot Instance': { process.subType = 'Sensor Process' process.name = 'Sensor Process' break diff --git a/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js b/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js index 4d28635ed..5b034f146 100644 --- a/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js +++ b/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js @@ -772,7 +772,7 @@ function newProtocolNode () { } return object } - case 'Sensor': { + case 'Sensor Bot Instance': { let object = { type: node.type, subType: node.subType, diff --git a/StrategySpace/Workspace/FunctionLibraries/ShortcutKeys.js b/StrategySpace/Workspace/FunctionLibraries/ShortcutKeys.js index ce6e6b4f5..d4d3a0d6e 100644 --- a/StrategySpace/Workspace/FunctionLibraries/ShortcutKeys.js +++ b/StrategySpace/Workspace/FunctionLibraries/ShortcutKeys.js @@ -547,7 +547,7 @@ function newShortcutKeys () { return } } - case 'Sensor': { + case 'Sensor Bot Instance': { let child for (let m = 0; m < node.processes.length; m++) { child = getNodeByShortcutKey(node.processes[m], searchingKey)