Parts Final Refactorings

This commit is contained in:
Luis Fernando Molina committed 2019-10-27 13:40:40 +01:00
1 parent f13700287e
commit b419d3cf92
10 files changed
+302 -302

No files matched your search

+2 -2
View File
@@ -197,8 +197,8 @@ function newCanvas () {
return
}
}
if (nodeOnFocus.payload.uiObject.partTitle !== undefined) {
if (nodeOnFocus.payload.uiObject.partTitle.editMode === true) {
if (nodeOnFocus.payload.uiObject.uiObjectTitle !== undefined) {
if (nodeOnFocus.payload.uiObject.uiObjectTitle.editMode === true) {
return
}
}
@@ -51,7 +51,7 @@ function newNodeDeleter () {
return thisObject
function destroyPart (node) {
function destroyUiObject (node) {
canvas.floatingSpace.uiObjectConstructor.destroyUiObject(node.payload)
}
@@ -266,7 +266,7 @@ function newNodeDeleter () {
}
completeDeletion(node, rootNodes)
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -296,7 +296,7 @@ function newNodeDeleter () {
}
completeDeletion(node, rootNodes)
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -314,7 +314,7 @@ function newNodeDeleter () {
}
completeDeletion(node, rootNodes)
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -337,7 +337,7 @@ function newNodeDeleter () {
}
completeDeletion(node, rootNodes)
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -352,7 +352,7 @@ function newNodeDeleter () {
}
}
completeDeletion(node, rootNodes)
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -372,7 +372,7 @@ function newNodeDeleter () {
}
}
completeDeletion(node, rootNodes)
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -390,7 +390,7 @@ function newNodeDeleter () {
deleteFormula(node.formula, rootNodes)
}
completeDeletion(node, rootNodes)
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -405,7 +405,7 @@ function newNodeDeleter () {
}
}
completeDeletion(node, rootNodes)
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -420,7 +420,7 @@ function newNodeDeleter () {
}
}
completeDeletion(node, rootNodes)
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -440,7 +440,7 @@ function newNodeDeleter () {
}
}
completeDeletion(node, rootNodes)
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -458,7 +458,7 @@ function newNodeDeleter () {
deleteBotInstance(node.bot, rootNodes)
}
completeDeletion(node, rootNodes)
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -474,7 +474,7 @@ function newNodeDeleter () {
}
completeDeletion(node, rootNodes)
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -511,7 +511,7 @@ function newNodeDeleter () {
}
completeDeletion(node, rootNodes)
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -534,7 +534,7 @@ function newNodeDeleter () {
deleteSocialBots(node.socialBots, rootNodes)
}
completeDeletion(node, rootNodes)
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -557,7 +557,7 @@ function newNodeDeleter () {
deleteSocialBots(node.socialBots, rootNodes)
}
completeDeletion(node, rootNodes)
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -580,7 +580,7 @@ function newNodeDeleter () {
deleteSocialBots(node.socialBots, rootNodes)
}
completeDeletion(node, rootNodes)
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -603,7 +603,7 @@ function newNodeDeleter () {
deleteSocialBots(node.socialBots, rootNodes)
}
completeDeletion(node, rootNodes)
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -621,7 +621,7 @@ function newNodeDeleter () {
}
completeDeletion(node, rootNodes)
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -647,7 +647,7 @@ function newNodeDeleter () {
}
completeDeletion(node, rootNodes)
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -663,7 +663,7 @@ function newNodeDeleter () {
} else {
completeDeletion(node, rootNodes)
}
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -684,7 +684,7 @@ function newNodeDeleter () {
} else {
completeDeletion(node, rootNodes)
}
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -706,7 +706,7 @@ function newNodeDeleter () {
}
completeDeletion(node, rootNodes)
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -735,7 +735,7 @@ function newNodeDeleter () {
if (node.key !== undefined) {
deleteExchangeAccountKey(node.key, rootNodes)
}
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -746,7 +746,7 @@ function newNodeDeleter () {
} else {
completeDeletion(node, rootNodes)
}
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -757,7 +757,7 @@ function newNodeDeleter () {
} else {
completeDeletion(node, rootNodes)
}
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -768,7 +768,7 @@ function newNodeDeleter () {
} else {
completeDeletion(node, rootNodes)
}
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -779,7 +779,7 @@ function newNodeDeleter () {
} else {
completeDeletion(node, rootNodes)
}
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -790,7 +790,7 @@ function newNodeDeleter () {
} else {
completeDeletion(node, rootNodes)
}
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -818,7 +818,7 @@ function newNodeDeleter () {
if (node.closeStage !== undefined) {
deleteCloseStage(node.closeStage, rootNodes)
}
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -838,7 +838,7 @@ function newNodeDeleter () {
if (node.takePosition !== undefined) {
deleteEvent(node.takePosition, rootNodes)
}
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -857,7 +857,7 @@ function newNodeDeleter () {
deleteOpenExecution(node.openExecution, rootNodes)
}
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -874,7 +874,7 @@ function newNodeDeleter () {
if (node.takeProfit !== undefined) {
deleteManagedItem(node.takeProfit, rootNodes)
}
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -888,7 +888,7 @@ function newNodeDeleter () {
if (node.closeExecution !== undefined) {
deleteCloseExecution(node.closeExecution, rootNodes)
}
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -902,7 +902,7 @@ function newNodeDeleter () {
if (node.formula !== undefined) {
deleteFormula(node.formula, rootNodes)
}
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -916,7 +916,7 @@ function newNodeDeleter () {
if (node.formula !== undefined) {
deleteFormula(node.formula, rootNodes)
}
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -939,7 +939,7 @@ function newNodeDeleter () {
if (node.positionRate !== undefined) {
deletePositionSize(node.positionRate, rootNodes)
}
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -950,7 +950,7 @@ function newNodeDeleter () {
} else {
completeDeletion(node, rootNodes)
}
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -961,7 +961,7 @@ function newNodeDeleter () {
} else {
completeDeletion(node, rootNodes)
}
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -1001,7 +1001,7 @@ function newNodeDeleter () {
deleteAnnouncement(node.announcements[0], rootNodes)
}
}
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -1028,7 +1028,7 @@ function newNodeDeleter () {
}
}
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -1063,7 +1063,7 @@ function newNodeDeleter () {
deleteAnnouncement(node.announcements[0], rootNodes)
}
}
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -1075,7 +1075,7 @@ function newNodeDeleter () {
completeDeletion(node, rootNodes)
}
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -1094,7 +1094,7 @@ function newNodeDeleter () {
situation.conditions = []
payload.parentNode.situations.splice(j, 1)
destroyPart(situation)
destroyUiObject(situation)
cleanNode(situation)
return
}
@@ -1109,7 +1109,7 @@ function newNodeDeleter () {
node.conditions = []
completeDeletion(node, rootNodes)
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
}
@@ -1129,7 +1129,7 @@ function newNodeDeleter () {
if (node.code !== undefined) {
deleteCode(node.code, rootNodes)
}
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
@@ -1141,7 +1141,7 @@ function newNodeDeleter () {
completeDeletion(node, rootNodes)
}
destroyPart(node)
destroyUiObject(node)
cleanNode(node)
}
File diff suppressed because it is too large. Load diff
+7 -7
View File
@@ -78,15 +78,15 @@ function newWorkspace () {
if (savedWorkspace === null || idAtStrategizer === null) {
thisObject.workspaceNode.type = 'Workspace'
thisObject.workspaceNode.name = 'My Workspace'
functionLibraryUiObjectsFromNodes.createPartFromNode(thisObject.workspaceNode, undefined, undefined)
functionLibraryUiObjectsFromNodes.createUiObjectFromNode(thisObject.workspaceNode, undefined, undefined)
spawnPosition.y = spawnPosition.y + 250
initializeLoadingFromStrategizer()
} else {
thisObject.workspaceNode = JSON.parse(savedWorkspace)
functionLibraryUiObjectsFromNodes.createPartFromNode(thisObject.workspaceNode, undefined, undefined)
functionLibraryUiObjectsFromNodes.createUiObjectFromNode(thisObject.workspaceNode, undefined, undefined)
for (let i = 0; i < thisObject.workspaceNode.rootNodes.length; i++) {
let rootNode = thisObject.workspaceNode.rootNodes[i]
functionLibraryUiObjectsFromNodes.createPartFromNode(rootNode, undefined, undefined)
functionLibraryUiObjectsFromNodes.createUiObjectFromNode(rootNode, undefined, undefined)
}
thisObject.enabled = true
}
@@ -100,7 +100,7 @@ function newWorkspace () {
if (result === true) {
thisObject.definition = canvas.designerSpace.strategizerGateway.strategizerData
thisObject.workspaceNode.rootNodes.push(thisObject.definition)
functionLibraryUiObjectsFromNodes.createPartFromNode(thisObject.definition, undefined, undefined)
functionLibraryUiObjectsFromNodes.createUiObjectFromNode(thisObject.definition, undefined, undefined)
thisObject.enabled = true
}
@@ -222,15 +222,15 @@ function newWorkspace () {
stopAllRunningTasks()
functionLibraryNodeDeleter.deleteWorkspace(thisObject.workspaceNode, thisObject.workspaceNode.rootNodes)
thisObject.workspaceNode = droppedNode
functionLibraryUiObjectsFromNodes.createPartFromNode(thisObject.workspaceNode, undefined, undefined)
functionLibraryUiObjectsFromNodes.createUiObjectFromNode(thisObject.workspaceNode, undefined, undefined)
for (let i = 0; i < thisObject.workspaceNode.rootNodes.length; i++) {
let rootNode = thisObject.workspaceNode.rootNodes[i]
functionLibraryUiObjectsFromNodes.createPartFromNode(rootNode, undefined, undefined)
functionLibraryUiObjectsFromNodes.createUiObjectFromNode(rootNode, undefined, undefined)
}
} else {
let rootNode = functionLibraryProtocolNode.getProtocolNode(droppedNode)
thisObject.workspaceNode.rootNodes.push(rootNode)
functionLibraryUiObjectsFromNodes.createPartFromNode(rootNode, undefined, undefined)
functionLibraryUiObjectsFromNodes.createUiObjectFromNode(rootNode, undefined, undefined)
}
} catch (err) {
if (ERROR_LOG === true) { logger.write('[ERROR] spawn -> err = ' + err.stack) }
+2 -2
View File
@@ -171,8 +171,8 @@ function newCircularMenuItem () {
thisObject.iconOff = canvas.designerSpace.iconCollection.get(thisObject.secondaryIcon)
} else {
if (thisObject.relatedUiObject !== undefined) {
thisObject.iconOn = canvas.designerSpace.iconByPartType.get(thisObject.relatedUiObject)
thisObject.iconOff = canvas.designerSpace.iconByPartType.get(thisObject.relatedUiObject)
thisObject.iconOn = canvas.designerSpace.iconByUiObjectType.get(thisObject.relatedUiObject)
thisObject.iconOff = canvas.designerSpace.iconByUiObjectType.get(thisObject.relatedUiObject)
} else {
thisObject.iconOn = canvas.designerSpace.iconCollection.get(thisObject.iconPathOn)
thisObject.iconOff = canvas.designerSpace.iconCollection.get(thisObject.iconPathOff)
+1 -1
View File
@@ -10,7 +10,7 @@
2. Notes: Notes are a rectangular area where some text is posted. It has a subject and a body.
3. Strategy Parts: These are small balls that represent parts of an strategy.
3. UI Objects: These are small balls that represent parts of an strategy.
*/
function newFloatingLayer () {
+16 -16
View File
@@ -15,7 +15,7 @@ function newUiObject () {
container: undefined,
payload: undefined,
codeEditor: undefined,
partTitle: undefined,
uiObjectTitle: undefined,
circularProgressBar: undefined,
isExecuting: undefined,
isRunning: undefined,
@@ -95,8 +95,8 @@ function newUiObject () {
thisObject.payload = undefined
thisObject.menu.finalize()
thisObject.menu = undefined
thisObject.partTitle.finalize()
thisObject.partTitle = undefined
thisObject.uiObjectTitle.finalize()
thisObject.uiObjectTitle = undefined
thisObject.fitFunction = undefined
thisObject.isVisibleFunction = undefined
@@ -118,14 +118,14 @@ function newUiObject () {
thisObject.menu.initialize(menuItemsInitialValues, thisObject.payload)
thisObject.menu.container.connectToParent(thisObject.container, false, false, true, true, false, false, true, true)
/* Initialize Part Title */
/* Initialize UI Object Title */
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)
thisObject.uiObjectTitle = newUiObjectTitle()
thisObject.uiObjectTitle.isVisibleFunction = thisObject.isVisibleFunction
thisObject.uiObjectTitle.container.connectToParent(thisObject.container, false, false, true, true, false, false, true, true)
thisObject.uiObjectTitle.initialize(thisObject.payload)
/* Load Part Image */
/* Load UI Object Image */
iconPhysics()
@@ -145,7 +145,7 @@ function newUiObject () {
if (container !== undefined) { return container }
}
container = thisObject.partTitle.getContainer(point)
container = thisObject.uiObjectTitle.getContainer(point)
if (container !== undefined) { return container }
container = thisObject.menu.getContainer(point)
@@ -161,7 +161,7 @@ function newUiObject () {
function physics () {
thisObject.menu.physics()
thisObject.partTitle.physics()
thisObject.uiObjectTitle.physics()
if (thisObject.codeEditor !== undefined) {
thisObject.codeEditor.physics()
@@ -658,7 +658,7 @@ function newUiObject () {
}
function iconPhysics () {
icon = canvas.designerSpace.iconByPartType.get(thisObject.payload.node.type)
icon = canvas.designerSpace.iconByUiObjectType.get(thisObject.payload.node.type)
executingIcon = canvas.designerSpace.iconCollection.get('attractive')
}
@@ -674,11 +674,11 @@ function newUiObject () {
}
function onDisplace (event) {
thisObject.partTitle.exitEditMode()
thisObject.uiObjectTitle.exitEditMode()
}
function onDragStarted (event) {
thisObject.partTitle.exitEditMode()
thisObject.uiObjectTitle.exitEditMode()
if (thisObject.codeEditor !== undefined) {
thisObject.codeEditor.deactivate()
}
@@ -717,7 +717,7 @@ function newUiObject () {
if (thisObject.isOnFocus === false) {
drawValue()
drawText()
thisObject.partTitle.draw()
thisObject.uiObjectTitle.draw()
}
}
@@ -762,7 +762,7 @@ function newUiObject () {
drawErrorMessage()
drawValue()
drawText()
thisObject.partTitle.draw()
thisObject.uiObjectTitle.draw()
}
}
+2 -2
View File
@@ -3178,7 +3178,7 @@ function newUiObjectConstructor () {
break
}
default: {
if (ERROR_LOG === true) { logger.write('[ERROR] getMenuItemsInitialValues -> Part Type not Recognized -> type = ' + payload.node.type) }
if (ERROR_LOG === true) { logger.write('[ERROR] getMenuItemsInitialValues -> UI Object Type not Recognized -> type = ' + payload.node.type) }
}
}
@@ -3395,7 +3395,7 @@ function newUiObjectConstructor () {
break
}
default: {
if (ERROR_LOG === true) { logger.write('[ERROR] initialize -> Part Type not Recognized -> type = ' + payload.node.type) }
if (ERROR_LOG === true) { logger.write('[ERROR] initialize -> UI Object Type not Recognized -> type = ' + payload.node.type) }
return
}
}
+2 -2
View File
@@ -1,6 +1,6 @@
function newUiObjectTitle () {
const MODULE_NAME = 'Strategy Part Title'
const MODULE_NAME = 'UI Object Title'
const ERROR_LOG = true
const logger = newWebDebugLog()
@@ -215,7 +215,7 @@ function newUiObjectTitle () {
break
}
default: {
if (ERROR_LOG === true) { logger.write('[ERROR] initialize -> Part Type not Recognized -> type = ' + payload.node.type) }
if (ERROR_LOG === true) { logger.write('[ERROR] initialize -> UI Object Type not Recognized -> type = ' + payload.node.type) }
}
}
+5 -5
View File
@@ -6,7 +6,7 @@ function newDesignerSpace () {
strategizerGateway: undefined,
container: undefined,
iconCollection: undefined,
iconByPartType: undefined,
iconByUiObjectType: undefined,
workspace: undefined,
physics: physics,
draw: draw,
@@ -23,13 +23,13 @@ function newDesignerSpace () {
container.isDraggeable = false
thisObject.iconCollection = new Map()
thisObject.iconByPartType = new Map()
thisObject.iconByUiObjectType = new Map()
return thisObject
async function initialize () {
loadIconCollection()
buildIconByPartTypeMap()
buildIconByUiObjectTypeMap()
thisObject.strategizerGateway = newStrategizerGateway()
@@ -37,7 +37,7 @@ function newDesignerSpace () {
thisObject.workspace.initialize()
}
function buildIconByPartTypeMap () {
function buildIconByUiObjectTypeMap () {
const relationshipArray = [
['Definition', 'text'],
['Network', 'network'],
@@ -95,7 +95,7 @@ function newDesignerSpace () {
for (let i = 0; i < relationshipArray.length; i++) {
let record = relationshipArray[i]
let icon = thisObject.iconCollection.get(record[1])
thisObject.iconByPartType.set(record[0], icon)
thisObject.iconByUiObjectType.set(record[0], icon)
}
}