no need to drag the initial workspace

This commit is contained in:
Luis Fernando Molina committed 2020-02-22 19:00:37 +01:00
1 parent fa7d55e541
commit 2e652a498f
9 files changed
+32 -189

No files matched your search

+1 -2
View File
@@ -81,8 +81,7 @@ function newWorkspace () {
let savedWorkspace = window.localStorage.getItem(CANVAS_APP_NAME + '.' + 'Workspace')
if (savedWorkspace === null) {
thisObject.workspaceNode.type = 'Workspace'
thisObject.workspaceNode.name = 'My Workspace'
thisObject.workspaceNode = getWorkspace()
} else {
thisObject.workspaceNode = JSON.parse(savedWorkspace)
}
-1
View File
@@ -1,6 +1,5 @@
let canvas
let markets
let ecosystem = newEcosystem()
let systemEventHandler
let APP_SCHEMA_MAP = new Map()
+4 -2
View File
@@ -77,8 +77,10 @@ function newChartingSpace () {
thisObject.container.finalize()
thisObject.container = undefined
thisObject.viewport.finalize()
thisObject.viewport = undefined
if (thisObject.viewport !== undefined) {
thisObject.viewport.finalize()
thisObject.viewport = undefined
}
thisObject.payload = undefined
}
+1
View File
@@ -0,0 +1 @@
{"type":"Workspace","name":"My Workspace","rootNodes":[{"type":"Network","name":"Superalgos","networkNodes":[{"type":"Network Node","name":"My Computer","dataStorage":{"type":"Data Storage","name":"New Data Storage","sessionIndependentData":{"type":"Session Independent Data","name":"New Session Independent Data","singleMarketData":[{"type":"Single Market Data","name":"Poloniex BTC/USDT","dataProducts":[{"type":"Data Product","name":"Candles","id":"55e735a5-60c9-4e2d-a582-a6c6eddf3502","savedPayload":{"position":{"x":21869.40956443714,"y":29946.274763371603},"targetPosition":{"x":21481.757830574268,"y":29392.650712345214},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":true,"angleToParent":3,"distanceToParent":3},"uiObject":{},"referenceParent":{"type":"Product Definition","name":"Candles","id":"36ae2d5d-6734-4526-b2f8-31c89a0c4fc1"}}},{"type":"Data Product","name":"Volumes","id":"ffaf5a8e-12d6-4040-922d-57845eb3377c","savedPayload":{"position":{"x":21767.384455977735,"y":30005.17898720474},"targetPosition":{"x":21481.757830574268,"y":29392.650712345214},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":true,"angleToParent":3,"distanceToParent":3},"uiObject":{},"referenceParent":{"type":"Product Definition","name":"Volumes","id":"b2d5ba69-67ac-490f-9e74-28239b35a92e"}}},{"type":"Data Product","name":"Candle-Stairs","id":"e1c46e1f-09d1-46a2-b738-e761b4e04cd9","savedPayload":{"position":{"x":21656.680727039493,"y":30045.471849360536},"targetPosition":{"x":21481.757830574268,"y":29392.650712345214},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":true,"angleToParent":3,"distanceToParent":3},"uiObject":{},"referenceParent":{"type":"Product Definition","name":"Candle-Stairs","id":"642474e9-da61-4168-97dc-7f7869bebc02"}}},{"type":"Data Product","name":"Volume-Stairs","id":"eefaf182-ffe4-457e-a7fa-f43dfabdc086","savedPayload":{"position":{"x":21540.662054407407,"y":30065.929071611557},"targetPosition":{"x":21481.757830574268,"y":29392.650712345214},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":true,"angleToParent":3,"distanceToParent":3},"uiObject":{},"referenceParent":{"type":"Product Definition","name":"Volume-Stairs","id":"846e9572-c4d6-4c7e-942e-c82402c5ecea"}}},{"type":"Data Product","name":"Bollinger Bands","id":"3576cfd0-1774-4094-b8a0-66e182fc4c41","savedPayload":{"position":{"x":21422.85360674113,"y":30065.929071611557},"targetPosition":{"x":21481.757830574268,"y":29392.650712345214},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":true,"angleToParent":3,"distanceToParent":3},"uiObject":{},"referenceParent":{"type":"Product Definition","name":"Bollinger Bands","id":"29088877-8d63-4217-8d34-8742afc262f4"}}},{"type":"Data Product","name":"Percentage Bandwidth","id":"4dfde44c-0bbf-4204-91de-ce99ecba4cf2","savedPayload":{"position":{"x":21306.834934109043,"y":30045.471849360536},"targetPosition":{"x":21481.757830574268,"y":29392.650712345214},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":true,"angleToParent":3,"distanceToParent":3},"uiObject":{},"referenceParent":{"type":"Product Definition","name":"Percentage Bandwidth","id":"3b7885a0-cd72-4a3f-a38b-3dc8c47bd068"}}},{"type":"Data Product","name":"Bollinger Channels Objects","id":"6986bcb1-119c-48c9-a00b-d046e9e07951","savedPayload":{"position":{"x":21196.1312051708,"y":30005.17898720474},"targetPosition":{"x":21481.757830574268,"y":29392.650712345214},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":true,"angleToParent":3,"distanceToParent":3},"uiObject":{},"referenceParent":{"type":"Product Definition","name":"Bollinger Channels Objects","id":"1f111f72-624f-4166-9f99-ab8d785d5267"}}},{"type":"Data Product","name":"Bollinger Sub-Channels Objects","id":"85098ab8-a125-49f1-b24d-416c2090c7a0","savedPayload":{"position":{"x":21094.106096711395,"y":29946.274763371603},"targetPosition":{"x":21481.757830574268,"y":29392.650712345214},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":true,"angleToParent":3,"distanceToParent":3},"uiObject":{},"referenceParent":{"type":"Product Definition","name":"Bollinger Sub-Channels Objects","id":"080c87fc-4546-4482-ab11-180a33f6d9ab"}}}],"id":"49a747b4-2eb7-41d6-b0e2-493f43ceed44","savedPayload":{"position":{"x":21481.757830574268,"y":29392.650712345214},"targetPosition":{"x":21481.757830574268,"y":28716.800539125023},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":true,"angleToParent":2,"distanceToParent":4},"uiObject":{},"referenceParent":{"type":"Market","name":"BTC/USDT","id":"d4098b73-7e25-434e-8fd9-342393cbb400"}}},{"type":"Single Market Data","name":"Kraken ETH/BTC","dataProducts":[{"type":"Data Product","name":"Candles","id":"fce50098-d674-4006-94ad-cce46f3d59a4","savedPayload":{"position":{"x":21134.859543298608,"y":30011.44257229641},"targetPosition":{"x":21223.08725836212,"y":29341.286542746402},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":trLine truncated
@@ -60,6 +60,7 @@
let dailyFilesUpdatedEventSubscriptionId
let scaleChangedEventSubscriptionId
let userPositionDate
return thisObject;
function finalize() {
-1
View File
@@ -1 +0,0 @@
{"type":"Workspace","name":"My Workspace","rootNodes":[{"type":"Network","name":"Superalgos","networkNodes":[{"type":"Network Node","name":"My Computer","dataStorage":{"type":"Data Storage","name":"New Data Storage","sessionIndependentData":{"type":"Session Independent Data","name":"New Session Independent Data","singleMarketData":[{"type":"Single Market Data","name":"Poloniex BTC/USDT","dataProducts":[{"type":"Data Product","name":"Candles","id":"55e735a5-60c9-4e2d-a582-a6c6eddf3502","savedPayload":{"position":{"x":20540.56208823942,"y":29594.304102979844},"targetPosition":{"x":20872.84953240464,"y":29006.988033410915},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":true,"angleToParent":3,"distanceToParent":3},"uiObject":{},"referenceParent":{"type":"Product Definition","name":"Candles","id":"36ae2d5d-6734-4526-b2f8-31c89a0c4fc1"}}},{"type":"Data Product","name":"Volumes","id":"ffaf5a8e-12d6-4040-922d-57845eb3377c","savedPayload":{"position":{"x":20443.62391567424,"y":29527.680342814157},"targetPosition":{"x":20872.84953240464,"y":29006.988033410915},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":true,"angleToParent":3,"distanceToParent":3},"uiObject":{},"referenceParent":{"type":"Product Definition","name":"Volumes","id":"b2d5ba69-67ac-490f-9e74-28239b35a92e"}}},{"type":"Data Product","name":"Candle-Stairs","id":"e1c46e1f-09d1-46a2-b738-e761b4e04cd9","savedPayload":{"position":{"x":20359.727546311304,"y":29445.235610255855},"targetPosition":{"x":20872.84953240464,"y":29006.988033410915},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":true,"angleToParent":3,"distanceToParent":3},"uiObject":{},"referenceParent":{"type":"Product Definition","name":"Candle-Stairs","id":"642474e9-da61-4168-97dc-7f7869bebc02"}}},{"type":"Data Product","name":"Volume-Stairs","id":"eefaf182-ffe4-457e-a7fa-f43dfabdc086","savedPayload":{"position":{"x":20291.422128880095,"y":29349.474946784678},"targetPosition":{"x":20872.84953240464,"y":29006.988033410915},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":true,"angleToParent":3,"distanceToParent":3},"uiObject":{},"referenceParent":{"type":"Product Definition","name":"Volume-Stairs","id":"846e9572-c4d6-4c7e-942e-c82402c5ecea"}}},{"type":"Data Product","name":"Bollinger Bands","id":"3576cfd0-1774-4094-b8a0-66e182fc4c41","savedPayload":{"position":{"x":20240.78308892505,"y":29243.30799170296},"targetPosition":{"x":20872.84953240464,"y":29006.988033410915},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":true,"angleToParent":3,"distanceToParent":3},"uiObject":{},"referenceParent":{"type":"Product Definition","name":"Bollinger Bands","id":"29088877-8d63-4217-8d34-8742afc262f4"}}},{"type":"Data Product","name":"Percentage Bandwidth","id":"4dfde44c-0bbf-4204-91de-ce99ecba4cf2","savedPayload":{"position":{"x":20209.34906805062,"y":29129.960574217792},"targetPosition":{"x":20872.84953240464,"y":29006.988033410915},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":true,"angleToParent":3,"distanceToParent":3},"uiObject":{},"referenceParent":{"type":"Product Definition","name":"Percentage Bandwidth","id":"3b7885a0-cd72-4a3f-a38b-3dc8c47bd068"}}},{"type":"Data Product","name":"Bollinger Channels Objects","id":"6986bcb1-119c-48c9-a00b-d046e9e07951","savedPayload":{"position":{"x":20198.075173074678,"y":29012.876698252894},"targetPosition":{"x":20872.84953240464,"y":29006.988033410915},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":true,"angleToParent":3,"distanceToParent":3},"uiObject":{},"referenceParent":{"type":"Product Definition","name":"Bollinger Channels Objects","id":"1f111f72-624f-4166-9f99-ab8d785d5267"}}},{"type":"Data Product","name":"Bollinger Sub-Channels Objects","id":"85098ab8-a125-49f1-b24d-416c2090c7a0","savedPayload":{"position":{"x":20207.303955591215,"y":28895.613898132164},"targetPosition":{"x":20872.84953240464,"y":29006.988033410915},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":true,"angleToParent":3,"distanceToParent":3},"uiObject":{},"referenceParent":{"type":"Product Definition","name":"Bollinger Sub-Channels Objects","id":"080c87fc-4546-4482-ab11-180a33f6d9ab"}}}],"id":"49a747b4-2eb7-41d6-b0e2-493f43ceed44","savedPayload":{"position":{"x":20872.84953362497,"y":29006.988031676094},"targetPosition":{"x":21481.677897291127,"y":28716.82275030991},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":true,"angleToParent":2,"distanceToParent":4},"uiObject":{},"referenceParent":{"type":"Market","name":"BTC/USDT","id":"d4098b73-7e25-434e-8fd9-342393cbb400"}}},{"type":"Single Market Data","name":"Kraken ETH/BTC","dataProducts":[{"type":"Data Product","name":"Candles","id":"fce50098-d674-4006-94ad-cce46f3d59a4","savedPayload":{"position":{"x":20166.315235076385,"y":28960.457709440976},"targetPosition":{"x":20808.088222980587,"y":28751.93302577254},"floatingObject":{"isPinned":false,"isFrozen":false,"isCollapsed":true,"anglLine truncated
-149
View File
@@ -1,149 +0,0 @@
function newEcosystem() {
let thisObject = {
getHost: getHost,
getCompetition: getCompetition,
getDataMine: getDataMine,
getDataMines: getDataMines,
getBot: getBot,
getProduct: getProduct,
getDataSet: getDataSet,
getExchange: getExchange,
getPlotter: getPlotter,
getPlotterModule: getPlotterModule,
getStoragePermissions: getStoragePermissions,
setEvent: setEvent,
initialize: initialize
}
let ECOSYSTEM = JSON.parse(window.localStorage.getItem('ecosystem'));
if (ECOSYSTEM === null || ECOSYSTEM === undefined) {
ECOSYSTEM = getUserEcosystem()
}
return thisObject;
function initialize() {
}
function setEvent(input) {
ECOSYSTEM.hosts = input;
}
function getStoragePermissions() {
return ECOSYSTEM.STORAGE_PERMISSIONS;
}
function getHost(pHostCodeName) {
for (let i = 0; i < ECOSYSTEM.hosts.length; i++) {
if (ECOSYSTEM.hosts[i].codeName === pHostCodeName) {
return ECOSYSTEM.hosts[i];
}
}
}
function getCompetition(pHost, pCompetitionCodeName) {
for (let i = 0; i < pHost.competitions.length; i++) {
if (pHost.competitions[i].codeName === pCompetitionCodeName) {
return pHost.competitions[i];
}
}
}
function getDataMines() {
return ECOSYSTEM.dataMines;
}
function getDataMine(pDataMineCodeName) {
for (let i = 0; i < ECOSYSTEM.dataMines.length; i++) {
if (ECOSYSTEM.dataMines[i].codeName === pDataMineCodeName) {
return ECOSYSTEM.dataMines[i];
}
}
}
function getBot(pDataMine, pBotCodeName) {
for (let i = 0; i < pDataMine.bots.length; i++) {
if (pDataMine.bots[i].codeName === pBotCodeName) {
return pDataMine.bots[i];
}
}
}
function getPlotter(pDataMine, pPlotterCodeName) {
for (let i = 0; i < pDataMine.plotters.length; i++) {
if (pDataMine.plotters[i].codeName === pPlotterCodeName) {
return pDataMine.plotters[i];
}
}
}
function getPlotterModule(pPlotter, pModuleCodeName) {
for (let i = 0; i < pPlotter.modules.length; i++) {
if (pPlotter.modules[i].codeName === pModuleCodeName) {
return pPlotter.modules[i];
}
}
}
function getProduct(pBot, pProductCodeName) {
for (let i = 0; i < pBot.products.length; i++) {
if (pBot.products[i].codeName === pProductCodeName) {
return pBot.products[i];
}
}
}
function getDataSet(pProduct, pSetCodeName) {
for (let i = 0; i < pProduct.dataSets.length; i++) {
if (pProduct.dataSets[i].codeName === pSetCodeName) {
return pProduct.dataSets[i];
}
}
}
function getExchange(pProduct, pName) {
for (let i = 0; i < pProduct.exchangeList.length; i++) {
if (pProduct.exchangeList[i].name === pName) {
return pProduct.exchangeList[i];
}
}
}
return false;
}
+3 -6
View File
@@ -17,21 +17,18 @@ function newAppLoader() {
try {
if (INFO_LOG === true) { logger.write('[INFO] loadModules -> Entering function.') }
window.localStorage.removeItem('ecosystem')
let plotters
let modulesArray = []
plotters = defaultPlotters()
modulesArray = ['UserEcosystem.js']
modulesArray = modulesArray.concat([
'ChartingSpace/Viewport.js',
'Globals.js',
'Ecosystem.js',
'UserEcosystem.js',
'AppSchema.js',
'Workspace.js',
'MQService',
'ChartingSpace/EdgeEditor.js',
+22 -28
View File
@@ -191,12 +191,6 @@ function onBrowserRequest (request, response) {
}
break
case 'Ecosystem.js':
{
respondWithFile(process.env.PATH_TO_WEB_SERVER + 'Ecosystem.js', response)
}
break
case 'Images': // This means the Scripts folder.
{
let path = process.env.PATH_TO_WEB_SERVER + 'Images/' + requestParameters[2]
@@ -340,28 +334,6 @@ function onBrowserRequest (request, response) {
}
break
case 'UserEcosystem.js':
{
let fs = require('fs')
try {
let filePath = process.env.INTER_PROCESS_FILES_PATH + '/ecosystem.json'
fs.readFile(filePath, onFileRead)
} catch (e) {
console.log('[ERROR] Error reading the user ecosystem.', e)
}
function onFileRead (err, userEcosystem) {
if (err) {
respondWithContent(undefined, response)
} else {
let responseContent = 'function getUserEcosystem(){ return ' + userEcosystem + '}'
respondWithContent(responseContent, response)
}
}
}
break
case 'AppSchema.js':
{
let fs = require('fs')
@@ -384,6 +356,28 @@ function onBrowserRequest (request, response) {
}
break
case 'Workspace.js':
{
let fs = require('fs')
try {
let filePath = process.env.INTER_PROCESS_FILES_PATH + '/Workspace.json'
fs.readFile(filePath, onFileRead)
} catch (e) {
console.log('[ERROR] Error reading the Workspace.', e)
}
function onFileRead(err, workspace) {
if (err) {
respondWithContent(undefined, response)
} else {
let responseContent = 'function getWorkspace(){ return ' + workspace + '}'
respondWithContent(responseContent, response)
}
}
}
break
case 'Storage':
{
respondWithFile(process.env.STORAGE_PATH + '/' + request.url.substring(9), response)