Latest fixes

This commit is contained in:
Luis Fernando Molina committed 2020-10-28 11:28:34 +01:00
1 parent 850018265e
commit 1262b339c6
3 files changed
+42 -23

No files matched your search

+16 -9
View File
@@ -115,8 +115,10 @@ function newCanvas() {
projectInstance.events.onMouseDownMap = new Map()
let spaceInitializationMap = new Map()
let spaceAnimationMap = new Map()
let spaceDefinitionMap = new Map()
let spaceAnimationPhysicsMap = new Map()
let spaceDefinitionPhysicsMap = new Map()
let spaceAnimationDrawMap = new Map()
let spaceDefinitionDrawMap = new Map()
/* Space Instantiation */
if (projectDefinition.spaces === undefined) { continue }
@@ -130,9 +132,14 @@ function newCanvas() {
spaceInitializationMap.set(spaceDefinition.initializationIndex, spaceInstance)
}
if (spaceDefinition.animationIndex !== undefined) {
spaceAnimationMap.set(spaceDefinition.animationIndex, spaceInstance)
spaceDefinitionMap.set(spaceDefinition.animationIndex, spaceDefinition)
if (spaceDefinition.animationPhysicsIndex !== undefined) {
spaceAnimationPhysicsMap.set(spaceDefinition.animationPhysicsIndex, spaceInstance)
spaceDefinitionPhysicsMap.set(spaceDefinition.animationPhysicsIndex, spaceDefinition)
}
if (spaceDefinition.animationDrawIndex !== undefined) {
spaceAnimationDrawMap.set(spaceDefinition.animationDrawIndex, spaceInstance)
spaceDefinitionDrawMap.set(spaceDefinition.animationDrawIndex, spaceDefinition)
}
/* Build the maps that defines the secuence of execution of different events. */
@@ -160,8 +167,8 @@ function newCanvas() {
/* Space Animation Physics */
for (let j = 0; j < projectDefinition.spaces.length; j++) {
let spaceInstance = spaceAnimationMap.get(j)
let spaceDefinition = spaceDefinitionMap.get(j)
let spaceInstance = spaceAnimationPhysicsMap.get(j)
let spaceDefinition = spaceDefinitionPhysicsMap.get(j)
if (spaceInstance === undefined || spaceDefinition === undefined) { continue }
if (spaceInstance.physics !== undefined) {
thisObject.animation.addCallBackFunction(spaceDefinition.name + ' ' + 'Physics', spaceInstance.physics)
@@ -170,8 +177,8 @@ function newCanvas() {
/* Space Animation Drawing*/
for (let j = 0; j < projectDefinition.spaces.length; j++) {
let spaceInstance = spaceAnimationMap.get(j)
let spaceDefinition = spaceDefinitionMap.get(j)
let spaceInstance = spaceAnimationDrawMap.get(j)
let spaceDefinition = spaceDefinitionDrawMap.get(j)
if (spaceInstance === undefined || spaceDefinition === undefined) { continue }
if (spaceInstance.draw !== undefined) {
thisObject.animation.addCallBackFunction(spaceDefinition.name + ' ' + 'Draw', spaceInstance.draw)
+19 -10
View File
@@ -98,7 +98,8 @@
"propertyName": "floatingSpace",
"functionName": "newSuperalgosFloatingSpace",
"initializationIndex": 0,
"animationIndex": 0,
"animationPhysicsIndex": 1,
"animationDrawIndex": 0,
"onMouseWheelIndex": 6,
"onMouseOverIndex": 8,
"onMouseClickIndex": 8,
@@ -109,8 +110,9 @@
"folderName": "Top-Space",
"propertyName": "topSpace",
"functionName": "newSuperalgosTopSpace",
"initializationIndex": 1,
"animationIndex": 6,
"initializationIndex": 1,
"animationPhysicsIndex": 7,
"animationDrawIndex": 6,
"onMouseOverIndex": 4,
"onMouseClickIndex": 4,
"onMouseDownIndex": 4
@@ -121,7 +123,8 @@
"propertyName": "cockpitSpace",
"functionName": "newSuperalgosCockpitSpace",
"initializationIndex": 2,
"animationIndex": 7,
"animationPhysicsIndex": 0,
"animationDrawIndex": 7,
"onMouseWheelIndex": 4,
"onMouseOverIndex": 5,
"onMouseClickIndex": 5,
@@ -133,7 +136,8 @@
"propertyName": "designSpace",
"functionName": "newSuperalgosDesignSpace",
"initializationIndex": 3,
"animationIndex": 2,
"animationPhysicsIndex": 3,
"animationDrawIndex": 2,
"onMouseWheelIndex": 0,
"onMouseOverIndex": 3,
"onMouseClickIndex": 3,
@@ -145,7 +149,8 @@
"propertyName": "panelSpace",
"functionName": "newSuperalgosPanelSpace",
"initializationIndex": 4,
"animationIndex": 3,
"animationPhysicsIndex": 4,
"animationDrawIndex": 3,
"onMouseWheelIndex": 3,
"onMouseOverIndex": 6,
"onMouseClickIndex": 6,
@@ -157,7 +162,8 @@
"propertyName": "chartingSpace",
"functionName": "newSuperalgosChartingSpace",
"initializationIndex": 5,
"animationIndex": 1,
"animationPhysicsIndex": 2,
"animationDrawIndex": 1,
"onMouseWheelIndex": 5,
"onMouseOverIndex": 7,
"onMouseClickIndex": 7,
@@ -169,7 +175,8 @@
"propertyName": "sideSpace",
"functionName": "newSuperalgosSideSpace",
"initializationIndex": 6,
"animationIndex": 8,
"animationPhysicsIndex": 8,
"animationDrawIndex": 8,
"onMouseWheelIndex": 2,
"onMouseOverIndex": 2,
"onMouseClickIndex": 2,
@@ -181,7 +188,8 @@
"propertyName": "docSpace",
"functionName": "newSuperalgosDocSpace",
"initializationIndex": 7,
"animationIndex": 4,
"animationPhysicsIndex": 5,
"animationDrawIndex": 4,
"onMouseWheelIndex": 1,
"onMouseOverIndex": 1,
"onMouseClickIndex": 1,
@@ -199,7 +207,8 @@
"propertyName": "tutorialSpace",
"functionName": "newSuperalgosTutorialSpace",
"initializationIndex": 8,
"animationIndex": 5,
"animationPhysicsIndex": 6,
"animationDrawIndex": 5,
"onMouseWheelIndex": 0,
"onMouseOverIndex": 0,
"onMouseClickIndex": 0,
@@ -163,7 +163,7 @@ function newLayer() {
'Data Product Folder->Data Product Folder->Data Product Folder->Data Product Folder->Data Product Folder->' +
'Bot Products->Data Mine Products->Trading Mine Products->' +
'Market Data Products->Exchange Data Products->' +
'Session Reference->Market Trading Products->Exchange Trading Products->' +
'Session Reference->Market Trading Products->Exchange Trading Products->' +
'Data Mines Data->Trading Mines Data->Data Storage->Network Node->' +
'Data Storage->Network Node->' +
'Backtesting Session->Paper Trading Session->Forward Testing Session->Live Trading Session->' +
@@ -287,7 +287,7 @@ function newLayer() {
thisObject.exchangeIcon = getIcon(thisObject.exchange)
if (thisObject.plotterModule.config.icon !== undefined) {
thisObject.plotterTypeIcon = UI.projects.superalgos.spaces.designSpace.getIconByProjectAndName( 'Superalgos', thisObject.plotterModule.config.icon)
thisObject.plotterTypeIcon = UI.projects.superalgos.spaces.designSpace.getIconByProjectAndName('Superalgos', thisObject.plotterModule.config.icon)
}
thisObject.baseAssetIcon = getIcon(thisObject.baseAsset)
@@ -306,9 +306,9 @@ function newLayer() {
}
}
if (iconName !== undefined) {
icon = UI.projects.superalgos.spaces.designSpace.getIconByProjectAndName( 'Superalgos', iconName)
icon = UI.projects.superalgos.spaces.designSpace.getIconByProjectAndName('Superalgos', iconName)
} else {
icon = UI.projects.superalgos.spaces.designSpace.getIconByProjectAndName( 'Superalgos', nodeDefinition.icon)
icon = UI.projects.superalgos.spaces.designSpace.getIconByProjectAndName('Superalgos', nodeDefinition.icon)
}
return icon
}
@@ -623,6 +623,9 @@ function newLayer() {
}
function drawLayerDisplay() {
if (thisObject.payload === undefined) { return }
if (thisObject.payload.node === undefined) { return }
let label1 = thisObject.payload.node.name
let label2 = thisObject.exchange.name.substring(0, 15) + ' - ' + thisObject.market
let label3 = thisObject.status.toUpperCase()