From d3a5e409488fc29090e94fcf5f821a4fbcdea9ce Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 12 Dec 2019 21:10:41 +0100 Subject: [PATCH] Panels with no coding --- .../FunctionLibraries/ChainAttachDetach.js | 18 ------ .../FunctionLibraries/NodeChildren.js | 17 ------ .../FunctionLibraries/NodeDeleter.js | 28 +--------- .../Workspace/FunctionLibraries/OnFocus.js | 12 ---- .../FunctionLibraries/ProtocolNode.js | 15 ----- .../FunctionLibraries/ShortcutKeys.js | 12 ---- .../FunctionLibraries/UiObjectsFromNodes.js | 22 -------- DesignerSpace/Workspace/Workspace.js | 9 --- FloatingSpace/UiObject.js | 4 -- FloatingSpace/UiObjectConstructor.js | 55 +------------------ FloatingSpace/UiObjectTitle.js | 4 -- Spaces/DesignerSpace.js | 3 +- 12 files changed, 3 insertions(+), 196 deletions(-) diff --git a/DesignerSpace/Workspace/FunctionLibraries/ChainAttachDetach.js b/DesignerSpace/Workspace/FunctionLibraries/ChainAttachDetach.js index 557e44e1c..c945827e6 100644 --- a/DesignerSpace/Workspace/FunctionLibraries/ChainAttachDetach.js +++ b/DesignerSpace/Workspace/FunctionLibraries/ChainAttachDetach.js @@ -199,17 +199,6 @@ function newChainAttachDetach () { completeDetachment(node, rootNodes) return } - case 'Plotter Panel': { - let payload = node.payload - for (let i = 0; i < payload.parentNode.panels.length; i++) { - let panel = payload.parentNode.panels[i] - if (panel.id === node.id) { - payload.parentNode.panels.splice(i, 1) - } - } - completeDetachment(node, rootNodes) - return - } case 'Network Node': { let payload = node.payload for (let i = 0; i < payload.parentNode.networkNodes.length; i++) { @@ -745,13 +734,6 @@ function newChainAttachDetach () { completeAttachment(node, rootNodes) } break - case 'Plotter Panel': { - node.payload.parentNode = attachToNode - node.payload.chainParent = attachToNode - node.payload.parentNode.panels.push(node) - completeAttachment(node, rootNodes) - } - break case 'Network Node': { node.payload.parentNode = attachToNode node.payload.chainParent = attachToNode diff --git a/DesignerSpace/Workspace/FunctionLibraries/NodeChildren.js b/DesignerSpace/Workspace/FunctionLibraries/NodeChildren.js index fd2456a0e..e27991ae5 100644 --- a/DesignerSpace/Workspace/FunctionLibraries/NodeChildren.js +++ b/DesignerSpace/Workspace/FunctionLibraries/NodeChildren.js @@ -83,9 +83,6 @@ function newNodeChildren () { case 'Plotter Module': { return countChildrenPlotterModule(parentNode, childNode) } - case 'Plotter Panel': { - return countChildrenPlotterPanel(parentNode, childNode) - } case 'Network Node': { return countChildrenNetworkNode(parentNode, childNode) } @@ -754,20 +751,6 @@ function newNodeChildren () { return response } - function countChildrenPlotterPanel (parentNode, childNode) { - let response = { - childrenCount: 0, - childIndex: undefined - } - if (parentNode.javascriptCode !== undefined) { - response.childrenCount++ - if (parentNode.javascriptCode.id === childNode.id) { - response.childIndex = response.childrenCount - } - } - return response - } - function countChildrenNetworkNode (parentNode, childNode) { let response = { childrenCount: 0, diff --git a/DesignerSpace/Workspace/FunctionLibraries/NodeDeleter.js b/DesignerSpace/Workspace/FunctionLibraries/NodeDeleter.js index 1aed7ed81..75c6363a5 100644 --- a/DesignerSpace/Workspace/FunctionLibraries/NodeDeleter.js +++ b/DesignerSpace/Workspace/FunctionLibraries/NodeDeleter.js @@ -26,7 +26,6 @@ function newNodeDeleter () { deleteDatasetDefinition: deleteDatasetDefinition, deletePlotter: deletePlotter, deletePlotterModule: deletePlotterModule, - deletePlotterPanel: deletePlotterPanel, deleteSocialBots: deleteSocialBots, deleteSocialBot: deleteSocialBot, deleteAnnouncement: deleteAnnouncement, @@ -189,10 +188,6 @@ function newNodeDeleter () { deletePlotterModule(rootNode, rootNodes) break } - case 'Plotter Panel': { - deletePlotterPanel(rootNode, rootNodes) - break - } case 'Social Bots': { deleteSocialBots(rootNode, rootNodes) break @@ -1004,7 +999,7 @@ function newNodeDeleter () { if (node.panels !== undefined) { while (node.panels.length > 0) { - deletePlotterPanel(node.panels[0], rootNodes) + deleteUIObject(node.panels[0], rootNodes) } } @@ -1013,27 +1008,6 @@ function newNodeDeleter () { cleanNode(node) } - function deletePlotterPanel (node, rootNodes) { - let payload = node.payload - - if (payload.parentNode !== undefined) { - for (let j = 0; j < payload.parentNode.panels.length; j++) { - let panel = payload.parentNode.panels[j] - if (panel.id === node.id) { - payload.parentNode.panels.splice(j, 1) - } - } - } - - if (node.javascriptCode !== undefined) { - deleteJavascriptCode(node.javascriptCode, rootNodes) - } - - completeDeletion(node, rootNodes) - destroyUiObject(node) - cleanNode(node) - } - function deleteSocialBots (node, rootNodes) { let payload = node.payload if (payload.parentNode !== undefined) { diff --git a/DesignerSpace/Workspace/FunctionLibraries/OnFocus.js b/DesignerSpace/Workspace/FunctionLibraries/OnFocus.js index d9581b2f3..2773fef45 100644 --- a/DesignerSpace/Workspace/FunctionLibraries/OnFocus.js +++ b/DesignerSpace/Workspace/FunctionLibraries/OnFocus.js @@ -1075,18 +1075,6 @@ function newOnFocus () { return } } - case 'Plotter Panel': { - let child - child = getNodeThatIsOnFocus(node.javascriptCode) - if (child !== undefined) { - return child - } - if (node.payload.uiObject.isOnFocus === true) { - return node - } else { - return - } - } default: { let nodeDefinition = APP_SCHEMA_MAP.get(node.type) if (nodeDefinition !== undefined) { diff --git a/DesignerSpace/Workspace/FunctionLibraries/ProtocolNode.js b/DesignerSpace/Workspace/FunctionLibraries/ProtocolNode.js index 41ef0611b..1f6c067be 100644 --- a/DesignerSpace/Workspace/FunctionLibraries/ProtocolNode.js +++ b/DesignerSpace/Workspace/FunctionLibraries/ProtocolNode.js @@ -1654,21 +1654,6 @@ function newProtocolNode () { } return object } - case 'Plotter Panel': { - let object = { - type: node.type, - subType: node.subType, - name: node.name, - javascriptCode: getProtocolNode(node.javascriptCode, removePersonalData, parseCode, includeIds, includePayload, includeReferences, followReferenceParent, includeParent, followAncestors, excludeChildren, excludeType) - } - if (includeIds) { - object.id = node.id - } - if (includePayload) { - object.savedPayload = getSavedPayload(node, includeReferences) - } - return object - } default: { let nodeDefinition = APP_SCHEMA_MAP.get(node.type) diff --git a/DesignerSpace/Workspace/FunctionLibraries/ShortcutKeys.js b/DesignerSpace/Workspace/FunctionLibraries/ShortcutKeys.js index 8fba3e417..532d19bbe 100644 --- a/DesignerSpace/Workspace/FunctionLibraries/ShortcutKeys.js +++ b/DesignerSpace/Workspace/FunctionLibraries/ShortcutKeys.js @@ -1054,18 +1054,6 @@ function newShortcutKeys () { return } } - case 'Plotter Panel': { - let child - child = getNodeByShortcutKey(node.javascriptCode, searchingKey) - if (child !== undefined) { - return child - } - if (node.payload.uiObject.shortcutKey === searchingKey) { - return node - } else { - return - } - } default: { let nodeDefinition = APP_SCHEMA_MAP.get(node.type) diff --git a/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js b/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js index 5a30a8cd2..350fd55d9 100644 --- a/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js +++ b/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js @@ -28,7 +28,6 @@ function newUiObjectsFromNodes () { addDatasetDefinition: addDatasetDefinition, addPlotter: addPlotter, addPlotterModule: addPlotterModule, - addPlotterPanel: addPlotterPanel, addDefinition: addDefinition, addNetwork: addNetwork, addNetworkNode: addNetworkNode, @@ -1073,14 +1072,7 @@ function newUiObjectsFromNodes () { } return } - case 'Plotter Panel': { - createUiObject(false, node.type, node.name, node, parentNode, chainParent, node.type, positionOffset) - if (node.javascriptCode !== undefined) { - createUiObjectFromNode(node.javascriptCode, node, node, positionOffset) - } - return - } default: { /* Get node definition */ let nodeDefinition = APP_SCHEMA_MAP.get(node.type) @@ -1556,20 +1548,6 @@ function newUiObjectsFromNodes () { return object } - function addPlotterPanel (node) { - let object = { - type: 'Plotter Panel', - name: 'New Plotter Panel' - } - if (node.panels === undefined) { - node.panels = [] - } - node.panels.push(object) - createUiObject(true, object.type, object.name, object, node, node) - - return object - } - function addNetwork (node) { let network = { name: 'Superalgos' diff --git a/DesignerSpace/Workspace/Workspace.js b/DesignerSpace/Workspace/Workspace.js index aef9f4bc8..72550bd0d 100644 --- a/DesignerSpace/Workspace/Workspace.js +++ b/DesignerSpace/Workspace/Workspace.js @@ -483,11 +483,6 @@ function newWorkspace () { functionLibraryUiObjectsFromNodes.addPlotterModule(payload.node) } break - case 'Add Plotter Panel': - { - functionLibraryUiObjectsFromNodes.addPlotterPanel(payload.node) - } - break case 'Add Network': { functionLibraryUiObjectsFromNodes.addNetwork(payload.node) @@ -765,10 +760,6 @@ function newWorkspace () { functionLibraryNodeDeleter.deletePlotterModule(payload.node, thisObject.workspaceNode.rootNodes) break } - case 'Delete Plotter Panel': { - functionLibraryNodeDeleter.deletePlotterPanel(payload.node, thisObject.workspaceNode.rootNodes) - break - } case 'Delete Network': { functionLibraryNodeDeleter.deleteNetwork(payload.node, thisObject.workspaceNode.rootNodes) break diff --git a/FloatingSpace/UiObject.js b/FloatingSpace/UiObject.js index a77f0d05b..1d4596695 100644 --- a/FloatingSpace/UiObject.js +++ b/FloatingSpace/UiObject.js @@ -345,10 +345,6 @@ function newUiObject () { compatibleTypes = '->' + 'Plotter' + '->' compatibleSubTypes = undefined break - case 'Plotter Panel': - compatibleTypes = '->' + 'Plotter Module' + '->' - compatibleSubTypes = undefined - break case 'Trading System': compatibleTypes = '->' + 'Definition' + '->' compatibleSubTypes = undefined diff --git a/FloatingSpace/UiObjectConstructor.js b/FloatingSpace/UiObjectConstructor.js index 589d323f4..8dae08e62 100644 --- a/FloatingSpace/UiObjectConstructor.js +++ b/FloatingSpace/UiObjectConstructor.js @@ -1657,7 +1657,7 @@ function newUiObjectConstructor () { ) menuItemsInitialValues.push( { - action: 'Add Plotter Panel', + action: 'Add UI Object', actionFunction: payload.onMenuItemClick, label: 'Add Plotter Panel', visible: true, @@ -1700,55 +1700,6 @@ function newUiObjectConstructor () { ) break } - case 'Plotter Panel': { - addLeftIcons(menuItemsInitialValues, floatingObject) - menuItemsInitialValues.push( - { - action: 'Add Code', - disableIfPropertyIsDefined: true, - propertyToCheckFor: 'code', - actionFunction: payload.onMenuItemClick, - label: 'Add Code', - visible: true, - relatedUiObject: 'Javascript Code', - rawRadius: 8, - targetRadius: 0, - currentRadius: 0, - angle: -30 - } - ) - menuItemsInitialValues.push( - { - action: 'Delete Plotter Panel', - askConfirmation: true, - confirmationLabel: 'Confirm to Delete', - actionFunction: payload.onMenuItemClick, - label: 'Delete Plotter Panel', - visible: true, - iconPathOn: 'delete', - iconPathOff: 'delete', - rawRadius: 8, - targetRadius: 0, - currentRadius: 0, - angle: 0 - } - ) - menuItemsInitialValues.push( - { - action: 'Share', - actionFunction: payload.onMenuItemClick, - label: 'Share', - visible: true, - iconPathOn: 'menu-share', - iconPathOff: 'menu-share', - rawRadius: 8, - targetRadius: 0, - currentRadius: 0, - angle: 30 - } - ) - break - } case 'Network': { addLeftIcons(menuItemsInitialValues, floatingObject) menuItemsInitialValues.push( @@ -4864,10 +4815,6 @@ function newUiObjectConstructor () { level_2() break } - case 'Plotter Panel': { - level_3() - break - } case 'Network': { level_1() break diff --git a/FloatingSpace/UiObjectTitle.js b/FloatingSpace/UiObjectTitle.js index f1f979ba7..ace5efac0 100644 --- a/FloatingSpace/UiObjectTitle.js +++ b/FloatingSpace/UiObjectTitle.js @@ -93,10 +93,6 @@ function newUiObjectTitle () { thisObject.allwaysVisible = true break } - case 'Plotter Panel': { - thisObject.allwaysVisible = true - break - } case 'Network': { thisObject.allwaysVisible = true break diff --git a/Spaces/DesignerSpace.js b/Spaces/DesignerSpace.js index 6a33ede08..b90060ad8 100644 --- a/Spaces/DesignerSpace.js +++ b/Spaces/DesignerSpace.js @@ -109,8 +109,7 @@ function newDesignerSpace () { ['Record Property', 'record-property'], ['Dataset Definition', 'dataset-definition'], ['Plotter', 'plotter'], - ['Plotter Module', 'plotter-module'], - ['Plotter Panel', 'plotter-panel'] + ['Plotter Module', 'plotter-module'] ] for (let i = 0; i < relationshipArray.length; i++) {