stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

webui status tab: change the implementation back to static columns

Browse source
This commit is contained in:
Jaroslav Kysela 2014-08-01 16:46:33 +02:00
parent 247848fd53
commit b5f39d5c5b
2 changed files with 43 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/webui/static/app/extensions.js
View file

@ -347,6 +347,7 @@ Ext.reg("multiselect", Ext.ux.Multiselect);
/**
* 22/07/2014: ceiling support backported from version 1.2, by Kai Sommerfeld
* 01/08/2014: tvh_renderer fcn added by Jaroslav Kysela
*/
Ext.namespace('Ext.ux.grid');
@ -402,7 +403,14 @@ Ext.extend(Ext.ux.grid.ProgressColumn, Ext.util.Observable, {
this.grid.startEditing(rowIndex, colIndex);
}
},
tvh_renderer: function (v, p, record) {
return v;
},
renderer: function(v, p, record) {
v = this.tvh_renderer(v, p, record);
if (typeof v === "string")
return v; // custom string
var style = '';
var textClass = (v < (this.ceiling / 1.818)) ? 'x-progress-text-back' : 'x-progress-text-front' + (Ext.isIE6 ? '-ie6' : '');

101
src/webui/static/app/status.js
View file

@ -269,10 +269,41 @@ tvheadend.status_streams = function() {
dataIndex: 'cc'
}]);
var has_signal_rel = false;
var has_signal_dbm = false;
var has_snr_rel = false;
var has_snr_db = false;
cm.config.push(new Ext.ux.grid.ProgressColumn({
header: "SNR",
dataIndex: 'snr',
width: 85,
colored: true,
ceiling: 65535,
tvh_renderer: function(v, p, record) {
var scale = record.get('snr_scale');
if (scale == 1)
return v;
if (scale == 2 && v > 0) {
var snr = v * 0.0001;
return snr.toFixed(1) + " dB";
}
return '<span class="tvh-grid-unset">Unknown</span>';
}
}));
cm.config.push(new Ext.ux.grid.ProgressColumn({
header: "Signal Strength",
dataIndex: 'signal',
width: 85,
colored: true,
ceiling: 65535,
tvh_renderer: function(v, p, record) {
var scale = record.get('snr_scale');
if (scale == 1)
return v;
if (scale == 2 && v > 0) {
var snr = v * 0.0001;
return snr.toFixed(1) + " dBm";
}
return '<span class="tvh-grid-unset">Unknown</span>';
}
}));
tvheadend.comet.on('input_status', function(m) {
if (m.reload != null)
@ -296,68 +327,6 @@ tvheadend.status_streams = function() {
r.data.ec_block = m.ec_block;
r.data.tc_block = m.tc_block;
if (r.data.snr_scale == 1 /* scale_relative */) {
if (!has_snr_rel) {
cm.config.push(new Ext.ux.grid.ProgressColumn({
header: "SNR (%)",
dataIndex: 'snr',
width: 85,
colored: true,
ceiling: 65535
}));
has_snr_rel = true;
}
}
else if (r.data.snr_scale == 2 /* scale_decibel */) {
if (!has_snr_db) {
cm.config.push(new Ext.grid.Column({
width: 50,
header: "SNR (dB)",
dataIndex: 'snr',
renderer: function(value) {
if (value > 0) {
var snr = value * 0.0001;
return snr.toFixed(1) + " dB";
} else {
return '<span class="tvh-grid-unset">Unknown</span>';
}
}
}));
has_snr_db = true;
}
}
if (r.data.signal_scale == 1 /* scale_relative */) {
if (!has_signal_rel) {
cm.config.push(new Ext.ux.grid.ProgressColumn({
header: "Signal Strength (%)",
dataIndex: 'signal',
width: 85,
colored: true,
ceiling: 65535
}));
has_signal_rel = true;
}
}
else if (r.data.signal_scale == 2 /* scale_decibel */) {
if (!has_signal_dbm) {
cm.config.push(new Ext.grid.Column({
width: 50,
header: "Signal Strength (dBm)",
dataIndex: 'signal',
renderer: function(value) {
if (value > 0) {
var snr = value * 0.0001;
return snr.toFixed(1) + " dBm";
} else {
return '<span class="tvh-grid-unset">Unknown</span>';
}
}
}));
has_signal_dbm = true;
}
}
tvheadend.streamStatusStore.afterEdit(r);
tvheadend.streamStatusStore.fireEvent('updated',
tvheadend.streamStatusStore,