Spectrum works now.

This commit is contained in:
Marat Fayzullin 2023-03-24 22:49:14 -04:00
parent b17a3dfe0c
commit 66eb14b78c
2 changed files with 4 additions and 11 deletions

View File

@ -52,16 +52,12 @@
<svg viewBox="0 0 80 80"><use xlink:href="static/gfx/svg-defs.svg#right"></use></svg>
</div>
</div>
<div class="openwebrx-spectrum-container" style="z-index:1;">
<canvas id="openwebrx-spectrum-canvas" width="0" height="0"></canvas>
</div>
<div id="openwebrx-scale-container" style="z-index:1;">
<canvas id="openwebrx-scale-canvas" width="0" height="0"></canvas>
</div>
<div class="openwebrx-spectrum-container">
<canvas id="openwebrx-spectrum-canvas" width="0" height="0"></canvas>
</div>
<a class="openwebrx-rx-details-arrow openwebrx-rx-details-arrow--down openwebrx-photo-trigger">
<svg class="down" viewBox="0 0 43 12"><use xlink:href="static/gfx/svg-defs.svg#rx-details-arrow-down"></use></svg>
<svg class="up" viewBox="0 0 43 12"><use xlink:href="static/gfx/svg-defs.svg#rx-details-arrow-up"></use></svg>
</a>
</div>
<div id="webrx-canvas-background">
<div id="webrx-canvas-container">
@ -245,7 +241,7 @@
<div class="openwebrx-button openwebrx-square-button openwebrx-zoom-button" onclick="zoomOutOneStep();" title="Zoom out one step"><svg viewBox="0 0 80 80"><use xlink:href="static/gfx/svg-defs.svg#zoom-out"></use></svg></div>
<div class="openwebrx-button openwebrx-square-button openwebrx-zoom-button" onclick="zoomInTotal();" title="Zoom in totally"><svg viewBox="0 0 80 80"><use xlink:href="static/gfx/svg-defs.svg#zoom-in-total"></use></svg></div>
<div class="openwebrx-button openwebrx-square-button openwebrx-zoom-button" onclick="zoomOutTotal();" title="Zoom out totally"><svg viewBox="0 0 80 80"><use xlink:href="static/gfx/svg-defs.svg#zoom-out-total"></use></svg></div>
<div class="openwebrx-button openwebrx-square-button openwebrx-zoom-button" onclick="toggleSpectrum();" title="Zoom out totally"><svg viewBox="0 0 80 80"><use xlink:href="static/gfx/svg-defs.svg#zoom-out-total"></use></svg></div>
<div class="openwebrx-button openwebrx-square-button openwebrx-zoom-button" onclick="toggleSpectrum();" title="Toggle spectrum display"><svg viewBox="0 0 80 80"><use xlink:href="static/gfx/svg-defs.svg#waterfall-default"></use></svg></div>
<div class="openwebrx-button openwebrx-square-button openwebrx-record-button" onclick="toggleRecording();" title="Record audio">REC</div>
</div>
<div class="openwebrx-panel-line">

View File

@ -68,7 +68,6 @@ Spectrum.prototype.draw = function() {
Spectrum.prototype.close = function() {
// Hide container
$('.openwebrx-spectrum-container').removeClass('expanded');
$('.openwebrx-rx-details-arrow').removeClass('openwebrx-rx-details-arrow--up').addClass('openwebrx-rx-details-arrow--down');
// Stop redraw timer
if (this.timer) {
@ -83,7 +82,6 @@ Spectrum.prototype.close = function() {
Spectrum.prototype.open = function() {
// Show container
$('.openwebrx-spectrum-container').addClass('expanded');
$('.openwebrx-rx-details-arrow').removeClass('openwebrx-rx-details-arrow--down').addClass('openwebrx-rx-details-arrow--up');
// Start redraw timer
if (!this.timer) {
@ -93,7 +91,6 @@ Spectrum.prototype.open = function() {
}
Spectrum.prototype.toggle = function() {
// if (ev && ev.target && ev.target.tagName == 'A') return;
// Toggle based on the current redraw timer state
if (this.timer) this.close(); else this.open();
};