From 832510c3d12710b4adba91c28c865f74f595bc55 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 3 Mar 2018 23:19:44 +0100 Subject: [PATCH] Panel positioning --- .vs/AAWebPlatform/v15/.suo | Bin 78848 -> 83456 bytes Panels/CurrentCandlePanel.js | 4 +-- Panels/CurrentVolumePanel.js | 2 +- Panels/ProductsPanel.js | 6 ++-- ProductCard.js | 65 ++++++++++++++++++++++++----------- 5 files changed, 50 insertions(+), 27 deletions(-) diff --git a/.vs/AAWebPlatform/v15/.suo b/.vs/AAWebPlatform/v15/.suo index 86bb77a4b182f9d9e60f188cbda333a577c81f17..e31f3643289f6a3d601679a9c2c9bd7f837c0264 100644 GIT binary patch delta 2556 zcmcgueN0nV6z_R`Ev58Hp$N!8Yf%Ip(E5SVZN`QQ%5(!%_=iPNak?NV1-}={41bty z#&O(m&JB4pUBb2uxtop4hEVp0nZ~cgxIY%HWPWUkaSSkXAF^{xA9>X3{&3lAem(b| zbM866bMC#b_1qCXZ|M#`KhdPoXtacfBO@aug5$&!C4U0wv3;3U9CF>rV%vl$02A)g z7D>PtOd*i}2wsXy7c|W{tepc(F-x2xJx7-Lghd1=t`>7a#%A$Vh{3yJQkssmg@ghE zj}b>mCgc;A;8fju@L;npSE{8skH3}VHtf~Shllt8R)UriTE(xTeJ`+WdW919&2T^? z4o9VD%^?42p|#UVIzr=Al0^hFA(Ie`PD7IUZ^|IijAzOwiJJ_mY3(#vK$uO)B|J-* zNk}0~!FGcsVFHcj5hf9M*JhE#GlsQbf2SlJmq%y99&Cs%pT3>+4I!T$BzF>a5q5`k zdr8{ZKy~^ zV5LEhO<=ZZWrA=jh3(EL0uv9R6wXt!!5NaiWp2gv!xaBWD8~mRj}nfB=6n%<9A(W zh~{kszD*-+1@Trf0(rMlUMR>#Lc~gNaAh{L7E}KYSoNHWw(Gs7IO#rxgAn#&Z)PbA ze3B!eXX9pccdXWH?DWaT6CD=p=@9jH^3-V9y^a>~(UlnZBIn;0cE(9YFP%LLg)wQ+ zezpxdvB|#$J7-44=Qq^VRn^qzSJrH(t}3pqsj9}N?pcpIl+{)@Y*9IUszks|Hzwl# z?sRD58hzR3svX6(==m`lUp##rJ^mVOysE?E%Td_Tm&xv(UIX$sLd>Z#KK~n)&$`

+D#5l|EAb$C#D;Dl_u@{AYnbuJA*ej8m^ys*k;@Zhq{?_^9-e_&mm} z@KKqAe8%;oGPS_raLsouSm1o!TwGVXp<#W!J9zOZ(_*FbbgRrTZicJQ=UZY&3k!Z{ z&^Nu%*~PPK0W4_zHm~K};&GSl+9e56DuS`y6_GFcSjDOyMymKRW~E}4`N=zwZcu7Q z=ha0Rdv`9rbfF6mUN$o6hdq!OuPU&a-jTdWS35fT>X`Z3uYfE3F?iv+BPa`R9X39F z=VBvwE&&kyJ*?*!rxtDB&wMJTtngNemcM;pCMbWFc%kf6pb+GMi1Fugm~{J1VN~&x zAO{45eTl6{Gw3f|#@Ze2@ zui6NQ0NmpdVU~rGv{?V1uv0n*jp$ b54mvb1A}k54Zehv8PG2<=b6diwS)K%Wdo?B delta 1448 zcma)+ZA?>V6vsKwy|=xTwv@FXk~(fHLS?leu(}t+)_{9y%+{J2_hAXey?)pWEEU0- z*e)TNj1SNwE8m1dxKeT?;kCL(^2Wo~To+l*@=x@F6j;4otuvpWyef$SyTi47ThXVntUYMK{OM)aIahkL)a_73D4rs@`g=C6n&0(hNvVIqJ$_Xo+^mE zSwCSXYKSuQsT(ZC!Gx8bO2wOPn}lyDJ`5Mp7x zqK07mU~n_;E_6W`9w^+mMZ^!}^9RW~i5}t*@d0s|IKt-(_bIAqPSrUKHdbM{_!>r| zZXULL#Z1d#ajbi39=2YSSMufk5DRp(;Szo*@I076ET&siiVHyxciL}2!p&lKjcZy4 zQV(m4YgI2ZHbk;&Kj3A3JzuCX>Xs{K@ZxGIK4Kkud7A#>?Gc=8iYMFNR($>}r9#Jlb`Hnl~-$ z#Wz^1SHveg%75?C8)Dvn8IED^iz_RwJuP4G8X?wh;TFGzju>MM$8C1ryyp@mo?xkd zO~J;)GQe0USJOO`VL&|CD3q zl;=Uzi3yWom@d4Px~T=2{i!WBRg5!p3eH@w!_f3`Jbz`JkACix*5&Bemc6wtah@55 zR^_YpIrevx+~m7B@^uzep1lfuZB(cQ`Wb;hv?B8Cq`Ic-t2?;1_@NNgNh)Qql;zqybp6 z3|M@&3AD6khK!Ufrx1nXvof^CJBmO}@2-F|kbH<*ei-(r{dPDD@!D#5Ej~bhTIsi) za12PLOIDNWQq6sF9B|2L*#k>@98Ff^XS_BYsE5 100) { marketFileProgressBar.value = 100; } + if (CONSOLE_LOG === true) { console.log("ProductCard onMarketFileLoaded Value = " + marketFileProgressBar.value + "% for " + thisObject.code + ". Event = " + JSON.stringify(event)); @@ -198,6 +203,8 @@ dailyFileProgressBar.fillStyle = LOADING_FILL_STYLE; dailyFileProgressBar.strokeStyle = LOADING_STROKE_STYLE; + if (dailyFileProgressBar.value > 100) { dailyFileProgressBar.value = 100;} + if (CONSOLE_LOG === true) { console.log("ProductCard onDailyFileLoaded Value = " + dailyFileProgressBar.value + "% for " + thisObject.code + ". Event = " + JSON.stringify(event)); @@ -211,6 +218,8 @@ singleFileProgressBar.fillStyle = LOADING_FILL_STYLE; singleFileProgressBar.strokeStyle = LOADING_STROKE_STYLE; + if (singleFileProgressBar.value > 100) { singleFileProgressBar.value = 100; } + if (CONSOLE_LOG === true) { console.log("ProductCard onSingleFileLoaded Value = " + singleFileProgressBar.value + "% for " + thisObject.code + ". Event = " + JSON.stringify(event)); @@ -378,6 +387,8 @@ /* ------------------- Progress Bars -------------------------- */ const ANIMATED_INCREMENT = 5; + const OPACITY_INCREMENT = 0.05; + const OPACITY_MIN = 0.1; let point1; let point2; @@ -391,6 +402,7 @@ if (marketFileProgressBar.animatedValue < marketFileProgressBar.value) { marketFileProgressBar.animatedValue = marketFileProgressBar.animatedValue + ANIMATED_INCREMENT; + marketFileProgressBar.opacity = marketFileProgressBar.opacity + OPACITY_INCREMENT; } @@ -398,8 +410,11 @@ marketFileProgressBar.animatedValue = 100; - marketFileProgressBar.fillStyle = LOADED_FILL_STYLE; - marketFileProgressBar.strokeStyle = LOADED_STROKE_STYLE; + marketFileProgressBar.opacity = marketFileProgressBar.opacity - OPACITY_INCREMENT; + if (marketFileProgressBar.opacity < OPACITY_MIN) { marketFileProgressBar.opacity = OPACITY_MIN;} + + marketFileProgressBar.fillStyle = LOADED_FILL_STYLE.replace('@Opacity', marketFileProgressBar.opacity.toString()); + marketFileProgressBar.strokeStyle = LOADED_STROKE_STYLE.replace('@Opacity', marketFileProgressBar.opacity.toString()); changeStatusTo(PRODUCT_CARD_STATUS.ON); } @@ -438,8 +453,8 @@ browserCanvasContext.lineTo(point4.x, point4.y); browserCanvasContext.closePath(); - browserCanvasContext.fillStyle = marketFileProgressBar.fillStyle; - browserCanvasContext.strokeStyle = marketFileProgressBar.strokeStyle; + browserCanvasContext.fillStyle = marketFileProgressBar.fillStyle.replace('@Opacity', marketFileProgressBar.opacity.toString()); + browserCanvasContext.strokeStyle = marketFileProgressBar.strokeStyle.replace('@Opacity', marketFileProgressBar.opacity.toString()); browserCanvasContext.fill(); browserCanvasContext.lineWidth = 0.1; @@ -452,6 +467,7 @@ if (dailyFileProgressBar.animatedValue < dailyFileProgressBar.value) { dailyFileProgressBar.animatedValue = dailyFileProgressBar.animatedValue + ANIMATED_INCREMENT; + dailyFileProgressBar.opacity = dailyFileProgressBar.opacity + OPACITY_INCREMENT; } @@ -459,8 +475,11 @@ dailyFileProgressBar.animatedValue = 100; - dailyFileProgressBar.fillStyle = LOADED_FILL_STYLE; - dailyFileProgressBar.strokeStyle = LOADED_STROKE_STYLE; + dailyFileProgressBar.opacity = dailyFileProgressBar.opacity - OPACITY_INCREMENT; + if (dailyFileProgressBar.opacity < OPACITY_MIN) { dailyFileProgressBar.opacity = OPACITY_MIN; } + + dailyFileProgressBar.fillStyle = LOADED_FILL_STYLE.replace('@Opacity', dailyFileProgressBar.opacity.toString()); + dailyFileProgressBar.strokeStyle = LOADED_STROKE_STYLE.replace('@Opacity', dailyFileProgressBar.opacity.toString()); changeStatusTo(PRODUCT_CARD_STATUS.ON); } @@ -499,8 +518,8 @@ browserCanvasContext.lineTo(point4.x, point4.y); browserCanvasContext.closePath(); - browserCanvasContext.fillStyle = dailyFileProgressBar.fillStyle; - browserCanvasContext.strokeStyle = dailyFileProgressBar.strokeStyle; + browserCanvasContext.fillStyle = dailyFileProgressBar.fillStyle.replace('@Opacity', dailyFileProgressBar.opacity.toString()); + browserCanvasContext.strokeStyle = dailyFileProgressBar.strokeStyle.replace('@Opacity', dailyFileProgressBar.opacity.toString()); browserCanvasContext.fill(); browserCanvasContext.lineWidth = 0.1; @@ -513,6 +532,7 @@ if (singleFileProgressBar.animatedValue < singleFileProgressBar.value) { singleFileProgressBar.animatedValue = singleFileProgressBar.animatedValue + ANIMATED_INCREMENT; + singleFileProgressBar.opacity = singleFileProgressBar.opacity + OPACITY_INCREMENT; } @@ -520,8 +540,11 @@ singleFileProgressBar.animatedValue = 100; - singleFileProgressBar.fillStyle = LOADED_FILL_STYLE; - singleFileProgressBar.strokeStyle = LOADED_STROKE_STYLE; + singleFileProgressBar.opacity = singleFileProgressBar.opacity - OPACITY_INCREMENT; + if (singleFileProgressBar.opacity < OPACITY_MIN) { singleFileProgressBar.opacity = OPACITY_MIN; } + + singleFileProgressBar.fillStyle = LOADED_FILL_STYLE.replace('@Opacity', singleFileProgressBar.opacity.toString()); + singleFileProgressBar.strokeStyle = LOADED_STROKE_STYLE.replace('@Opacity', singleFileProgressBar.opacity.toString()); changeStatusTo(PRODUCT_CARD_STATUS.ON); @@ -561,8 +584,8 @@ browserCanvasContext.lineTo(point4.x, point4.y); browserCanvasContext.closePath(); - browserCanvasContext.fillStyle = singleFileProgressBar.fillStyle; - browserCanvasContext.strokeStyle = singleFileProgressBar.strokeStyle; + browserCanvasContext.fillStyle = singleFileProgressBar.fillStyle.replace('@Opacity', singleFileProgressBar.opacity.toString()); + browserCanvasContext.strokeStyle = singleFileProgressBar.strokeStyle.replace('@Opacity', singleFileProgressBar.opacity.toString()); browserCanvasContext.fill(); browserCanvasContext.lineWidth = 0.1;