From 0652aebf47beb7e9da232839c1c66d63808ebc8d Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 18 Oct 2020 20:42:41 +0200 Subject: [PATCH] Spaces --- Projects/ProjectsSchema.json | 93 +++++++++++++++++++ .../Spaces/Charting-Space/ChartingSpace.js | 2 +- .../Superalgos/Spaces/Chat-Space/ChatSpace.js | 2 +- .../Spaces/Cockpit-Space/CockpitSpace.js | 2 +- .../Spaces/Design-Space/DesignSpace.js | 6 +- .../Spaces/Design-Space/Workspace.js | 4 +- .../Superalgos/Spaces/Doc-Space/DocSpace.js | 2 +- .../Spaces/Floating-Space/FloatingSpace.js | 4 +- .../Spaces/Panel-Space/PanelSpace.js | 3 +- .../Superalgos/Spaces/Side-Space/SideSpace.js | 2 +- .../Superalgos/Spaces/Top-Space/TopSpace.js | 2 +- .../Spaces/Tutorial-Space/TutorialSpace.js | 2 +- 12 files changed, 108 insertions(+), 16 deletions(-) create mode 100644 Projects/ProjectsSchema.json diff --git a/Projects/ProjectsSchema.json b/Projects/ProjectsSchema.json new file mode 100644 index 000000000..0978f2e2f --- /dev/null +++ b/Projects/ProjectsSchema.json @@ -0,0 +1,93 @@ +[ + { + "name": "Superalgos", + "propertyName": "superalgos", + "spaces": [ + { + "name": "Floating Space", + "folderName": "Floating-Space", + "propertyName": "floatingSpace", + "functionName": "newSuperalgosFloatingSpace", + "initializationIndex": 0, + "animationIndex": 1 + }, + { + "name": "Top Space", + "folderName": "Top-Space", + "propertyName": "topSpace", + "functionName": "newSuperalgosTopSpace", + "initializationIndex": 1, + "animationIndex": 1 + }, + { + "name": "Cockpit Space", + "folderName": "Cocksit-Space", + "propertyName": "cockpitSpace", + "functionName": "newSuperalgosCockpitSpace", + "initializationIndex": 2, + "animationIndex": 0 + }, + { + "name": "Design Space", + "folderName": "Design-Space", + "propertyName": "designSpace", + "functionName": "newSuperalgosDesignSpace", + "initializationIndex": 3, + "animationIndex": 3 + }, + { + "name": "Panel Space", + "folderName": "Panel-Space", + "propertyName": "panelSpace", + "functionName": "newSuperalgosPanelSpace", + "initializationIndex": 4, + "animationIndex": 4 + }, + { + "name": "Charting Space", + "folderName": "Charting-Space", + "propertyName": "chartingSpace", + "functionName": "newSuperalgosChartingSpace", + "initializationIndex": 5, + "animationIndex": 2 + }, + { + "name": "Side Space", + "folderName": "Floating-Space", + "propertyName": "sideSpace", + "functionName": "newSuperalgosFloatingSpace", + "initializationIndex": 6, + "animationIndex": 5 + }, + { + "name": "Doc Space", + "folderName": "Doc-Space", + "propertyName": "docSpace", + "functionName": "newSuperalgosDocSpace", + "initializationIndex": 7, + "animationIndex": 6 + }, + { + "name": "Chat Space", + "folderName": "Chat-Space", + "propertyName": "chatSpace", + "functionName": "newSuperalgosChatSpace", + "initializationIndex": 8, + "animationIndex": 7 + }, + { + "name": "Tutorial Space", + "folderName": "Tutorial-Space", + "propertyName": "tutorialSpace", + "functionName": "newSuperalgosTutorialSpace", + "initializationIndex": 9, + "animationIndex": 8 + } + ] + }, + { + "name": "Ethereum", + "propertyName": "ethereum", + "spaces": [] + } +] \ No newline at end of file diff --git a/Projects/Superalgos/Spaces/Charting-Space/ChartingSpace.js b/Projects/Superalgos/Spaces/Charting-Space/ChartingSpace.js index 68f5d017b..aa6262a01 100644 --- a/Projects/Superalgos/Spaces/Charting-Space/ChartingSpace.js +++ b/Projects/Superalgos/Spaces/Charting-Space/ChartingSpace.js @@ -6,7 +6,7 @@ changes, then all charts in it are replotted with the corresponging data. */ -function newChartingSpace() { +function newSuperalgosChartingSpace() { const MODULE_NAME = 'Charting Space' const ERROR_LOG = true const logger = newWebDebugLog() diff --git a/Projects/Superalgos/Spaces/Chat-Space/ChatSpace.js b/Projects/Superalgos/Spaces/Chat-Space/ChatSpace.js index e6f0d271d..6a72c1676 100644 --- a/Projects/Superalgos/Spaces/Chat-Space/ChatSpace.js +++ b/Projects/Superalgos/Spaces/Chat-Space/ChatSpace.js @@ -1,4 +1,4 @@ -function newChatSpace() { +function newSuperalgosChatSpace() { const MODULE_NAME = 'Chat Space' let thisObject = { sidePanelTab: undefined, diff --git a/Projects/Superalgos/Spaces/Cockpit-Space/CockpitSpace.js b/Projects/Superalgos/Spaces/Cockpit-Space/CockpitSpace.js index 2b7670e0f..c484a41c3 100644 --- a/Projects/Superalgos/Spaces/Cockpit-Space/CockpitSpace.js +++ b/Projects/Superalgos/Spaces/Cockpit-Space/CockpitSpace.js @@ -1,5 +1,5 @@ -function newCockpitSpace() { +function newSuperalgosCockpitSpace() { const MODULE_NAME = 'CockpitSpace' const STATUS_TYPES = { ALL_GOOD: 1, diff --git a/Projects/Superalgos/Spaces/Design-Space/DesignSpace.js b/Projects/Superalgos/Spaces/Design-Space/DesignSpace.js index f61df46d5..51267a439 100644 --- a/Projects/Superalgos/Spaces/Design-Space/DesignSpace.js +++ b/Projects/Superalgos/Spaces/Design-Space/DesignSpace.js @@ -1,5 +1,5 @@ -function newDesignSpace() { +function newSuperalgosDesignSpace() { const MODULE_NAME = 'Designe Space' let thisObject = { container: undefined, @@ -38,8 +38,8 @@ function newDesignSpace() { function buildIconByProjectAndTypeMap() { /* Take types-icons relationships defined at the schema */ - for (let i = 0; i < PROJECTS.length; i++) { - let project = PROJECTS[i] + for (let i = 0; i < PROJECTS_ARRAY.length; i++) { + let project = PROJECTS_ARRAY[i] let appSchema = SCHEMAS_BY_PROJECT.get(project).array.appSchema for (let j = 0; j < appSchema.length; j++) { let nodeDefinition = appSchema[j] diff --git a/Projects/Superalgos/Spaces/Design-Space/Workspace.js b/Projects/Superalgos/Spaces/Design-Space/Workspace.js index 91547ab68..c2e917df7 100644 --- a/Projects/Superalgos/Spaces/Design-Space/Workspace.js +++ b/Projects/Superalgos/Spaces/Design-Space/Workspace.js @@ -65,8 +65,8 @@ function newWorkspace() { function initialize() { try { /* Set up the action switches map */ - for (let i = 0; i < PROJECTS.length; i++) { - let project = PROJECTS[i] + for (let i = 0; i < PROJECTS_ARRAY.length; i++) { + let project = PROJECTS_ARRAY[i] let actionSwitch = eval('new' + project + 'ActionSwitch()') actionSwitchesByProject.set(project, actionSwitch) } diff --git a/Projects/Superalgos/Spaces/Doc-Space/DocSpace.js b/Projects/Superalgos/Spaces/Doc-Space/DocSpace.js index 06a77c401..cec1ff7ea 100644 --- a/Projects/Superalgos/Spaces/Doc-Space/DocSpace.js +++ b/Projects/Superalgos/Spaces/Doc-Space/DocSpace.js @@ -1,4 +1,4 @@ -function newDocSpace() { +function newSuperalgosDocSpace() { const MODULE_NAME = 'Doc Space' let thisObject = { sidePanelTab: undefined, diff --git a/Projects/Superalgos/Spaces/Floating-Space/FloatingSpace.js b/Projects/Superalgos/Spaces/Floating-Space/FloatingSpace.js index e45af38fb..1d45ac365 100644 --- a/Projects/Superalgos/Spaces/Floating-Space/FloatingSpace.js +++ b/Projects/Superalgos/Spaces/Floating-Space/FloatingSpace.js @@ -1,5 +1,5 @@ -function newFloatingSpace() { +function newSuperalgosFloatingSpace() { const MODULE_NAME = 'Floating Space' const ERROR_LOG = true /* @@ -127,7 +127,7 @@ function newFloatingSpace() { thisObject.uiObjectConstructor.initialize(thisObject.floatingLayer) onDragStartedEventSubscriptionId = thisObject.container.eventHandler.listenToEvent('onDragStarted', onDragStarted) - spaceFocusAquiredEventSubscriptionId = canvas.floatingSpace.container.eventHandler.listenToEvent('onFocusAquired', someoneAquiredFocus) + spaceFocusAquiredEventSubscriptionId = thisObject.container.eventHandler.listenToEvent('onFocusAquired', someoneAquiredFocus) } function someoneAquiredFocus(floatingObject) { diff --git a/Projects/Superalgos/Spaces/Panel-Space/PanelSpace.js b/Projects/Superalgos/Spaces/Panel-Space/PanelSpace.js index 8b5a0c2c6..7a7fd4617 100644 --- a/Projects/Superalgos/Spaces/Panel-Space/PanelSpace.js +++ b/Projects/Superalgos/Spaces/Panel-Space/PanelSpace.js @@ -3,8 +3,7 @@ The Panel Space y the place wehre all panels live, no matter who create them. */ - -function newPanelSpace() { +function newSuperalgosPanelSpace() { let thisObject = { visible: true, container: undefined, diff --git a/Projects/Superalgos/Spaces/Side-Space/SideSpace.js b/Projects/Superalgos/Spaces/Side-Space/SideSpace.js index b2ebe1f87..deba8d0f4 100644 --- a/Projects/Superalgos/Spaces/Side-Space/SideSpace.js +++ b/Projects/Superalgos/Spaces/Side-Space/SideSpace.js @@ -1,4 +1,4 @@ -function newSideSpace() { +function newSuperalgosSideSpace() { const MODULE_NAME = 'Side Space' let thisObject = { sidePanelTab: undefined, diff --git a/Projects/Superalgos/Spaces/Top-Space/TopSpace.js b/Projects/Superalgos/Spaces/Top-Space/TopSpace.js index 339eabdb8..73eb110b0 100644 --- a/Projects/Superalgos/Spaces/Top-Space/TopSpace.js +++ b/Projects/Superalgos/Spaces/Top-Space/TopSpace.js @@ -1,5 +1,5 @@ -function newTopSpace() { +function newSuperalgosTopSpace() { let thisObject = { container: undefined, draw: draw, diff --git a/Projects/Superalgos/Spaces/Tutorial-Space/TutorialSpace.js b/Projects/Superalgos/Spaces/Tutorial-Space/TutorialSpace.js index f4f585a03..15c9efdfa 100644 --- a/Projects/Superalgos/Spaces/Tutorial-Space/TutorialSpace.js +++ b/Projects/Superalgos/Spaces/Tutorial-Space/TutorialSpace.js @@ -1,4 +1,4 @@ -function newTutorialSpace() { +function newSuperalgosTutorialSpace() { const MODULE_NAME = 'Tutorial Space' let thisObject = { stop: stop,