diff --git a/CandlePanel.js b/CandlePanel.js index 297f02f66..4ee162d6d 100644 --- a/CandlePanel.js +++ b/CandlePanel.js @@ -37,8 +37,8 @@ function newAAMastersPlottersCandlesVolumesCandlesCandlePanel() { 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 * 2; - thisObject.container.frame.position.y = canvas.chartSpace.viewport.visibleArea.bottomLeft.y - thisObject.container.frame.height; + thisObject.container.frame.position.x = canvas.chartingSpace.viewport.visibleArea.topRight.x - thisObject.container.frame.width * 2; + thisObject.container.frame.position.y = canvas.chartingSpace.viewport.visibleArea.bottomLeft.y - thisObject.container.frame.height; panelTabButton = newPanelTabButton() panelTabButton.parentContainer = thisObject.container diff --git a/Candles.js b/Candles.js index cf10c3d57..adabe9ed2 100644 --- a/Candles.js +++ b/Candles.js @@ -57,8 +57,8 @@ /* 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); @@ -110,8 +110,8 @@ /* 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); @@ -303,8 +303,8 @@ 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(); @@ -348,6 +348,13 @@ if (candle.open < candle.close) { candle.direction = 'up'; } if (candle.open === candle.close) { candle.direction = 'side'; } + /* Contributing to Auto-Scale*/ + if (i === 0) { + coordinateSystem.reportXValue(candle.begin) + } + if (i === dailyFile.length - 1) { + coordinateSystem.reportXValue(candle.end) + } if ( (candle.begin >= farLeftDate.valueOf() && candle.end <= farRightDate.valueOf()) && @@ -393,8 +400,8 @@ 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(); @@ -428,6 +435,14 @@ if (candle.open < candle.close) { candle.direction = 'up'; } if (candle.open === candle.close) { candle.direction = 'side'; } + /* Contributing to Auto-Scale*/ + if (i === 0) { + coordinateSystem.reportXValue(candle.begin) + } + if (i === marketFile.length - 1) { + coordinateSystem.reportXValue(candle.end) + } + if ( (candle.begin >= leftDate.valueOf() && candle.end <= rightDate.valueOf()) && (candle.begin >= coordinateSystem.min.x && candle.end <= coordinateSystem.max.x) @@ -522,46 +537,48 @@ candle.stickPoint3 = transformThisPoint(candle.stickPoint3, thisObject.container); candle.stickPoint4 = transformThisPoint(candle.stickPoint4, thisObject.container); - let diffA = candle.stickPoint3.y - canvas.chartSpace.viewport.visibleArea.bottomLeft.y - if (diffA > 0) { - candle.candlePoint1.y = candle.candlePoint1.y - diffA - candle.candlePoint2.y = candle.candlePoint2.y - diffA - candle.candlePoint3.y = candle.candlePoint3.y - diffA - candle.candlePoint4.y = candle.candlePoint4.y - diffA + if (canvas.chartingSpace.viewport.zoomTargetLevel < ZOOM_OUT_THRESHOLD_FOR_PACKING_OBJECTS_AT_THE_BOTTOM_OR_TOP_OF_VIEWPORT) { + let diffA = candle.stickPoint3.y - canvas.chartingSpace.viewport.visibleArea.bottomLeft.y + if (diffA > 0) { + candle.candlePoint1.y = candle.candlePoint1.y - diffA + candle.candlePoint2.y = candle.candlePoint2.y - diffA + candle.candlePoint3.y = candle.candlePoint3.y - diffA + candle.candlePoint4.y = candle.candlePoint4.y - diffA - candle.stickPoint1.y = candle.stickPoint1.y - diffA - candle.stickPoint2.y = candle.stickPoint2.y - diffA - candle.stickPoint3.y = candle.stickPoint3.y - diffA - candle.stickPoint4.y = candle.stickPoint4.y - diffA + candle.stickPoint1.y = candle.stickPoint1.y - diffA + candle.stickPoint2.y = candle.stickPoint2.y - diffA + candle.stickPoint3.y = candle.stickPoint3.y - diffA + candle.stickPoint4.y = candle.stickPoint4.y - diffA + } + + let diffB = candle.stickPoint1.y - canvas.chartingSpace.viewport.visibleArea.topLeft.y + if (diffB < 0) { + candle.candlePoint1.y = candle.candlePoint1.y - diffB + candle.candlePoint2.y = candle.candlePoint2.y - diffB + candle.candlePoint3.y = candle.candlePoint3.y - diffB + candle.candlePoint4.y = candle.candlePoint4.y - diffB + + candle.stickPoint1.y = candle.stickPoint1.y - diffB + candle.stickPoint2.y = candle.stickPoint2.y - diffB + candle.stickPoint3.y = candle.stickPoint3.y - diffB + candle.stickPoint4.y = candle.stickPoint4.y - diffB + } } - let diffB = candle.stickPoint1.y - canvas.chartSpace.viewport.visibleArea.topLeft.y - if (diffB < 0) { - candle.candlePoint1.y = candle.candlePoint1.y - diffB - candle.candlePoint2.y = candle.candlePoint2.y - diffB - candle.candlePoint3.y = candle.candlePoint3.y - diffB - candle.candlePoint4.y = candle.candlePoint4.y - diffB - - candle.stickPoint1.y = candle.stickPoint1.y - diffB - candle.stickPoint2.y = candle.stickPoint2.y - diffB - candle.stickPoint3.y = candle.stickPoint3.y - diffB - candle.stickPoint4.y = candle.stickPoint4.y - diffB - } - - 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 = canvas.chartingSpace.viewport.fitIntoVisibleArea(candle.candlePoint1); + candle.candlePoint2 = canvas.chartingSpace.viewport.fitIntoVisibleArea(candle.candlePoint2); + candle.candlePoint3 = canvas.chartingSpace.viewport.fitIntoVisibleArea(candle.candlePoint3); + candle.candlePoint4 = canvas.chartingSpace.viewport.fitIntoVisibleArea(candle.candlePoint4); candle.candlePoint1 = thisObject.fitFunction(candle.candlePoint1); candle.candlePoint2 = thisObject.fitFunction(candle.candlePoint2); candle.candlePoint3 = thisObject.fitFunction(candle.candlePoint3); candle.candlePoint4 = thisObject.fitFunction(candle.candlePoint4); - 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 = canvas.chartingSpace.viewport.fitIntoVisibleArea(candle.stickPoint1); + candle.stickPoint2 = canvas.chartingSpace.viewport.fitIntoVisibleArea(candle.stickPoint2); + candle.stickPoint3 = canvas.chartingSpace.viewport.fitIntoVisibleArea(candle.stickPoint3); + candle.stickPoint4 = canvas.chartingSpace.viewport.fitIntoVisibleArea(candle.stickPoint4); candle.stickPoint1 = thisObject.fitFunction(candle.stickPoint1); candle.stickPoint2 = thisObject.fitFunction(candle.stickPoint2); @@ -578,13 +595,13 @@ candle = candles[i]; - if (candle.candlePoint2.x < canvas.chartSpace.viewport.visibleArea.bottomLeft.x || candle.candlePoint1.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x) { + if (candle.candlePoint2.x < canvas.chartingSpace.viewport.visibleArea.bottomLeft.x || candle.candlePoint1.x > canvas.chartingSpace.viewport.visibleArea.bottomRight.x) { continue } /* Contributing to Auto-Scale*/ - coordinateSystem.reportValue(candle.max) - coordinateSystem.reportValue(candle.min) + coordinateSystem.reportYValue(candle.max) + coordinateSystem.reportYValue(candle.min) //if (onScreenCandles.length < 15000) { diff --git a/VolumePanel.js b/VolumePanel.js index 50a3d726a..0ac28e3f7 100644 --- a/VolumePanel.js +++ b/VolumePanel.js @@ -37,8 +37,8 @@ function newAAMastersPlottersCandlesVolumesVolumesVolumePanel() { 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.position.y = canvas.chartSpace.viewport.visibleArea.bottomLeft.y - thisObject.container.frame.height; + thisObject.container.frame.position.x = canvas.chartingSpace.viewport.visibleArea.topRight.x - thisObject.container.frame.width; + thisObject.container.frame.position.y = canvas.chartingSpace.viewport.visibleArea.bottomLeft.y - thisObject.container.frame.height; panelTabButton = newPanelTabButton() panelTabButton.parentContainer = thisObject.container diff --git a/Volumes.js b/Volumes.js index 3d4a72f56..19ff0c473 100644 --- a/Volumes.js +++ b/Volumes.js @@ -65,8 +65,8 @@ /* 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); @@ -118,8 +118,8 @@ /* 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); @@ -298,8 +298,8 @@ if (fileCursor.files.size === 0) { return; } // We need to wait until there are files in the cursor - 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(); @@ -382,8 +382,8 @@ if (marketFile === undefined) { return; } // Initialization not complete yet. - 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(); @@ -438,7 +438,7 @@ /* Now we calculate and plot the volumes */ - let visibleHeight = canvas.chartSpace.viewport.visibleArea.bottomRight.y - canvas.chartSpace.viewport.visibleArea.topLeft.y; + let visibleHeight = canvas.chartingSpace.viewport.visibleArea.bottomRight.y - canvas.chartingSpace.viewport.visibleArea.topLeft.y; let frameCorner1 = { x: 0, @@ -506,7 +506,7 @@ volumePointA1.x = volumePointA1.x - baseIncrement; volumePointA4.x = volumePointA4.x + baseIncrement; - if (volumePointA4.x < canvas.chartSpace.viewport.visibleArea.bottomLeft.x || volumePointA1.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x) { + if (volumePointA4.x < canvas.chartingSpace.viewport.visibleArea.bottomLeft.x || volumePointA1.x > canvas.chartingSpace.viewport.visibleArea.bottomRight.x) { return false; } @@ -516,7 +516,7 @@ if (calculateBuys(coordinateSystem, thisObject.container.frame.height) === false) { continue; } // We try to see if it fits in the visible area. - let diffA = volumePointA1.y - canvas.chartSpace.viewport.visibleArea.bottomLeft.y + let diffA = volumePointA1.y - canvas.chartingSpace.viewport.visibleArea.bottomLeft.y if (diffA > 0) { volumePointA1.y = volumePointA1.y - diffA volumePointA2.y = volumePointA2.y - diffA @@ -565,7 +565,7 @@ calculateSells(coordinateSystem, thisObject.container.frame.height); // We try to see if it fits in the visible area. - let diffB = volumePointB1.y - canvas.chartSpace.viewport.visibleArea.topLeft.y + let diffB = volumePointB1.y - canvas.chartingSpace.viewport.visibleArea.topLeft.y if (diffB < 0) { volumePointB1.y = volumePointB1.y - diffB volumePointB2.y = volumePointB2.y - diffB @@ -593,15 +593,15 @@ /* Everything must fit within the visible area */ - volumePointA1 = canvas.chartSpace.viewport.fitIntoVisibleArea(volumePointA1); - volumePointA2 = canvas.chartSpace.viewport.fitIntoVisibleArea(volumePointA2); - volumePointA3 = canvas.chartSpace.viewport.fitIntoVisibleArea(volumePointA3); - volumePointA4 = canvas.chartSpace.viewport.fitIntoVisibleArea(volumePointA4); + volumePointA1 = canvas.chartingSpace.viewport.fitIntoVisibleArea(volumePointA1); + volumePointA2 = canvas.chartingSpace.viewport.fitIntoVisibleArea(volumePointA2); + volumePointA3 = canvas.chartingSpace.viewport.fitIntoVisibleArea(volumePointA3); + volumePointA4 = canvas.chartingSpace.viewport.fitIntoVisibleArea(volumePointA4); - volumePointB1 = canvas.chartSpace.viewport.fitIntoVisibleArea(volumePointB1); - volumePointB2 = canvas.chartSpace.viewport.fitIntoVisibleArea(volumePointB2); - volumePointB3 = canvas.chartSpace.viewport.fitIntoVisibleArea(volumePointB3); - volumePointB4 = canvas.chartSpace.viewport.fitIntoVisibleArea(volumePointB4); + volumePointB1 = canvas.chartingSpace.viewport.fitIntoVisibleArea(volumePointB1); + volumePointB2 = canvas.chartingSpace.viewport.fitIntoVisibleArea(volumePointB2); + volumePointB3 = canvas.chartingSpace.viewport.fitIntoVisibleArea(volumePointB3); + volumePointB4 = canvas.chartingSpace.viewport.fitIntoVisibleArea(volumePointB4); volumePointA1 = thisObject.fitFunction(volumePointA1); volumePointA2 = thisObject.fitFunction(volumePointA2); @@ -700,9 +700,9 @@ } /* Contributing to Auto-Scale*/ - coordinateSystem.reportValue(volume.amountBuy * 5) - coordinateSystem.reportValue(volume.amountSell * 5) - coordinateSystem.reportValue(0) + coordinateSystem.reportYValue(volume.amountBuy * 5) + coordinateSystem.reportYValue(volume.amountSell * 5) + coordinateSystem.reportYValue(0) } } }