From 4b5e7ec55a5484543d088992f2f2237cbaeb85c1 Mon Sep 17 00:00:00 2001 From: ha7ilm Date: Wed, 10 Aug 2016 13:48:43 +0200 Subject: [PATCH] Have a working 3D waterfall... --- htdocs/openwebrx.js | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js index 5955be6..177bd05 100644 --- a/htdocs/openwebrx.js +++ b/htdocs/openwebrx.js @@ -2009,31 +2009,26 @@ function mathbox_init() //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 zIndex = Math.trunc(z*(mathbox_data_max_depth-1)); //z: time var realZIndex = mathbox_get_data_line(zIndex); - if(!mathbox_data_index_valid(zIndex)) return undefined; + if(!mathbox_data_index_valid(zIndex)) return; //if(realZIndex>=(mathbox_data_max_depth-1)) console.log("realZIndexundef", realZIndex, zIndex); var index = Math.trunc(xIndex + realZIndex * fft_size); /*if(mathbox_data[index]==undefined) console.log("Undef", index, mathbox_data.length, zIndex, realZIndex, mathbox_data_max_depth, mathbox_data_current_depth, mathbox_data_index);*/ - var dBValue = mathbox_data[index]; + var dBValue = mathbox_data[index]; //y=1; if(dBValue>waterfall_max_level) y = 1; else if(dBValue