diff --git a/.vs/AAWeb/v15/.suo b/.vs/AAWeb/v15/.suo index 94b705b76..c1b80f83b 100644 Binary files a/.vs/AAWeb/v15/.suo and b/.vs/AAWeb/v15/.suo differ 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("/");