From 3c58e98788c901fe6452b2d4a44c43fb39821986 Mon Sep 17 00:00:00 2001 From: Denny Sheirer Date: Sat, 7 May 2022 06:36:42 -0400 Subject: [PATCH] #1239 Resolves issue where a user can't view the spectrum of a tuner when the spectral display is disabled. Tuner editor button overrides the property setting so that the view completes correctly. (#1240) Co-authored-by: Dennis Sheirer --- .idea/misc.xml | 5 ++++- .../github/dsheirer/source/tuner/ui/TunerEditor.java | 12 ++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 1db132d2..a7b7329f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,10 @@ - + + + + \ No newline at end of file diff --git a/src/main/java/io/github/dsheirer/source/tuner/ui/TunerEditor.java b/src/main/java/io/github/dsheirer/source/tuner/ui/TunerEditor.java index 9b3710af..723d8c53 100644 --- a/src/main/java/io/github/dsheirer/source/tuner/ui/TunerEditor.java +++ b/src/main/java/io/github/dsheirer/source/tuner/ui/TunerEditor.java @@ -20,6 +20,7 @@ package io.github.dsheirer.source.tuner.ui; import io.github.dsheirer.gui.control.JFrequencyControl; import io.github.dsheirer.preference.UserPreferences; +import io.github.dsheirer.properties.SystemProperties; import io.github.dsheirer.record.wave.IRecordingStatusListener; import io.github.dsheirer.sample.Listener; import io.github.dsheirer.source.ISourceEventProcessor; @@ -32,7 +33,12 @@ import io.github.dsheirer.source.tuner.manager.DiscoveredTuner; import io.github.dsheirer.source.tuner.manager.IDiscoveredTunerStatusListener; import io.github.dsheirer.source.tuner.manager.TunerManager; import io.github.dsheirer.source.tuner.manager.TunerStatus; +import io.github.dsheirer.spectrum.SpectralDisplayPanel; import io.github.dsheirer.util.SwingUtils; +import java.awt.EventQueue; +import java.text.CharacterIterator; +import java.text.DecimalFormat; +import java.text.StringCharacterIterator; import net.miginfocom.swing.MigLayout; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,10 +54,6 @@ import javax.swing.SpinnerNumberModel; import javax.swing.SwingConstants; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import java.awt.EventQueue; -import java.text.CharacterIterator; -import java.text.DecimalFormat; -import java.text.StringCharacterIterator; /** * Base tuner configuration editor. @@ -320,6 +322,8 @@ public abstract class TunerEditor if(tuner != null) { + SystemProperties.getInstance().set(SpectralDisplayPanel.SPECTRAL_DISPLAY_ENABLED, true); + mTunerManager.getDiscoveredTunerModel().broadcast(new TunerEvent(tuner, TunerEvent.Event.REQUEST_MAIN_SPECTRAL_DISPLAY)); }