From 0fd53d7cef8e7eaf1b5a7f0e2b41147d2825f964 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 27 Oct 2019 11:10:58 +0100 Subject: [PATCH] Indicator Refactoring --- FloatingSpace/UiObject.js | 6 +++--- FloatingSpace/UiObjectConstructor.js | 6 +++--- FloatingSpace/UiObjectTitle.js | 2 +- Panels/ProductsPanel.js | 2 +- Spaces/StrategySpace.js | 2 +- .../Workspace/FunctionLibraries/AttachDetach.js | 4 ++-- .../Workspace/FunctionLibraries/NodeChildren.js | 2 +- .../Workspace/FunctionLibraries/NodeDeleter.js | 2 +- StrategySpace/Workspace/FunctionLibraries/OnFocus.js | 2 +- .../Workspace/FunctionLibraries/PartsFromNodes.js | 10 +++++----- .../Workspace/FunctionLibraries/ProtocolNode.js | 2 +- .../Workspace/FunctionLibraries/ShortcutKeys.js | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/FloatingSpace/UiObject.js b/FloatingSpace/UiObject.js index 60f5e36a3..c352b012a 100644 --- a/FloatingSpace/UiObject.js +++ b/FloatingSpace/UiObject.js @@ -299,7 +299,7 @@ function newUiObject () { compatibleType = '->' + 'Task' + '->' compatibleSubType = undefined break - case 'Indicator': + case 'Indicator Bot Instance': compatibleType = '->' + 'Task' + '->' compatibleSubType = undefined break @@ -314,7 +314,7 @@ function newUiObject () { break } case 'Indicator Process': { - compatibleType = '->' + 'Indicator' + '->' + compatibleType = '->' + 'Indicator Bot Instance' + '->' break } case 'Trading Engine Process': { @@ -424,7 +424,7 @@ function newUiObject () { /* Discard objects with busy coonection ports */ if (thisObject.payload.node.type === 'Task' && nearbyNode.task !== 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 === 'Indicator Bot Instance' && 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 } if (thisObject.payload.node.type === 'Trading System' && nearbyNode.tradingSystem !== undefined) { continue } diff --git a/FloatingSpace/UiObjectConstructor.js b/FloatingSpace/UiObjectConstructor.js index 5548c237f..9cb2742e0 100644 --- a/FloatingSpace/UiObjectConstructor.js +++ b/FloatingSpace/UiObjectConstructor.js @@ -788,7 +788,7 @@ function newUiObjectConstructor () { actionFunction: payload.onMenuItemClick, label: 'Add Indicator', visible: true, - relatedUiObject: 'Indicator', + relatedUiObject: 'Indicator Bot Instance', rawRadius: 8, targetRadius: 0, currentRadius: 0, @@ -907,7 +907,7 @@ function newUiObjectConstructor () { ) break } - case 'Indicator': { + case 'Indicator Bot Instance': { uiObject.codeEditor = newCodeEditor() uiObject.codeEditor.isVisibleFunction = uiObject.isVisibleFunction uiObject.codeEditor.initialize() @@ -3238,7 +3238,7 @@ function newUiObjectConstructor () { level_3() break } - case 'Indicator': { + case 'Indicator Bot Instance': { level_3() break } diff --git a/FloatingSpace/UiObjectTitle.js b/FloatingSpace/UiObjectTitle.js index f7ac667b1..b9662009a 100644 --- a/FloatingSpace/UiObjectTitle.js +++ b/FloatingSpace/UiObjectTitle.js @@ -86,7 +86,7 @@ function newUiObjectTitle () { thisObject.allwaysVisible = true break } - case 'Indicator': { + case 'Indicator Bot Instance': { thisObject.allwaysVisible = true break } diff --git a/Panels/ProductsPanel.js b/Panels/ProductsPanel.js index 3d6e61160..150161998 100644 --- a/Panels/ProductsPanel.js +++ b/Panels/ProductsPanel.js @@ -71,7 +71,7 @@ function newProductsPanel () { for (let j = 0; j < devTeam.bots.length; j++) { let bot = devTeam.bots[j] - if (bot.type !== 'Indicator') { continue } + if (bot.type !== 'Indicator Bot Instance') { continue } if (bot.products !== undefined) { for (let k = 0; k < bot.products.length; k++) { diff --git a/Spaces/StrategySpace.js b/Spaces/StrategySpace.js index b35581d92..a50f67716 100644 --- a/Spaces/StrategySpace.js +++ b/Spaces/StrategySpace.js @@ -50,7 +50,7 @@ function newStrategySpace () { ['Task Manager', 'task'], ['Task', 'timeline'], ['Sensor Bot Instance', 'bot-sensor'], - ['Indicator', 'bot-indicator'], + ['Indicator Bot Instance', 'bot-indicator'], ['Trading Engine', 'trading-engine'], ['Process', 'process'], ['Backtesting Session', 'session-backtesting'], diff --git a/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js b/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js index 8a23cacc7..79c85e8a8 100644 --- a/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js +++ b/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js @@ -140,7 +140,7 @@ function newAttachDetach () { completeDetachment(node, rootNodes) return } - case 'Indicator': { + case 'Indicator Bot Instance': { node.payload.parentNode.bot = undefined completeDetachment(node, rootNodes) return @@ -430,7 +430,7 @@ function newAttachDetach () { completeAttachment(node, rootNodes) } break - case 'Indicator': { + case 'Indicator 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 3436023fc..72daee458 100644 --- a/StrategySpace/Workspace/FunctionLibraries/NodeChildren.js +++ b/StrategySpace/Workspace/FunctionLibraries/NodeChildren.js @@ -41,7 +41,7 @@ function newNodeChildren () { case 'Sensor Bot Instance': { return countChildrenSensor(parentNode, childNode) } - case 'Indicator': { + case 'Indicator Bot Instance': { return countChildrenIndicator(parentNode, childNode) } case 'Trading Engine': { diff --git a/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js b/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js index 4df67afe2..c287d3b66 100644 --- a/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js +++ b/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js @@ -105,7 +105,7 @@ function newNodeDeleter () { deleteBot(rootNode, rootNodes) break } - case 'Indicator': { + case 'Indicator Bot Instance': { deleteBot(rootNode, rootNodes) break } diff --git a/StrategySpace/Workspace/FunctionLibraries/OnFocus.js b/StrategySpace/Workspace/FunctionLibraries/OnFocus.js index de2854820..beb2590b7 100644 --- a/StrategySpace/Workspace/FunctionLibraries/OnFocus.js +++ b/StrategySpace/Workspace/FunctionLibraries/OnFocus.js @@ -560,7 +560,7 @@ function newOnFocus () { return } } - case 'Indicator': { + case 'Indicator 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 a223ff74d..8d6075a95 100644 --- a/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js +++ b/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js @@ -473,8 +473,8 @@ function newPartsFromNodes () { } return } - case 'Indicator': { - createPart('Indicator', node.name, node, parentNode, chainParent, 'Indicator') + case 'Indicator Bot Instance': { + createPart('Indicator Bot Instance', node.name, node, parentNode, chainParent, 'Indicator Bot Instance') for (let m = 0; m < node.processes.length; m++) { let process = node.processes[m] createPartFromNode(process, node, node) @@ -496,7 +496,7 @@ function newPartsFromNodes () { node.subType = 'Sensor Process' break } - case 'Indicator': { + case 'Indicator Bot Instance': { node.subType = 'Indicator Process' break } @@ -690,7 +690,7 @@ function newPartsFromNodes () { processes: [], code: '{}' } - createPart('Indicator', '', node.bot, node, node) + createPart('Indicator Bot Instance', '', node.bot, node, node) } return node.bot } @@ -718,7 +718,7 @@ function newPartsFromNodes () { process.name = 'Sensor Process' break } - case 'Indicator': { + case 'Indicator Bot Instance': { process.subType = 'Indicator Process' process.name = 'Indicator Process' break diff --git a/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js b/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js index 5b034f146..f7ea34a97 100644 --- a/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js +++ b/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js @@ -798,7 +798,7 @@ function newProtocolNode () { } return object } - case 'Indicator': { + case 'Indicator 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 d4d3a0d6e..6e9e3dfa3 100644 --- a/StrategySpace/Workspace/FunctionLibraries/ShortcutKeys.js +++ b/StrategySpace/Workspace/FunctionLibraries/ShortcutKeys.js @@ -561,7 +561,7 @@ function newShortcutKeys () { return } } - case 'Indicator': { + case 'Indicator Bot Instance': { let child for (let m = 0; m < node.processes.length; m++) { child = getNodeByShortcutKey(node.processes[m], searchingKey)