Icons Multi Project
This commit is contained in:
1 parent
f7faf0dd9d
commit
8dba5c1136
15 files changed
+103
-92
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.project + '-' + thisObject.payload.node.type )
|
||||
let icon = canvas.designSpace.getIconByProjectAndType(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.project + '-' + thisObject.payload.node.type)
|
||||
let icon = canvas.designSpace.getIconByProjectAndType(thisObject.payload.node.project, thisObject.payload.node.type)
|
||||
|
||||
position = transformThisPoint(position, thisObject.container)
|
||||
|
||||
@@ -829,7 +829,7 @@ function newTimeMachine() {
|
||||
minValue,
|
||||
maxValue,
|
||||
thisObject.container.frame.width,
|
||||
thisObject.container.frame.height
|
||||
thisObject.container.frame.height
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -242,19 +242,19 @@ function newCircularMenuItem() {
|
||||
temporaryStatus === STATUS_SECONDARY_WORK_FAILED
|
||||
) && thisObject.secondaryAction !== undefined
|
||||
) {
|
||||
thisObject.iconOn = canvas.designSpace.iconsByName.get(thisObject.secondaryIcon)
|
||||
thisObject.iconOff = canvas.designSpace.iconsByName.get(thisObject.secondaryIcon)
|
||||
thisObject.iconOn = canvas.designSpace.getIconByProjectAndName('Superalgos', thisObject.secondaryIcon)
|
||||
thisObject.iconOff = canvas.designSpace.getIconByProjectAndName('Superalgos', thisObject.secondaryIcon)
|
||||
} else {
|
||||
if (thisObject.relatedUiObject !== undefined) {
|
||||
thisObject.iconOn = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.project + '-' + thisObject.relatedUiObject)
|
||||
thisObject.iconOff = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.project + '-' + thisObject.relatedUiObject)
|
||||
thisObject.iconOn = canvas.designSpace.getIconByProjectAndType(thisObject.payload.node.project, thisObject.relatedUiObject)
|
||||
thisObject.iconOff = canvas.designSpace.getIconByProjectAndType(thisObject.payload.node.project, thisObject.relatedUiObject)
|
||||
} else {
|
||||
if (thisObject.iconPathOn !== undefined && thisObject.iconPathOff !== undefined) {
|
||||
thisObject.iconOn = canvas.designSpace.iconsByName.get(thisObject.iconPathOn)
|
||||
thisObject.iconOff = canvas.designSpace.iconsByName.get(thisObject.iconPathOff)
|
||||
thisObject.iconOn = canvas.designSpace.getIconByProjectAndName('Superalgos', thisObject.iconPathOn)
|
||||
thisObject.iconOff = canvas.designSpace.getIconByProjectAndName('Superalgos', thisObject.iconPathOff)
|
||||
} else {
|
||||
thisObject.iconOn = canvas.designSpace.iconsByName.get(thisObject.icons[thisObject.actionStatus()])
|
||||
thisObject.iconOff = canvas.designSpace.iconsByName.get(thisObject.icons[thisObject.actionStatus()])
|
||||
thisObject.iconOn = canvas.designSpace.getIconByProjectAndName('Superalgos', thisObject.icons[thisObject.actionStatus()])
|
||||
thisObject.iconOff = canvas.designSpace.getIconByProjectAndName('Superalgos', thisObject.icons[thisObject.actionStatus()])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -67,14 +67,14 @@ function newConditionEditor() {
|
||||
}
|
||||
|
||||
function initialize() {
|
||||
timeFrameIcon = canvas.designSpace.iconsByName.get('time-period')
|
||||
dataMineIcon = canvas.designSpace.iconsByName.get('data-mine')
|
||||
botIcon = canvas.designSpace.iconsByName.get('bot-indicator')
|
||||
whenIcon = canvas.designSpace.iconsByName.get('chronometer')
|
||||
productIcon = canvas.designSpace.iconsByName.get('product-definition')
|
||||
propertyIcon = canvas.designSpace.iconsByName.get('record-property')
|
||||
operationIcon = canvas.designSpace.iconsByName.get('headphones')
|
||||
valueIcon = canvas.designSpace.iconsByName.get('competition')
|
||||
timeFrameIcon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'time-frame')
|
||||
dataMineIcon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'data-mine')
|
||||
botIcon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'indicator-bot')
|
||||
whenIcon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'trigger-on')
|
||||
productIcon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'product-definition')
|
||||
propertyIcon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'record-property')
|
||||
operationIcon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'space-settings')
|
||||
valueIcon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'trading-strategy')
|
||||
}
|
||||
|
||||
function activate(payload) {
|
||||
|
||||
+11
-11
@@ -1112,7 +1112,7 @@ function newUiObject() {
|
||||
}
|
||||
|
||||
function iconPhysics() {
|
||||
icon = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.project + '-' + thisObject.payload.node.type)
|
||||
icon = canvas.designSpace.getIconByProjectAndType(thisObject.payload.node.project, thisObject.payload.node.type)
|
||||
let nodeDefinition = getNodeDefinition(thisObject.payload.node)
|
||||
if (nodeDefinition.alternativeIcons !== undefined) {
|
||||
let nodeToUse = thisObject.payload.node
|
||||
@@ -1142,7 +1142,7 @@ function newUiObject() {
|
||||
iconName = alternativeIcon.iconName
|
||||
}
|
||||
}
|
||||
let newIcon = canvas.designSpace.iconsByName.get(iconName)
|
||||
let newIcon = canvas.designSpace.getIconByProjectAndName('Superalgos', iconName)
|
||||
if (newIcon !== undefined) {
|
||||
icon = newIcon
|
||||
}
|
||||
@@ -1151,7 +1151,7 @@ function newUiObject() {
|
||||
}
|
||||
}
|
||||
|
||||
executingIcon = canvas.designSpace.iconsByName.get('attractive')
|
||||
executingIcon = canvas.designSpace.getIconByProjectAndName('Superalgos', 'bitcoin')
|
||||
}
|
||||
|
||||
function onFocus() {
|
||||
@@ -1527,7 +1527,7 @@ function newUiObject() {
|
||||
label = addIndexNumber(label)
|
||||
|
||||
if (label !== undefined) {
|
||||
|
||||
|
||||
if (canvas.floatingSpace.inMapMode === true) {
|
||||
let nodeDefinition = getNodeDefinition(thisObject.payload.node)
|
||||
if (nodeDefinition !== undefined) {
|
||||
@@ -1544,7 +1544,7 @@ function newUiObject() {
|
||||
if (thisObject.isOnFocus === true) {
|
||||
labelPoint = {
|
||||
x: position.x - label.length / 2 * fontSize * FONT_ASPECT_RATIO - 5,
|
||||
y: position.y + radius * 2 / 3 + lineSeparator * 1+ 30
|
||||
y: position.y + radius * 2 / 3 + lineSeparator * 1 + 30
|
||||
}
|
||||
} else {
|
||||
labelPoint = {
|
||||
@@ -1554,7 +1554,7 @@ function newUiObject() {
|
||||
}
|
||||
|
||||
if (canvas.floatingSpace.inMapMode === true) {
|
||||
labelPoint.y = position.y + 50 / 2 + lineSeparator * 2
|
||||
labelPoint.y = position.y + 50 / 2 + lineSeparator * 2
|
||||
}
|
||||
|
||||
browserCanvasContext.font = fontSize + 'px ' + UI_FONT.PRIMARY
|
||||
@@ -1623,7 +1623,7 @@ function newUiObject() {
|
||||
if (thisObject.isOnFocus === true) {
|
||||
labelPoint = {
|
||||
x: position.x - label.length / 2 * fontSize * FONT_ASPECT_RATIO - 5,
|
||||
y: position.y + radius * 2 / 3 + lineSeparator * 6+ 30
|
||||
y: position.y + radius * 2 / 3 + lineSeparator * 6 + 30
|
||||
}
|
||||
} else {
|
||||
labelPoint = {
|
||||
@@ -1698,7 +1698,7 @@ function newUiObject() {
|
||||
if (thisObject.isOnFocus === true) {
|
||||
labelPoint = {
|
||||
x: position.x - label.length / 2 * fontSize * FONT_ASPECT_RATIO - 10,
|
||||
y: position.y + radius * 2 / 3 + lineSeparator * 4+ 30
|
||||
y: position.y + radius * 2 / 3 + lineSeparator * 4 + 30
|
||||
}
|
||||
} else {
|
||||
labelPoint = {
|
||||
@@ -1751,7 +1751,7 @@ function newUiObject() {
|
||||
if (thisObject.isOnFocus === true) {
|
||||
labelPoint = {
|
||||
x: position.x - label.length / 2 * fontSize * FONT_ASPECT_RATIO - 5,
|
||||
y: position.y + radius * 2 / 3 + lineSeparator * 5+ 30
|
||||
y: position.y + radius * 2 / 3 + lineSeparator * 5 + 30
|
||||
}
|
||||
} else {
|
||||
labelPoint = {
|
||||
@@ -1802,7 +1802,7 @@ function newUiObject() {
|
||||
if (thisObject.isOnFocus === true) {
|
||||
labelPoint = {
|
||||
x: position.x - label.length / 2 * fontSize * FONT_ASPECT_RATIO - 10,
|
||||
y: position.y + radius * 2 / 3 + lineSeparator * 3+ 30
|
||||
y: position.y + radius * 2 / 3 + lineSeparator * 3 + 30
|
||||
}
|
||||
} else {
|
||||
labelPoint = {
|
||||
@@ -2183,7 +2183,7 @@ function newUiObject() {
|
||||
} else {
|
||||
totalImageSize = canvas.floatingSpace.transformImagesizeToMap(totalImageSize)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (thisObject.isShowing === true) {
|
||||
totalImageSize = 50
|
||||
|
||||
+3
-3
@@ -287,7 +287,7 @@ function newLayer() {
|
||||
thisObject.exchangeIcon = getIcon(thisObject.exchange)
|
||||
|
||||
if (thisObject.plotterModule.config.icon !== undefined) {
|
||||
thisObject.plotterTypeIcon = canvas.designSpace.iconsByName.get(thisObject.plotterModule.config.icon)
|
||||
thisObject.plotterTypeIcon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', thisObject.plotterModule.config.icon)
|
||||
}
|
||||
|
||||
thisObject.baseAssetIcon = getIcon(thisObject.baseAsset)
|
||||
@@ -306,9 +306,9 @@ function newLayer() {
|
||||
}
|
||||
}
|
||||
if (iconName !== undefined) {
|
||||
icon = canvas.designSpace.iconsByName.get(iconName)
|
||||
icon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', iconName)
|
||||
} else {
|
||||
icon = canvas.designSpace.iconsByName.get(nodeDefinition.icon)
|
||||
icon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', nodeDefinition.icon)
|
||||
}
|
||||
return icon
|
||||
}
|
||||
|
||||
@@ -406,8 +406,8 @@ function newLayersPanel() {
|
||||
function removeFromLocalLayers(id) {
|
||||
for (let i = 0; i < localLayers.length; i++) {
|
||||
let layer = localLayers[i]
|
||||
if (layer.payload === undefined) {continue}
|
||||
if (layer.payload.node === undefined) {continue}
|
||||
if (layer.payload === undefined) { continue }
|
||||
if (layer.payload.node === undefined) { continue }
|
||||
if (layer.payload.node.id === id) {
|
||||
thisObject.layers.push(layer)
|
||||
localLayers.splice(i, 1)
|
||||
@@ -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.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 icon1 = canvas.designSpace.getIconByProjectAndType(thisObject.payload.node.payload.parentNode.payload.parentNode.project, thisObject.payload.node.payload.parentNode.payload.parentNode.type)
|
||||
let icon2 = canvas.designSpace.getIconByProjectAndType(thisObject.payload.node.payload.parentNode.project, thisObject.payload.node.payload.parentNode.type)
|
||||
|
||||
let backgroundColor = UI_COLOR.BLACK
|
||||
|
||||
|
||||
@@ -74,9 +74,9 @@ function newPanelsVisibleButton() {
|
||||
function draw() {
|
||||
let icon
|
||||
if (thisObject.showPanels === true) {
|
||||
icon = canvas.designSpace.iconsByName.get('plotter-panel')
|
||||
icon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'plotter-panel')
|
||||
} else {
|
||||
icon = canvas.designSpace.iconsByName.get('toggle-panel-off')
|
||||
icon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'toggle-panel-off')
|
||||
}
|
||||
|
||||
drawIcon(icon, 1 / 2, 1 / 2, 0, 0, 14, thisObject.container)
|
||||
|
||||
+1
-1
@@ -817,7 +817,7 @@ function newPlotter() {
|
||||
|
||||
imagePosition.x = dataPoint.x
|
||||
imagePosition.y = dataPoint.y
|
||||
let imageToDraw = canvas.designSpace.iconsByName.get(imageName)
|
||||
let imageToDraw = canvas.designSpace.getIconByProjectAndName( 'Superalgos', imageName)
|
||||
if (imageToDraw !== undefined) {
|
||||
if (imageToDraw.canDrawIcon === true) {
|
||||
browserCanvasContext.drawImage(imageToDraw, imagePosition.x - imageSize / 2 + offsetX, imagePosition.y - imageSize / 2 - offsetY, imageSize, imageSize)
|
||||
|
||||
@@ -170,32 +170,32 @@ function newAutoScaleButton() {
|
||||
switch (axis) {
|
||||
case 'X': {
|
||||
if (thisObject.autoMinScale === false && thisObject.autoMaxScale === false) {
|
||||
icon = canvas.designSpace.iconsByName.get('toggle-auto-time-scale-manual')
|
||||
icon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'toggle-auto-time-scale-manual')
|
||||
}
|
||||
if (thisObject.autoMinScale === true && thisObject.autoMaxScale === false) {
|
||||
icon = canvas.designSpace.iconsByName.get('toggle-auto-time-scale-auto-min')
|
||||
icon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'toggle-auto-time-scale-auto-min')
|
||||
}
|
||||
if (thisObject.autoMinScale === false && thisObject.autoMaxScale === true) {
|
||||
icon = canvas.designSpace.iconsByName.get('toggle-auto-time-scale-auto-max')
|
||||
icon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'toggle-auto-time-scale-auto-max')
|
||||
}
|
||||
if (thisObject.autoMinScale === true && thisObject.autoMaxScale === true) {
|
||||
icon = canvas.designSpace.iconsByName.get('toggle-auto-time-scale-auto-min-max')
|
||||
icon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'toggle-auto-time-scale-auto-min-max')
|
||||
}
|
||||
drawIcon(icon, 0, 0, 0, 0, ICON_SIZE, thisObject.container)
|
||||
break
|
||||
}
|
||||
case 'Y': {
|
||||
if (thisObject.autoMinScale === false && thisObject.autoMaxScale === false) {
|
||||
icon = canvas.designSpace.iconsByName.get('toggle-auto-scale-manual')
|
||||
icon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'toggle-auto-scale-manual')
|
||||
}
|
||||
if (thisObject.autoMinScale === true && thisObject.autoMaxScale === false) {
|
||||
icon = canvas.designSpace.iconsByName.get('toggle-auto-scale-auto-min')
|
||||
icon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'toggle-auto-scale-auto-min')
|
||||
}
|
||||
if (thisObject.autoMinScale === false && thisObject.autoMaxScale === true) {
|
||||
icon = canvas.designSpace.iconsByName.get('toggle-auto-scale-auto-max')
|
||||
icon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'toggle-auto-scale-auto-max')
|
||||
}
|
||||
if (thisObject.autoMinScale === true && thisObject.autoMaxScale === true) {
|
||||
icon = canvas.designSpace.iconsByName.get('toggle-auto-scale-auto-min-max')
|
||||
icon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'toggle-auto-scale-auto-min-max')
|
||||
}
|
||||
drawIcon(icon, 0, 0, 0, 0, ICON_SIZE, thisObject.container)
|
||||
break
|
||||
|
||||
+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.project + '-' + thisObject.payload.node.payload.parentNode.type)
|
||||
let icon2 = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.project + '-' + thisObject.payload.node.type)
|
||||
let icon1 = canvas.designSpace.getIconByProjectAndType(thisObject.payload.node.payload.parentNode.project, thisObject.payload.node.payload.parentNode.type)
|
||||
let icon2 = canvas.designSpace.getIconByProjectAndType(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.project + '-' + thisObject.payload.node.payload.parentNode.type)
|
||||
let icon2 = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.project + '-' + thisObject.payload.node.type)
|
||||
let icon1 = canvas.designSpace.getIconByProjectAndType(thisObject.payload.node.payload.parentNode.project, thisObject.payload.node.payload.parentNode.type)
|
||||
let icon2 = canvas.designSpace.getIconByProjectAndType(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.project + '-' + thisObject.payload.node.payload.parentNode.type)
|
||||
let icon2 = canvas.designSpace.iconsByProjectType.get(thisObject.payload.node.project + '-' + thisObject.payload.node.type)
|
||||
let icon1 = canvas.designSpace.getIconByProjectAndType(thisObject.payload.node.payload.parentNode.project, thisObject.payload.node.payload.parentNode.type)
|
||||
let icon2 = canvas.designSpace.getIconByProjectAndType(thisObject.payload.node.project, thisObject.payload.node.type)
|
||||
|
||||
let backgroundColor = UI_COLOR.BLACK
|
||||
let labels = scaleLabels(thisObject.date)
|
||||
|
||||
@@ -77,7 +77,7 @@ function newListItem() {
|
||||
}
|
||||
|
||||
function draw() {
|
||||
let icon = canvas.designSpace.iconsByProjectType.get(project + '-' + type)
|
||||
let icon = canvas.designSpace.getIconByProjectAndType(project, type)
|
||||
let backgroundColor = UI_COLOR.BLACK
|
||||
let labelColor
|
||||
|
||||
|
||||
+29
-18
@@ -3,9 +3,11 @@ function newDesignSpace() {
|
||||
const MODULE_NAME = 'Designe Space'
|
||||
let thisObject = {
|
||||
container: undefined,
|
||||
iconsByName: undefined,
|
||||
iconsByProjectType: undefined,
|
||||
iconsByProjectAndName: undefined,
|
||||
iconsByProjectAndType: undefined,
|
||||
workspace: undefined,
|
||||
getIconByProjectAndName: getIconByProjectAndName,
|
||||
getIconByProjectAndType: getIconByProjectAndType,
|
||||
physics: physics,
|
||||
draw: draw,
|
||||
getContainer: getContainer,
|
||||
@@ -20,8 +22,8 @@ function newDesignSpace() {
|
||||
|
||||
container.isDraggeable = false
|
||||
|
||||
thisObject.iconsByName = new Map()
|
||||
thisObject.iconsByProjectType = new Map()
|
||||
thisObject.iconsByProjectAndName = new Map()
|
||||
thisObject.iconsByProjectAndType = new Map()
|
||||
|
||||
return thisObject
|
||||
|
||||
@@ -29,12 +31,12 @@ function newDesignSpace() {
|
||||
loadIconCollection(onIconsReady)
|
||||
|
||||
function onIconsReady() {
|
||||
buildIconByUiObjectTypeMap()
|
||||
buildIconByProjectAndTypeMap()
|
||||
thisObject.workspace = newWorkspace()
|
||||
thisObject.workspace.initialize()
|
||||
}
|
||||
|
||||
function buildIconByUiObjectTypeMap() {
|
||||
function buildIconByProjectAndTypeMap() {
|
||||
/* Take types-icons relationships defined at the schema */
|
||||
for (let i = 0; i < APP_SCHEMA_ARRAY.length; i++) {
|
||||
let nodeDefinition = APP_SCHEMA_ARRAY[i]
|
||||
@@ -43,9 +45,9 @@ function newDesignSpace() {
|
||||
iconName = nodeDefinition.type.toLowerCase()
|
||||
iconName = iconName.split(" ").join("-")
|
||||
}
|
||||
let icon = thisObject.iconsByName.get(iconName)
|
||||
let icon = thisObject.getIconByProjectAndName('Superalgos', iconName)
|
||||
if (icon !== undefined) {
|
||||
thisObject.iconsByProjectType.set('Superalgos' + '-' + nodeDefinition.type, icon)
|
||||
thisObject.iconsByProjectAndType.set('Superalgos' + '-' + nodeDefinition.type, icon)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -53,7 +55,7 @@ function newDesignSpace() {
|
||||
|
||||
function loadIconCollection(callBack) {
|
||||
|
||||
callServer(undefined, 'ImagesNames', onResponse)
|
||||
callServer(undefined, 'IconNames', onResponse)
|
||||
|
||||
function onResponse(err, data) {
|
||||
if (err.result !== GLOBAL.DEFAULT_OK_RESPONSE.result) {
|
||||
@@ -61,17 +63,18 @@ function newDesignSpace() {
|
||||
return
|
||||
}
|
||||
|
||||
let imageNames = JSON.parse(data)
|
||||
let iconsArray = JSON.parse(data)
|
||||
let imageLoadedCounter = 0
|
||||
|
||||
for (let i = 0; i < imageNames.length; i++) {
|
||||
let name = imageNames[i]
|
||||
loadImage(name)
|
||||
for (let i = 0; i < iconsArray.length; i++) {
|
||||
let project = iconsArray[i][0]
|
||||
let name = iconsArray[i][1]
|
||||
loadImage(project, name)
|
||||
}
|
||||
|
||||
function loadImage(name) {
|
||||
function loadImage(project, name) {
|
||||
imageLoadedCounter++
|
||||
const PATH = 'Images/Icons/style-01/'
|
||||
const PATH = 'Icons/' + project + '/'
|
||||
let image = new Image()
|
||||
image.onload = onImageLoad
|
||||
image.fileName = name
|
||||
@@ -80,16 +83,24 @@ function newDesignSpace() {
|
||||
image.canDrawIcon = true
|
||||
}
|
||||
image.src = PATH + name
|
||||
let key = name.substring(0, name.length - 4)
|
||||
thisObject.iconsByName.set(key, image)
|
||||
let key = project + '-' + name.substring(0, name.length - 4)
|
||||
thisObject.iconsByProjectAndName.set(key, image)
|
||||
|
||||
if (imageLoadedCounter === imageNames.length) {
|
||||
if (imageLoadedCounter === iconsArray.length) {
|
||||
callBack()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function getIconByProjectAndName(project, name) {
|
||||
return thisObject.iconsByProjectAndName.get(project + '-' + name)
|
||||
}
|
||||
|
||||
function getIconByProjectAndType(project, type) {
|
||||
return thisObject.iconsByProjectAndType.get(project + '-' + type)
|
||||
}
|
||||
|
||||
function physics() {
|
||||
if (thisObject.workspace === undefined) { return }
|
||||
thisObject.workspace.physics()
|
||||
|
||||
+19
-19
@@ -20,12 +20,12 @@ function newVideoRecorder() {
|
||||
const DISTANCE_BETWEEN_ICONS = 35
|
||||
const ICON_SIZES = 50
|
||||
|
||||
let mousePointerIcon = canvas.designSpace.iconsByName.get('mouse-pointer')
|
||||
let draggingIcon = canvas.designSpace.iconsByName.get('hand-drag')
|
||||
let mousePointerIcon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'mouse-pointer')
|
||||
let draggingIcon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'hand-drag')
|
||||
|
||||
let leftClickIcon = canvas.designSpace.iconsByName.get('mouse-left-click')
|
||||
let rightClickIcon = canvas.designSpace.iconsByName.get('mouse-right-click')
|
||||
let wheelClickIcon = canvas.designSpace.iconsByName.get('mouse-wheel-click')
|
||||
let leftClickIcon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'mouse-left-click')
|
||||
let rightClickIcon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'mouse-right-click')
|
||||
let wheelClickIcon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'mouse-wheel-click')
|
||||
|
||||
let imagePosition
|
||||
let buttonPressedIcon
|
||||
@@ -45,10 +45,10 @@ function newVideoRecorder() {
|
||||
case 'wheel': {
|
||||
wheelAnimationCounter = 25
|
||||
if (canvas.mouse.event.delta > 0) {
|
||||
pointerIcon = canvas.designSpace.iconsByName.get('mouse-wheel-up')
|
||||
pointerIcon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'mouse-wheel-up')
|
||||
lastWheelPointerIcon = pointerIcon
|
||||
} else {
|
||||
pointerIcon = canvas.designSpace.iconsByName.get('mouse-wheel-down')
|
||||
pointerIcon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'mouse-wheel-down')
|
||||
lastWheelPointerIcon = pointerIcon
|
||||
}
|
||||
|
||||
@@ -65,27 +65,27 @@ function newVideoRecorder() {
|
||||
switch (key.toLowerCase()) {
|
||||
case 'escape':
|
||||
{
|
||||
pointerIcon = canvas.designSpace.iconsByName.get('key-m')
|
||||
pointerIcon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'key-m')
|
||||
break
|
||||
}
|
||||
case 'm':
|
||||
{
|
||||
pointerIcon = canvas.designSpace.iconsByName.get('key-m')
|
||||
pointerIcon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'key-m')
|
||||
break
|
||||
}
|
||||
case 'a':
|
||||
{
|
||||
pointerIcon = canvas.designSpace.iconsByName.get('key-a')
|
||||
pointerIcon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'key-a')
|
||||
break
|
||||
}
|
||||
case 'r':
|
||||
{
|
||||
pointerIcon = canvas.designSpace.iconsByName.get('key-r')
|
||||
pointerIcon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'key-r')
|
||||
break
|
||||
}
|
||||
case 'c':
|
||||
{
|
||||
pointerIcon = canvas.designSpace.iconsByName.get('key-r')
|
||||
pointerIcon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'key-r')
|
||||
break
|
||||
}
|
||||
}
|
||||
@@ -139,7 +139,7 @@ function newVideoRecorder() {
|
||||
drawMousePointer(buttonPressedIcon, imagePosition, ICON_SIZES)
|
||||
|
||||
if (canvas.mouse.event.shiftKey === true) {
|
||||
icon = canvas.designSpace.iconsByName.get('key-shift')
|
||||
icon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'key-shift')
|
||||
imagePosition = {
|
||||
x: canvas.mouse.position.x - DISTANCE_BETWEEN_ICONS * 3,
|
||||
y: canvas.mouse.position.y + firstRow
|
||||
@@ -148,7 +148,7 @@ function newVideoRecorder() {
|
||||
}
|
||||
|
||||
if (canvas.mouse.event.ctrlKey === true || canvas.mouse.event.metaKey === true) {
|
||||
icon = canvas.designSpace.iconsByName.get('key-ctrl')
|
||||
icon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'key-ctrl')
|
||||
imagePosition = {
|
||||
x: canvas.mouse.position.x - DISTANCE_BETWEEN_ICONS * 3,
|
||||
y: canvas.mouse.position.y + secondRow
|
||||
@@ -157,7 +157,7 @@ function newVideoRecorder() {
|
||||
}
|
||||
|
||||
if (canvas.mouse.event.altKey === true) {
|
||||
icon = canvas.designSpace.iconsByName.get('key-alt')
|
||||
icon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'key-alt')
|
||||
imagePosition = {
|
||||
x: canvas.mouse.position.x + DISTANCE_BETWEEN_ICONS * 3 + ICON_SIZES * 0,
|
||||
y: canvas.mouse.position.y + secondRow
|
||||
@@ -166,7 +166,7 @@ function newVideoRecorder() {
|
||||
}
|
||||
|
||||
if (canvas.mouse.event.code === 'ArrowUp') {
|
||||
icon = canvas.designSpace.iconsByName.get('key-up')
|
||||
icon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'key-up')
|
||||
imagePosition = {
|
||||
x: canvas.mouse.position.x - 0,
|
||||
y: canvas.mouse.position.y + firstRow
|
||||
@@ -175,7 +175,7 @@ function newVideoRecorder() {
|
||||
}
|
||||
|
||||
if (canvas.mouse.event.code === 'ArrowDown') {
|
||||
icon = canvas.designSpace.iconsByName.get('key-down')
|
||||
icon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'key-down')
|
||||
imagePosition = {
|
||||
x: canvas.mouse.position.x - 0,
|
||||
y: canvas.mouse.position.y + secondRow
|
||||
@@ -184,7 +184,7 @@ function newVideoRecorder() {
|
||||
}
|
||||
|
||||
if (canvas.mouse.event.code === 'ArrowLeft') {
|
||||
icon = canvas.designSpace.iconsByName.get('key-left')
|
||||
icon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'key-left')
|
||||
imagePosition = {
|
||||
x: canvas.mouse.position.x - DISTANCE_BETWEEN_ICONS * 0 - ICON_SIZES * 1,
|
||||
y: canvas.mouse.position.y + secondRow
|
||||
@@ -193,7 +193,7 @@ function newVideoRecorder() {
|
||||
}
|
||||
|
||||
if (canvas.mouse.event.code === 'ArrowRight') {
|
||||
icon = canvas.designSpace.iconsByName.get('key-right')
|
||||
icon = canvas.designSpace.getIconByProjectAndName( 'Superalgos', 'key-right')
|
||||
imagePosition = {
|
||||
x: canvas.mouse.position.x + DISTANCE_BETWEEN_ICONS * 0 + ICON_SIZES * 1,
|
||||
y: canvas.mouse.position.y + secondRow
|
||||
|
||||
Reference in new issue
Block a user