diff --git a/.vs/AAWeb/v15/.suo b/.vs/AAWeb/v15/.suo index a4537a730..f520f8a17 100644 Binary files a/.vs/AAWeb/v15/.suo and b/.vs/AAWeb/v15/.suo differ diff --git a/Ball.js b/Ball.js index cd2002192..c4081a7a4 100644 --- a/Ball.js +++ b/Ball.js @@ -227,17 +227,37 @@ function newBall() { browserCanvasContext.font = fontSize + 'px Courier New'; - let label = thisObject.input.label; + let label; + + label = thisObject.input.upLabel; - labelPoint = { - x: thisObject.currentPosition.x - label.length / 2 * fontSize * 0.60, - y: thisObject.currentPosition.y + thisObject.currentImageSize / 2 + fontSize * 0.60 + 5 - }; + if (label !== undefined) { - browserCanvasContext.font = fontSize + 'px Courier New'; - browserCanvasContext.fillStyle = thisObject.labelStrokeStyle; - browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y); + labelPoint = { + x: thisObject.currentPosition.x - label.length / 2 * fontSize * 0.60, + y: thisObject.currentPosition.y - thisObject.currentImageSize / 2 - fontSize * 0.60 - 5 + }; + browserCanvasContext.font = fontSize + 'px Courier New'; + browserCanvasContext.fillStyle = thisObject.labelStrokeStyle; + browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y); + + } + + label = thisObject.input.downLabel; + + if (label !== undefined) { + + labelPoint = { + x: thisObject.currentPosition.x - label.length / 2 * fontSize * 0.60, + y: thisObject.currentPosition.y + thisObject.currentImageSize / 2 + fontSize * 0.60 + 10 + }; + + browserCanvasContext.font = fontSize + 'px Courier New'; + browserCanvasContext.fillStyle = thisObject.labelStrokeStyle; + browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y); + + } } } } diff --git a/CompetitionStorage.js b/CompetitionStorage.js index c62dcd1fa..d0ddd77ba 100644 --- a/CompetitionStorage.js +++ b/CompetitionStorage.js @@ -43,7 +43,7 @@ function newCompetitionStorage(pName) { let devTeam = ecosystem.getTeam(pCompetition.participants[i].devTeam); let bot = ecosystem.getBot(devTeam, pCompetition.participants[i].bot) - let product = ecosystem.getProduct(bot, "Trading History"); + let product = ecosystem.getProduct(bot, "Live Trading History"); for (let i = 0; i < product.dataSets.length; i++) { diff --git a/TimelineChart.js b/TimelineChart.js index 05f417647..1041b5235 100644 --- a/TimelineChart.js +++ b/TimelineChart.js @@ -265,7 +265,8 @@ let imageId = pProductCard.bot.devTeam + "." + pProductCard.bot.profilePicture; - productPlotter.plotter.profile.label = pProductCard.bot.displayName; + productPlotter.plotter.profile.upLabel = pProductCard.product.shortDisplayName; + productPlotter.plotter.profile.downLabel = pProductCard.bot.displayName; productPlotter.plotter.profile.imageId = imageId; productPlotter.profile = canvas.floatingSpace.createNewBall(productPlotter.plotter.profile, thisObject.container)