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

Marker is also synced with the secondary waterfall zoom

Browse Source
This commit is contained in:
ha7ilm 2017-05-23 11:16:57 +02:00
parent f11e701fae
commit 3599259a25
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/openwebrx.css
View File

@ -399,6 +399,7 @@ input[type=range]:focus::-ms-fill-upper
border-style: none; border-style: none;
image-rendering: crisp-edges; image-rendering: crisp-edges;
image-rendering: -webkit-optimize-contrast; image-rendering: -webkit-optimize-contrast;
/*transition: left 200ms, width 200ms;*/
} }
#openwebrx-phantom-canvas #openwebrx-phantom-canvas
@ -831,6 +832,7 @@ img.openwebrx-mirror-img
{ {
position: absolute; position: absolute;
pointer-events: none; pointer-events: none;
transition: width 500ms, left 500ms;
} }
#openwebrx-secondary-demod-listbox #openwebrx-secondary-demod-listbox

18
htdocs/openwebrx.js
View File

@ -2271,7 +2271,8 @@ function secondary_demod_init_canvases()
secondary_demod_current_canvas_actual_line=$(secondary_demod_canvas_container).height()-1; secondary_demod_current_canvas_actual_line=$(secondary_demod_canvas_container).height()-1;
secondary_demod_current_canvas_index=0; secondary_demod_current_canvas_index=0;
secondary_demod_canvases_initialized=true; secondary_demod_canvases_initialized=true;
secondary_demod_update_channel_freq_from_event(); //secondary_demod_update_channel_freq_from_event();
mkscale(); //so that the secondary waterfall zoom level will be initialized
} }
function secondary_demod_canvases_update_top() function secondary_demod_canvases_update_top()
@ -2419,8 +2420,8 @@ function secondary_demod_listbox_update()
secondary_demod_channel_freq=1000; secondary_demod_channel_freq=1000;
function secondary_demod_update_marker() function secondary_demod_update_marker()
{ {
var width = Math.max( (secondary_bw / (if_samp_rate/2)) * $(secondary_demod_canvas_container).width(), 5); var width = Math.max( (secondary_bw / (if_samp_rate/2)) * secondary_demod_canvas_width, 5);
var center_at = (secondary_demod_channel_freq / (if_samp_rate/2)) * $(secondary_demod_canvas_container).width(); var center_at = (secondary_demod_channel_freq / (if_samp_rate/2)) * secondary_demod_canvas_width + secondary_demod_canvas_left;
var left = center_at-width/2; var left = center_at-width/2;
//console.log("sdum", width, left); //console.log("sdum", width, left);
$("#openwebrx-digimode-select-channel").width(width).css("left",left+"px") $("#openwebrx-digimode-select-channel").width(width).css("left",left+"px")
@ -2487,9 +2488,12 @@ function secondary_demod_waterfall_set_zoom(low_cut, high_cut)
high_cut=Math.max(Math.abs(high_cut), Math.abs(low_cut)); high_cut=Math.max(Math.abs(high_cut), Math.abs(low_cut));
low_cut=0; low_cut=0;
} }
secondary_demod_low_cut = low_cut;
secondary_demod_high_cut = high_cut;
var shown_bw = high_cut-low_cut; var shown_bw = high_cut-low_cut;
var canvas_width = $(secondary_demod_canvas_container).width() * (if_samp_rate/2)/shown_bw; secondary_demod_canvas_width = $(secondary_demod_canvas_container).width() * (if_samp_rate/2)/shown_bw;
var canvas_left = -canvas_width*(low_cut/(if_samp_rate/2)); secondary_demod_canvas_left = -secondary_demod_canvas_width*(low_cut/(if_samp_rate/2));
console.log("setzoom", canvas_width, canvas_left, low_cut, high_cut); //console.log("setzoom", secondary_demod_canvas_width, secondary_demod_canvas_left, low_cut, high_cut);
secondary_demod_canvases.map((x)=>{$(x).css("left",canvas_left+"px").css("width",canvas_width+"px");}); secondary_demod_canvases.map((x)=>{$(x).css("left",secondary_demod_canvas_left+"px").css("width",secondary_demod_canvas_width+"px");});
secondary_demod_update_channel_freq_from_event();
} }