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

WIP #34 - more work on tuner model and view. Includes new tuner

Browse Source 
configuration and tuner configuration assignment editors.  Beginning of
tuner editor panel rework.   Removes most of the remaining JTree
configuration pieces.  Updates the settings manager to load and save
tuners and refactors all of the tuner configuration management out into
the tuner configuration model.
This commit is contained in:
denny
2016-03-12 12:54:48 -05:00
parent 9d4afb8c1f
commit 218eeb1848
66 changed files with 1983 additions and 2594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/source/tuner/hackrf/HackRFTuner.java
View File

@@ -29,12 +29,12 @@ import sample.complex.ComplexBuffer;
import settings.SettingsManager;
import source.SourceException;
import source.tuner.Tuner;
import source.tuner.TunerChangeEvent;
import source.tuner.TunerEvent;
import source.tuner.TunerChannel;
import source.tuner.TunerChannelSource;
import source.tuner.TunerClass;
import source.tuner.TunerConfiguration;
import source.tuner.TunerType;
import source.tuner.configuration.TunerConfiguration;
import source.tuner.hackrf.HackRFTunerController.BoardID;
public class HackRFTuner extends Tuner
@@ -75,12 +75,6 @@ public class HackRFTuner extends Tuner
return TunerType.HACKRF;
}
@Override
public JPanel getEditor( SettingsManager settingsManager )
{
return new HackRFTunerEditorPanel( this, settingsManager );
}
@Override
public void apply( TunerConfiguration config ) throws SourceException
{
@@ -113,7 +107,7 @@ public class HackRFTuner extends Tuner
if( source != null )
{
broadcast( new TunerChangeEvent( this, TunerChangeEvent.Event.CHANNEL_COUNT ) );
broadcast( new TunerEvent( this, TunerEvent.Event.CHANNEL_COUNT ) );
}
return source;

2
src/source/tuner/hackrf/HackRFTunerConfiguration.java
View File

@@ -20,8 +20,8 @@ package source.tuner.hackrf;
import javax.xml.bind.annotation.XmlAttribute;
import source.tuner.TunerConfiguration;
import source.tuner.TunerType;
import source.tuner.configuration.TunerConfiguration;
import source.tuner.hackrf.HackRFTunerController.HackRFLNAGain;
import source.tuner.hackrf.HackRFTunerController.HackRFSampleRate;
import source.tuner.hackrf.HackRFTunerController.HackRFVGAGain;

82
src/source/tuner/hackrf/HackRFTunerConfigurationPanel.java
View File

@@ -50,9 +50,9 @@ import org.slf4j.LoggerFactory;
import settings.SettingsManager;
import source.SourceException;
import source.tuner.TunerConfiguration;
import source.tuner.TunerConfigurationAssignment;
import source.tuner.TunerType;
import source.tuner.configuration.TunerConfiguration;
import source.tuner.configuration.TunerConfigurationAssignment;
import source.tuner.hackrf.HackRFTunerController.HackRFLNAGain;
import source.tuner.hackrf.HackRFTunerController.HackRFSampleRate;
import source.tuner.hackrf.HackRFTunerController.HackRFVGAGain;
@@ -117,11 +117,11 @@ public class HackRFTunerConfigurationPanel extends JPanel
mLog.error( "couldn't read hackrf serial number", e2 );
}
if( serial != null )
{
savedConfig = mSettingsManager.getSelectedTunerConfiguration(
TunerType.HACKRF, serial );
}
// if( serial != null )
// {
// savedConfig = mSettingsManager.getSelectedTunerConfiguration(
// TunerType.HACKRF, serial );
// }
if( savedConfig != null )
{
@@ -136,12 +136,12 @@ public class HackRFTunerConfigurationPanel extends JPanel
//Store this config as the default for this tuner at this address
if( serial != null )
{
mSettingsManager
.setSelectedTunerConfiguration( TunerType.HACKRF,
serial, mSelectedConfig );
}
// if( serial != null )
// {
// mSettingsManager
// .setSelectedTunerConfiguration( TunerType.HACKRF,
// serial, mSelectedConfig );
// }
}
mComboConfigurations.setSelectedItem( mSelectedConfig );
@@ -416,15 +416,15 @@ public class HackRFTunerConfigurationPanel extends JPanel
@Override
public void actionPerformed( ActionEvent e )
{
TunerConfiguration config =
mSettingsManager
.addNewTunerConfiguration(
TunerType.HACKRF,
"New Configuration" );
// TunerConfiguration config =
// mSettingsManager
// .addNewTunerConfiguration(
// TunerType.HACKRF,
// "New Configuration" );
mComboConfigurations.setModel( getModel() );
mComboConfigurations.setSelectedItem( config );
// mComboConfigurations.setSelectedItem( config );
repaint();
}
@@ -457,8 +457,8 @@ public class HackRFTunerConfigurationPanel extends JPanel
if( n == JOptionPane.YES_OPTION )
{
mSettingsManager
.deleteTunerConfiguration( selected );
// mSettingsManager
// .deleteTunerConfiguration( selected );
mComboConfigurations.setModel( getModel() );
@@ -493,10 +493,10 @@ public class HackRFTunerConfigurationPanel extends JPanel
mComboSampleRate.setSelectedItem( mSelectedConfig.getSampleRate() );
mSettingsManager.setSelectedTunerConfiguration(
TunerType.HACKRF, mController.getSerial().getSerialNumber(), config );
// mSettingsManager.setSelectedTunerConfiguration(
// TunerType.HACKRF, mController.getSerial().getSerialNumber(), config );
}
catch ( UsbException | SourceException e1 )
catch ( SourceException e1 )
{
JOptionPane.showMessageDialog(
HackRFTunerConfigurationPanel.this,
@@ -516,17 +516,17 @@ public class HackRFTunerConfigurationPanel extends JPanel
*/
private ComboBoxModel<HackRFTunerConfiguration> getModel()
{
ArrayList<TunerConfiguration> configs =
mSettingsManager
.getTunerConfigurations( TunerType.HACKRF );
// ArrayList<TunerConfiguration> configs =
// mSettingsManager
// .getTunerConfigurations( TunerType.HACKRF );
DefaultComboBoxModel<HackRFTunerConfiguration> model =
new DefaultComboBoxModel<HackRFTunerConfiguration>();
for( TunerConfiguration config: configs )
{
model.addElement( (HackRFTunerConfiguration)config );
}
// for( TunerConfiguration config: configs )
// {
// model.addElement( (HackRFTunerConfiguration)config );
// }
return model;
}
@@ -536,17 +536,17 @@ public class HackRFTunerConfigurationPanel extends JPanel
*/
private HackRFTunerConfiguration getNamedConfiguration( String name )
{
ArrayList<TunerConfiguration> configs =
mSettingsManager
.getTunerConfigurations( TunerType.HACKRF );
// ArrayList<TunerConfiguration> configs =
// mSettingsManager
// .getTunerConfigurations( TunerType.HACKRF );
for( TunerConfiguration config: configs )
{
if( config.getName().contentEquals( name ) )
{
return (HackRFTunerConfiguration)config;
}
}
// for( TunerConfiguration config: configs )
// {
// if( config.getName().contentEquals( name ) )
// {
// return (HackRFTunerConfiguration)config;
// }
// }
return null;
}

2
src/source/tuner/hackrf/HackRFTunerController.java
View File

@@ -81,8 +81,8 @@ import sample.Listener;
import sample.adapter.ByteSampleAdapter;
import sample.complex.ComplexBuffer;
import source.SourceException;
import source.tuner.TunerConfiguration;
import source.tuner.TunerController;
import source.tuner.configuration.TunerConfiguration;
import controller.ThreadPoolManager;
import controller.ThreadPoolManager.ThreadType;