Icons part 1
This commit is contained in:
1 parent
ffc6778007
commit
f7faf0dd9d
12 files changed
+28
-17
No files matched your search
@@ -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)
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
+2
-2
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
+2
-2
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user