From c9b135dd6552b6ef1e25884f672c5c239c75bafc Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 23 Apr 2018 11:59:00 +0200 Subject: [PATCH] Control Panel UPGRADE / solved issues --- .vs/AAWeb/v15/.suo | Bin 49664 -> 55296 bytes Panels/ControlPanel.js | 27 +++++++++++++++++++++++---- server.js | 2 +- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/.vs/AAWeb/v15/.suo b/.vs/AAWeb/v15/.suo index 94b705b762fb9376d32c58fed8078e56b4758acf..c1b80f83b582f369be333d38d7c53a95d808d8d6 100644 GIT binary patch delta 2279 zcmd6oYfM~46vub&zIiMcmUmH>F0|VPVRwnUJXnVZNNvW#dDUsh%HoO{NTVZXXc!l zxpV&a+*u)@6vE1I0|yNnlVSPLH#0wc`8g|4C=`MXhBd=%3RbxbtOH)qjSz0gQUs61lg+4W+FS04CEZL14%-1k#y)&89P(4w+Epo7-UQR z6zs<%yOCJrKKhq<( ziP)z&i9?ozByo!5G5IL5avbkNDv(NKFG6BgBl{6IQiIeZwMZRu0C@_b^@q^XUQf&R z$hw7cb%yS!JO`T9S?U%FKu&BvLoJVmVk#gvc2RwurUYB>Jv27dKn-tac`#%cWx24* zk1{h1C434shD~0KnWdq`HBRHija*66aB`9c(qrSK*E7%RLzYDyosGj7Bswh8ilu;o zsoxAAXzVc9|BRklFhs9qJ=`D1!~!mqIkCRQt^)3X^;Qp)+|GBIXw%HqEizpkE~V0? ze>E86{)xe#S4o_Ue(s`L9ZA%gcZA=|6cNm}3VBd4gD>5eqrd&531^ z|AX9I-A7Cn-3wOg1x*$1XT_8byv)P~)m)Q_lT1f%G4X^3glQ9)+NRho2)Ffu;PApw z`?C-_lO;BAVizZNaPU%B6;$;IF}O*jShNbr_B(Y=pG7|-n3oFdUMu!*F!2<( zeU5X(3*0|U3lcB-CBHDrVyqhpp$tLxud`b4RZ$j7cbx<7TsBg6QdZzw2LAC9Xujy& zBDL!bk5I&ndWHK6bC=ohZ=|@k&TeS;1<$quCh>pKw6J@i1eh-;eJjDE!RWi% zyb>Cx>Qm`@h&H;Bsd(Lw62dHoxD317%7`RG@pSr-v()W{CfsPft1AmN@XMcu0-3PYCBo#ak>rV)`xw%__tNh zF8w%uQwcqnnRiz&-KhKdy8v9Bw25IJ>|zR>s^q1--dVQgq`#l> E2mY}8>;M1& delta 1766 zcmdtie{54#6bJBk@7k^%TlY%00R^CYd8?rZdEtsZ8Q9 zwsVt^1sUxDWdh2sQ>Q4FK19Tcn;^m;`o|!|7$y6|XoCNUu2B=m{GQkuSoVj1`w72ny=WpM+Le)5D`~C8Z4WrM{jmAlOJb>}X;B}wTiV4%O36;Knx4(vA?hfV zQTR|HiWAsM($R`|S9)BE=zuJk1+&2feEc1V^B^DQzzUcPTq{CcLQk5U`J637RseR$ zgByLZqztVZrrfDfg83ExM5to4Y2~|1Gmiuljm^z(&P0LWk{Tm12ez_{4|RZy}$?h z5V^aR>72XE8+ULyaCbSsH@3k^f0>HR_haG)6`RY%me_`}c$O*F9F1pHMfPGo25}(R z2m9e=cm)nXFT4r|;Sd~#*Wh(H0)3$14d{nA;VpO@2H+id7mmVv@ID-a4>YY#OJHyu zl3>6I_z+IQM{o*0hSTr~48o^y20nw&VHmhWXA#fA7qq}NE7ttY|NjB)K?>>>;sUkV zBjQU+=@D_B+H$|9p#7#<)Xp1ijtObuFT!|^(VjQclFbW~-_#y34!9n((XU>o;apxL z^kY9>U9IyoM)hG`24K?*pvg zDb#AILMFZl_H{D3(Jc*k!>CzploTG!qiZL#$=%e0h9sI=O>~sLhgI2nQ(eXf$gauN}XAnHr7mi_sIU#T0FcQpKr!YO2!mG#r6c^ zB|)3uyW`IS-#Kk7d4SH!3S+D!Tc}1!!`n-Z@twnhe%_u>$9?W;?QINsbpg zj5E8I2ugH>ZoT~Vmz)&XKSbW{JbIY2jo-R*#I1*q_DyrdqTY}Z>Q0!+5v!%=`?5I^ zDlRF|;_)9?`;DqxLl7Q`$4wf4B9ht$M{Dr)yVUy|U`}pSq~S-)amc141RF v+AUR5sy$Mju;Myu(8QObftj=Qsizs&M|2UtbVMa|H6qEEC@=~}u8F?^X3sdc diff --git a/Panels/ControlPanel.js b/Panels/ControlPanel.js index 2f41e3684..3b27ba910 100644 --- a/Panels/ControlPanel.js +++ b/Panels/ControlPanel.js @@ -32,11 +32,11 @@ function newControlPanel() { function initialize() { this.container.frame.width = 200; - this.container.frame.height = 65; + this.container.frame.height = 85; var position = { x: (viewPort.visibleArea.topRight.x - viewPort.visibleArea.topLeft.x) / 2 - this.container.frame.width / 2, - y: browserCanvas.height * 0.30 + y: 0 }; this.container.frame.position = position; @@ -302,13 +302,16 @@ function newControlPanel() { let fontSize = 10; - var label = controlPanel.datetimeDisplay.currentDatetime.toDateString() + ' ' + controlPanel.datetimeDisplay.currentDatetime.toLocaleTimeString(); + let label = controlPanel.datetimeDisplay.currentDatetime.toUTCString(); + let labelArray = label.split(" "); + + label = labelArray[0] + " " + labelArray[1] + " " + labelArray[2] + " " + labelArray[3]; /* Now we transform x on the actual coordinate on the canvas. */ let labelPoint = { x: controlPanel.container.frame.width / 2 - label.length / 2 * fontSize * FONT_ASPECT_RATIO, - y: controlPanel.container.frame.height * 4.5 / 10 + y: controlPanel.container.frame.height * 3.4 / 10 }; labelPoint = controlPanel.container.frame.frameThisPoint(labelPoint); @@ -317,6 +320,22 @@ function newControlPanel() { browserCanvasContext.fillStyle = 'rgba(60, 60, 60, 0.50)'; browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y); + /* The time */ + + label = labelArray[4] + " " + labelArray[5]; + + /* Now we transform x on the actual coordinate on the canvas. */ + + labelPoint = { + x: controlPanel.container.frame.width / 2 - label.length / 2 * fontSize * FONT_ASPECT_RATIO, + y: controlPanel.container.frame.height * 5.0 / 10 + }; + + labelPoint = controlPanel.container.frame.frameThisPoint(labelPoint); + + browserCanvasContext.font = fontSize + 'px Courier New'; + browserCanvasContext.fillStyle = 'rgba(60, 60, 60, 0.50)'; + browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y); label = PLAY_STEP / _1_MINUTE_IN_MILISECONDS + ' min'; diff --git a/server.js b/server.js index 0bb5a2cc2..c079bdec4 100644 --- a/server.js +++ b/server.js @@ -545,7 +545,7 @@ function startHtttpServer() { function onBrowserRequest(request, response) { if (CONSOLE_LOG === true) { console.log("[INFO] onBrowserRequest -> Entering function."); } - if (CONSOLE_LOG === true) { console.log("[INFO] onBrowserRequest -> request = " + request); } + if (CONSOLE_LOG === true) { console.log("[INFO] onBrowserRequest -> request.url = " + request.url); } var htmlResponse; var requestParameters = request.url.split("/");