Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6490 from Ansuel/improve-chan-grap

Browse source
This commit is contained in:
Jo-Philipp Wich 2023-08-03 17:09:36 +02:00 committed by GitHub
commit 0ea74956c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
modules/luci-mod-status/htdocs/luci-static/resources/view/status/channel_analysis.js
View file

@ -105,13 +105,13 @@ return view.extend({
step = (chan_graph.offsetWidth - 2) / columns, step = (chan_graph.offsetWidth - 2) / columns,
curr_offset = step; curr_offset = step;
function createGraphHLine(graph, pos) { function createGraphHLine(graph, pos, width, dash) {
var elem = document.createElementNS('http://www.w3.org/2000/svg', 'line'); var elem = document.createElementNS('http://www.w3.org/2000/svg', 'line');
elem.setAttribute('x1', pos); elem.setAttribute('x1', pos);
elem.setAttribute('y1', 0); elem.setAttribute('y1', 0);
elem.setAttribute('x2', pos); elem.setAttribute('x2', pos);
elem.setAttribute('y2', '100%'); elem.setAttribute('y2', '100%');
elem.setAttribute('style', 'stroke:black;stroke-width:0.1'); elem.setAttribute('style', 'stroke:black;stroke-width:'+width+';stroke-dasharray:'+dash);
graph.appendChild(elem); graph.appendChild(elem);
} }
@ -126,13 +126,21 @@ return view.extend({
chan_analysis.col_width = step; chan_analysis.col_width = step;
createGraphHLine(G,curr_offset); createGraphHLine(G,curr_offset, 0.1, 1);
for (var i=0; i< freq_tbl.length;i++) { for (var i=0; i< freq_tbl.length;i++) {
var channel = freq_tbl[i] var channel = freq_tbl[i]
chan_analysis.offset_tbl[channel] = curr_offset+step; chan_analysis.offset_tbl[channel] = curr_offset+step;
createGraphHLine(G,curr_offset+step); if (is5GHz) {
createGraphHLine(G,curr_offset+step, 0.1, 3);
if (channel < 100)
createGraphText(G,curr_offset-(step/2), channel);
else
createGraphText(G,curr_offset-step, channel);
} else {
createGraphHLine(G,curr_offset+step, 0.1, 0);
createGraphText(G,curr_offset+step, channel); createGraphText(G,curr_offset+step, channel);
}
curr_offset += step; curr_offset += step;
if (is5GHz && freq_tbl[i+1]) { if (is5GHz && freq_tbl[i+1]) {
@ -141,25 +149,28 @@ return view.extend({
if ((next_channel - channel) == 4) { if ((next_channel - channel) == 4) {
for (var j=1; j < 4; j++) { for (var j=1; j < 4; j++) {
chan_analysis.offset_tbl[channel+j] = curr_offset+step; chan_analysis.offset_tbl[channel+j] = curr_offset+step;
createGraphHLine(G,curr_offset+step); if (j == 2)
createGraphHLine(G,curr_offset+step, 0.1, 0);
else
createGraphHLine(G,curr_offset+step, 0.1, 1);
curr_offset += step; curr_offset += step;
} }
} else { } else {
chan_analysis.offset_tbl[channel+1] = curr_offset+step; chan_analysis.offset_tbl[channel+1] = curr_offset+step;
createGraphHLine(G,curr_offset+step); createGraphHLine(G,curr_offset+step, 0.1, 1);
curr_offset += step; curr_offset += step;
chan_analysis.offset_tbl[next_channel-2] = curr_offset+step; chan_analysis.offset_tbl[next_channel-2] = curr_offset+step;
createGraphHLine(G,curr_offset+step); createGraphHLine(G,curr_offset+step, 0.5, 0);
curr_offset += step; curr_offset += step;
chan_analysis.offset_tbl[next_channel-1] = curr_offset+step; chan_analysis.offset_tbl[next_channel-1] = curr_offset+step;
createGraphHLine(G,curr_offset+step); createGraphHLine(G,curr_offset+step, 0.1, 1);
curr_offset += step; curr_offset += step;
} }
} }
} }
createGraphHLine(G,curr_offset+step); createGraphHLine(G,curr_offset+step, 0.1, 1);
chan_analysis.tab.addEventListener('cbi-tab-active', L.bind(function(ev) { chan_analysis.tab.addEventListener('cbi-tab-active', L.bind(function(ev) {
this.active_tab = ev.detail.tab; this.active_tab = ev.detail.tab;