From 27c72c858668cfc50df831df0d039d8de0682b96 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 27 Apr 2018 15:15:02 +0200 Subject: [PATCH] 2 labels per ball --- .vs/AAWeb/v15/.suo | Bin 62464 -> 65024 bytes Ball.js | 36 ++++++++++++++++++++++++++++-------- CompetitionStorage.js | 2 +- TimelineChart.js | 3 ++- 4 files changed, 31 insertions(+), 10 deletions(-) diff --git a/.vs/AAWeb/v15/.suo b/.vs/AAWeb/v15/.suo index a4537a73053eca30de09c39a104e449b0e05d277..f520f8a1767b039fdefebf6bb9802dd6979169de 100644 GIT binary patch delta 3085 zcmdUxYfO_@7{}l9_AOArN&x|p%S%D&R0NbEidK z@}A4{f6h5={a(@fNYRlIFA75`Oc17^N#(~rpO0!4J!Ofas`d8yPiNfyoTY(7Y++~M zf%ukKBEk;EG8My)zEtc9nhKq=4vkyzP%*7C4lN0xW=fOLRv{WB3Ymt)AdyHkvJjDx zP(+8&H(JbtkrxnLo4*b$K`~h~u`m@0K{AneWG*rbQ6q^6?VuL(BqSYy3qdK7)6rOf ztUzWXGz;7hYGa$6#$;Ep#PXm^HDCEAHtlvAr(q2|V&yCVlEg&S(Uuhh7cP zXxSrPFk=C|5SS_zpam&XMob_YG#Mq@4&~$yut;$WsPL?1VFWr4p$?AAntZ6D|j2f<5^Rm*e`Cu1J~7x_;(P zkvtoUSx_Z*q?HbKPOE^WX*uqh;&W}lGY1F89s6i|G%&ZPw@dDYqJQ#OQRLd3eg>l2 zAo)W_UpPA;2fJ2B!4CB@mH()O53lJrb$JlEZSqhBn+lG}D^z~{0*308bO1&EFgGyR zv-b*<=;#2Bsw5Xx@P|tR)h>g~vLVT^O4*HdPS8{>2mO%(kgN2g@=G1MtWcP5gt&&)U~G_M^8{L%Amj>J_`6e>hk;yzH$bMqS-p>mJ^`4ufN5Y)Ljn9` zHE@G9pSfmVhN86BK(0v{S2hr>h2Y(?bn>1g0N7P#c3xdtzASO%fFssK0x= zkgJc8qGGQP>Q( zwoeHw%WwI4<`*wkb^q{7^xk7@`=MHngd}_V#O7jp&b&U1tkZgU^&|QJv}oqOBEqF> z*>K~tPdt{ny3z}#q(b0WhZKpF%Gn3u$1QIaH%jQjn5EF|{v@-(hE&mSnN`0i`A06e^zeE>K4 zUVfdyPTdmd=UMvo7+4Ksx@1!r*6aw*4m^-)uqT8XR8GY~IT!%-hLpJqHYOlhNGg(z zyoN*}X$Vcq!?FmOg;;}q)8RA2q*`aNMN#z3z;+=r6Pb?`BlIc-Se76zWFbRPs|ptqnL*gS>!jL^dI{(4kBLd4i42>!?ig@iI06(s`O< zFBmN#ZL`4>_781K4J2v`0?}1A{bsD7zwjw#Nmz?S!jWi%>?9)zNE{N6I1mdm39%t~ zYSJ_$0wKMW^F%D6UQWmfrTw7dS1}-@I3+kKJy^mSIWuk!Hps{dBxDt?$t`TWqb5VY z1$(zbmp)%l8{k`K_>4zrC|R5_e#%$|cp{pa6>i3?ltZt{(!mqi>T|f{7@Q5o&KY4# zv9c=$b~=_Qj9$|~184+pI4TVE9!~{3*d*}GTcI%OBR>=rK{DvB(sSSTtxS;^c99o~ zyO#{6lrB86t=tz?HI))4NG;uZQcpRM4Z4VCgf5^3x{R@+J<83%8*dfXgkh%TS-G&L z4C}RZC5(On(3E^!STaX+s+FtLxNloO^xM49zilnNJJlxBDN-g1?T2+q5`WHI#0+!* zv?Yy+rrB-sljTK9jkF9Yor{%_QryiSaEF%I8|d|9RF7eR_ABT4_OUnFmJK2 zVfbi^o7Kafjx|s<6ax)gpQ9t+B|U>b@lyPt;3ox&>x;ly@6=|w?&=QYA4qm~oAB0q z8Mt3|g44ZYV&3b!D;i&^tKHZ{TgM{d(%bOW_FTiNi)0rUtLe0YAkin(xv+iD!9m5P3wm4w*(U%~#EgX&y#zFHNao9cvyT90{=5Telthol+ z-*-dYSa^vUNPplcNmW3x7~31p)oKnk`^!XG%W3uqM{hj~3)B>m+V&HBB1;h6xY~Dq zv*>Ggvj0VndWb`1XExZI^5Agep@-;sQ9bgwkYh03vliB=c34yNG}s#*V0tqP4yaMk z(d~nCM;AP5T&GAbJf?%td|Zp)L!XJ@^8bZjKTI7YZ1h zJ6sIT_miM_&;m81lSSOG8yIs6cEPXHMtouL^KBQL{N4zWwI;FYib)?FQ-}C_O}}x7 zUS<~NZ+~QveJvYi{2n2+TV_2(w`78MwbOLD?n9+;{;jjF;^CpvKd$V9icY(B*~cGP Y^@vfu!@&e@uya{k)yEz_@!tmi0{)}SssI20 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)