From 1a9f859a50b0b9b28045275c22b0e93280e07b2d Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 17 Jan 2020 18:46:36 +0100 Subject: [PATCH] Viewport inside the Chartspace --- CandlePanel.js | 4 ++-- Candles.js | 50 +++++++++++++++++++++---------------------- VolumePanel.js | 4 ++-- Volumes.js | 58 +++++++++++++++++++++++++------------------------- 4 files changed, 58 insertions(+), 58 deletions(-) diff --git a/CandlePanel.js b/CandlePanel.js index f4e8529ca..f436bfb1a 100644 --- a/CandlePanel.js +++ b/CandlePanel.js @@ -35,8 +35,8 @@ function newAAMastersPlottersCandlesVolumesCandlesCandlePanel() { thisObject.container.frame.width = UI_PANEL.WIDTH.NORMAL; thisObject.container.frame.height = UI_PANEL.HEIGHT.NORMAL; - thisObject.container.frame.position.x = viewPort.visibleArea.topRight.x - thisObject.container.frame.width * 2; - thisObject.container.frame.position.y = viewPort.visibleArea.bottomLeft.y - thisObject.container.frame.height; + thisObject.container.frame.position.x = canvas.chartSpace.viewport.visibleArea.topRight.x - thisObject.container.frame.width * 2; + thisObject.container.frame.position.y = canvas.chartSpace.viewport.visibleArea.bottomLeft.y - thisObject.container.frame.height; panelTabButton = newPanelTabButton() panelTabButton.parentContainer = thisObject.container diff --git a/Candles.js b/Candles.js index 3cf8c81ac..4af5529fe 100644 --- a/Candles.js +++ b/Candles.js @@ -64,8 +64,8 @@ /* Stop listening to the necesary events. */ - viewPort.eventHandler.stopListening(zoomChangedEventSubscriptionId); - viewPort.eventHandler.stopListening(offsetChangedEventSubscriptionId); + canvas.chartSpace.viewport.eventHandler.stopListening(zoomChangedEventSubscriptionId); + canvas.chartSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId); canvas.eventHandler.stopListening(dragFinishedEventSubscriptionId); thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId) marketFiles.eventHandler.stopListening(marketFilesUpdatedEventSubscriptionId); @@ -114,8 +114,8 @@ /* Listen to the necesary events. */ - zoomChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged); - offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged); + zoomChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged); + offsetChangedEventSubscriptionId = canvas.chartSpace.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); @@ -264,18 +264,18 @@ targetMin = transformThisPoint(targetMin, thisObject.container); let center = { - x: (viewPort.visibleArea.bottomRight.x - viewPort.visibleArea.bottomLeft.x) / 2, - y: (viewPort.visibleArea.bottomRight.y - viewPort.visibleArea.topRight.y) / 2 + 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 }; - if (targetMax.y < viewPort.visibleArea.topLeft.y || targetMin.y > viewPort.visibleArea.bottomRight.y) { + if (targetMax.y < canvas.chartSpace.viewport.visibleArea.topLeft.y || targetMin.y > canvas.chartSpace.viewport.visibleArea.bottomRight.y) { let displaceVector = { x: 0, y: center.y - targetPoint.y }; - viewPort.displaceTarget(displaceVector); + canvas.chartSpace.viewport.displaceTarget(displaceVector); } @@ -284,7 +284,7 @@ y: 0 }; - viewPort.displace(displaceVector); + canvas.chartSpace.viewport.displace(displaceVector); return; } @@ -301,8 +301,8 @@ targetPoint = transformThisPoint(targetPoint, thisObject.container); let center = { - x: (viewPort.visibleArea.bottomRight.x - viewPort.visibleArea.bottomLeft.x) / 2, - y: (viewPort.visibleArea.bottomRight.y - viewPort.visibleArea.topRight.y) / 2 + 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 }; let displaceVector = { @@ -310,7 +310,7 @@ y: center.y - targetPoint.y }; - viewPort.displace(displaceVector); + canvas.chartSpace.viewport.displace(displaceVector); return; } @@ -387,8 +387,8 @@ let daysOnSides = getSideDays(timeFrame); - let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, coordinateSystem); - let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, coordinateSystem); + let leftDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem); + let rightDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem); let dateDiff = rightDate.valueOf() - leftDate.valueOf(); @@ -473,8 +473,8 @@ let daysOnSides = getSideDays(timeFrame); - let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, coordinateSystem); - let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, coordinateSystem); + let leftDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem); + let rightDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem); let dateDiff = rightDate.valueOf() - leftDate.valueOf(); @@ -601,10 +601,10 @@ candle.candlePoint3 = transformThisPoint(candle.candlePoint3, thisObject.container); candle.candlePoint4 = transformThisPoint(candle.candlePoint4, thisObject.container); - candle.candlePoint1 = viewPort.fitIntoVisibleArea(candle.candlePoint1); - candle.candlePoint2 = viewPort.fitIntoVisibleArea(candle.candlePoint2); - candle.candlePoint3 = viewPort.fitIntoVisibleArea(candle.candlePoint3); - candle.candlePoint4 = viewPort.fitIntoVisibleArea(candle.candlePoint4); + candle.candlePoint1 = canvas.chartSpace.viewport.fitIntoVisibleArea(candle.candlePoint1); + candle.candlePoint2 = canvas.chartSpace.viewport.fitIntoVisibleArea(candle.candlePoint2); + candle.candlePoint3 = canvas.chartSpace.viewport.fitIntoVisibleArea(candle.candlePoint3); + candle.candlePoint4 = canvas.chartSpace.viewport.fitIntoVisibleArea(candle.candlePoint4); candle.candlePoint1 = thisObject.fitFunction(candle.candlePoint1); candle.candlePoint2 = thisObject.fitFunction(candle.candlePoint2); @@ -641,10 +641,10 @@ candle.stickPoint3 = transformThisPoint(candle.stickPoint3, thisObject.container); candle.stickPoint4 = transformThisPoint(candle.stickPoint4, thisObject.container); - candle.stickPoint1 = viewPort.fitIntoVisibleArea(candle.stickPoint1); - candle.stickPoint2 = viewPort.fitIntoVisibleArea(candle.stickPoint2); - candle.stickPoint3 = viewPort.fitIntoVisibleArea(candle.stickPoint3); - candle.stickPoint4 = viewPort.fitIntoVisibleArea(candle.stickPoint4); + candle.stickPoint1 = canvas.chartSpace.viewport.fitIntoVisibleArea(candle.stickPoint1); + candle.stickPoint2 = canvas.chartSpace.viewport.fitIntoVisibleArea(candle.stickPoint2); + candle.stickPoint3 = canvas.chartSpace.viewport.fitIntoVisibleArea(candle.stickPoint3); + candle.stickPoint4 = canvas.chartSpace.viewport.fitIntoVisibleArea(candle.stickPoint4); candle.stickPoint1 = thisObject.fitFunction(candle.stickPoint1); candle.stickPoint2 = thisObject.fitFunction(candle.stickPoint2); @@ -661,7 +661,7 @@ candle = candles[i]; - if (candle.candlePoint2.x < viewPort.visibleArea.bottomLeft.x || candle.candlePoint1.x > viewPort.visibleArea.bottomRight.x) { + if (candle.candlePoint2.x < canvas.chartSpace.viewport.visibleArea.bottomLeft.x || candle.candlePoint1.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x) { continue } diff --git a/VolumePanel.js b/VolumePanel.js index 8df5284bc..4bcf3b2a0 100644 --- a/VolumePanel.js +++ b/VolumePanel.js @@ -35,8 +35,8 @@ function newAAMastersPlottersCandlesVolumesVolumesVolumePanel() { thisObject.container.frame.width = UI_PANEL.WIDTH.NORMAL; thisObject.container.frame.height = UI_PANEL.HEIGHT.NORMAL; - thisObject.container.frame.position.x = viewPort.visibleArea.topRight.x - thisObject.container.frame.width; - thisObject.container.frame.position.y = viewPort.visibleArea.bottomLeft.y - thisObject.container.frame.height; + thisObject.container.frame.position.x = canvas.chartSpace.viewport.visibleArea.topRight.x - thisObject.container.frame.width; + thisObject.container.frame.position.y = canvas.chartSpace.viewport.visibleArea.bottomLeft.y - thisObject.container.frame.height; panelTabButton = newPanelTabButton() panelTabButton.parentContainer = thisObject.container diff --git a/Volumes.js b/Volumes.js index 2fa906f39..fa7daab72 100644 --- a/Volumes.js +++ b/Volumes.js @@ -62,8 +62,8 @@ /* Stop listening to the necesary events. */ - viewPort.eventHandler.stopListening(zoomChangedEventSubscriptionId); - viewPort.eventHandler.stopListening(offsetChangedEventSubscriptionId); + canvas.chartSpace.viewport.eventHandler.stopListening(zoomChangedEventSubscriptionId); + canvas.chartSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId); canvas.eventHandler.stopListening(dragFinishedEventSubscriptionId); thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId) marketFiles.eventHandler.stopListening(marketFilesUpdatedEventSubscriptionId); @@ -110,8 +110,8 @@ /* Listen to the necesary events. */ - zoomChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged); - offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged); + zoomChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged); + offsetChangedEventSubscriptionId = canvas.chartSpace.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); @@ -305,8 +305,8 @@ if (fileCursor.files.size === 0) { return; } // We need to wait until there are files in the cursor - let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, coordinateSystem); - let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, coordinateSystem); + let leftDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem); + let rightDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem); let dateDiff = rightDate.valueOf() - leftDate.valueOf(); @@ -386,8 +386,8 @@ if (marketFile === undefined) { return; } // Initialization not complete yet. - let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, coordinateSystem); - let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, coordinateSystem); + let leftDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem); + let rightDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem); let dateDiff = rightDate.valueOf() - leftDate.valueOf(); @@ -480,7 +480,7 @@ coordinateSystem.initializeY( minValue, maxValue, - viewPort.visibleArea.bottomRight.y - viewPort.visibleArea.topLeft.y + canvas.chartSpace.viewport.visibleArea.bottomRight.y - canvas.chartSpace.viewport.visibleArea.topLeft.y ); plotAreaFrame.initializeY( @@ -523,7 +523,7 @@ /* Now we calculate and plot the volumes */ - let visibleHeight = viewPort.visibleArea.bottomRight.y - viewPort.visibleArea.topLeft.y; + let visibleHeight = canvas.chartSpace.viewport.visibleArea.bottomRight.y - canvas.chartSpace.viewport.visibleArea.topLeft.y; let frameCorner1 = { x: 0, @@ -591,7 +591,7 @@ volumePointA1.x = volumePointA1.x - baseIncrement; volumePointA4.x = volumePointA4.x + baseIncrement; - if (volumePointA4.x < viewPort.visibleArea.bottomLeft.x || volumePointA1.x > viewPort.visibleArea.bottomRight.x) { + if (volumePointA4.x < canvas.chartSpace.viewport.visibleArea.bottomLeft.x || volumePointA1.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x) { return false; } @@ -601,16 +601,16 @@ if (calculateBuys(plotAreaFrame, thisObject.container.frame.height) === false) { continue; } // We try to see if it fits in the visible area. - if (volumePointA1.y > viewPort.visibleArea.bottomLeft.y && frameHeightInViewPort > visibleHeight * 2 / 3) { + if (volumePointA1.y > canvas.chartSpace.viewport.visibleArea.bottomLeft.y && frameHeightInViewPort > visibleHeight * 2 / 3) { if (calculateBuys(coordinateSystem, visibleHeight) === false) { continue; } // We snap t to the view port. /* Now we set the real value of y. */ - volumePointA1.y = viewPort.visibleArea.bottomRight.y; - volumePointA2.y = viewPort.visibleArea.bottomRight.y - volume.amountBuy * coordinateSystem.scale.y; - volumePointA3.y = viewPort.visibleArea.bottomRight.y - volume.amountBuy * coordinateSystem.scale.y; - volumePointA4.y = viewPort.visibleArea.bottomRight.y; + volumePointA1.y = canvas.chartSpace.viewport.visibleArea.bottomRight.y; + volumePointA2.y = canvas.chartSpace.viewport.visibleArea.bottomRight.y - volume.amountBuy * coordinateSystem.scale.y; + volumePointA3.y = canvas.chartSpace.viewport.visibleArea.bottomRight.y - volume.amountBuy * coordinateSystem.scale.y; + volumePointA4.y = canvas.chartSpace.viewport.visibleArea.bottomRight.y; } @@ -655,16 +655,16 @@ calculateSells(plotAreaFrame, thisObject.container.frame.height); // We try to see if it fits in the visible area. - if (volumePointB1.y < viewPort.visibleArea.topLeft.y && frameHeightInViewPort > visibleHeight * 2 / 3) { + if (volumePointB1.y < canvas.chartSpace.viewport.visibleArea.topLeft.y && frameHeightInViewPort > visibleHeight * 2 / 3) { calculateSells(coordinateSystem, visibleHeight); // We snap it to the view port. /* Now we set the real value of y. */ - volumePointB1.y = viewPort.visibleArea.topLeft.y; - volumePointB2.y = viewPort.visibleArea.topLeft.y + volume.amountSell * coordinateSystem.scale.y; - volumePointB3.y = viewPort.visibleArea.topLeft.y + volume.amountSell * coordinateSystem.scale.y; - volumePointB4.y = viewPort.visibleArea.topLeft.y; + volumePointB1.y = canvas.chartSpace.viewport.visibleArea.topLeft.y; + volumePointB2.y = canvas.chartSpace.viewport.visibleArea.topLeft.y + volume.amountSell * coordinateSystem.scale.y; + volumePointB3.y = canvas.chartSpace.viewport.visibleArea.topLeft.y + volume.amountSell * coordinateSystem.scale.y; + volumePointB4.y = canvas.chartSpace.viewport.visibleArea.topLeft.y; } @@ -688,15 +688,15 @@ /* Everything must fit within the visible area */ - volumePointA1 = viewPort.fitIntoVisibleArea(volumePointA1); - volumePointA2 = viewPort.fitIntoVisibleArea(volumePointA2); - volumePointA3 = viewPort.fitIntoVisibleArea(volumePointA3); - volumePointA4 = viewPort.fitIntoVisibleArea(volumePointA4); + volumePointA1 = canvas.chartSpace.viewport.fitIntoVisibleArea(volumePointA1); + volumePointA2 = canvas.chartSpace.viewport.fitIntoVisibleArea(volumePointA2); + volumePointA3 = canvas.chartSpace.viewport.fitIntoVisibleArea(volumePointA3); + volumePointA4 = canvas.chartSpace.viewport.fitIntoVisibleArea(volumePointA4); - volumePointB1 = viewPort.fitIntoVisibleArea(volumePointB1); - volumePointB2 = viewPort.fitIntoVisibleArea(volumePointB2); - volumePointB3 = viewPort.fitIntoVisibleArea(volumePointB3); - volumePointB4 = viewPort.fitIntoVisibleArea(volumePointB4); + volumePointB1 = canvas.chartSpace.viewport.fitIntoVisibleArea(volumePointB1); + volumePointB2 = canvas.chartSpace.viewport.fitIntoVisibleArea(volumePointB2); + volumePointB3 = canvas.chartSpace.viewport.fitIntoVisibleArea(volumePointB3); + volumePointB4 = canvas.chartSpace.viewport.fitIntoVisibleArea(volumePointB4); volumePointA1 = thisObject.fitFunction(volumePointA1); volumePointA2 = thisObject.fitFunction(volumePointA2);