From 744b72e9eb41906e47b71d2663953eca9fef08c6 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 5 Oct 2019 16:52:38 +0200 Subject: [PATCH] Concept of default definition eliminated --- FloatingSpace/StrategyPart.js | 24 ++----------------- FloatingSpace/StrategyPartConstructor.js | 7 ------ .../FunctionLibraries/NodeDeleter.js | 4 ---- .../FunctionLibraries/StringifyNode.js | 2 +- StrategySpace/Workspace/Workspace.js | 2 +- 5 files changed, 4 insertions(+), 35 deletions(-) diff --git a/FloatingSpace/StrategyPart.js b/FloatingSpace/StrategyPart.js index 764f38e65..fb700c195 100644 --- a/FloatingSpace/StrategyPart.js +++ b/FloatingSpace/StrategyPart.js @@ -18,12 +18,9 @@ function newStrategyPart () { partTitle: undefined, circularProgressBar: undefined, isExecuting: undefined, - isDefault: undefined, isRunning: undefined, run: run, stop: stop, - setDefaultStatus: setDefaultStatus, - setNotRunningStatus: setNotRunningStatus, getReadyToAttach: getReadyToAttach, showAvailabilityToAttach: showAvailabilityToAttach, highlight: highlight, @@ -64,7 +61,6 @@ function newStrategyPart () { let hasValue let valueCounter = 0 - let runningCounter = 0 let previousDistance @@ -640,22 +636,6 @@ function newStrategyPart () { } } - function setAsDefault () { - setDefaultStatus() - canvas.cockpitSpace.restartSimulation.restart() - } - - function setDefaultStatus () { - canvas.strategySpace.workspace.definition = thisObject.payload.node - thisObject.isDefault = true - runningCounter = 30 - } - - function setNotRunningStatus () { - canvas.strategySpace.workspace.definition = undefined - thisObject.isDefault = false - } - function iconPhysics () { icon = canvas.strategySpace.iconByPartType.get(thisObject.payload.node.type) executingIcon = canvas.strategySpace.iconCollection.get('attractive') @@ -1033,9 +1013,9 @@ function newStrategyPart () { browserCanvasContext.fill() - if (thisObject.isDefault === true) { + if (thisObject.payload.node.type === 'Definition') { VISIBLE_RADIUS = thisObject.container.frame.radius * 2 - let OPACITY = runningCounter / 30 + let OPACITY = 1 browserCanvasContext.beginPath() browserCanvasContext.arc(visiblePosition.x, visiblePosition.y, VISIBLE_RADIUS, 0, Math.PI * 2, true) diff --git a/FloatingSpace/StrategyPartConstructor.js b/FloatingSpace/StrategyPartConstructor.js index 00f79b833..eedbeeba8 100644 --- a/FloatingSpace/StrategyPartConstructor.js +++ b/FloatingSpace/StrategyPartConstructor.js @@ -67,13 +67,6 @@ function newStrategyPartConstructor () { strategyPart.initialize(payload, menuItemsInitialValues) strategyPart.container.connectToParent(floatingObject.container, false, false, true, true, false, false, true, true, true, true, true) - if (payload.node.savedPayload !== undefined) { - if (payload.node.savedPayload.uiObject.isDefault === true) { - strategyPart.setDefaultStatus() - canvas.strategySpace.workspace.definition = payload.node - } - } - setFloatingObjectBasicProperties(floatingObject, payload) payload.node.savedPayload = undefined diff --git a/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js b/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js index f1420dee0..f761a7fd8 100644 --- a/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js +++ b/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js @@ -260,10 +260,6 @@ function newNodeDeleter () { if (counter <= 1) { return } } - if (node.payload.uiObject.isDefault === true) { - node.payload.uiObject.setNotRunningStatus() - } - if (node.tradingSystem !== undefined) { deleteTradingSystem(node.tradingSystem, rootNodes) } diff --git a/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js b/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js index 9628bf28c..f2a8e485e 100644 --- a/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js +++ b/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js @@ -643,7 +643,7 @@ function newStringifyNode () { isTensed: (node.payload.floatingObject.isTensed && node.payload.floatingObject.tensedManually) }, uiObject: { - isDefault: node.payload.uiObject.isDefault + isRunning: node.payload.uiObject.isRunning } } return savedPayload diff --git a/StrategySpace/Workspace/Workspace.js b/StrategySpace/Workspace/Workspace.js index 229bfbeb8..b338c2522 100644 --- a/StrategySpace/Workspace/Workspace.js +++ b/StrategySpace/Workspace/Workspace.js @@ -97,7 +97,7 @@ function newWorkspace () { thisObject.definition = canvas.strategySpace.strategizerGateway.strategizerData thisObject.workspaceNode.rootNodes.push(thisObject.definition) functionLibraryPartsFromNodes.createPartFromNode(thisObject.definition, undefined, undefined) - thisObject.definition.payload.uiObject.setDefaultStatus() + thisObject.enabled = true } }