More fixes

2020-10-10 13:50:19 +02:00
1 parent f6321a1abc
commit e58ddc49ef
@@ -652,8 +652,8 @@ function newTimeMachine() {
            x: 0,
            y: 0
        }
-        let imageSize = 13
-        let fontSize = 15
+        let imageSize = 12
+        let fontSize = 12
        let opacity = 1
        let icon = canvas.designSpace.iconByUiObjectType.get(thisObject.payload.node.type)

@@ -671,7 +671,7 @@ function newTimeMachine() {
            if (icon.canDrawIcon === true) {
                browserCanvasContext.drawImage(
                    icon, position.x + 5,
-                    position.y - 22,
+                    position.y - 18,
                    imageSize,
                    imageSize)
            }
@@ -55,6 +55,7 @@ function newChartingSpaceFunctions() {
                let allLayers = nodeBranchToArray(botLayers, 'Layer')
                for (let j = 0; j < allLayers.length; j++) {
                    let layer = allLayers[j]
+                    layer.payload.floatingObject.angleToParent = ANGLE_TO_PARENT.RANGE_45

                    let plotterModule = findNodeInNodeMesh(layer, 'Plotter Module', undefined, true, false, false, true)
                    if (plotterModule === undefined) {
@@ -115,6 +116,9 @@ function newChartingSpaceFunctions() {
        timeMachine.name = session.name + ' ' + session.type + ' ' + networkNode.name
        timeMachine.payload.floatingObject.collapseToggle()
        timeMachine.payload.floatingObject.angleToParent = ANGLE_TO_PARENT.RANGE_180
+        timeMachine.timeFrameScale.payload.floatingObject.angleToParent = ANGLE_TO_PARENT.RANGE_180
+        timeMachine.timeScale.payload.floatingObject.angleToParent = ANGLE_TO_PARENT.RANGE_180
+        timeMachine.rateScale.payload.floatingObject.angleToParent = ANGLE_TO_PARENT.RANGE_180
        /*
        We need to create a Timeline Chart for each Data Mine Indicators.
        */
@@ -129,10 +133,18 @@ function newChartingSpaceFunctions() {
            if (mineProduct.payload.parentNode.payload.referenceParent.id !== market.id) { continue }

            let timelineChart = functionLibraryUiObjectsFromNodes.addUIObject(timeMachine, 'Timeline Chart')
+            /* 
+            The Mine Product Node might be collapesd and since its creation it never 
+            received the physics call, so we will do the call so that it properly
+            sets its own name, which we are going to reuse here.
+            */
+            mineProduct.payload.uiObject.invisiblePhysics()
            timelineChart.name = mineProduct.name
            timelineChart.layersManager.payload.referenceParent = mineProduct
            timelineChart.payload.floatingObject.collapseToggle()
            timelineChart.layersManager.payload.floatingObject.collapseToggle()
+            timelineChart.payload.floatingObject.angleToParent = ANGLE_TO_PARENT.RANGE_180
+            timelineChart.layersManager.payload.floatingObject.angleToParent = ANGLE_TO_PARENT.RANGE_180

            let menu = timelineChart.layersManager.payload.uiObject.menu
            menu.internalClick('Add All Mine Layers')
@@ -161,6 +173,8 @@ function newChartingSpaceFunctions() {
                timelineChart.layersManager.payload.referenceParent = mineProduct
                timelineChart.payload.floatingObject.collapseToggle()
                timelineChart.layersManager.payload.floatingObject.collapseToggle()
+                timelineChart.payload.floatingObject.angleToParent = ANGLE_TO_PARENT.RANGE_180
+                timelineChart.layersManager.payload.floatingObject.angleToParent = ANGLE_TO_PARENT.RANGE_180

                let menu = timelineChart.layersManager.payload.uiObject.menu
                menu.internalClick('Add All Mine Layers')
@@ -170,17 +184,17 @@ function newChartingSpaceFunctions() {
                    case 0: {
                        timelineChart.name = 'Trading Engine'
                        deleteNodeByName('Trading System')
-                        deleteNodeByName('Objects')
+                        deleteNodeByName('Simulation Objects')
                        break
                    }
                    case 1: {
                        timelineChart.name = 'Trading System'
                        deleteNodeByName('Trading Engine')
-                        deleteNodeByName('Objects')
+                        deleteNodeByName('Simulation Objects')
                        break
                    }
                    case 2: {
-                        timelineChart.name = 'Objects'
+                        timelineChart.name = 'Simulation Objects'
                        deleteNodeByName('Trading Engine')
                        deleteNodeByName('Trading System')
                        break
@@ -562,7 +562,7 @@ function newUiObjectConstructor() {
            floatingObject.friction = INITIAL_FRICTION

            floatingObject.initializeMass(300)
-            floatingObject.initializeRadius(INITIAL_RADIOUS - 2)
+            floatingObject.initializeRadius(INITIAL_RADIOUS - 1)
            floatingObject.initializeImageSize(INITIAL_IMAGE_SIZE - 10)
            floatingObject.initializeFontSize(INITIAL_FONT_SIZE)

@@ -577,7 +577,7 @@ function newUiObjectConstructor() {
            floatingObject.friction = INITIAL_FRICTION

            floatingObject.initializeMass(150)
-            floatingObject.initializeRadius(INITIAL_RADIOUS - 4)
+            floatingObject.initializeRadius(INITIAL_RADIOUS - 2)
            floatingObject.initializeImageSize(INITIAL_IMAGE_SIZE - 20)
            floatingObject.initializeFontSize(INITIAL_FONT_SIZE)

@@ -592,7 +592,7 @@ function newUiObjectConstructor() {
            floatingObject.friction = INITIAL_FRICTION

            floatingObject.initializeMass(75)
-            floatingObject.initializeRadius(INITIAL_RADIOUS - 6)
+            floatingObject.initializeRadius(INITIAL_RADIOUS - 3)
            floatingObject.initializeImageSize(INITIAL_IMAGE_SIZE - 30)
            floatingObject.initializeFontSize(INITIAL_FONT_SIZE)

@@ -607,7 +607,7 @@ function newUiObjectConstructor() {
            floatingObject.friction = INITIAL_FRICTION

            floatingObject.initializeMass(50)
-            floatingObject.initializeRadius(INITIAL_RADIOUS - 8)
+            floatingObject.initializeRadius(INITIAL_RADIOUS - 4)
            floatingObject.initializeImageSize(INITIAL_IMAGE_SIZE - 40)
            floatingObject.initializeFontSize(INITIAL_FONT_SIZE)

@@ -618,7 +618,7 @@ function newUiObjectConstructor() {
            floatingObject.friction = INITIAL_FRICTION

            floatingObject.initializeMass(25)
-            floatingObject.initializeRadius(INITIAL_RADIOUS - 10)
+            floatingObject.initializeRadius(INITIAL_RADIOUS - 5)
            floatingObject.initializeImageSize(INITIAL_IMAGE_SIZE - 50)
            floatingObject.initializeFontSize(INITIAL_FONT_SIZE)

@@ -1 +1 @@
-{"type":"Trading Mine","name":"Masters","config":"{ \n\"codeName\": \"Masters\"\n}","tradingBots":[{"type":"Trading Bot","name":"Low Frequency","config":"{\n\"codeName\": \"Low-Frequency\",\n\"repo\": \"Exchange-Raw-Data-Sensor-Bot\"\n}","processes":[{"type":"Process Definition","name":"Trading","config":"{\n    \"codeName\": \"Trading\",\n    \"sessionRunWaitTime\": 5000,\n    \"retryWaitTime\": 10000,\n    \"framework\": {\n      \"name\": \"Low-Frequency-Trading-Process\"\n    }\n  }","processOutput":{"type":"Process Output","name":"New Process Output","outputDatasets":[],"outputDatasetFolders":[{"type":"Output Dataset Folder","name":"Trading Engine","outputDatasets":[],"outputDatasetFolders":[{"type":"Output Dataset Folder","name":"Episode","outputDatasets":[{"type":"Output Dataset","name":"Multi-Period-Market Episode Counters","id":"a1ba5aea-27cf-4789-858f-bcae5e844d68","savedPayload":{"position":{"x":24759.631900172484,"y":18129.670483934216},"targetPosition":{"x":24366.58984855878,"y":17432.75965266405},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{},"referenceParent":{"type":"Dataset Definition","name":"Multi-Period-Market","id":"3ed03a02-381d-43fe-9faa-761728c53bd8"}}},{"type":"Output Dataset","name":"Multi-Period-Daily Episode Counters","id":"0545bf38-80e0-4888-88bc-a8710355fa57","savedPayload":{"position":{"x":24616.91382467489,"y":18187.752283102793},"targetPosition":{"x":24366.58984855878,"y":17432.75965266405},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{},"referenceParent":{"type":"Dataset Definition","name":"Multi-Period-Daily","id":"15f5b150-f1cf-403c-8cb9-2c7c4e1db8e8"}}},{"type":"Output Dataset","name":"Multi-Period-Market Episode Statistics","id":"5af42032-7ce1-4afe-95d7-e33ba00794eb","savedPayload":{"position":{"x":24467.32574891778,"y":18213.619014780168},"targetPosition":{"x":24366.58984855878,"y":17432.75965266405},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{},"referenceParent":{"type":"Dataset Definition","name":"Multi-Period-Market","id":"fc9dc0f7-35e0-4548-bb91-f920825d694f"}}},{"type":"Output Dataset","name":"Multi-Period-Daily Episode Statistics","id":"d18cec41-5512-44d3-8005-5b9a7fd80461","savedPayload":{"position":{"x":24312.199531118506,"y":18282.702923036555},"targetPosition":{"x":24366.58984855878,"y":17432.75965266405},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{},"referenceParent":{"type":"Dataset Definition","name":"Multi-Period-Daily","id":"91953362-8751-4440-a898-21245cd47c15"}}},{"type":"Output Dataset","name":"Multi-Period-Market Episode Candle","id":"3df1601e-ef97-4103-b90e-364c1b6527f6","savedPayload":{"position":{"x":24176.08514639884,"y":18215.729402248384},"targetPosition":{"x":24366.58984855878,"y":17432.75965266405},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{},"referenceParent":{"type":"Dataset Definition","name":"Multi-Period-Market","id":"17fb41f5-61b5-4433-9a10-950ff8216a7e"}}},{"type":"Output Dataset","name":"Multi-Period-Daily Episode Candle","id":"7745d3f8-0a55-4d1a-9778-1360c5a5fad6","savedPayload":{"position":{"x":24038.4963756947,"y":18157.795869882535},"targetPosition":{"x":24366.58984855878,"y":17432.75965266405},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{},"referenceParent":{"type":"Dataset Definition","name":"Multi-Period-Daily","id":"bbc9467d-28bf-432b-9e49-582d1bcabfb9"}}},{"type":"Output Dataset","name":"Multi-Period-Market Episode Balances","id":"f5549653-3d66-4f6b-8aff-44f728772ed9","savedPayload":{"position":{"x":23907.619142082276,"y":18087.027884380746},"targetPosition":{"x":24366.58984855878,"y":17432.75965266405},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{},"referenceParent":{"type":"Dataset Definition","name":"Multi-Period-Market","id":"acddff59-b51b-4b45-b58f-71d4077755ee"}}},{"type":"Output Dataset","name":"Multi-Period-Daily Episode Balances","id":"5d016965-9c3b-48bf-8969-157430be4d54","savedPayload":{"position":{"x":23795.542044304937,"y":17990.498514211948},"targetPosition":{"x":24366.58984855878,"y":17432.75965266405},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{},"referenceParent":{"type":"Dataset Definition","name":"Multi-Period-Daily","id":"213b8fe8-f772-41ea-a3f5-97867be555f7"}}},{"type":"Output Dataset","name":"Multi-Period-Market DiLine truncated
+{"type":"Trading Mine","name":"Masters","config":"{ \n\"codeName\": \"Masters\"\n}","tradingBots":[{"type":"Trading Bot","name":"Low Frequency","config":"{\n\"codeName\": \"Low-Frequency\",\n\"repo\": \"Exchange-Raw-Data-Sensor-Bot\"\n}","processes":[{"type":"Process Definition","name":"Trading","config":"{\n    \"codeName\": \"Trading\",\n    \"sessionRunWaitTime\": 5000,\n    \"retryWaitTime\": 10000,\n    \"framework\": {\n      \"name\": \"Low-Frequency-Trading-Process\"\n    }\n  }","processOutput":{"type":"Process Output","name":"New Process Output","outputDatasets":[],"outputDatasetFolders":[{"type":"Output Dataset Folder","name":"Trading Engine","outputDatasets":[],"outputDatasetFolders":[{"type":"Output Dataset Folder","name":"Episode","outputDatasets":[{"type":"Output Dataset","name":"Multi-Period-Market Episode Counters","id":"a1ba5aea-27cf-4789-858f-bcae5e844d68","savedPayload":{"position":{"x":24759.631900172484,"y":18129.670483934216},"targetPosition":{"x":24366.58984855878,"y":17432.75965266405},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{},"referenceParent":{"type":"Dataset Definition","name":"Multi-Period-Market","id":"3ed03a02-381d-43fe-9faa-761728c53bd8"}}},{"type":"Output Dataset","name":"Multi-Period-Daily Episode Counters","id":"0545bf38-80e0-4888-88bc-a8710355fa57","savedPayload":{"position":{"x":24616.91382467489,"y":18187.752283102793},"targetPosition":{"x":24366.58984855878,"y":17432.75965266405},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{},"referenceParent":{"type":"Dataset Definition","name":"Multi-Period-Daily","id":"15f5b150-f1cf-403c-8cb9-2c7c4e1db8e8"}}},{"type":"Output Dataset","name":"Multi-Period-Market Episode Statistics","id":"5af42032-7ce1-4afe-95d7-e33ba00794eb","savedPayload":{"position":{"x":24467.32574891778,"y":18213.619014780168},"targetPosition":{"x":24366.58984855878,"y":17432.75965266405},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{},"referenceParent":{"type":"Dataset Definition","name":"Multi-Period-Market","id":"fc9dc0f7-35e0-4548-bb91-f920825d694f"}}},{"type":"Output Dataset","name":"Multi-Period-Daily Episode Statistics","id":"d18cec41-5512-44d3-8005-5b9a7fd80461","savedPayload":{"position":{"x":24312.199531118506,"y":18282.702923036555},"targetPosition":{"x":24366.58984855878,"y":17432.75965266405},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{},"referenceParent":{"type":"Dataset Definition","name":"Multi-Period-Daily","id":"91953362-8751-4440-a898-21245cd47c15"}}},{"type":"Output Dataset","name":"Multi-Period-Market Episode Candle","id":"3df1601e-ef97-4103-b90e-364c1b6527f6","savedPayload":{"position":{"x":24176.08514639884,"y":18215.729402248384},"targetPosition":{"x":24366.58984855878,"y":17432.75965266405},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{},"referenceParent":{"type":"Dataset Definition","name":"Multi-Period-Market","id":"17fb41f5-61b5-4433-9a10-950ff8216a7e"}}},{"type":"Output Dataset","name":"Multi-Period-Daily Episode Candle","id":"7745d3f8-0a55-4d1a-9778-1360c5a5fad6","savedPayload":{"position":{"x":24038.4963756947,"y":18157.795869882535},"targetPosition":{"x":24366.58984855878,"y":17432.75965266405},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{},"referenceParent":{"type":"Dataset Definition","name":"Multi-Period-Daily","id":"bbc9467d-28bf-432b-9e49-582d1bcabfb9"}}},{"type":"Output Dataset","name":"Multi-Period-Market Episode Balances","id":"f5549653-3d66-4f6b-8aff-44f728772ed9","savedPayload":{"position":{"x":23907.619142082276,"y":18087.027884380746},"targetPosition":{"x":24366.58984855878,"y":17432.75965266405},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{},"referenceParent":{"type":"Dataset Definition","name":"Multi-Period-Market","id":"acddff59-b51b-4b45-b58f-71d4077755ee"}}},{"type":"Output Dataset","name":"Multi-Period-Daily Episode Balances","id":"5d016965-9c3b-48bf-8969-157430be4d54","savedPayload":{"position":{"x":23795.542044304937,"y":17990.498514211948},"targetPosition":{"x":24366.58984855878,"y":17432.75965266405},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":false,"angleToParent":2,"distanceToParent":3,"arrangementStyle":0},"uiObject":{},"referenceParent":{"type":"Dataset Definition","name":"Multi-Period-Daily","id":"213b8fe8-f772-41ea-a3f5-97867be555f7"}}},{"type":"Output Dataset","name":"Multi-Period-Market DiLine truncated