diff --git a/Animation.js b/Animation.js index 4a0e1e72d..9163e8a69 100644 --- a/Animation.js +++ b/Animation.js @@ -93,7 +93,7 @@ function newAnimation () { callBackFunction() let t1 = performance.now() timeConsumed = t1 - t0 - if (key === 'Chart Space Draw') { + if (key === 'Charting Space Draw') { if (Math.random() * 100 > 99) { totalConsumption = 0 totalCounter = 0 diff --git a/Canvas.js b/Canvas.js index 7a29f3d29..13b89c586 100644 --- a/Canvas.js +++ b/Canvas.js @@ -32,7 +32,7 @@ function newCanvas () { let thisObject = { eventHandler: undefined, topSpace: undefined, - chartSpace: undefined, + chartingSpace: undefined, floatingSpace: undefined, panelsSpace: undefined, cockpitSpace: undefined, @@ -53,7 +53,7 @@ function newCanvas () { function finalize () { try { - thisObject.chartSpace.finalize() + thisObject.chartingSpace.finalize() thisObject.floatingSpace.finalize() browserCanvas.removeEventListener('mousedown', onMouseDown, false) @@ -104,8 +104,8 @@ function newCanvas () { thisObject.panelsSpace = newPanelsSpace() thisObject.panelsSpace.initialize() - thisObject.chartSpace = newChartSpace() - thisObject.chartSpace.initialize() + thisObject.chartingSpace = newChartingSpace() + thisObject.chartingSpace.initialize() thisObject.bottomSpace = thisObject.cockpitSpace @@ -122,13 +122,13 @@ function newCanvas () { /* Spcaces Physics */ animation.addCallBackFunction('CockpitSpace Physics', thisObject.cockpitSpace.physics) animation.addCallBackFunction('Floating Space Physics', thisObject.floatingSpace.physics) - animation.addCallBackFunction('Chart Space Physics', thisObject.chartSpace.physics) + animation.addCallBackFunction('Charting Space Physics', thisObject.chartingSpace.physics) animation.addCallBackFunction('Designer Space Physics', thisObject.designerSpace.physics) animation.addCallBackFunction('Panels Space Physics', thisObject.panelsSpace.physics) /* Spcaces Drawing */ animation.addCallBackFunction('Floating Space Draw', thisObject.floatingSpace.draw) - animation.addCallBackFunction('Chart Space Draw', thisObject.chartSpace.draw) + 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) @@ -297,22 +297,22 @@ function newCanvas () { } if (event.shiftKey === true && event.ctrlKey === false && event.code === 'ArrowLeft') { - canvas.chartSpace.oneScreenLeft() + canvas.chartingSpace.oneScreenLeft() return } if (event.shiftKey === true && event.ctrlKey === false && event.code === 'ArrowRight') { - canvas.chartSpace.oneScreenRight() + canvas.chartingSpace.oneScreenRight() return } if (event.shiftKey === true && event.code === 'ArrowUp') { - canvas.chartSpace.oneScreenUp() + canvas.chartingSpace.oneScreenUp() return } if (event.shiftKey === true && event.code === 'ArrowDown') { - canvas.chartSpace.oneScreenDown() + canvas.chartingSpace.oneScreenDown() return } @@ -528,9 +528,9 @@ function newCanvas () { return } - /* we check if it is over any of the existing containers at the Chart Space. */ + /* we check if it is over any of the existing containers at the Charting Space. */ - container = thisObject.chartSpace.getContainer(point, GET_CONTAINER_PURPOSE.DRAGGING) + container = thisObject.chartingSpace.getContainer(point, GET_CONTAINER_PURPOSE.DRAGGING) if (container !== undefined) { if (container.isDraggeable === true) { @@ -613,9 +613,9 @@ function newCanvas () { return } - /* If it is not, then we check if it is over any of the existing containers at the Chart Space. */ + /* If it is not, then we check if it is over any of the existing containers at the Charting Space. */ - container = thisObject.chartSpace.getContainer(point, GET_CONTAINER_PURPOSE.MOUSE_CLICK) + container = thisObject.chartingSpace.getContainer(point, GET_CONTAINER_PURPOSE.MOUSE_CLICK) if (container !== undefined && container.isClickeable === true) { container.eventHandler.raiseEvent('onMouseClick', point) @@ -656,9 +656,9 @@ function newCanvas () { point.x = event.pageX point.y = event.pageY - CURRENT_TOP_MARGIN - if (canvas.chartSpace.viewport !== undefined) { - canvas.chartSpace.viewport.mousePosition.x = point.x - canvas.chartSpace.viewport.mousePosition.y = point.y + if (canvas.chartingSpace.viewport !== undefined) { + canvas.chartingSpace.viewport.mousePosition.x = point.x + canvas.chartingSpace.viewport.mousePosition.y = point.y } if (containerDragStarted === true || floatingObjectDragStarted === true || viewPortBeingDragged === true) { @@ -751,9 +751,9 @@ function newCanvas () { } } - /* If it is not, then we check if it is over any of the existing containers at the Chart Space. */ - if (thisObject.chartSpace !== undefined) { - container = thisObject.chartSpace.getContainer(point, GET_CONTAINER_PURPOSE.MOUSE_OVER) + /* If it is not, then we check if it is over any of the existing containers at the Charting Space. */ + if (thisObject.chartingSpace !== undefined) { + container = thisObject.chartingSpace.getContainer(point, GET_CONTAINER_PURPOSE.MOUSE_OVER) if (container !== undefined && container.detectMouseOver === true) { containerFound() @@ -816,16 +816,16 @@ function newCanvas () { return false // This instructs the browser not to take the event and scroll the page. } - /* Chart Space. */ + /* Charting Space. */ - container = canvas.chartSpace.getContainer({ x: point.x, y: point.y }, GET_CONTAINER_PURPOSE.MOUSE_WHEEL) + container = canvas.chartingSpace.getContainer({ x: point.x, y: point.y }, GET_CONTAINER_PURPOSE.MOUSE_WHEEL) if (container !== undefined && container.isWheelable === true) { container.eventHandler.raiseEvent('onMouseWheel', event) return false // This instructs the browser not to take the event and scroll the page. } if (container !== undefined) { - canvas.chartSpace.viewport.onMouseWheel(event) + canvas.chartingSpace.viewport.onMouseWheel(event) return false } @@ -886,7 +886,7 @@ function newCanvas () { y: dragVector.upY - dragVector.downY } - canvas.chartSpace.viewport.displace(displaceVector) + canvas.chartingSpace.viewport.displace(displaceVector) } if (containerDragStarted) { if (containerBeingDragged !== undefined) { @@ -897,7 +897,7 @@ function newCanvas () { } let downNoZoom - downNoZoom = canvas.chartSpace.viewport.unTransformThisPoint(downCopy) + downNoZoom = canvas.chartingSpace.viewport.unTransformThisPoint(downCopy) let upCopy = { x: dragVector.upX, @@ -905,7 +905,7 @@ function newCanvas () { } let upNoZoom - upNoZoom = canvas.chartSpace.viewport.unTransformThisPoint(upCopy) + upNoZoom = canvas.chartingSpace.viewport.unTransformThisPoint(upCopy) displaceVector = { x: upNoZoom.x - downNoZoom.x, diff --git a/ChartsSpace/ChartUtilities.js b/ChartingSpace/ChartUtilities.js similarity index 100% rename from ChartsSpace/ChartUtilities.js rename to ChartingSpace/ChartUtilities.js diff --git a/ChartsSpace/CoordinateSystem.js b/ChartingSpace/CoordinateSystem.js similarity index 100% rename from ChartsSpace/CoordinateSystem.js rename to ChartingSpace/CoordinateSystem.js diff --git a/ChartsSpace/EdgeEditor.js b/ChartingSpace/EdgeEditor.js similarity index 96% rename from ChartsSpace/EdgeEditor.js rename to ChartingSpace/EdgeEditor.js index 16cb52358..78f327139 100644 --- a/ChartsSpace/EdgeEditor.js +++ b/ChartingSpace/EdgeEditor.js @@ -402,15 +402,15 @@ function newEdgeEditor () { y: pointB4.y + edgeSize } - pointA1 = canvas.chartSpace.viewport.fitIntoViewport(pointA1) - pointA2 = canvas.chartSpace.viewport.fitIntoViewport(pointA2) - pointA3 = canvas.chartSpace.viewport.fitIntoViewport(pointA3) - pointA4 = canvas.chartSpace.viewport.fitIntoViewport(pointA4) + pointA1 = canvas.chartingSpace.viewport.fitIntoViewport(pointA1) + pointA2 = canvas.chartingSpace.viewport.fitIntoViewport(pointA2) + pointA3 = canvas.chartingSpace.viewport.fitIntoViewport(pointA3) + pointA4 = canvas.chartingSpace.viewport.fitIntoViewport(pointA4) - pointB1 = canvas.chartSpace.viewport.fitIntoViewport(pointB1) - pointB2 = canvas.chartSpace.viewport.fitIntoViewport(pointB2) - pointB3 = canvas.chartSpace.viewport.fitIntoViewport(pointB3) - pointB4 = canvas.chartSpace.viewport.fitIntoViewport(pointB4) + pointB1 = canvas.chartingSpace.viewport.fitIntoViewport(pointB1) + pointB2 = canvas.chartingSpace.viewport.fitIntoViewport(pointB2) + pointB3 = canvas.chartingSpace.viewport.fitIntoViewport(pointB3) + pointB4 = canvas.chartingSpace.viewport.fitIntoViewport(pointB4) browserCanvasContext.setLineDash([0, 0]) diff --git a/ChartsSpace/PlottersManager.js b/ChartingSpace/PlottersManager.js similarity index 100% rename from ChartsSpace/PlottersManager.js rename to ChartingSpace/PlottersManager.js diff --git a/ChartsSpace/TimeMachine.js b/ChartingSpace/TimeMachine.js similarity index 95% rename from ChartsSpace/TimeMachine.js rename to ChartingSpace/TimeMachine.js index 406d5090d..502f5dbb9 100644 --- a/ChartsSpace/TimeMachine.js +++ b/ChartingSpace/TimeMachine.js @@ -71,8 +71,8 @@ function newTimeMachine () { } function finalize () { - canvas.chartSpace.viewport.eventHandler.stopListening(onViewportPositionChangedEventSuscriptionId) - canvas.chartSpace.viewport.eventHandler.stopListening(onViewportZoomChangedEventSuscriptionId) + canvas.chartingSpace.viewport.eventHandler.stopListening(onViewportPositionChangedEventSuscriptionId) + canvas.chartingSpace.viewport.eventHandler.stopListening(onViewportZoomChangedEventSuscriptionId) if (thisObject.timeScale !== undefined) { finalizeTimeScale() @@ -147,8 +147,8 @@ function newTimeMachine () { onMouseOverEventSuscriptionId = thisObject.container.eventHandler.listenToEvent('onMouseOver', onMouseOver) onMouseNotOverEventSuscriptionId = thisObject.container.eventHandler.listenToEvent('onMouseNotOver', onMouseNotOver) - onViewportPositionChangedEventSuscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent('Position Changed', onViewportPositionChanged) - onViewportZoomChangedEventSuscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent('Zoom Changed', onViewportZoomChanged) + onViewportPositionChangedEventSuscriptionId = canvas.chartingSpace.viewport.eventHandler.listenToEvent('Position Changed', onViewportPositionChanged) + onViewportZoomChangedEventSuscriptionId = canvas.chartingSpace.viewport.eventHandler.listenToEvent('Zoom Changed', onViewportZoomChanged) thisObject.edgeEditor = newEdgeEditor() thisObject.edgeEditor.initialize(timeMachineCoordinateSystem) @@ -322,8 +322,8 @@ function newTimeMachine () { must calculate. */ let center = { - x: (canvas.chartSpace.viewport.visibleArea.bottomRight.x - canvas.chartSpace.viewport.visibleArea.bottomLeft.x) / 2, - y: (canvas.chartSpace.viewport.visibleArea.bottomRight.y - canvas.chartSpace.viewport.visibleArea.topRight.y) / 2 + x: (canvas.chartingSpace.viewport.visibleArea.bottomRight.x - canvas.chartingSpace.viewport.visibleArea.bottomLeft.x) / 2, + y: (canvas.chartingSpace.viewport.visibleArea.bottomRight.y - canvas.chartingSpace.viewport.visibleArea.topRight.y) / 2 } center = unTransformThisPoint(center, thisObject.container) @@ -338,7 +338,7 @@ function newTimeMachine () { } function fitFunction (point, fullVisible, margin, topMargin, bottomMargin) { - /* We prevent a point to be out of the container AND out of the Chart Space in general */ + /* We prevent a point to be out of the container AND out of the Charting Space in general */ let returnPoint = { x: point.x, @@ -368,7 +368,7 @@ function newTimeMachine () { if (returnPoint.y - margin - topMargin < upCorner.y) { returnPoint.y = upCorner.y + margin + topMargin } if (returnPoint.y + margin + bottomMargin > bottonCorner.y) { returnPoint.y = bottonCorner.y - margin - bottomMargin } - returnPoint = canvas.chartSpace.fitFunction(returnPoint, fullVisible) + returnPoint = canvas.chartingSpace.fitFunction(returnPoint, fullVisible) return returnPoint } @@ -386,7 +386,7 @@ function newTimeMachine () { } function panelPhysics () { - if (thisObject.container.frame.isInViewPort() && canvas.chartSpace.viewport.zoomTargetLevel > ZOOM_OUT_THRESHOLD_FOR_HIDDING_PANELS) { + if (thisObject.container.frame.isInViewPort() && canvas.chartingSpace.viewport.zoomTargetLevel > ZOOM_OUT_THRESHOLD_FOR_HIDDING_PANELS) { canvas.panelsSpace.unHide(thisObject.payload.node.id, 'Layers Panel') canvas.panelsSpace.unHide(thisObject.payload.node.id, 'Plotter Panel') } else { diff --git a/ChartsSpace/TimelineChart.js b/ChartingSpace/TimelineChart.js similarity index 100% rename from ChartsSpace/TimelineChart.js rename to ChartingSpace/TimelineChart.js diff --git a/ChartsSpace/ViewPort.js b/ChartingSpace/Viewport.js similarity index 100% rename from ChartsSpace/ViewPort.js rename to ChartingSpace/Viewport.js diff --git a/DesignerSpace/Workspace/Workspace.js b/DesignerSpace/Workspace/Workspace.js index f5d85214d..d061988c8 100644 --- a/DesignerSpace/Workspace/Workspace.js +++ b/DesignerSpace/Workspace/Workspace.js @@ -140,7 +140,7 @@ function newWorkspace () { workingAtTask++ break case 5: - canvas.chartSpace.reset() + canvas.chartingSpace.reset() workingAtTask++ break case 6: diff --git a/Frame.js b/Frame.js index fc38fea12..3f8bb1590 100644 --- a/Frame.js +++ b/Frame.js @@ -52,7 +52,7 @@ function newFrame () { } function isInViewPort () { - /* This function is usefull to know if the object who has this frame is currently appearing at least in part at the canvas.chartSpace.viewport */ + /* This function is usefull to know if the object who has this frame is currently appearing at least in part at the canvas.chartingSpace.viewport */ point1 = { x: 0, @@ -69,7 +69,7 @@ function newFrame () { point1 = transformThisPoint(point1, thisObject.container) point3 = transformThisPoint(point3, thisObject.container) - if (point1.x < canvas.chartSpace.viewport.visibleArea.topRight.x && point1.y < canvas.chartSpace.viewport.visibleArea.bottomRight.y && point3.x > canvas.chartSpace.viewport.visibleArea.bottomLeft.x && point3.y > canvas.chartSpace.viewport.visibleArea.topLeft.y) { + if (point1.x < canvas.chartingSpace.viewport.visibleArea.topRight.x && point1.y < canvas.chartingSpace.viewport.visibleArea.bottomRight.y && point3.x > canvas.chartingSpace.viewport.visibleArea.bottomLeft.x && point3.y > canvas.chartingSpace.viewport.visibleArea.topLeft.y) { return true } else { return false diff --git a/Globals.js b/Globals.js index d0441e059..27c3cde52 100644 --- a/Globals.js +++ b/Globals.js @@ -164,9 +164,9 @@ const _3_MINUTES_IN_MILISECONDS = 3 * 60 * 1000; const _2_MINUTES_IN_MILISECONDS = 2 * 60 * 1000; const _1_MINUTE_IN_MILISECONDS = 1 * 60 * 1000; -let NEW_SESSION_INITIAL_DATE = new Date(); // This value will be overwritten at the canvas.chartSpace.viewport.initialize if the user had a prevous session with this same browser. +let NEW_SESSION_INITIAL_DATE = new Date(); // This value will be overwritten at the canvas.chartingSpace.viewport.initialize if the user had a prevous session with this same browser. let INITIAL_ZOOM_LEVEL = -28.25 // This is the zoom level at the view port in which the APP starts. -let INITIAL_TIME_PERIOD = ONE_DAY_IN_MILISECONDS // This value will be overwritten at the canvas.chartSpace.viewport.initialize if the user had a prevous session with this same browser. +let INITIAL_TIME_PERIOD = ONE_DAY_IN_MILISECONDS // This value will be overwritten at the canvas.chartingSpace.viewport.initialize if the user had a prevous session with this same browser. let VERY_LARGE_NUMBER = 100000000000 let CURRENT_TOP_MARGIN = window.canvasApp.topMargin @@ -206,7 +206,7 @@ const PERIOD_05_MIN = "05-min"; const PERIOD_01_MIN = "01-min"; /* -We define here the size of the chartSpace. It has to bee enough big in order to accomodate all the charts we expect to display in this space. +We define here the size of the chartingSpace. It has to bee enough big in order to accomodate all the charts we expect to display in this space. */ const TIME_MACHINE_WIDTH = 320; diff --git a/Panels/LayersPanel.js b/Panels/LayersPanel.js index bfc43216f..ad3fd6190 100644 --- a/Panels/LayersPanel.js +++ b/Panels/LayersPanel.js @@ -60,8 +60,8 @@ function newLayersPanel () { thisObject.container.frame.height = headerHeight let position = { // Default position - x: canvas.chartSpace.viewport.visibleArea.topLeft.x, - y: canvas.chartSpace.viewport.visibleArea.topLeft.y + x: canvas.chartingSpace.viewport.visibleArea.topLeft.x, + y: canvas.chartingSpace.viewport.visibleArea.topLeft.y } thisObject.container.frame.position = position @@ -189,7 +189,7 @@ function newLayersPanel () { function panelSizePhysics () { if (isInitialized === false || thisObject.visible === false || thisObject.isHidden === true) { return } - let viewPortHeight = canvas.chartSpace.viewport.visibleArea.bottomLeft.y - canvas.chartSpace.viewport.visibleArea.topLeft.y + let viewPortHeight = canvas.chartingSpace.viewport.visibleArea.bottomLeft.y - canvas.chartingSpace.viewport.visibleArea.topLeft.y if (viewPortHeight < headerHeight) { thisObject.visible = false diff --git a/Panels/PanelTabButton.js b/Panels/PanelTabButton.js index 484fa66a8..2d4b37565 100644 --- a/Panels/PanelTabButton.js +++ b/Panels/PanelTabButton.js @@ -58,7 +58,7 @@ function newPanelTabButton () { upPosition.y = thisObject.parentContainer.frame.position.y downPosition.x = thisObject.parentContainer.frame.position.x - downPosition.y = canvas.chartSpace.viewport.visibleArea.bottomRight.y + downPosition.y = canvas.chartingSpace.viewport.visibleArea.bottomRight.y transitionPosition.x = upPosition.x transitionPosition.y = upPosition.y @@ -96,10 +96,10 @@ function newPanelTabButton () { if (isInitialized === false) { return } upPosition.x = thisObject.parentContainer.frame.position.x - upPosition.y = canvas.chartSpace.viewport.visibleArea.topRight.y + upPosition.y = canvas.chartingSpace.viewport.visibleArea.topRight.y downPosition.x = thisObject.parentContainer.frame.position.x - downPosition.y = canvas.chartSpace.viewport.visibleArea.bottomRight.y + downPosition.y = canvas.chartingSpace.viewport.visibleArea.bottomRight.y if (thisObject.status === 'going down') { if (transitionPosition.y < downPosition.y) { diff --git a/Panels/PlotterPanel.js b/Panels/PlotterPanel.js index 28d38f488..24ef4f91f 100644 --- a/Panels/PlotterPanel.js +++ b/Panels/PlotterPanel.js @@ -47,8 +47,8 @@ function newPlotterPanel () { thisObject.container.frame.width = UI_PANEL.WIDTH.NORMAL thisObject.container.frame.height = UI_PANEL.HEIGHT.NORMAL - thisObject.container.frame.position.x = canvas.chartSpace.viewport.visibleArea.topRight.x - thisObject.container.frame.width - thisObject.container.frame.width * Math.random() * 8 - thisObject.container.frame.position.y = canvas.chartSpace.viewport.visibleArea.bottomLeft.y - thisObject.container.frame.height - thisObject.container.frame.height * Math.random() * 1.5 + thisObject.container.frame.position.x = canvas.chartingSpace.viewport.visibleArea.topRight.x - thisObject.container.frame.width - thisObject.container.frame.width * Math.random() * 8 + thisObject.container.frame.position.y = canvas.chartingSpace.viewport.visibleArea.bottomLeft.y - thisObject.container.frame.height - thisObject.container.frame.height * Math.random() * 1.5 panelTabButton = newPanelTabButton() panelTabButton.parentContainer = thisObject.container diff --git a/Plotter.js b/Plotter.js index 095b1d6f5..398d96b2b 100644 --- a/Plotter.js +++ b/Plotter.js @@ -25,7 +25,7 @@ function newPlotter () { let coordinateSystem let plotterModuleConfig - let slotHeight = (canvas.chartSpace.viewport.visibleArea.bottomRight.y - canvas.chartSpace.viewport.visibleArea.topLeft.y) / 10 // This is the amount of slots available + let slotHeight = (canvas.chartingSpace.viewport.visibleArea.bottomRight.y - canvas.chartingSpace.viewport.visibleArea.topLeft.y) / 10 // This is the amount of slots available let mustRecalculateDataPoints = false let atMousePositionFillStyles = new Map() let atMousePositionStrokeStyles = new Map() @@ -61,8 +61,8 @@ function newPlotter () { try { /* Stop listening to the necesary events. */ thisObject.container.eventHandler.stopListening(onMouseOverEventSuscriptionId) - canvas.chartSpace.viewport.eventHandler.stopListening(zoomChangedEventSubscriptionId) - canvas.chartSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId) + canvas.chartingSpace.viewport.eventHandler.stopListening(zoomChangedEventSubscriptionId) + canvas.chartingSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId) canvas.eventHandler.stopListening(dragFinishedEventSubscriptionId) thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId) marketFiles.eventHandler.stopListening(marketFilesUpdatedEventSubscriptionId) @@ -113,8 +113,8 @@ function newPlotter () { fileCursor = dailyFiles.getFileCursor(pTimeFrame) /* Listen to the necesary events. */ - zoomChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent('Zoom Changed', onViewportZoomChanged) - offsetChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent('Position Changed', onViewportPositionChanged) + zoomChangedEventSubscriptionId = canvas.chartingSpace.viewport.eventHandler.listenToEvent('Zoom Changed', onViewportZoomChanged) + offsetChangedEventSubscriptionId = canvas.chartingSpace.viewport.eventHandler.listenToEvent('Position Changed', onViewportPositionChanged) dragFinishedEventSubscriptionId = canvas.eventHandler.listenToEvent('Drag Finished', onDragFinished) marketFilesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent('Files Updated', onMarketFilesUpdated) dailyFilesUpdatedEventSubscriptionId = dailyFiles.eventHandler.listenToEvent('Files Updated', onDailyFilesUpdated) @@ -376,8 +376,8 @@ function newPlotter () { let daysOnSides = getSideDays(timeFrame) - let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem) - let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem) + let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem) + let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem) let dateDiff = rightDate.valueOf() - leftDate.valueOf() @@ -429,8 +429,8 @@ function newPlotter () { let daysOnSides = getSideDays(timeFrame) - let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem) - let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem) + let leftDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem) + let rightDate = getDateFromPointAtBrowserCanvas(canvas.chartingSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem) let dateDiff = rightDate.valueOf() - leftDate.valueOf() @@ -520,13 +520,13 @@ function newPlotter () { beginPoint = transformThisPoint(beginPoint, thisObject.container) endPoint = transformThisPoint(endPoint, thisObject.container) - beginPoint = canvas.chartSpace.viewport.fitIntoVisibleArea(beginPoint) - endPoint = canvas.chartSpace.viewport.fitIntoVisibleArea(endPoint) + beginPoint = canvas.chartingSpace.viewport.fitIntoVisibleArea(beginPoint) + endPoint = canvas.chartingSpace.viewport.fitIntoVisibleArea(endPoint) beginPoint = thisObject.fitFunction(beginPoint) endPoint = thisObject.fitFunction(endPoint) - if (endPoint.x < canvas.chartSpace.viewport.visibleArea.bottomLeft.x || beginPoint.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x) { + if (endPoint.x < canvas.chartingSpace.viewport.visibleArea.bottomLeft.x || beginPoint.x > canvas.chartingSpace.viewport.visibleArea.bottomRight.x) { continue } @@ -577,7 +577,7 @@ function newPlotter () { */ dataPoint = coordinateSystem.transformThisPoint(dataPoint) dataPoint = transformThisPoint(dataPoint, thisObject.container) - dataPoint = canvas.chartSpace.viewport.fitIntoVisibleArea(dataPoint) + dataPoint = canvas.chartingSpace.viewport.fitIntoVisibleArea(dataPoint) dataPoint = thisObject.fitFunction(dataPoint) /* Store the data point at the local map */ @@ -586,7 +586,7 @@ function newPlotter () { if (plotterModuleConfig !== undefined) { if (plotterModuleConfig.slot !== undefined) { /* We reset the y coordinate since it will be transformed with another coordinate system to fit into a slot. */ - dataPoint.y = (-1) * y * coordinateSystem.scale.y + (plotterModuleConfig.slot.number - 1) * slotHeight + canvas.chartSpace.viewport.visibleArea.topLeft.y + dataPoint.y = (-1) * y * coordinateSystem.scale.y + (plotterModuleConfig.slot.number - 1) * slotHeight + canvas.chartingSpace.viewport.visibleArea.topLeft.y } } } @@ -726,7 +726,7 @@ function newPlotter () { y: dataPointObject.y } /* We make sure the points do not fall outside the viewport visible area. This step allways need to be done. */ - dataPoint = canvas.chartSpace.viewport.fitIntoVisibleArea(dataPoint) + dataPoint = canvas.chartingSpace.viewport.fitIntoVisibleArea(dataPoint) dataPoint = thisObject.fitFunction(dataPoint) if (k === 0) { browserCanvasContext.moveTo(dataPoint.x, dataPoint.y) diff --git a/Project.njsproj b/Project.njsproj index 3dedf7ed3..886b43884 100644 --- a/Project.njsproj +++ b/Project.njsproj @@ -145,7 +145,7 @@ - + diff --git a/Scales/TimeFrameScale.js b/Scales/TimeFrameScale.js index d75038abd..d4fc855e7 100644 --- a/Scales/TimeFrameScale.js +++ b/Scales/TimeFrameScale.js @@ -61,7 +61,7 @@ function newTimeFrameScale () { function finalize () { thisObject.container.eventHandler.stopListening(onMouseWheelEventSubscriptionId) - canvas.chartSpace.viewport.eventHandler.stopListening(onViewportZoomChangedEventSubscriptionId) + canvas.chartingSpace.viewport.eventHandler.stopListening(onViewportZoomChangedEventSubscriptionId) thisObject.container.eventHandler.stopListening(onMouseOverEventSubscriptionId) thisObject.container.eventHandler.stopListening(onMouseNotOverEventSubscriptionId) @@ -81,7 +81,7 @@ function newTimeFrameScale () { newTimeFrame() onMouseWheelEventSubscriptionId = thisObject.container.eventHandler.listenToEvent('onMouseWheel', onMouseWheel) - onViewportZoomChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent('Zoom Changed', onViewportZoomChanged) + onViewportZoomChangedEventSubscriptionId = canvas.chartingSpace.viewport.eventHandler.listenToEvent('Zoom Changed', onViewportZoomChanged) onMouseOverEventSubscriptionId = thisObject.container.eventHandler.listenToEvent('onMouseOver', onMouseOver) onMouseNotOverEventSubscriptionId = thisObject.container.eventHandler.listenToEvent('onMouseNotOver', onMouseNotOver) } @@ -123,13 +123,13 @@ function newTimeFrameScale () { } function zoomOutPhysics () { - if ((thisObject.isVisible === true && previousIsVisible === false) && (canvas.chartSpace.viewport.zoomTargetLevel >= ZOOM_OUT_THRESHOLD_FOR_CHANGING_TIME_FRAME)) { + if ((thisObject.isVisible === true && previousIsVisible === false) && (canvas.chartingSpace.viewport.zoomTargetLevel >= ZOOM_OUT_THRESHOLD_FOR_CHANGING_TIME_FRAME)) { let event = {} event.timeFrame = thisObject.timeFrame thisObject.container.eventHandler.raiseEvent('Time Frame Value Changed', event) previousIsVisible = true } - if ((thisObject.isVisible === false && previousIsVisible === true) || (canvas.chartSpace.viewport.zoomTargetLevel < ZOOM_OUT_THRESHOLD_FOR_CHANGING_TIME_FRAME)) { + if ((thisObject.isVisible === false && previousIsVisible === true) || (canvas.chartingSpace.viewport.zoomTargetLevel < ZOOM_OUT_THRESHOLD_FOR_CHANGING_TIME_FRAME)) { let event = {} event.timeFrame = ONE_DAY_IN_MILISECONDS thisObject.container.eventHandler.raiseEvent('Time Frame Value Changed', event) diff --git a/Spaces/ChartSpace.js b/Spaces/ChartingSpace.js similarity index 95% rename from Spaces/ChartSpace.js rename to Spaces/ChartingSpace.js index 1251ceeb2..93b053060 100644 --- a/Spaces/ChartSpace.js +++ b/Spaces/ChartingSpace.js @@ -6,8 +6,8 @@ changes, then all charts in it are replotted with the corresponging data. */ -function newChartSpace () { - const MODULE_NAME = 'Chart Space' +function newChartingSpace () { + const MODULE_NAME = 'Charting Space' const ERROR_LOG = true const logger = newWebDebugLog() logger.fileName = MODULE_NAME @@ -167,7 +167,7 @@ function newChartSpace () { y: browserCanvas.height * PERCENTAGE_OF_SCREEN_FOR_DISPLACEMENT / 100 } - canvas.chartSpace.viewport.displace(displaceVector) + canvas.chartingSpace.viewport.displace(displaceVector) } function oneScreenDown () { @@ -176,7 +176,7 @@ function newChartSpace () { y: -browserCanvas.height * PERCENTAGE_OF_SCREEN_FOR_DISPLACEMENT / 100 } - canvas.chartSpace.viewport.displace(displaceVector) + canvas.chartingSpace.viewport.displace(displaceVector) } function oneScreenLeft () { @@ -185,7 +185,7 @@ function newChartSpace () { y: 0 } - canvas.chartSpace.viewport.displace(displaceVector, true) + canvas.chartingSpace.viewport.displace(displaceVector, true) } function oneScreenRight () { @@ -194,7 +194,7 @@ function newChartSpace () { y: 0 } - canvas.chartSpace.viewport.displace(displaceVector, true) + canvas.chartingSpace.viewport.displace(displaceVector, true) } function fitFunction (point, fullVisible) { @@ -317,8 +317,8 @@ function newChartSpace () { function onTimeMachineInitialized () { thisObject.timeMachines.push(timeMachine) timeMachine.payload.uiObject.setValue('') - if (canvas.chartSpace.viewport !== undefined) { - canvas.chartSpace.viewport.raiseEvents() // These events will impacts on objects just initialized. + if (canvas.chartingSpace.viewport !== undefined) { + canvas.chartingSpace.viewport.raiseEvents() // These events will impacts on objects just initialized. } } } @@ -333,8 +333,8 @@ function newChartSpace () { thisObject.visible = true } - if (canvas.chartSpace.viewport !== undefined) { - canvas.chartSpace.viewport.resize() + if (canvas.chartingSpace.viewport !== undefined) { + canvas.chartingSpace.viewport.resize() } } diff --git a/Spaces/CockpitSpace.js b/Spaces/CockpitSpace.js index e866d859d..b2d04b483 100644 --- a/Spaces/CockpitSpace.js +++ b/Spaces/CockpitSpace.js @@ -161,8 +161,8 @@ spacePosition: COCKPIT_SPACE_POSITION } window.localStorage.setItem(MODULE_NAME, JSON.stringify(storage)) - if (canvas.chartSpace.viewport !== undefined) { - canvas.chartSpace.viewport.resize() + if (canvas.chartingSpace.viewport !== undefined) { + canvas.chartingSpace.viewport.resize() } } diff --git a/Spaces/PanelsSpace.js b/Spaces/PanelsSpace.js index 6efa86a7a..b1bd3ebc6 100644 --- a/Spaces/PanelsSpace.js +++ b/Spaces/PanelsSpace.js @@ -43,8 +43,8 @@ function newPanelsSpace () { case 'Layers Panel': { panel = newLayersPanel() - panel.fitFunction = canvas.chartSpace.fitFunction - panel.container.isVisibleFunction = canvas.chartSpace.isThisPointVisible + panel.fitFunction = canvas.chartingSpace.fitFunction + panel.container.isVisibleFunction = canvas.chartingSpace.isThisPointVisible panel.type = 'Layers Panel' break } @@ -52,14 +52,14 @@ function newPanelsSpace () { { if (pParameters.panelNode.code.isLegacy !== true) { panel = newPlotterPanel() - panel.fitFunction = canvas.chartSpace.fitFunction - panel.container.isVisibleFunction = canvas.chartSpace.isThisPointVisible + panel.fitFunction = canvas.chartingSpace.fitFunction + panel.container.isVisibleFunction = canvas.chartingSpace.isThisPointVisible panel.session = pSession panel.initialize(pParameters.panelNode) } else { panel = getNewPlotterPanel(pParameters.dataMine, pParameters.plotterCodeName, pParameters.moduleCodeName, pParameters.panelNode.code.codeName) - panel.fitFunction = canvas.chartSpace.fitFunction - panel.container.isVisibleFunction = canvas.chartSpace.isThisPointVisible + panel.fitFunction = canvas.chartingSpace.fitFunction + panel.container.isVisibleFunction = canvas.chartingSpace.isThisPointVisible panel.session = pSession panel.initialize() } @@ -130,7 +130,7 @@ function newPanelsSpace () { if (thisObject.panels !== undefined) { for (let i = 0; i < thisObject.panels.length; i++) { let panel = thisObject.panels[i] - let owner = canvas.chartSpace.inViewport.get(panel.owner) + let owner = canvas.chartingSpace.inViewport.get(panel.owner) if (owner !== undefined) { if (panel.physics !== undefined) { panel.physics() @@ -162,8 +162,8 @@ function newPanelsSpace () { centerPoint.y = centerPoint.y + panel.container.frame.height / 2 /* Lets see which quadrant the panel is at */ - let verticalLine = (canvas.chartSpace.viewport.visibleArea.topRight.x - canvas.chartSpace.viewport.visibleArea.topLeft.x) / 2 + canvas.chartSpace.viewport.visibleArea.topLeft.x - let horizontalLine = (canvas.chartSpace.viewport.visibleArea.bottomRight.y - canvas.chartSpace.viewport.visibleArea.topRight.y) / 2 + canvas.chartSpace.viewport.visibleArea.topRight.y + let verticalLine = (canvas.chartingSpace.viewport.visibleArea.topRight.x - canvas.chartingSpace.viewport.visibleArea.topLeft.x) / 2 + canvas.chartingSpace.viewport.visibleArea.topLeft.x + let horizontalLine = (canvas.chartingSpace.viewport.visibleArea.bottomRight.y - canvas.chartingSpace.viewport.visibleArea.topRight.y) / 2 + canvas.chartingSpace.viewport.visibleArea.topRight.y if (panel.panelTabButton !== undefined) { if (panel.panelTabButton.status === 'up') { @@ -208,18 +208,18 @@ function newPanelsSpace () { panel.container.frame.position.x = browserCanvas.width - panel.container.frame.width } } - if (panel.container.frame.height <= canvas.chartSpace.viewport.visibleArea.bottomRight.y - canvas.chartSpace.viewport.visibleArea.topRight.y) { + if (panel.container.frame.height <= canvas.chartingSpace.viewport.visibleArea.bottomRight.y - canvas.chartingSpace.viewport.visibleArea.topRight.y) { if (panel.gravitatesTowards === 'topLeft' || panel.gravitatesTowards === 'topRight') { panel.container.frame.position.y = panel.container.frame.position.y - panel.container.speed.y isOverlapping(i, panel.container) - if (panel.container.frame.position.y < canvas.chartSpace.viewport.visibleArea.topLeft.y) { - panel.container.frame.position.y = canvas.chartSpace.viewport.visibleArea.topLeft.y + if (panel.container.frame.position.y < canvas.chartingSpace.viewport.visibleArea.topLeft.y) { + panel.container.frame.position.y = canvas.chartingSpace.viewport.visibleArea.topLeft.y } } else { panel.container.frame.position.y = panel.container.frame.position.y + panel.container.speed.y isOverlapping(i, panel.container) - if (panel.container.frame.position.y + panel.container.frame.height > canvas.chartSpace.viewport.visibleArea.bottomRight.y) { - panel.container.frame.position.y = canvas.chartSpace.viewport.visibleArea.bottomRight.y - panel.container.frame.height + if (panel.container.frame.position.y + panel.container.frame.height > canvas.chartingSpace.viewport.visibleArea.bottomRight.y) { + panel.container.frame.position.y = canvas.chartingSpace.viewport.visibleArea.bottomRight.y - panel.container.frame.height } } } @@ -317,7 +317,7 @@ function newPanelsSpace () { for (let i = 0; i < thisObject.panels.length; i++) { let panel = thisObject.panels[i] - let owner = canvas.chartSpace.inViewport.get(panel.owner) + let owner = canvas.chartingSpace.inViewport.get(panel.owner) if (owner !== undefined) { if (panel.isVisible === true && panel.isHidden === false) { panel.draw() @@ -336,7 +336,7 @@ function newPanelsSpace () { */ for (let i = thisObject.panels.length - 1; i >= 0; i--) { let panel = thisObject.panels[i] - let owner = canvas.chartSpace.inViewport.get(panel.owner) + let owner = canvas.chartingSpace.inViewport.get(panel.owner) if (owner !== undefined) { if (panel.isVisible === true && panel.isHidden === false) { container = panel.getContainer(point) diff --git a/Spaces/TopSpace.js b/Spaces/TopSpace.js index ff1b7786f..905a93894 100644 --- a/Spaces/TopSpace.js +++ b/Spaces/TopSpace.js @@ -45,7 +45,7 @@ function newTopSpace () { thisObject.container.frame.position.x = 0 try { - thisObject.container.frame.position.y = canvas.chartSpace.viewport.visibleArea.bottomLeft.y + thisObject.container.frame.position.y = canvas.chartingSpace.viewport.visibleArea.bottomLeft.y } catch (e) { } } diff --git a/Utilities.js b/Utilities.js index 8079fe872..2588156b9 100644 --- a/Utilities.js +++ b/Utilities.js @@ -114,15 +114,15 @@ function transformThisPoint (point, container) { point = container.frame.frameThisPoint(point) - /* We pass this point through the canvas.chartSpace.viewport lends, meaning we apply the canvas.chartSpace.viewport zoom and displacement. */ + /* We pass this point through the canvas.chartingSpace.viewport lends, meaning we apply the canvas.chartingSpace.viewport zoom and displacement. */ - point = canvas.chartSpace.viewport.transformThisPoint(point) + point = canvas.chartingSpace.viewport.transformThisPoint(point) return point } function unTransformThisPoint (point, container) { - point = canvas.chartSpace.viewport.unTransformThisPoint(point) + point = canvas.chartingSpace.viewport.unTransformThisPoint(point) point = container.frame.unframeThisPoint(point) return point @@ -174,7 +174,7 @@ function getRateFromPointAtBrowserCanvas (point, container, coordinateSystem) { return point.y } -function getRateFromPointAtChartSpace (point, container, coordinateSystem) { +function getRateFromPointAtChartingSpace (point, container, coordinateSystem) { point = container.frame.unframeThisPoint(point) point = coordinateSystem.unInverseTransform(point, container.frame.height) @@ -200,14 +200,14 @@ function moveToUserPosition (container, currentDate, currentRate, coordinateSyst y: currentRate } - /* Put this point in the coordinate system of the canvas.chartSpace.viewport */ + /* Put this point in the coordinate system of the canvas.chartingSpace.viewport */ targetPoint = coordinateSystem.transformThisPoint(targetPoint) targetPoint = transformThisPoint(targetPoint, container) let displaceVector - let targetNoZoom = canvas.chartSpace.viewport.unTransformThisPoint(targetPoint) - let mouseNoZoom = canvas.chartSpace.viewport.unTransformThisPoint(mousePosition) + let targetNoZoom = canvas.chartingSpace.viewport.unTransformThisPoint(targetPoint) + let mouseNoZoom = canvas.chartingSpace.viewport.unTransformThisPoint(mousePosition) displaceVector = { x: mouseNoZoom.x - targetNoZoom.x,