GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-15 10:07:26 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Don't show tuner on spectral display while disabled (#1236)

Browse Source
This commit is contained in:
Doug Hoffman
2022-05-07 06:30:11 -04:00
committed by GitHub
parent 925353d515
commit 36de81248c
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/io/github/dsheirer/spectrum/ClearTunerMenuItem.java
View File

@@ -36,9 +36,9 @@ public class ClearTunerMenuItem extends JMenuItem
@Override @Override
public void actionPerformed(ActionEvent e) public void actionPerformed(ActionEvent e)
{ {
mSpectralDisplayPanel.clearTuner();
SystemProperties properties = SystemProperties.getInstance(); SystemProperties properties = SystemProperties.getInstance();
properties.set(SpectralDisplayPanel.SPECTRAL_DISPLAY_ENABLED, false); properties.set(SpectralDisplayPanel.SPECTRAL_DISPLAY_ENABLED, false);
mSpectralDisplayPanel.clearTuner();
} }
}); });
} }

2
src/main/java/io/github/dsheirer/spectrum/ShowTunerMenuItem.java
View File

@@ -49,9 +49,9 @@ public class ShowTunerMenuItem extends JMenuItem
@Override @Override
public void run() public void run()
{ {
mDiscoveredTunerModel.broadcast(new TunerEvent(mTuner, TunerEvent.Event.REQUEST_MAIN_SPECTRAL_DISPLAY));
SystemProperties properties = SystemProperties.getInstance(); SystemProperties properties = SystemProperties.getInstance();
properties.set(SpectralDisplayPanel.SPECTRAL_DISPLAY_ENABLED, true); properties.set(SpectralDisplayPanel.SPECTRAL_DISPLAY_ENABLED, true);
mDiscoveredTunerModel.broadcast(new TunerEvent(mTuner, TunerEvent.Event.REQUEST_MAIN_SPECTRAL_DISPLAY));
} }
}); });
} }

5
src/main/java/io/github/dsheirer/spectrum/SpectralDisplayPanel.java
View File

@@ -423,6 +423,11 @@ public class SpectralDisplayPanel extends JPanel
public void showTuner(Tuner tuner) public void showTuner(Tuner tuner)
{ {
clearTuner(); clearTuner();
if(!SystemProperties.getInstance().get(SpectralDisplayPanel.SPECTRAL_DISPLAY_ENABLED, true))
{
//Spectral display is disabled, stop
return;
}
mComplexDftProcessor.clearBuffer(); mComplexDftProcessor.clearBuffer();