From a1d10c5870726bff24fc1dcf4c224f86f7f296cf Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 12 Mar 2018 14:45:27 +0100 Subject: [PATCH] Left Scale Running --- .vs/AAWebPlatform/v15/.suo | Bin 83456 -> 76288 bytes ChartGrid.js | 808 +++++++++++++++++++------------------ ViewPort.js | 2 +- server.js | 2 +- 4 files changed, 423 insertions(+), 389 deletions(-) diff --git a/.vs/AAWebPlatform/v15/.suo b/.vs/AAWebPlatform/v15/.suo index 0eea32e5d423a3e2bc7424667f13002174b44c99..6e8fe90b13be245dc813604f1e6ac0f68a9ffb7f 100644 GIT binary patch delta 4057 zcmd^>ZBSI#8OQfrcH;^QEN_Cm$nJsy@*+zRMKK}}HNK>PO09`T2w1@I;<7|R2G%4d zhL8yRWP-^w0k4J`NM;iEexQ?d8iLif({z}$pwk)4prcTe(TNjr+KFZRf7ZJRHl%63 z^h0xpAJ5A<=iYOl|2gNbqeJHy)pn+vC5?I+H5y;IK48Y}c5{~f*fT{@Qb7GXztQMF z__HWLW~i8&rDm~-rln^^DmD2W7SGVMPi)&pG-9OZ+5o>qjeiCk1|Cu41+XDtCD;#w z0S}rFn*k!#cpGej>K}v+SAFjL5d3&Gj)7gQ(PU{-;VcE|YC|z>8pu{-J*-Lf@w%Re zn!AcZ!fFr%f@n3#Pe`U)`tYv3`o)`({3jBdV7GwvKnoUvt-t_w;V#RA;3NSa&6gj1 zE+t<-h5s0M96SN;W!>&_49x!dtVAXJC9~qE;I9BSHFsoITMh=tA3~y8O&*4A0c~o` zPjSF^N;Uow&EmTi40{s2uA1-$F8#zVQ#j>A*v_PY9<8?OVouT#s|H z_D%@Qq1zTFQk0aEQ6Fce{eek5tJP0wuIv+vY0re9j2u+Z<`l-eH>M}E&)xpKVc>T! zjEudrm2SNoPM#ZO*3*y`vWf8+Er&t3LBDa%hmPZOE;#pyJB#&97N`@Rn0>dc>~6Z|dU z6xojy8dyR;*1S?0{)XUnz!$A+j8dZNuZeFL*3Vm5bW_|7LXw}+I@22c4*3k&);)SR zY;l`eailqfd`yyCCF;7pP+9m^rH?_0sY%{JrEwvy zQPY@_?4UI2T2K9X06q z0}`o}Ua$#iT+rCXSRH?CH6(^J_4$>hHv0x!m22D~{919g^CwQH>7_HS+Iec5?9{p@ z972~p(x3DiFGqU)asqv-q=@&>EkvMd<0UkCGr0S7mIyU|7@Rw^XXM0}t;757T+dj4 z(KF()q}cAERbq&`hWA*uRMl4G*VWm|t7=Q_72BE`>=iX>)eS8zhpm|f))m=VR@b79 zLeI10Qrz3RvG0m3GH1pas*&D5t4U{sP$#LYe;M`mN7MLb3#>_H(VX$#W05qW#E8?F zzok330P|Y+`_1IIXr!-(6Y1576e|2Ek9w~Mx*Yl9dlsm2`-nk{RYl^gMQZ86Eo<~8 zRTT#d>uh#1|1p{Bh6BWX1?Adlb(#V$Uk#qB4V|kZJT@k3dsR)vT&<{A0hxcB#KR-L zufyE;&%LoeXdVjbz4#CfqMM_(uU7?6biTp6M(EA4G?B0FoGIa59-N-jJ&x zy(hlS@XZJd-txR{?{zB{%%|5CUYfqVH2DWofv0Ri-m-nY7|3yRi0kU_H>)X=-`nu- ziEnD2dn0+?&Jkap0-5h-)6nI_#5#=~KSQ=?O7X*^0zWbvG==bMHHpUajmL*$^8Rx9 zWXV6WEv-uDm3kpxk?6qHD4IB_RbqR~#N20uE)CnM>=`N(&*WdfJ|L5(ay>BlldAENpc)iCY1Plf&5`Wk6&Z5{} p<6vZ>m<*({>1gMSFYPW17|hHP?@RPr|I%4!xc4mo#!iF={|nFoJhlJ; delta 5314 zcmdUy3s6+&702&)*%cNSxIA1?P?i;xmlS*}YLQobB@v&AH6eg+!9`q11Ow{>V=WD` zr@pGOaIJKzq1C;UI+>~IMpDg89c@}Coy=s6bhPQDX{RxoHknlVKg(WO1k5;frskXZ z?K$81zWY7S`R@7dIO~!qhR9Rz+Q6y=IBuN3_Zg+P#ge1V&Gexm-sHghIoiE<} zqsWIP=V_{yYlT90D~04X>3p_YGr_$OmP!=RR3Z@!%x6wuoZBd1F{;_0Pas8n&J#jROo9_8Jan^<-@_F z)UXr%ZdmbyqE8eAo!#YMc;EuqIeu)P2bl|E0LL#1=j#@lIWJfGA__p zoevogh5-(F2#5x}_a`A2g9R-`(OJu&@R(edLx0v+Ujg|&zyU7y*|^V?mZHd{20z0( z=o|g&<jgU^L4cm^d7RT82EwgCLw`MD9W#j?Gn zq|THLWd>Kyl!OVF*&)KH+T0+2EYTO{digIB)r9O-E%GBCGyJ4xjk+$}qpY%Kje!zp zHE7mfB#R*38&njZNRD5=u34?41?9zLX^w;@nVgX}%{JnipzWh0wa77Al@RZ%%xA9Gn%1O_mtD2hLp?7JTl;bRwQOoUra5b!LY*qRXLSmrK%S6j`_^>h z51};E*2omimYyI#vA)otGK$tIdPrBhvCn7aeLd9FsEWPLaESHSmu zw!M%%I=69Y@zc5PLjARtqO|a1Q2aOHUAa3mO(?4x+s>pIPX+y9$D%!IcX2CaXZ=>4 zCsWnm)3x+vR|C{S*}agD(8}vVT_n3oH!8_-L5CBUhy7#G+Ff@~xH}e5){JO!m7Y*` zcYb7F-0-KLy;W%s*4}ZH(PypE^n97>e&LV^;^`S`EqTGUCeJ81WAIVX9BZ0{YlUOT zGcbHUOsiedF31{j+CZ!kS)AyBXM#GUDz2zGq)=Swqj3oXxCD5T^R3f z>5&StaEngbJ5@o9G z;^&m5Rz&34D=Jqz);reQH!XJ9t4h|crngU}QG_kSbuK5UaDDmeymEUrc}}GV91;1n z`BE%h-)Yd|ca(}pu}reMt<>Bx-@r5R%;Gg(7PWSoNa;-Wt;1AMX5X@Pi(_?#x629c z61uR;zN)&+(SOw@@2X46*7Xe7#=V2Rw(6=a_A2iX?J!PNkI8iU+@!GHwmki*P&it! zv$?F#@j5J+l(tNGrSEEFa{(>v$fWD%jN+c=*JalELJMERdf{7@zjE>i+eKt}-<@S_ z*fO2YbfiQKY`)(QJRg7Z>4lT_1d#urct;QGe-1G3ES}dgc+)_qhv(=0>17m@G?3pX zu);(YoinJWv&O>NRWENsi39l@pNfG36BTh^w6M%Ixb-$y~AR@$?TTU{wDuJhVjEK`T>%XJSotVD70-nA0Y3e_l}zRUKL|c z;<0H(XXXFvTP}E%iidt36OCTa^SfmVEev`FWR9&_G8(40UdaxNrCXCa;BONIEqF&=;Ca-}KwGxxHTakkqign}Za{5)1!XbyGR;^~TJ>z5S}{Q<&h2pl|n1z@8+Me$gmKZ(l2XRnmV-fZH% zgYd?1R{NIatv;EIobPyqH=X&tUJp!OS>!pFq+k7y{Dyd(e4I_^?@pxR`cN(R@>_y$ zJpHBlKinC;+5Ry}-J?QE9Bb_QWnQjcH9ROysn_I(%T&~LsX)vB^RGqw5MiLwiUnV fontSize || lastLabelPosition.y === 0)) { + let label = ' ' + Math.round(j * 1000000) / 1000000; - if (labelPoint.y > viewPort.visibleArea.topLeft.y + fontSize && labelPoint.y < viewPort.visibleArea.bottomRight.y - fontSize) { + let labelPoint = { + x: viewPort.visibleArea.bottomRight.x + 1, + y: point1.y + fontSize / 2 * FONT_ASPECT_RATIO + }; - browserCanvasContext.font = fontSize + 'px Courier New'; - browserCanvasContext.fillStyle = 'rgba(60, 60, 60, 0.50)'; - browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y); + if (Math.abs(lastRightLabelPosition.y - labelPoint.y > fontSize || lastRightLabelPosition.y === 0)) { + if (labelPoint.y > viewPort.visibleArea.topLeft.y + fontSize && labelPoint.y < viewPort.visibleArea.bottomRight.y - fontSize) { + + browserCanvasContext.font = fontSize + 'px Courier New'; + browserCanvasContext.fillStyle = 'rgba(60, 60, 60, 0.50)'; + browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y); + + } } + + lastRightLabelPosition.x = labelPoint.x; + lastRightLabelPosition.y = labelPoint.y; + } + function leftScale() { - lastLabelPosition.x = labelPoint.x; - lastLabelPosition.y = labelPoint.y; + let fontSize = 10; + + /* + j is a value between 0 and the max y on the scale of the products. + If we want to convert j to the scale of profits we need to apply the following formula: + */ + + let labelValue = (j - timeLineCoordinateSystem.max.y / 2) * 200 / timeLineCoordinateSystem.max.y; + labelValue = Math.round(labelValue * 1000000) / 1000000; + if (labelValue > 0) { labelValue = '+' + labelValue; } + if (parseInt(labelValue) > -10 && parseInt(labelValue) < 10) { labelValue = ' ' + labelValue; } + if (parseInt(labelValue) === 0) { labelValue = ' ' + labelValue; } + let label = ' ' + pad(labelValue, 3) + '%'; + + let labelPoint = { + x: -2, + y: point1.y + fontSize / 2 * FONT_ASPECT_RATIO + }; + + if (Math.abs(lastLeftLabelPosition.y - labelPoint.y > fontSize || lastLeftLabelPosition.y === 0)) { + + if (labelPoint.y > viewPort.visibleArea.topLeft.y + fontSize && labelPoint.y < viewPort.visibleArea.bottomRight.y - fontSize) { + + browserCanvasContext.font = fontSize + 'px Courier New'; + browserCanvasContext.fillStyle = 'rgba(60, 60, 60, 0.50)'; + browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y); + + } + } + + lastLeftLabelPosition.x = labelPoint.x; + lastLeftLabelPosition.y = labelPoint.y; + + } } } @@ -592,7 +629,6 @@ } - function printLabels(baseZoomFilter, maxZoom) { let zoomFilter = viewPort.zoomFontSize(baseZoomFilter); @@ -639,6 +675,4 @@ browserCanvasContext.fill(); } } - - } diff --git a/ViewPort.js b/ViewPort.js index a550cda47..6ca6a9d33 100644 --- a/ViewPort.js +++ b/ViewPort.js @@ -6,7 +6,7 @@ function newViewPort() { let ANIMATION_INCREMENT = 0.25; const TOP_MARGIN = 15; const BOTTOM_MARGIN = 0; - const LEFT_MARGIN = 0; + const LEFT_MARGIN = 50; const RIGHT_MARGIN = 50; let viewPort = { diff --git a/server.js b/server.js index 1c66dcc86..6fb2d9dee 100644 --- a/server.js +++ b/server.js @@ -6,7 +6,7 @@ if (CONSOLE_LOG === true) { } -const DEBUG_MODE = false; // This forces the server to read Plotters from the local drive. +const DEBUG_MODE = true; // This forces the server to read Plotters from the local drive. if (CONSOLE_LOG === true && DEBUG_MODE === true) {