From a17a0ed87897ca008408b296cba044cf33796707 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 1 Oct 2021 11:46:53 +0200 Subject: [PATCH 1/4] Improvement inMapMode --- Projects/Foundations/UI/Spaces/Floating-Space/UiObject.js | 7 +++++++ Projects/Governance/Schemas/App-Schema/user-profile.json | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Projects/Foundations/UI/Spaces/Floating-Space/UiObject.js b/Projects/Foundations/UI/Spaces/Floating-Space/UiObject.js index 3de121654..8ba9a4d0b 100644 --- a/Projects/Foundations/UI/Spaces/Floating-Space/UiObject.js +++ b/Projects/Foundations/UI/Spaces/Floating-Space/UiObject.js @@ -1683,6 +1683,13 @@ function newUiObject() { if (UI.projects.foundations.spaces.floatingSpace.inMapMode === true) { position = UI.projects.foundations.spaces.floatingSpace.transformPointToMap(position) + + let schemaDocument = getSchemaDocument(thisObject.payload.node) + if (schemaDocument.inMapMode !== undefined) { + if (schemaDocument.inMapMode.showNodeType === false) { + return + } + } } let radius = thisObject.payload.floatingObject.container.frame.radius diff --git a/Projects/Governance/Schemas/App-Schema/user-profile.json b/Projects/Governance/Schemas/App-Schema/user-profile.json index 4fe356ae4..25f0c6cf2 100644 --- a/Projects/Governance/Schemas/App-Schema/user-profile.json +++ b/Projects/Governance/Schemas/App-Schema/user-profile.json @@ -76,5 +76,8 @@ "childType": "Signing Accounts", "autoAdd": false } - ] + ], + "inMapMode": { + "showNodeType": false + } } \ No newline at end of file From c1729dbdacc4fddb17542034dc438d8e54381773 Mon Sep 17 00:00:00 2001 From: prepheadrus <83468174+prepheadrus@users.noreply.github.com> Date: Fri, 1 Oct 2021 12:53:48 +0300 Subject: [PATCH 2/4] This is my contribution to Superalgos --- .../Plugins/User-Profiles/prepheadrus.json | 115 ++++++++++++------ 1 file changed, 77 insertions(+), 38 deletions(-) diff --git a/Projects/Governance/Plugins/User-Profiles/prepheadrus.json b/Projects/Governance/Plugins/User-Profiles/prepheadrus.json index e8e877d77..6aaff380f 100644 --- a/Projects/Governance/Plugins/User-Profiles/prepheadrus.json +++ b/Projects/Governance/Plugins/User-Profiles/prepheadrus.json @@ -26,11 +26,11 @@ "id": "090ead39-f6f4-4358-a947-08783eae5ddb", "savedPayload": { "position": { - "x": 5150, + "x": 16816.666666666664, "y": 23470.577136594 }, "targetPosition": { - "x": 5300, + "x": 16966.666666666664, "y": 23730.384757729335 }, "floatingObject": { @@ -49,11 +49,11 @@ "id": "29a7071b-07c8-4ac6-9241-79a169c6bdc4", "savedPayload": { "position": { - "x": 5300, + "x": 16966.666666666664, "y": 23730.384757729335 }, "targetPosition": { - "x": 5450, + "x": 17116.666666666664, "y": 23990.192378864667 }, "floatingObject": { @@ -81,11 +81,11 @@ "id": "25f013be-7b91-447e-993f-b4dd8efa6cbd", "savedPayload": { "position": { - "x": 6050, + "x": 17716.666666666664, "y": 23990.192378864667 }, "targetPosition": { - "x": 5750, + "x": 17416.666666666664, "y": 23990.192378864667 }, "floatingObject": { @@ -104,11 +104,11 @@ "id": "09e21adb-573e-4f5a-91ef-c6db8cb01e08", "savedPayload": { "position": { - "x": 5750, + "x": 17416.666666666664, "y": 23990.192378864667 }, "targetPosition": { - "x": 5450, + "x": 17116.666666666664, "y": 23990.192378864667 }, "floatingObject": { @@ -127,11 +127,11 @@ "id": "69b4f8d0-c9bb-4716-84fa-4fa392fe0ef1", "savedPayload": { "position": { - "x": 5450, + "x": 17116.666666666664, "y": 23990.192378864667 }, "targetPosition": { - "x": 5300, + "x": 16966.666666666664, "y": 24250 }, "floatingObject": { @@ -166,11 +166,11 @@ "id": "120a12ff-a26b-4b0e-b03e-36240e9f1abb", "savedPayload": { "position": { - "x": 5750, - "y": 24209.807621135333 + "x": 17323.96156835418, + "y": 24224.490666246787 }, "targetPosition": { - "x": 5750, + "x": 17416.666666666664, "y": 24509.807621135333 }, "floatingObject": { @@ -198,6 +198,45 @@ ] ] } + }, + { + "type": "User Referrer", + "name": "Luis-Fernando-Molina", + "config": "{}", + "project": "Governance", + "id": "3a7fc9a7-7939-433d-bbef-6bfc0af1fe37", + "savedPayload": { + "position": { + "x": 17659.371764979147, + "y": 24333.47204544759 + }, + "targetPosition": { + "x": 17416.666666666664, + "y": 24509.807621135333 + }, + "floatingObject": { + "isPinned": false, + "isFrozen": false, + "isCollapsed": false, + "angleToParent": 1, + "distanceToParent": 3, + "arrangementStyle": 0 + }, + "uiObject": { + "isRunning": false + }, + "referenceParent": { + "type": "User Profile", + "name": "Luis-Fernando-Molina", + "id": "a8de78f0-c3e4-4a2a-b7e8-f659073969db" + }, + "referenceParentCombinedNodePath": [ + [ + "Luis-Fernando-Molina", + "User Profile" + ] + ] + } } ], "tokensAwarded": { @@ -207,11 +246,11 @@ "id": "bef02b17-5cbc-4861-8121-29bddc448905", "savedPayload": { "position": { - "x": 6050, - "y": 24509.807621135333 + "x": 17659.371764979147, + "y": 24686.143196823075 }, "targetPosition": { - "x": 5750, + "x": 17416.666666666664, "y": 24509.807621135333 }, "floatingObject": { @@ -234,11 +273,11 @@ "id": "15637f0c-dd96-40e8-a997-0a5af0f91d35", "savedPayload": { "position": { - "x": 5750, - "y": 24809.807621135333 + "x": 17323.96156835418, + "y": 24795.124576023878 }, "targetPosition": { - "x": 5750, + "x": 17416.666666666664, "y": 24509.807621135333 }, "floatingObject": { @@ -257,11 +296,11 @@ "id": "b573ee60-8430-41a2-a952-6deac320aee1", "savedPayload": { "position": { - "x": 5750, + "x": 17416.666666666664, "y": 24509.807621135333 }, "targetPosition": { - "x": 5450, + "x": 17116.666666666664, "y": 24509.807621135333 }, "floatingObject": { @@ -291,11 +330,11 @@ "id": "bbb25bb9-b04a-4c65-96c8-7530f3fdfcc8", "savedPayload": { "position": { - "x": 5559.807621135332, + "x": 17226.474287801997, "y": 24919.615242270665 }, "targetPosition": { - "x": 5300, + "x": 16966.666666666664, "y": 24769.615242270665 }, "floatingObject": { @@ -332,11 +371,11 @@ "id": "cc178821-4f6b-44b1-82af-7a4173f9bf2c", "savedPayload": { "position": { - "x": 5150, + "x": 16816.666666666664, "y": 25029.422863406 }, "targetPosition": { - "x": 5300, + "x": 16966.666666666664, "y": 24769.615242270665 }, "floatingObject": { @@ -359,11 +398,11 @@ "id": "f5059354-dd55-4ae3-863c-b9e5a0fbb827", "savedPayload": { "position": { - "x": 5040.192378864668, + "x": 16706.85904553133, "y": 24619.615242270665 }, "targetPosition": { - "x": 5300, + "x": 16966.666666666664, "y": 24769.615242270665 }, "floatingObject": { @@ -382,11 +421,11 @@ "id": "73623eba-8a71-4876-8b17-c71b19f2f47a", "savedPayload": { "position": { - "x": 5300, + "x": 16966.666666666664, "y": 24769.615242270665 }, "targetPosition": { - "x": 5450, + "x": 17116.666666666664, "y": 24509.807621135333 }, "floatingObject": { @@ -405,11 +444,11 @@ "id": "fd803f47-976b-4c5f-a1d2-e9c54b96d2d2", "savedPayload": { "position": { - "x": 5450, + "x": 17116.666666666664, "y": 24509.807621135333 }, "targetPosition": { - "x": 5300, + "x": 16966.666666666664, "y": 24250 }, "floatingObject": { @@ -428,11 +467,11 @@ "id": "5daefc7c-340a-4a60-8c5d-884d2e262729", "savedPayload": { "position": { - "x": 5300, + "x": 16966.666666666664, "y": 24250 }, "targetPosition": { - "x": 5000, + "x": 16666.666666666664, "y": 24250 }, "floatingObject": { @@ -455,11 +494,11 @@ "id": "057b6d0e-2ae5-4c54-99f2-b6d262bde1b5", "savedPayload": { "position": { - "x": 4700, + "x": 16366.666666666664, "y": 24250 }, "targetPosition": { - "x": 5000, + "x": 16666.666666666664, "y": 24250 }, "floatingObject": { @@ -478,17 +517,17 @@ "id": "501b09ca-778e-479b-98ff-7d2e6e8f2bb8", "savedPayload": { "position": { - "x": 5000, + "x": 16666.666666666664, "y": 24250 }, "targetPosition": { - "x": 5000, + "x": 16666.666666666664, "y": 24250 }, "floatingObject": { "isPinned": true, "isFrozen": false, - "isCollapsed": true, + "isCollapsed": false, "angleToParent": 1, "distanceToParent": 3, "arrangementStyle": 0 From e8694bdf9855936ddb05451aa4e5ba458e3c4e76 Mon Sep 17 00:00:00 2001 From: prepheadrus <83468174+prepheadrus@users.noreply.github.com> Date: Fri, 1 Oct 2021 12:57:41 +0300 Subject: [PATCH 3/4] This is my contribution to Superalgos --- .../Plugins/User-Profiles/prepheadrus.json | 94 +++++++++++++++++-- 1 file changed, 86 insertions(+), 8 deletions(-) diff --git a/Projects/Governance/Plugins/User-Profiles/prepheadrus.json b/Projects/Governance/Plugins/User-Profiles/prepheadrus.json index 6aaff380f..353f7c5af 100644 --- a/Projects/Governance/Plugins/User-Profiles/prepheadrus.json +++ b/Projects/Governance/Plugins/User-Profiles/prepheadrus.json @@ -166,8 +166,8 @@ "id": "120a12ff-a26b-4b0e-b03e-36240e9f1abb", "savedPayload": { "position": { - "x": 17323.96156835418, - "y": 24224.490666246787 + "x": 17229.619726109046, + "y": 24275.258176394924 }, "targetPosition": { "x": 17416.666666666664, @@ -207,8 +207,8 @@ "id": "3a7fc9a7-7939-433d-bbef-6bfc0af1fe37", "savedPayload": { "position": { - "x": 17659.371764979147, - "y": 24333.47204544759 + "x": 17483.42294685356, + "y": 24217.329247480786 }, "targetPosition": { "x": 17416.666666666664, @@ -237,6 +237,84 @@ ] ] } + }, + { + "type": "User Referrer", + "name": "piyanthak", + "config": "{}", + "project": "Governance", + "id": "e11390b6-be65-4642-abdf-df82d1a2b571", + "savedPayload": { + "position": { + "x": 17686.95732703739, + "y": 24379.642499400066 + }, + "targetPosition": { + "x": 17416.666666666664, + "y": 24509.807621135333 + }, + "floatingObject": { + "isPinned": false, + "isFrozen": false, + "isCollapsed": false, + "angleToParent": 1, + "distanceToParent": 3, + "arrangementStyle": 0 + }, + "uiObject": { + "isRunning": false + }, + "referenceParent": { + "type": "User Profile", + "name": "piyanthak", + "id": "b1ce221b-2752-4419-ae53-8410e8a93798" + }, + "referenceParentCombinedNodePath": [ + [ + "piyanthak", + "User Profile" + ] + ] + } + }, + { + "type": "User Referrer", + "name": "hellarnasstrom", + "config": "{}", + "project": "Governance", + "id": "7b36cafa-d057-4ad5-bfb8-90821cc78e05", + "savedPayload": { + "position": { + "x": 17686.95732703739, + "y": 24639.9727428706 + }, + "targetPosition": { + "x": 17416.666666666664, + "y": 24509.807621135333 + }, + "floatingObject": { + "isPinned": false, + "isFrozen": false, + "isCollapsed": false, + "angleToParent": 1, + "distanceToParent": 3, + "arrangementStyle": 0 + }, + "uiObject": { + "isRunning": false + }, + "referenceParent": { + "type": "User Profile", + "name": "hellarnasstrom", + "id": "f93bb5da-dd98-4dcf-92b2-95d86e0e0ed2" + }, + "referenceParentCombinedNodePath": [ + [ + "hellarnasstrom", + "User Profile" + ] + ] + } } ], "tokensAwarded": { @@ -246,8 +324,8 @@ "id": "bef02b17-5cbc-4861-8121-29bddc448905", "savedPayload": { "position": { - "x": 17659.371764979147, - "y": 24686.143196823075 + "x": 17483.42294685356, + "y": 24802.28599478988 }, "targetPosition": { "x": 17416.666666666664, @@ -273,8 +351,8 @@ "id": "15637f0c-dd96-40e8-a997-0a5af0f91d35", "savedPayload": { "position": { - "x": 17323.96156835418, - "y": 24795.124576023878 + "x": 17229.619726109046, + "y": 24744.35706587574 }, "targetPosition": { "x": 17416.666666666664, From 1669e7950ed6b4296ed3bbd87cc58426eab42594 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 1 Oct 2021 11:59:06 +0200 Subject: [PATCH 4/4] Image size smaller inMapMode --- Projects/Foundations/UI/Spaces/Floating-Space/UiObject.js | 8 ++++++++ Projects/Governance/Schemas/App-Schema/user-profile.json | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Projects/Foundations/UI/Spaces/Floating-Space/UiObject.js b/Projects/Foundations/UI/Spaces/Floating-Space/UiObject.js index 8ba9a4d0b..61380a87c 100644 --- a/Projects/Foundations/UI/Spaces/Floating-Space/UiObject.js +++ b/Projects/Foundations/UI/Spaces/Floating-Space/UiObject.js @@ -2401,6 +2401,14 @@ function newUiObject() { totalImageSize = 50 } + if (UI.projects.foundations.spaces.floatingSpace.inMapMode === true) { + if (schemaDocument.inMapMode !== undefined) { + if (schemaDocument.inMapMode.smallIcon === true) { + totalImageSize = totalImageSize / 2 + } + } + } + browserCanvasContext.drawImage( icon, position.x - totalImageSize / 2, position.y - totalImageSize / 2, diff --git a/Projects/Governance/Schemas/App-Schema/user-profile.json b/Projects/Governance/Schemas/App-Schema/user-profile.json index 25f0c6cf2..0a4347f23 100644 --- a/Projects/Governance/Schemas/App-Schema/user-profile.json +++ b/Projects/Governance/Schemas/App-Schema/user-profile.json @@ -78,6 +78,7 @@ } ], "inMapMode": { - "showNodeType": false + "showNodeType": false, + "smallIcon": true } } \ No newline at end of file