From f7faf0dd9d8213807af78d2527503550f408a40f Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 14 Oct 2020 19:09:14 +0200 Subject: [PATCH] Icons part 1 --- ChartingSpace/TimeMachine.js | 4 ++-- .../Workspace/FunctionLibraries/UiObjectsFromNodes.js | 5 +++++ DesignSpace/Workspace/Workspace.js | 4 ++++ FloatingSpace/CircularMenuItem.js | 4 ++-- FloatingSpace/UiObject.js | 2 +- Panels/LayersPanel.js | 4 ++-- Scales/RateScale.js | 4 ++-- Scales/TimeFrameScale.js | 4 ++-- Scales/TimeScale.js | 4 ++-- SideSpace/ListItem.js | 6 ++++-- SideSpace/ListView.js | 2 +- Spaces/DesignSpace.js | 2 +- 12 files changed, 28 insertions(+), 17 deletions(-) diff --git a/ChartingSpace/TimeMachine.js b/ChartingSpace/TimeMachine.js index cb7c1405c..f2fbd4485 100644 --- a/ChartingSpace/TimeMachine.js +++ b/ChartingSpace/TimeMachine.js @@ -602,7 +602,7 @@ function newTimeMachine() { } } else { if (canvas.chartingSpace.viewport.zoomTargetLevel < ZOOM_OUT_THRESHOLD_FOR_DISPLAYING_TIME_MACHINES_ICONIZED) { - let icon = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.type) + let icon = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.project + '-' + thisObject.payload.node.type ) if (icon !== undefined) { if (icon.canDrawIcon === true) { let imageSize = 40 @@ -655,7 +655,7 @@ function newTimeMachine() { let imageSize = 12 let fontSize = 12 let opacity = 1 - let icon = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.type) + let icon = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.project + '-' + thisObject.payload.node.type) position = transformThisPoint(position, thisObject.container) diff --git a/DesignSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js b/DesignSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js index 6ae08e9ae..d515b67eb 100644 --- a/DesignSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js +++ b/DesignSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js @@ -216,6 +216,11 @@ function newUiObjectsFromNodes() { } function createUiObjectFromNode(node, parentNode, chainParent, positionOffset) { + /* Migration code from beta 6 to beta 7 */ + if (node.project === undefined) { + node.project = 'Superalgos' + } + /* This function can be called with a positionOffset to change the node saved position and all of its descendants positions as well with an diff --git a/DesignSpace/Workspace/Workspace.js b/DesignSpace/Workspace/Workspace.js index abc1f88c8..2dc255463 100644 --- a/DesignSpace/Workspace/Workspace.js +++ b/DesignSpace/Workspace/Workspace.js @@ -106,14 +106,17 @@ function newWorkspace() { if (err && err.result !== GLOBAL.DEFAULT_OK_RESPONSE.result) { canvas.cockpitSpace.setStatus('Could not load the last Workspace used, called "' + lastUsedWorkspace + '". Will switch to the default Workspace instead.', 500, canvas.cockpitSpace.statusTypes.WARNING) thisObject.workspaceNode = getWorkspace() // This is the default workspace that comes with the system. + thisObject.workspaceNode.project = 'Superalgos' recreateWorkspace() return } thisObject.workspaceNode = JSON.parse(text) + thisObject.workspaceNode.project = 'Superalgos' recreateWorkspace() } } else { thisObject.workspaceNode = getWorkspace() // This is the default workspace that comes with the system. + thisObject.workspaceNode.project = 'Superalgos' recreateWorkspace() } @@ -276,6 +279,7 @@ function newWorkspace() { break case 4: thisObject.workspaceNode = loadedWorkspaceNode + thisObject.workspaceNode.project = 'Superalgos' loadedWorkspaceNode = undefined workingAtTask++ break diff --git a/FloatingSpace/CircularMenuItem.js b/FloatingSpace/CircularMenuItem.js index 01cd2f84e..5e0260a34 100644 --- a/FloatingSpace/CircularMenuItem.js +++ b/FloatingSpace/CircularMenuItem.js @@ -246,8 +246,8 @@ function newCircularMenuItem() { thisObject.iconOff = canvas.designSpace.iconsByName.get(thisObject.secondaryIcon) } else { if (thisObject.relatedUiObject !== undefined) { - thisObject.iconOn = canvas.designSpace.iconsByProjectType.get(thisObject.relatedUiObject) - thisObject.iconOff = canvas.designSpace.iconsByProjectType.get(thisObject.relatedUiObject) + thisObject.iconOn = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.project + '-' + thisObject.relatedUiObject) + thisObject.iconOff = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.project + '-' + thisObject.relatedUiObject) } else { if (thisObject.iconPathOn !== undefined && thisObject.iconPathOff !== undefined) { thisObject.iconOn = canvas.designSpace.iconsByName.get(thisObject.iconPathOn) diff --git a/FloatingSpace/UiObject.js b/FloatingSpace/UiObject.js index 060361c4e..c42a2654e 100644 --- a/FloatingSpace/UiObject.js +++ b/FloatingSpace/UiObject.js @@ -1112,7 +1112,7 @@ function newUiObject() { } function iconPhysics() { - icon = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.type) + icon = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.project + '-' + thisObject.payload.node.type) let nodeDefinition = getNodeDefinition(thisObject.payload.node) if (nodeDefinition.alternativeIcons !== undefined) { let nodeToUse = thisObject.payload.node diff --git a/Panels/LayersPanel.js b/Panels/LayersPanel.js index cec1f5158..1fbcfb246 100644 --- a/Panels/LayersPanel.js +++ b/Panels/LayersPanel.js @@ -450,8 +450,8 @@ function newLayersPanel() { let label2 = thisObject.payload.node.payload.parentNode.name.substring(0, 18) let label3 = '' - let icon1 = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.payload.parentNode.payload.parentNode.type) - let icon2 = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.payload.parentNode.type) + let icon1 = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.payload.parentNode.payload.parentNode.project + '-' + thisObject.payload.node.payload.parentNode.payload.parentNode.type) + let icon2 = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.payload.parentNode.project + '-' + thisObject.payload.node.payload.parentNode.type) let backgroundColor = UI_COLOR.BLACK diff --git a/Scales/RateScale.js b/Scales/RateScale.js index 437c00ab7..ab9e7ad6c 100644 --- a/Scales/RateScale.js +++ b/Scales/RateScale.js @@ -532,8 +532,8 @@ function newRateScale() { if (thisObject.payload === undefined) { return } if (thisObject.payload.node === undefined) { return } - let icon1 = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.payload.parentNode.type) - let icon2 = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.type) + let icon1 = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.payload.parentNode.project + '-' + thisObject.payload.node.payload.parentNode.type) + let icon2 = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.project + '-' + thisObject.payload.node.type) let backgroundColor = UI_COLOR.BLACK let labels = scaleLabels(thisObject.rate) diff --git a/Scales/TimeFrameScale.js b/Scales/TimeFrameScale.js index 0e65aa0ab..84d11e18b 100644 --- a/Scales/TimeFrameScale.js +++ b/Scales/TimeFrameScale.js @@ -383,8 +383,8 @@ function newTimeFrameScale() { let label2 = label[0] let label3 = label[1].toUpperCase() - let icon1 = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.payload.parentNode.type) - let icon2 = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.type) + let icon1 = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.payload.parentNode.project + '-' + thisObject.payload.node.payload.parentNode.type) + let icon2 = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.project + '-' + thisObject.payload.node.type) let backgroundColor = UI_COLOR.BLACK diff --git a/Scales/TimeScale.js b/Scales/TimeScale.js index 8fcec3981..6410e6a34 100644 --- a/Scales/TimeScale.js +++ b/Scales/TimeScale.js @@ -338,8 +338,8 @@ function newTimeScale() { function drawScaleBox() { if (thisObject.date === undefined) { return } - let icon1 = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.payload.parentNode.type) - let icon2 = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.type) + let icon1 = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.payload.parentNode.project + '-' + thisObject.payload.node.payload.parentNode.type) + let icon2 = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.project + '-' + thisObject.payload.node.type) let backgroundColor = UI_COLOR.BLACK let labels = scaleLabels(thisObject.date) diff --git a/SideSpace/ListItem.js b/SideSpace/ListItem.js index f7d19472b..d677e128e 100644 --- a/SideSpace/ListItem.js +++ b/SideSpace/ListItem.js @@ -24,6 +24,7 @@ function newListItem() { thisObject.container.frame.height = SIDE_PANEL_WIDTH * 0.75 let name + let project let type let onMouseOverEventSubscriptionId @@ -43,8 +44,9 @@ function newListItem() { thisObject.fitFunction = undefined } - function initialize(pName, pType) { + function initialize(pName, pProject, pType) { name = pName + project = pProject type = pType onMouseOverEventSubscriptionId = thisObject.container.eventHandler.listenToEvent('onMouseOver', onMouseOver) @@ -75,7 +77,7 @@ function newListItem() { } function draw() { - let icon = canvas.designSpace.iconsByProjectType.get(type) + let icon = canvas.designSpace.iconsByProjectType.get(project + '-' + type) let backgroundColor = UI_COLOR.BLACK let labelColor diff --git a/SideSpace/ListView.js b/SideSpace/ListView.js index c1f49199b..3f8b77b37 100644 --- a/SideSpace/ListView.js +++ b/SideSpace/ListView.js @@ -103,7 +103,7 @@ function newListView() { for (let i = 0; i < workspacelist.length; i++) { let workspace = workspacelist[i].replace('.json', '') let listItem = newListItem() - listItem.initialize(workspace, 'Workspace') + listItem.initialize(workspace, 'Superalgos', 'Workspace') listItem.container.connectToParent(thisObject.container, false, false) thisObject.listItems.push(listItem) diff --git a/Spaces/DesignSpace.js b/Spaces/DesignSpace.js index 32ad1aee4..71f689453 100644 --- a/Spaces/DesignSpace.js +++ b/Spaces/DesignSpace.js @@ -45,7 +45,7 @@ function newDesignSpace() { } let icon = thisObject.iconsByName.get(iconName) if (icon !== undefined) { - thisObject.iconsByProjectType.set(nodeDefinition.type, icon) + thisObject.iconsByProjectType.set('Superalgos' + '-' + nodeDefinition.type, icon) } } }