Designer Refactoring

Canvas.js

@@ -37,7 +37,7 @@ function newCanvas () {
     panelsSpace: undefined,
     cockpitSpace: undefined,
     bottomSpace: undefined,
-    designerSpace: undefined,
+    designSpace: undefined,
     animation: undefined,
     initialize: initialize,
     finalize: finalize
@@ -95,8 +95,8 @@ function newCanvas () {
       thisObject.topSpace = newTopSpace()
       thisObject.topSpace.initialize()
 
-      thisObject.designerSpace = newDesignerSpace()
-      thisObject.designerSpace.initialize()
+      thisObject.designSpace = newDesignSpace()
+      thisObject.designSpace.initialize()
 
       thisObject.cockpitSpace = newCockpitSpace()
       thisObject.cockpitSpace.initialize()
@@ -123,7 +123,7 @@ function newCanvas () {
       animation.addCallBackFunction('CockpitSpace Physics', thisObject.cockpitSpace.physics)
       animation.addCallBackFunction('Floating Space Physics', thisObject.floatingSpace.physics)
       animation.addCallBackFunction('Charting Space Physics', thisObject.chartingSpace.physics)
-      animation.addCallBackFunction('Designer Space Physics', thisObject.designerSpace.physics)
+      animation.addCallBackFunction('Design Space Physics', thisObject.designSpace.physics)
       animation.addCallBackFunction('Panels Space Physics', thisObject.panelsSpace.physics)
 
       /* Spcaces Drawing */
@@ -131,7 +131,7 @@ function newCanvas () {
       animation.addCallBackFunction('Charting Space Draw', thisObject.chartingSpace.draw)
       animation.addCallBackFunction('Panels Space', thisObject.panelsSpace.draw)
       animation.addCallBackFunction('CockpitSpace Draw', thisObject.cockpitSpace.draw)
-      animation.addCallBackFunction('Designer Space Draw', thisObject.designerSpace.draw)
+      animation.addCallBackFunction('Design Space Draw', thisObject.designSpace.draw)
       animation.addCallBackFunction('Top Space Draw', thisObject.topSpace.draw)
       animation.addCallBackFunction('Splash Screen Draw', splashScreen.draw)
       animation.start()
@@ -231,7 +231,7 @@ function newCanvas () {
   function onKeyDown (event) {
     checkMediaRecording(event)
 
-    let nodeOnFocus = canvas.designerSpace.workspace.getNodeThatIsOnFocus()
+    let nodeOnFocus = canvas.designSpace.workspace.getNodeThatIsOnFocus()
     if (nodeOnFocus !== undefined) {
       if (nodeOnFocus.payload.uiObject.codeEditor !== undefined) {
         if (nodeOnFocus.payload.uiObject.codeEditor.visible === true) {
@@ -360,7 +360,7 @@ function newCanvas () {
         /* From here we prevent the default behaviour */
         event.preventDefault()
 
-        let nodeUsingThisKey = canvas.designerSpace.workspace.getNodeByShortcutKey(event.key)
+        let nodeUsingThisKey = canvas.designSpace.workspace.getNodeByShortcutKey(event.key)
 
         if (nodeOnFocus === undefined && nodeUsingThisKey !== undefined) {
           /* Then we displace the whole workspace to center it at the node using this key */
@@ -451,7 +451,7 @@ function newCanvas () {
             x: event.x,
             y: event.y
           }
-          thisObject.designerSpace.workspace.spawn(reader.result, mousePosition)
+          thisObject.designSpace.workspace.spawn(reader.result, mousePosition)
         }
       }
     } catch (err) {
@@ -470,9 +470,9 @@ function newCanvas () {
 
       let container
 
-            /* We check if the mouse is over an element of the Designer Space / */
+            /* We check if the mouse is over an element of the Design Space / */
 
-      container = thisObject.designerSpace.getContainer(point)
+      container = thisObject.designSpace.getContainer(point)
 
       if (container !== undefined && container.isDraggeable === true) {
         containerBeingDragged = container
@@ -577,9 +577,9 @@ function newCanvas () {
 
       let container
 
-            /* We check if the mouse is over an element of the Designer Space / */
+            /* We check if the mouse is over an element of the Design Space / */
 
-      container = thisObject.designerSpace.getContainer(point)
+      container = thisObject.designSpace.getContainer(point)
 
       if (container !== undefined && container.isClickeable === true) {
         container.eventHandler.raiseEvent('onMouseClick', point)
@@ -712,8 +712,8 @@ function newCanvas () {
       let container
 
       /* We check if the mouse is over an element of the Strategy Space / */
-      if (thisObject.designerSpace !== undefined) {
-        container = thisObject.designerSpace.getContainer(point)
+      if (thisObject.designSpace !== undefined) {
+        container = thisObject.designSpace.getContainer(point)
 
         if (container !== undefined && container.detectMouseOver === true) {
           containerFound()

ChartingSpace/TimeMachine.js

@@ -530,7 +530,7 @@ function newTimeMachine () {
         if (thisObject.rateScale !== undefined && thisObject.rateScale.isVisible === true) { thisObject.rateScale.draw() }
       }
     } else {
-      let icon = canvas.designerSpace.iconByUiObjectType.get(thisObject.payload.node.type)
+      let icon = canvas.designSpace.iconByUiObjectType.get(thisObject.payload.node.type)
       if (icon !== undefined) {
         if (icon.canDrawIcon === true) {
           let imageSize = 40
@@ -580,7 +580,7 @@ function newTimeMachine () {
     let imageSize = 25
     let fontSize = 25
     let opacity = 1
-    let icon = canvas.designerSpace.iconByUiObjectType.get(thisObject.payload.node.type)
+    let icon = canvas.designSpace.iconByUiObjectType.get(thisObject.payload.node.type)
 
     position = transformThisPoint(position, thisObject.container)
     printLabel(thisObject.payload.node.name, position.x + 30, position.y - 10, opacity, fontSize)

Dashboard.js

@@ -88,7 +88,7 @@ function newDashboard () {
   function setBrowserEvents () {
     window.onbeforeunload = onBrowserClosed
     function onBrowserClosed () {
-      // canvas.designerSpace.workspace.stopAllRunningTasks()
+      // canvas.designSpace.workspace.stopAllRunningTasks()
     }
   }
 }

DesignSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js

@@ -384,7 +384,7 @@ function newUiObjectsFromNodes () {
     payload.node = node
     payload.parentNode = parentNode
     payload.chainParent = chainParent
-    payload.onMenuItemClick = canvas.designerSpace.workspace.onMenuItemClick
+    payload.onMenuItemClick = canvas.designSpace.workspace.onMenuItemClick
 
     node.payload = payload
     node.type = uiObjectType

FloatingSpace/CircularMenuItem.js

@@ -203,19 +203,19 @@ function newCircularMenuItem () {
       temporaryStatus === STATUS_SECONDARY_WORK_FAILED
     ) && thisObject.secondaryAction !== undefined
       ) {
-      thisObject.iconOn = canvas.designerSpace.iconCollection.get(thisObject.secondaryIcon)
-      thisObject.iconOff = canvas.designerSpace.iconCollection.get(thisObject.secondaryIcon)
+      thisObject.iconOn = canvas.designSpace.iconCollection.get(thisObject.secondaryIcon)
+      thisObject.iconOff = canvas.designSpace.iconCollection.get(thisObject.secondaryIcon)
     } else {
       if (thisObject.relatedUiObject !== undefined) {
-        thisObject.iconOn = canvas.designerSpace.iconByUiObjectType.get(thisObject.relatedUiObject)
-        thisObject.iconOff = canvas.designerSpace.iconByUiObjectType.get(thisObject.relatedUiObject)
+        thisObject.iconOn = canvas.designSpace.iconByUiObjectType.get(thisObject.relatedUiObject)
+        thisObject.iconOff = canvas.designSpace.iconByUiObjectType.get(thisObject.relatedUiObject)
       } else {
         if (thisObject.iconPathOn !== undefined && thisObject.iconPathOff !== undefined) {
-          thisObject.iconOn = canvas.designerSpace.iconCollection.get(thisObject.iconPathOn)
-          thisObject.iconOff = canvas.designerSpace.iconCollection.get(thisObject.iconPathOff)
+          thisObject.iconOn = canvas.designSpace.iconCollection.get(thisObject.iconPathOn)
+          thisObject.iconOff = canvas.designSpace.iconCollection.get(thisObject.iconPathOff)
         } else {
-          thisObject.iconOn = canvas.designerSpace.iconCollection.get(thisObject.icons[thisObject.actionStatus()])
-          thisObject.iconOff = canvas.designerSpace.iconCollection.get(thisObject.icons[thisObject.actionStatus()])
+          thisObject.iconOn = canvas.designSpace.iconCollection.get(thisObject.icons[thisObject.actionStatus()])
+          thisObject.iconOff = canvas.designSpace.iconCollection.get(thisObject.icons[thisObject.actionStatus()])
         }
       }
     }

FloatingSpace/FloatingObject.js

@@ -261,7 +261,7 @@ function newFloatingObject () {
       if (parent.payload.position === undefined) { return }
 
       let distanceToParent = Math.sqrt(Math.pow(parent.payload.position.x - thisObject.container.frame.position.x, 2) + Math.pow(parent.payload.position.y - thisObject.container.frame.position.y, 2))  // ... we calculate the distance ...
-      let parentChildren = canvas.designerSpace.workspace.nodeChildren.childrenCount(parent, thisObject.payload.node)
+      let parentChildren = canvas.designSpace.workspace.nodeChildren.childrenCount(parent, thisObject.payload.node)
       let axisCount = parentChildren.childrenCount
       let axisIndex = parentChildren.childIndex
       let baseAngle = 0

FloatingSpace/UiObject.js

@@ -427,7 +427,7 @@ function newUiObject () {
 
     if (previousDistanceToChainParent !== undefined) {
       if (ratio > THRESHOLD) {
-        canvas.designerSpace.workspace.chainDetachNode(thisObject.payload.node)
+        canvas.designSpace.workspace.chainDetachNode(thisObject.payload.node)
       }
     }
   }
@@ -534,7 +534,7 @@ function newUiObject () {
 
     if (previousDistanceToReferenceParent !== undefined) {
       if (ratio > THRESHOLD) {
-        canvas.designerSpace.workspace.referenceDetachNode(thisObject.payload.node)
+        canvas.designSpace.workspace.referenceDetachNode(thisObject.payload.node)
       }
     }
   }
@@ -657,7 +657,7 @@ function newUiObject () {
   }
 
   function iconPhysics () {
-    icon = canvas.designerSpace.iconByUiObjectType.get(thisObject.payload.node.type)
+    icon = canvas.designSpace.iconByUiObjectType.get(thisObject.payload.node.type)
     let nodeDefinition = APP_SCHEMA_MAP.get(thisObject.payload.node.type)
     if (nodeDefinition.alternativeIcons !== undefined) {
       let nodeToUse = thisObject.payload.node
@@ -685,7 +685,7 @@ function newUiObject () {
             iconName = alternativeIcon.iconName
           }
         }
-        let newIcon = canvas.designerSpace.iconCollection.get(iconName)
+        let newIcon = canvas.designSpace.iconCollection.get(iconName)
         if (newIcon !== undefined) {
           icon = newIcon
         }
@@ -694,7 +694,7 @@ function newUiObject () {
       }
     }
 
-    executingIcon = canvas.designerSpace.iconCollection.get('attractive')
+    executingIcon = canvas.designSpace.iconCollection.get('attractive')
   }
 
   function onFocus () {
@@ -748,12 +748,12 @@ function newUiObject () {
 
   function onDragFinished (event) {
     if (isChainAttaching === true) {
-      canvas.designerSpace.workspace.chainAttachNode(thisObject.payload.node, chainAttachToNode)
+      canvas.designSpace.workspace.chainAttachNode(thisObject.payload.node, chainAttachToNode)
       chainAttachToNode = undefined
       isChainAttaching = false
     }
     if (isReferenceAttaching === true) {
-      canvas.designerSpace.workspace.referenceAttachNode(thisObject.payload.node, referenceAttachToNode)
+      canvas.designSpace.workspace.referenceAttachNode(thisObject.payload.node, referenceAttachToNode)
       referenceAttachToNode = undefined
       isReferenceAttaching = false
     }

Panels/Layer.js

@@ -472,7 +472,7 @@ function newLayer () {
 
     let icon2
     if (plotterModule.code.icon !== undefined) {
-      icon2 = canvas.designerSpace.iconCollection.get(plotterModule.code.icon)
+      icon2 = canvas.designSpace.iconCollection.get(plotterModule.code.icon)
     }
 
     let icon3 = getIcon(baseAsset)
@@ -490,9 +490,9 @@ function newLayer () {
         }
       }
       if (iconName !== undefined) {
-        icon = canvas.designerSpace.iconCollection.get(iconName)
+        icon = canvas.designSpace.iconCollection.get(iconName)
       } else {
-        icon = canvas.designerSpace.iconCollection.get(nodeDefinition.icon)
+        icon = canvas.designSpace.iconCollection.get(nodeDefinition.icon)
       }
       return icon
     }

Panels/LayersPanel.js

@@ -386,8 +386,8 @@ function newLayersPanel () {
     let label2 = thisObject.payload.node.payload.parentNode.name.substring(0, 18)
     let label3 = ''
 
-    let icon1 = canvas.designerSpace.iconByUiObjectType.get(thisObject.payload.node.payload.parentNode.payload.parentNode.type)
-    let icon2 = canvas.designerSpace.iconByUiObjectType.get(thisObject.payload.node.payload.parentNode.type)
+    let icon1 = canvas.designSpace.iconByUiObjectType.get(thisObject.payload.node.payload.parentNode.payload.parentNode.type)
+    let icon2 = canvas.designSpace.iconByUiObjectType.get(thisObject.payload.node.payload.parentNode.type)
 
     let backgroundColor = UI_COLOR.BLACK
 

Panels/PanelsVisibleButton.js

@@ -74,9 +74,9 @@ function newPanelsVisibleButton () {
   function draw () {
     let icon
     if (thisObject.showPanels === true) {
-      icon = canvas.designerSpace.iconCollection.get('plotter-panel')
+      icon = canvas.designSpace.iconCollection.get('plotter-panel')
     } else {
-      icon = canvas.designerSpace.iconCollection.get('toggle-panel-off')
+      icon = canvas.designSpace.iconCollection.get('toggle-panel-off')
     }
 
     drawIcon(icon, 1 / 2, 1 / 2, 0, 0, 14, thisObject.container)

Scales/AutoScaleButton.js

@@ -96,16 +96,16 @@ function newAutoScaleButton () {
   function draw () {
     let icon
     if (thisObject.autoMinScale === false && thisObject.autoMaxScale === false) {
-      icon = canvas.designerSpace.iconCollection.get('toggle-auto-scale-manual')
+      icon = canvas.designSpace.iconCollection.get('toggle-auto-scale-manual')
     }
     if (thisObject.autoMinScale === true && thisObject.autoMaxScale === false) {
-      icon = canvas.designerSpace.iconCollection.get('toggle-auto-scale-auto-min')
+      icon = canvas.designSpace.iconCollection.get('toggle-auto-scale-auto-min')
     }
     if (thisObject.autoMinScale === false && thisObject.autoMaxScale === true) {
-      icon = canvas.designerSpace.iconCollection.get('toggle-auto-scale-auto-max')
+      icon = canvas.designSpace.iconCollection.get('toggle-auto-scale-auto-max')
     }
     if (thisObject.autoMinScale === true && thisObject.autoMaxScale === true) {
-      icon = canvas.designerSpace.iconCollection.get('toggle-auto-scale-auto-min-max')
+      icon = canvas.designSpace.iconCollection.get('toggle-auto-scale-auto-min-max')
     }
 
     drawIcon(icon, 1 / 2, 1 / 2, 0, 0, 14, thisObject.container)

Scales/RateScale.js

@@ -394,8 +394,8 @@ function newRateScale () {
     let label3 = labelArray[1]
     if (label3 === undefined) { label3 = '00' }
 
-    let icon1 = canvas.designerSpace.iconByUiObjectType.get(thisObject.payload.node.payload.parentNode.type)
-    let icon2 = canvas.designerSpace.iconByUiObjectType.get(thisObject.payload.node.type)
+    let icon1 = canvas.designSpace.iconByUiObjectType.get(thisObject.payload.node.payload.parentNode.type)
+    let icon2 = canvas.designSpace.iconByUiObjectType.get(thisObject.payload.node.type)
 
     let backgroundColor = UI_COLOR.BLACK
 

Scales/TimeFrameScale.js

@@ -340,8 +340,8 @@ function newTimeFrameScale () {
     let label2 = label[0]
     let label3 = label[1].toUpperCase()
 
-    let icon1 = canvas.designerSpace.iconByUiObjectType.get(thisObject.payload.node.payload.parentNode.type)
-    let icon2 = canvas.designerSpace.iconByUiObjectType.get(thisObject.payload.node.type)
+    let icon1 = canvas.designSpace.iconByUiObjectType.get(thisObject.payload.node.payload.parentNode.type)
+    let icon2 = canvas.designSpace.iconByUiObjectType.get(thisObject.payload.node.type)
 
     let backgroundColor = UI_COLOR.BLACK
 

Scales/TimeScale.js

@@ -249,8 +249,8 @@ function newTimeScale () {
     let label2 = labelArray[1] + ' ' + labelArray[2] + ' ' + labelArray[3]
     let label3 = labelArray[4]
 
-    let icon1 = canvas.designerSpace.iconByUiObjectType.get(thisObject.payload.node.payload.parentNode.type)
-    let icon2 = canvas.designerSpace.iconByUiObjectType.get(thisObject.payload.node.type)
+    let icon1 = canvas.designSpace.iconByUiObjectType.get(thisObject.payload.node.payload.parentNode.type)
+    let icon2 = canvas.designSpace.iconByUiObjectType.get(thisObject.payload.node.type)
 
     let backgroundColor = UI_COLOR.BLACK
 

Spaces/ChartingSpace.js

@@ -84,7 +84,7 @@ function newChartingSpace () {
   }
 
   function initialize () {
-    let rootNodes = canvas.designerSpace.workspace.workspaceNode.rootNodes
+    let rootNodes = canvas.designSpace.workspace.workspaceNode.rootNodes
     for (let i = 0; i < rootNodes.length; i++) {
       let rootNode = rootNodes[i]
       if (rootNode.type === 'Charting Space') {
@@ -93,7 +93,7 @@ function newChartingSpace () {
     }
 
     if (thisObject.payload === undefined) {
-      if (ERROR_LOG === true) { logger.write('[WARN] initialize -> There must exist a Charting Space at the Designer Space in order to enable Charts. PLease create one and refreash your browser. ') }
+      if (ERROR_LOG === true) { logger.write('[WARN] initialize -> There must exist a Charting Space at the Design Space in order to enable Charts. PLease create one and refreash your browser. ') }
       return
     }
 

Spaces/CockpitSpace.js

@@ -48,7 +48,7 @@
      thisObject.container.frame.position.x = 0
 
      let INITIAL_POSITION
-     if (canvas.designerSpace.workspace.enabled === true) {
+     if (canvas.designSpace.workspace.enabled === true) {
        let localStorage = window.localStorage.getItem(MODULE_NAME)
        if (localStorage !== null) {
          storage = JSON.parse(localStorage)
@@ -132,7 +132,7 @@
 
      thisObject.status = 'MIDDLE'
 
-     if (canvas.designerSpace.workspace.enabled === true) {
+     if (canvas.designSpace.workspace.enabled === true) {
        thisObject.container.isDraggeable = true
      } else {
        thisObject.container.isDraggeable = false
@@ -141,10 +141,10 @@
      if (thisObject.container.frame.position.y > browserCanvas.height * 99.5 / 100 - COCKPIT_SPACE_HEIGHT) {
        thisObject.container.frame.position.y = browserCanvas.height - COCKPIT_SPACE_HEIGHT
        thisObject.status = 'BOTTOM'
-       canvas.designerSpace.makeInvisible()
+       canvas.designSpace.makeInvisible()
        canvas.floatingSpace.makeInvisible()
      } else {
-       canvas.designerSpace.makeVisible()
+       canvas.designSpace.makeVisible()
        canvas.floatingSpace.makeVisible()
      }
 
@@ -219,7 +219,7 @@
      browserCanvasContext.closePath()
      browserCanvasContext.fill()
 
-     if (canvas.designerSpace.workspace.enabled === true) {
+     if (canvas.designSpace.workspace.enabled === true) {
        arrow()
      }
    }

Spaces/DesignSpace.js

@@ -1,5 +1,5 @@
 
-function newDesignerSpace () {
+function newDesignSpace () {
   const MODULE_NAME = 'Strategy Space'
   let thisObject = {
     sidePanel: undefined,
@@ -287,7 +287,7 @@ function newDesignerSpace () {
     if (thisObject.sidePanel !== undefined) {
       container = thisObject.sidePanel.getContainer(point)
       if (container !== undefined) {
-        container.space = 'Designer Space'
+        container.space = 'Design Space'
         return container
       }
     }