uiObject refactoring part 4

This commit is contained in:
Luis Fernando Molina committed 2019-10-26 18:46:38 +02:00
1 parent d2c0ec98de
commit ad87566876
7 files changed
+71 -71

No files matched your search

+1 -1
View File
@@ -72,7 +72,7 @@ function newCircularMenu () {
menuItem.currentRadius = menuItemInitialValue.currentRadius
menuItem.angle = menuItemInitialValue.angle
menuItem.currentStatus = menuItemInitialValue.currentStatus
menuItem.relatedStrategyPart = menuItemInitialValue.relatedStrategyPart
menuItem.relatedUiObject = menuItemInitialValue.relatedUiObject
menuItem.dontShowAtFullscreen = menuItemInitialValue.dontShowAtFullscreen
menuItem.askConfirmation = menuItemInitialValue.askConfirmation
menuItem.confirmationLabel = menuItemInitialValue.confirmationLabel
+4 -4
View File
@@ -33,7 +33,7 @@ function newCircularMenuItem () {
angle: undefined,
container: undefined,
payload: undefined,
relatedStrategyPart: undefined,
relatedUiObject: undefined,
dontShowAtFullscreen: undefined,
internalClick: internalClick,
physics: physics,
@@ -170,9 +170,9 @@ function newCircularMenuItem () {
thisObject.iconOn = canvas.strategySpace.iconCollection.get(thisObject.secondaryIcon)
thisObject.iconOff = canvas.strategySpace.iconCollection.get(thisObject.secondaryIcon)
} else {
if (thisObject.relatedStrategyPart !== undefined) {
thisObject.iconOn = canvas.strategySpace.iconByPartType.get(thisObject.relatedStrategyPart)
thisObject.iconOff = canvas.strategySpace.iconByPartType.get(thisObject.relatedStrategyPart)
if (thisObject.relatedUiObject !== undefined) {
thisObject.iconOn = canvas.strategySpace.iconByPartType.get(thisObject.relatedUiObject)
thisObject.iconOff = canvas.strategySpace.iconByPartType.get(thisObject.relatedUiObject)
} else {
thisObject.iconOn = canvas.strategySpace.iconCollection.get(thisObject.iconPathOn)
thisObject.iconOff = canvas.strategySpace.iconCollection.get(thisObject.iconPathOff)
+1 -1
View File
@@ -1,5 +1,5 @@
function newStrategyPartTitle () {
function newUiObjectTitle () {
const MODULE_NAME = 'Strategy Part Title'
const ERROR_LOG = true
+1 -1
View File
@@ -120,7 +120,7 @@ function newUiObject () {
/* Initialize Part Title */
thisObject.partTitle = newStrategyPartTitle()
thisObject.partTitle = newUiObjectTitle()
thisObject.partTitle.isVisibleFunction = thisObject.isVisibleFunction
thisObject.partTitle.container.connectToParent(thisObject.container, false, false, true, true, false, false, true, true)
thisObject.partTitle.initialize(thisObject.payload)
+62 -62
View File
@@ -6,8 +6,8 @@ function newUiObjectConstructor () {
logger.fileName = MODULE_NAME
let thisObject = {
createStrategyPart: createStrategyPart,
destroyStrategyPart: destroyStrategyPart,
createUiObject: createUiObject,
destroyUiObject: destroyUiObject,
initialize: initialize,
finalize: finalize
}
@@ -27,7 +27,7 @@ function newUiObjectConstructor () {
floatingLayer = pFloatingLayer
}
function createStrategyPart (payload) {
function createUiObject (payload) {
let floatingObject = newFloatingObject()
floatingObject.fitFunction = canvas.floatingSpace.fitIntoVisibleArea
floatingObject.container.connectToParent(canvas.floatingSpace.container, false, false, false, false, false, false, false, false)
@@ -200,7 +200,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Definition',
visible: true,
relatedStrategyPart: 'Definition',
relatedUiObject: 'Definition',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -230,7 +230,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Trading System',
visible: true,
relatedStrategyPart: 'Trading System',
relatedUiObject: 'Trading System',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -243,7 +243,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Personal Data',
visible: true,
relatedStrategyPart: 'Personal Data',
relatedUiObject: 'Personal Data',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -256,7 +256,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Network',
visible: true,
relatedStrategyPart: 'Network',
relatedUiObject: 'Network',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -303,7 +303,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Network Node',
visible: true,
relatedStrategyPart: 'Network Node',
relatedUiObject: 'Network Node',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -350,7 +350,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Task Manager',
visible: true,
relatedStrategyPart: 'Task Manager',
relatedUiObject: 'Task Manager',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -397,7 +397,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Telegram Bot',
visible: true,
relatedStrategyPart: 'Telegram Bot',
relatedUiObject: 'Telegram Bot',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -448,7 +448,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Announcement',
visible: true,
relatedStrategyPart: 'Announcement',
relatedUiObject: 'Announcement',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -514,7 +514,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Formula',
visible: true,
relatedStrategyPart: 'Formula',
relatedUiObject: 'Formula',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -577,7 +577,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Layer',
visible: true,
relatedStrategyPart: 'Layer',
relatedUiObject: 'Layer',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -705,7 +705,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Task',
visible: true,
relatedStrategyPart: 'Task Manager',
relatedUiObject: 'Task Manager',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -775,7 +775,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Sensor',
visible: true,
relatedStrategyPart: 'Sensor',
relatedUiObject: 'Sensor',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -788,7 +788,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Indicator',
visible: true,
relatedStrategyPart: 'Indicator',
relatedUiObject: 'Indicator',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -801,7 +801,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Trading Engine',
visible: true,
relatedStrategyPart: 'Trading Engine',
relatedUiObject: 'Trading Engine',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -853,7 +853,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Process',
visible: true,
relatedStrategyPart: 'Process',
relatedUiObject: 'Process',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -920,7 +920,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Process',
visible: true,
relatedStrategyPart: 'Process',
relatedUiObject: 'Process',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -987,7 +987,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Process',
visible: true,
relatedStrategyPart: 'Process',
relatedUiObject: 'Process',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -1057,7 +1057,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Backtesting',
visible: true,
relatedStrategyPart: 'Backtesting Session',
relatedUiObject: 'Backtesting Session',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -1070,7 +1070,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Live Trading',
visible: true,
relatedStrategyPart: 'Live Trading Session',
relatedUiObject: 'Live Trading Session',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -1083,7 +1083,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Fordward Testing',
visible: true,
relatedStrategyPart: 'Fordward Testing Session',
relatedUiObject: 'Fordward Testing Session',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -1096,7 +1096,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Paper Trading',
visible: true,
relatedStrategyPart: 'Paper Trading Session',
relatedUiObject: 'Paper Trading Session',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -1237,7 +1237,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Layer Manager',
visible: true,
relatedStrategyPart: 'Layer Manager',
relatedUiObject: 'Layer Manager',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -1250,7 +1250,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Parameters',
visible: true,
relatedStrategyPart: 'Parameters',
relatedUiObject: 'Parameters',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -1263,7 +1263,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Social Bots',
visible: true,
relatedStrategyPart: 'Social Bots',
relatedUiObject: 'Social Bots',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -1353,7 +1353,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Layer Manager',
visible: true,
relatedStrategyPart: 'Layer Manager',
relatedUiObject: 'Layer Manager',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -1366,7 +1366,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Parameters',
visible: true,
relatedStrategyPart: 'Parameters',
relatedUiObject: 'Parameters',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -1379,7 +1379,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Social Bots',
visible: true,
relatedStrategyPart: 'Social Bots',
relatedUiObject: 'Social Bots',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -1469,7 +1469,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Layer Manager',
visible: true,
relatedStrategyPart: 'Layer Manager',
relatedUiObject: 'Layer Manager',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -1482,7 +1482,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Parameters',
visible: true,
relatedStrategyPart: 'Parameters',
relatedUiObject: 'Parameters',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -1495,7 +1495,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Social Bots',
visible: true,
relatedStrategyPart: 'Social Bots',
relatedUiObject: 'Social Bots',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -1585,7 +1585,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Layer Manager',
visible: true,
relatedStrategyPart: 'Layer Manager',
relatedUiObject: 'Layer Manager',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -1598,7 +1598,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Parameters',
visible: true,
relatedStrategyPart: 'Parameters',
relatedUiObject: 'Parameters',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -1611,7 +1611,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Social Bots',
visible: true,
relatedStrategyPart: 'Social Bots',
relatedUiObject: 'Social Bots',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -1673,7 +1673,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Exchange Account',
visible: true,
relatedStrategyPart: 'Exchange Account',
relatedUiObject: 'Exchange Account',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -1706,7 +1706,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Asset',
visible: true,
relatedStrategyPart: 'Exchange Account Asset',
relatedUiObject: 'Exchange Account Asset',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -1719,7 +1719,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Key',
visible: true,
relatedStrategyPart: 'Exchange Account Key',
relatedUiObject: 'Exchange Account Key',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -1812,7 +1812,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Strategy',
visible: true,
relatedStrategyPart: 'Strategy',
relatedUiObject: 'Strategy',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -1825,7 +1825,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Parameters',
visible: true,
relatedStrategyPart: 'Parameters',
relatedUiObject: 'Parameters',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -1872,7 +1872,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Missing Params',
visible: true,
relatedStrategyPart: 'Parameters',
relatedUiObject: 'Parameters',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -2184,7 +2184,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Missing Stages',
visible: true,
relatedStrategyPart: 'Strategy',
relatedUiObject: 'Strategy',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -2231,7 +2231,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Missing Events',
visible: true,
relatedStrategyPart: 'Trigger Stage',
relatedUiObject: 'Trigger Stage',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -2278,7 +2278,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Initial Definition',
visible: true,
relatedStrategyPart: 'Initial Definition',
relatedUiObject: 'Initial Definition',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -2291,7 +2291,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Open Execution',
visible: true,
relatedStrategyPart: 'Open Execution',
relatedUiObject: 'Open Execution',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -2338,7 +2338,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Missing Items',
visible: true,
relatedStrategyPart: 'Manage Stage',
relatedUiObject: 'Manage Stage',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -2385,7 +2385,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Close Execution',
visible: true,
relatedStrategyPart: 'Close Execution',
relatedUiObject: 'Close Execution',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -2432,7 +2432,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Formula',
visible: true,
relatedStrategyPart: 'Formula',
relatedUiObject: 'Formula',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -2479,7 +2479,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Formula',
visible: true,
relatedStrategyPart: 'Formula',
relatedUiObject: 'Formula',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -2526,7 +2526,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Situation',
visible: true,
relatedStrategyPart: 'Situation',
relatedUiObject: 'Situation',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -2573,7 +2573,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Situation',
visible: true,
relatedStrategyPart: 'Situation',
relatedUiObject: 'Situation',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -2620,7 +2620,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Situation',
visible: true,
relatedStrategyPart: 'Situation',
relatedUiObject: 'Situation',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -2667,7 +2667,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Missing Items',
visible: true,
relatedStrategyPart: 'Initial Definition',
relatedUiObject: 'Initial Definition',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -2782,7 +2782,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Phase',
visible: true,
relatedStrategyPart: 'Phase',
relatedUiObject: 'Phase',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -2829,7 +2829,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Phase',
visible: true,
relatedStrategyPart: 'Phase',
relatedUiObject: 'Phase',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -2876,7 +2876,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Formula',
visible: true,
relatedStrategyPart: 'Formula',
relatedUiObject: 'Formula',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -2889,7 +2889,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Next Phase Event',
visible: true,
relatedStrategyPart: 'Next Phase Event',
relatedUiObject: 'Next Phase Event',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -2990,7 +2990,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Situation',
visible: true,
relatedStrategyPart: 'Situation',
relatedUiObject: 'Situation',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -3037,7 +3037,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Condition',
visible: true,
relatedStrategyPart: 'Condition',
relatedUiObject: 'Condition',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -3084,7 +3084,7 @@ function newUiObjectConstructor () {
actionFunction: payload.onMenuItemClick,
label: 'Add Code',
visible: true,
relatedStrategyPart: 'Code',
relatedUiObject: 'Code',
rawRadius: 8,
targetRadius: 0,
currentRadius: 0,
@@ -3502,7 +3502,7 @@ function newUiObjectConstructor () {
floatingObject.labelStrokeStyle = 'rgba(' + UI_COLOR.WHITE + ', 1)'
}
function destroyStrategyPart (payload) {
function destroyUiObject (payload) {
floatingLayer.removeFloatingObject(payload.floatingObject.handle)
payload.floatingObject.finalize()
@@ -52,7 +52,7 @@ function newNodeDeleter () {
return thisObject
function destroyPart (node) {
canvas.floatingSpace.uiObjectConstructor.destroyStrategyPart(node.payload)
canvas.floatingSpace.uiObjectConstructor.destroyUiObject(node.payload)
}
function deleteWorkspace (node, rootNodes) {
@@ -1298,6 +1298,6 @@ function newPartsFromNodes () {
}
node.payload = payload
node.type = partType
canvas.floatingSpace.uiObjectConstructor.createStrategyPart(payload)
canvas.floatingSpace.uiObjectConstructor.createUiObject(payload)
}
}