From 4f3fa1a6150a70142385c02b607ed971ca91de4a Mon Sep 17 00:00:00 2001 From: Kai Lauterbach Date: Mon, 22 May 2023 09:47:15 +0200 Subject: [PATCH 01/10] Generating traces for the webinterface'sgraphs optimized. --- firmware/data/bottom.js | 66 ++++++++------------------------ firmware/html/bottom.js | 84 +++++++++++++---------------------------- 2 files changed, 42 insertions(+), 108 deletions(-) diff --git a/firmware/data/bottom.js b/firmware/data/bottom.js index 11dcd6a..e70fdf7 100644 --- a/firmware/data/bottom.js +++ b/firmware/data/bottom.js @@ -95,34 +95,17 @@ var indexFloat = lowerIndex + timeDiff / ((upperTime[0] - lowerTime[0]) + ((uppe if (indexFloat > index) { index = indexFloat; } -var trace1 = { +var traces = []; +for (var i = 1; i <= 4; i++) { +var trace = { x: time, -y: channel1, -name: 'Channel 1', -type: 'scatter', -mode: 'lines+markers', -}; -var trace2 = { -x: time, -y: channel2, -name: 'Channel 2', -type: 'scatter', -mode: 'lines+markers', -}; -var trace3 = { -x: time, -y: channel3, -name: 'Channel 3', -type: 'scatter', -mode: 'lines+markers', -}; -var trace4 = { -x: time, -y: channel4, -name: 'Channel 4', +y: eval("channel" + i), +name: 'Channel ' + i, type: 'scatter', mode: 'lines+markers', }; +traces.push(trace); +} var layout = { title: 'Timing Control Data Blocks', xaxis: { @@ -146,7 +129,7 @@ dash: 'dot' } }] }; -Plotly.newPlot('plot_chart', [trace1, trace2, trace3, trace4], layout); +Plotly.newPlot('plot_chart', traces, layout); }); } setInterval(loadGraphData, 10000); @@ -206,34 +189,17 @@ var indexFloat = lowerIndex + timeDiff / ((upperTime[0] - lowerTime[0]) + ((uppe if (indexFloat > index) { index = indexFloat; } -var trace1 = { +var traces = []; +for (var i = 1; i <= 4; i++) { +var trace = { x: time, -y: channel1, -name: 'Channel 1', -type: 'scatter', -mode: 'lines+markers', -}; -var trace2 = { -x: time, -y: channel2, -name: 'Channel 2', -type: 'scatter', -mode: 'lines+markers', -}; -var trace3 = { -x: time, -y: channel3, -name: 'Channel 3', -type: 'scatter', -mode: 'lines+markers', -}; -var trace4 = { -x: time, -y: channel4, -name: 'Channel 4', +y: eval("channel" + i), +name: 'Channel ' + i, type: 'scatter', mode: 'lines+markers', }; +traces.push(trace); +} var layout = { title: 'Timing Control Data Blocks', xaxis: { @@ -257,7 +223,7 @@ dash: 'dot' } }] }; -Plotly.newPlot('tc_plot_chart', [trace1, trace2, trace3, trace4], layout); +Plotly.newPlot('tc_plot_chart', traces, layout); var plot = document.getElementById('tc_plot_chart'); } function rgbaToHex(rgba) { diff --git a/firmware/html/bottom.js b/firmware/html/bottom.js index 4d61172..e4293d7 100644 --- a/firmware/html/bottom.js +++ b/firmware/html/bottom.js @@ -121,34 +121,18 @@ function loadGraphData() { index = indexFloat; } //console.log("index in graph >>>" + index); - var trace1 = { - x: time, - y: channel1, - name: 'Channel 1', - type: 'scatter', - mode: 'lines+markers', - }; - var trace2 = { - x: time, - y: channel2, - name: 'Channel 2', - type: 'scatter', - mode: 'lines+markers', - }; - var trace3 = { - x: time, - y: channel3, - name: 'Channel 3', - type: 'scatter', - mode: 'lines+markers', - }; - var trace4 = { - x: time, - y: channel4, - name: 'Channel 4', - type: 'scatter', - mode: 'lines+markers', - }; + var traces = []; + for (var i = 1; i <= 4; i++) { + var trace = { + x: time, + y: eval("channel" + i), + name: 'Channel ' + i, + type: 'scatter', + mode: 'lines+markers', + }; + + traces.push(trace); + } var layout = { title: 'Timing Control Data Blocks', xaxis: { @@ -172,7 +156,7 @@ function loadGraphData() { } }] }; - Plotly.newPlot('plot_chart', [trace1, trace2, trace3, trace4], layout); + Plotly.newPlot('plot_chart', traces, layout); }); } setInterval(loadGraphData, 10000); @@ -246,34 +230,18 @@ function loadTCGraphData() { index = indexFloat; } //console.log("index in graph >>>" + index); - var trace1 = { - x: time, - y: channel1, - name: 'Channel 1', - type: 'scatter', - mode: 'lines+markers', - }; - var trace2 = { - x: time, - y: channel2, - name: 'Channel 2', - type: 'scatter', - mode: 'lines+markers', - }; - var trace3 = { - x: time, - y: channel3, - name: 'Channel 3', - type: 'scatter', - mode: 'lines+markers', - }; - var trace4 = { - x: time, - y: channel4, - name: 'Channel 4', - type: 'scatter', - mode: 'lines+markers', - }; + var traces = []; + for (var i = 1; i <= 4; i++) { + var trace = { + x: time, + y: eval("channel" + i), + name: 'Channel ' + i, + type: 'scatter', + mode: 'lines+markers', + }; + + traces.push(trace); + } var layout = { title: 'Timing Control Data Blocks', xaxis: { @@ -297,7 +265,7 @@ function loadTCGraphData() { } }] }; - Plotly.newPlot('tc_plot_chart', [trace1, trace2, trace3, trace4], layout); + Plotly.newPlot('tc_plot_chart', traces, layout); var plot = document.getElementById('tc_plot_chart'); // Das HTML-Div-Element, in dem der Plot angezeigt wird } From dc3204dc17962af2905609c471d151e2cfd98b66 Mon Sep 17 00:00:00 2001 From: Kai Lauterbach Date: Mon, 22 May 2023 12:02:14 +0200 Subject: [PATCH 02/10] Added development into to the title of the webinterface --- firmware/data/index_template_top.html | 2 +- firmware/html/index_template_top.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/firmware/data/index_template_top.html b/firmware/data/index_template_top.html index 551633c..2edfb96 100644 --- a/firmware/data/index_template_top.html +++ b/firmware/data/index_template_top.html @@ -3,7 +3,7 @@ -Light setup - {{LIGHT_NAME}} +Light setup - {{LIGHT_NAME}}{{LIGHT_NAME_DEV_POSTFIX}} diff --git a/firmware/html/index_template_top.html b/firmware/html/index_template_top.html index 72631cd..07a4680 100644 --- a/firmware/html/index_template_top.html +++ b/firmware/html/index_template_top.html @@ -3,7 +3,7 @@ - Light setup - {{LIGHT_NAME}} + Light setup - {{LIGHT_NAME}}{{LIGHT_NAME_DEV_POSTFIX}} From 69ebdda2691f64c33e4878b5a116b17c2df4bf24 Mon Sep 17 00:00:00 2001 From: Kai Lauterbach Date: Mon, 22 May 2023 12:12:22 +0200 Subject: [PATCH 03/10] CSS updated, webinterface is a bit cleaner now. Added a reset button to the tc editor. --- firmware/data/index_template_bottom.html | 1 + firmware/data/style.css | 48 +++++++++++++++++------- firmware/html/bottom.js | 1 - firmware/html/index_template_bottom.html | 1 + firmware/html/style.css | 48 +++++++++++++++++------- 5 files changed, 72 insertions(+), 27 deletions(-) diff --git a/firmware/data/index_template_bottom.html b/firmware/data/index_template_bottom.html index 985a4fd..1f7dec1 100644 --- a/firmware/data/index_template_bottom.html +++ b/firmware/data/index_template_bottom.html @@ -19,6 +19,7 @@ save +reset