joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Okay, fixed rearrange to getY

Browse Source
This commit is contained in:
ha7ilm 2016-08-10 13:51:04 +02:00
parent 4b5e7ec55a
commit 182067f801
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/openwebrx.js
View File

@ -2009,26 +2009,31 @@ function mathbox_init()
//var remap = function (v) { return Math.sqrt(.5 + .5 * v); }; //var remap = function (v) { return Math.sqrt(.5 + .5 * v); };
var getY = function(x,z)
{
var points = view.area({
expr: function (emit, x, z, i, j, t) {
var xIndex = Math.trunc(((x+1)/2.0)*fft_size); //x: frequency var xIndex = Math.trunc(((x+1)/2.0)*fft_size); //x: frequency
var zIndex = Math.trunc(z*(mathbox_data_max_depth-1)); //z: time var zIndex = Math.trunc(z*(mathbox_data_max_depth-1)); //z: time
var realZIndex = mathbox_get_data_line(zIndex); var realZIndex = mathbox_get_data_line(zIndex);
if(!mathbox_data_index_valid(zIndex)) return; if(!mathbox_data_index_valid(zIndex)) return undefined;
//if(realZIndex>=(mathbox_data_max_depth-1)) console.log("realZIndexundef", realZIndex, zIndex); //if(realZIndex>=(mathbox_data_max_depth-1)) console.log("realZIndexundef", realZIndex, zIndex);
var index = Math.trunc(xIndex + realZIndex * fft_size); var index = Math.trunc(xIndex + realZIndex * fft_size);
/*if(mathbox_data[index]==undefined) console.log("Undef", index, mathbox_data.length, zIndex, /*if(mathbox_data[index]==undefined) console.log("Undef", index, mathbox_data.length, zIndex,
realZIndex, mathbox_data_max_depth, realZIndex, mathbox_data_max_depth,
mathbox_data_current_depth, mathbox_data_index);*/ mathbox_data_current_depth, mathbox_data_index);*/
var dBValue = mathbox_data[index]; var dBValue = mathbox_data[index];
//y=1; //y=1;
if(dBValue>waterfall_max_level) y = 1; if(dBValue>waterfall_max_level) y = 1;
else if(dBValue<waterfall_min_level) y = 0; else if(dBValue<waterfall_min_level) y = 0;
else y = (dBValue-waterfall_min_level)/(waterfall_max_level-waterfall_min_level); else y = (dBValue-waterfall_min_level)/(waterfall_max_level-waterfall_min_level);
if(!y) y=0;
mathbox_dbg = { dbv: dBValue, indexval: index, mbd: mathbox_data.length, yval: y }; mathbox_dbg = { dbv: dBValue, indexval: index, mbd: mathbox_data.length, yval: y };
if(!y) y=0;
return y;
}
var points = view.area({
expr: function (emit, x, z, i, j, t) {
var y;
if((y=getY(x,z))==undefined) return;
emit(x, y, z); emit(x, y, z);
}, },
width: 32, width: 32,