diff --git a/AppSchema.json b/AppSchema.json index 924d1e769..184505f0f 100644 --- a/AppSchema.json +++ b/AppSchema.json @@ -7870,7 +7870,7 @@ } ], "initialValues": { - "config": "{ \n\"initialDatetime\": \"2020-09-01\",\n\"finalDatetime\": \"2020-09-02\",\n \"allowStartingFromThePast\": false\n}" + "config": "{ \n\"initialDatetime\": \"2020-09-01\",\n\"finalDatetime\": \"2020-09-02\" \n}" }, "addLeftIcons": true, "editors": { diff --git a/BackendServers/WebServer/Images/Tutorial/Gifs/Test01.gif b/BackendServers/WebServer/Images/Tutorial/Gifs/Test01.gif new file mode 100644 index 000000000..51948dd61 Binary files /dev/null and b/BackendServers/WebServer/Images/Tutorial/Gifs/Test01.gif differ diff --git a/BackendServers/WebServer/Images/Tutorial/Gifs/Test02.gif b/BackendServers/WebServer/Images/Tutorial/Gifs/Test02.gif new file mode 100644 index 000000000..b66f9d0d3 Binary files /dev/null and b/BackendServers/WebServer/Images/Tutorial/Gifs/Test02.gif differ diff --git a/BackendServers/WebServer/Images/Tutorial/Gifs/Test03.gif b/BackendServers/WebServer/Images/Tutorial/Gifs/Test03.gif new file mode 100644 index 000000000..c9b67f870 Binary files /dev/null and b/BackendServers/WebServer/Images/Tutorial/Gifs/Test03.gif differ diff --git a/BackendServers/WebServer/Images/Tutorial/Gifs/Test04.gif b/BackendServers/WebServer/Images/Tutorial/Gifs/Test04.gif new file mode 100644 index 000000000..95aa25340 Binary files /dev/null and b/BackendServers/WebServer/Images/Tutorial/Gifs/Test04.gif differ diff --git a/BackendServers/WebServer/Images/Tutorial/Gifs/Test05.gif b/BackendServers/WebServer/Images/Tutorial/Gifs/Test05.gif new file mode 100644 index 000000000..8ad26f46b Binary files /dev/null and b/BackendServers/WebServer/Images/Tutorial/Gifs/Test05.gif differ diff --git a/BackendServers/WebServer/Images/Tutorial/Gifs/Test06.gif b/BackendServers/WebServer/Images/Tutorial/Gifs/Test06.gif new file mode 100644 index 000000000..5be6343dc Binary files /dev/null and b/BackendServers/WebServer/Images/Tutorial/Gifs/Test06.gif differ diff --git a/BackendServers/WebServer/Images/Tutorial/Gifs/Test07.gif b/BackendServers/WebServer/Images/Tutorial/Gifs/Test07.gif new file mode 100644 index 000000000..fab9ee13e Binary files /dev/null and b/BackendServers/WebServer/Images/Tutorial/Gifs/Test07.gif differ diff --git a/CanvasApp/Canvas.js b/CanvasApp/Canvas.js index 405509b6e..65d8aff93 100644 --- a/CanvasApp/Canvas.js +++ b/CanvasApp/Canvas.js @@ -43,7 +43,7 @@ function newCanvas() { animation: undefined, mouse: undefined, shorcutNumbers: new Map(), - onKeyDown: onKeyDown, + onKeyDown: onKeyDown, initialize: initialize, finalize: finalize } @@ -216,12 +216,48 @@ function newCanvas() { browserCanvas.width = window.innerWidth browserCanvas.height = window.innerHeight - CURRENT_TOP_MARGIN + browserCanvas.style = "position:absolute; top:0px; left:0px; z-index:1" } function checkMediaRecording(event) { if ((event.ctrlKey === true || event.metaKey === true)) { let constructorParams switch (event.keyCode) { + case 113: { // F2 + browserCanvas.width = 400 * 3 + browserCanvas.height = 580 * 3 + centerCanvar() + return + break + } + case 114: { // F2 + browserCanvas.width = 400 * 2 + browserCanvas.height = 580 * 2 + centerCanvar() + return + break + } + case 115: { // F3 + browserCanvas.width = 400 * 1.5 + browserCanvas.height = 580 * 1.5 + centerCanvar() + return + break + } + case 116: { // F5 + browserCanvas.width = 400 * 1 + browserCanvas.height = 580 * 1 + centerCanvar() + return + break + } + case 117: { // F6 + browserCanvas.width = window.innerWidth + browserCanvas.height = window.innerHeight - CURRENT_TOP_MARGIN + centerCanvar() + return + break + } case 118: { // F7 downloadPanorama('Superalgos.Market.Panorama') return @@ -255,6 +291,12 @@ function newCanvas() { mediaRecorder.save() } } + + function centerCanvar() { + let top = (window.innerHeight - browserCanvas.height) / 2 + let left = (window.innerWidth - browserCanvas.width) / 2 + browserCanvas.style = "position:absolute; top:"+ top + "px; left:"+ left + "px; z-index:1" + } } function onKeyUp(event) { diff --git a/CanvasApp/Plotting/Plotter.js b/CanvasApp/Plotting/Plotter.js index 96cb8c927..14da86ad7 100644 --- a/CanvasApp/Plotting/Plotter.js +++ b/CanvasApp/Plotting/Plotter.js @@ -216,6 +216,7 @@ function newPlotter() { } else { fileCursor = dailyFiles.getFileCursor(pTimeFrame) } + recalculate() } } catch (err) { if (ERROR_LOG === true) { logger.write('[ERROR] setTimeFrame -> err = ' + err.stack) } diff --git a/CanvasApp/Spaces/TutorialSpace.js b/CanvasApp/Spaces/TutorialSpace.js index 0ea651583..b161f6d43 100644 --- a/CanvasApp/Spaces/TutorialSpace.js +++ b/CanvasApp/Spaces/TutorialSpace.js @@ -234,7 +234,7 @@ function newTutorialSpace() { currentGifName = newGifName htmlGif.src = 'Images/Tutorial/Gifs/' + currentGifName + '.gif' htmlGif.width = "400" - //htmlGif.height = "100" + htmlGif.height = "580" } function checkImage() { @@ -414,7 +414,7 @@ function newTutorialSpace() { changeNodeConfigCounter++ if (changeNodeConfigCounter === 5) { let nodeConfig = JSON.parse(currentNode.payload.referenceParent.config) - for (const property in config.changeNodeConfigReferenceParent) { + for (const property in config.changeNodeConfigReferenceParent) { nodeConfig[property] = config.changeNodeConfigReferenceParent[property] } currentNode.payload.referenceParent.config = JSON.stringify(nodeConfig) @@ -533,7 +533,13 @@ function newTutorialSpace() { const MARGIN = 100 const FORM_HEIGHT = 40 - let nodeConfig = JSON.parse(currentNode.config) + let nodeConfig + try { + nodeConfig = JSON.parse(currentNode.config) + } catch (err) { + return + } + switch (nodeConfig.position) { case 'Left': { tutorialPosition = { @@ -972,7 +978,7 @@ function newTutorialSpace() { if (nodeConfig.title !== undefined && nodeConfig.title !== '') { html = html + '