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

#1209 updates tuner manager to properly deref usb devices on discovery. Updates tuner editors to separate enable/disable from tuner error state. Updates settings manager to disable auto-fail when loading xml file when unknown tags are encountered so that users' existing configs don't fail on startup and erase their existing settings. (#1211)

Browse Source 
Co-authored-by: Denny Sheirer <sheirerd@ainfosec.com>
This commit is contained in:
Denny Sheirer
2022-04-23 06:05:12 -04:00
committed by GitHub
parent 7f5ad7eb20
commit 1b90e0b50c
9 changed files with 227 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/io/github/dsheirer/source/tuner/ui/DiscoveredTunerEditor.java
View File

@@ -21,7 +21,7 @@ package io.github.dsheirer.source.tuner.ui;
import io.github.dsheirer.gui.editor.Editor;
import io.github.dsheirer.preference.UserPreferences;
import io.github.dsheirer.source.tuner.configuration.TunerConfigurationFactory;
import io.github.dsheirer.source.tuner.TunerFactory;
import io.github.dsheirer.source.tuner.manager.DiscoveredTuner;
import io.github.dsheirer.source.tuner.manager.IDiscoveredTunerStatusListener;
import io.github.dsheirer.source.tuner.manager.TunerManager;
@@ -101,7 +101,7 @@ public class DiscoveredTunerEditor extends Editor<DiscoveredTuner> implements ID
if(hasItem())
{
mEditor = TunerConfigurationFactory.getEditor(mUserPreferences, getItem(), mTunerManager);
mEditor = TunerFactory.getEditor(mUserPreferences, getItem(), mTunerManager);
getItem().addTunerStatusListener(this);
}
else

76
src/main/java/io/github/dsheirer/source/tuner/ui/TunerEditor.java
View File

@@ -62,7 +62,6 @@ public abstract class TunerEditor<T extends Tuner,C extends TunerConfiguration>
private Logger mLog = LoggerFactory.getLogger(TunerEditor.class);
private static final String BUTTON_STATUS_ENABLE = "Enable";
private static final String BUTTON_STATUS_DISABLE = "Disable";
private static final String BUTTON_STATUS_RESET = "Reset Error";
private static final long serialVersionUID = 1L;
private UserPreferences mUserPreferences;
private TunerManager mTunerManager;
@@ -71,9 +70,10 @@ public abstract class TunerEditor<T extends Tuner,C extends TunerConfiguration>
private FrequencyAndCorrectionChangeListener mFrequencyAndCorrectionChangeListener = new FrequencyAndCorrectionChangeListener();
private JFrequencyControl mFrequencyControl;
private JSpinner mFrequencyCorrectionSpinner;
private JButton mChangeStatusButton;
private JButton mEnabledButton;
private JButton mViewSpectrumButton;
private JButton mNewSpectrumButton;
private JButton mRestartTunerButton;
private JToggleButton mRecordButton;
private ButtonPanel mButtonsPanel;
private FrequencyPanel mFrequencyPanel;
@@ -107,6 +107,11 @@ public abstract class TunerEditor<T extends Tuner,C extends TunerConfiguration>
if(mDiscoveredTuner.hasTuner())
{
mDiscoveredTuner.getTuner().addTunerEventListener(this);
if(!mDiscoveredTuner.hasTunerConfiguration())
{
mLog.warn("Tuner does not have a tuner configuration ....");
}
}
}
}
@@ -327,15 +332,15 @@ public abstract class TunerEditor<T extends Tuner,C extends TunerConfiguration>
/**
* Button to change enable, disable, or error restart status.
*/
protected JButton getChangeStatusButton()
protected JButton getEnabledButton()
{
if(mChangeStatusButton == null)
if(mEnabledButton == null)
{
mChangeStatusButton = new JButton(BUTTON_STATUS_ENABLE);
mChangeStatusButton.setToolTipText("Enable or disable the tuner for use by sdrtrunk, or attempt to reset a tuner error");
mChangeStatusButton.addActionListener(e ->
mEnabledButton = new JButton(BUTTON_STATUS_ENABLE);
mEnabledButton.setToolTipText("Enable or disable the tuner for use by sdrtrunk, or attempt to reset a tuner error");
mEnabledButton.addActionListener(e ->
{
switch(getChangeStatusButton().getText())
switch(getEnabledButton().getText())
{
case BUTTON_STATUS_DISABLE:
mLog.info("Disabling " + getDiscoveredTuner().getTunerClass() + " tuner");
@@ -345,17 +350,37 @@ public abstract class TunerEditor<T extends Tuner,C extends TunerConfiguration>
mLog.info("Enabling " + getDiscoveredTuner().getTunerClass() + " tuner");
getDiscoveredTuner().setEnabled(true);
break;
case BUTTON_STATUS_RESET:
mLog.info("Resetting " + getDiscoveredTuner().getTunerClass() + " tuner");
getDiscoveredTuner().reset();
break;
default:
mLog.info("None matched");
}
});
}
return mChangeStatusButton;
return mEnabledButton;
}
protected JButton getRestartTunerButton()
{
if(mRestartTunerButton == null)
{
mRestartTunerButton = new JButton("Restart Tuner");
mRestartTunerButton.setVisible(false);
mRestartTunerButton.setToolTipText("Attempt to restart this tuner to recover from error condition");
mRestartTunerButton.addActionListener(e ->
{
if(!hasTuner() && getDiscoveredTuner().getTunerStatus() == TunerStatus.ERROR)
{
mLog.info("Resetting " + getDiscoveredTuner().getTunerClass() + " tuner");
getDiscoveredTuner().reset();
if(getDiscoveredTuner().isEnabled())
{
getDiscoveredTuner().start();
}
}
});
}
return mRestartTunerButton;
}
/**
@@ -532,12 +557,12 @@ public abstract class TunerEditor<T extends Tuner,C extends TunerConfiguration>
*/
public ButtonPanel()
{
setLayout(new MigLayout("insets 0,fill", "[][][][][grow,fill]", ""));
add(getChangeStatusButton());
setLayout(new MigLayout("insets 0,fill", "[][][][][][grow,fill]", ""));
add(getEnabledButton());
add(getRecordButton());
add(getViewSpectrumButton());
add(getNewSpectrumButton(), "wrap");
// add(new JLabel(""), "wrap"); //Spacer to allow recording status label to grow and not affect buttons
add(getNewSpectrumButton());
add(getRestartTunerButton(), "wrap");
add(getRecordingStatusLabel(), "span");
}
@@ -552,18 +577,15 @@ public abstract class TunerEditor<T extends Tuner,C extends TunerConfiguration>
getRecordingStatusLabel().setText(" ");
getViewSpectrumButton().setEnabled(tunerStatus.isAvailable() && getDiscoveredTuner().hasTuner());
getNewSpectrumButton().setEnabled(tunerStatus.isAvailable() && getDiscoveredTuner().hasTuner());
getRestartTunerButton().setVisible(tunerStatus == TunerStatus.ERROR);
switch(tunerStatus)
if(getDiscoveredTuner().isEnabled())
{
case ENABLED:
getChangeStatusButton().setText(BUTTON_STATUS_DISABLE);
break;
case DISABLED:
getChangeStatusButton().setText(BUTTON_STATUS_ENABLE);
break;
case ERROR:
getChangeStatusButton().setText(BUTTON_STATUS_RESET);
break;
getEnabledButton().setText(BUTTON_STATUS_DISABLE);
}
else
{
getEnabledButton().setText(BUTTON_STATUS_ENABLE);
}
}
}