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

wip: #34 Adds the E4000 tuner editor and updates a few other tuner

Browse Source 
editor pieces.
This commit is contained in:
denny
2016-03-20 05:30:16 -04:00
parent 6bb417f69a
commit d3e8816bb4
8 changed files with 635 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/source/tuner/configuration/TunerConfigurationFactory.java
View File

@@ -12,11 +12,15 @@ import source.tuner.fcd.proplusV2.FCD2TunerConfiguration;
import source.tuner.hackrf.HackRFTunerConfiguration;
import source.tuner.rtl.RTL2832Tuner;
import source.tuner.rtl.e4k.E4KTunerConfiguration;
import source.tuner.rtl.e4k.E4KTunerEditor;
import source.tuner.rtl.r820t.R820TTunerConfiguration;
import source.tuner.rtl.r820t.R820TTunerEditor;
public class TunerConfigurationFactory
{
/**
* Creates a tuner configuration for the specified tuner type, unique ID and name
*/
public static TunerConfiguration getTunerConfiguration( TunerType type,
String uniqueID, String name )
{
@@ -41,6 +45,9 @@ public class TunerConfigurationFactory
}
}
/**
* Creates a tuner editor gui for the specified tuner
*/
public static Editor<TunerConfiguration> getEditor( Tuner tuner,
TunerConfigurationModel model )
{
@@ -49,20 +56,18 @@ public class TunerConfigurationFactory
case AIRSPY_R820T:
return new AirspyTunerEditor( model, (AirspyTuner)tuner );
case ELONICS_E4000:
break;
return new E4KTunerEditor( model, (RTL2832Tuner)tuner );
case FUNCUBE_DONGLE_PRO:
break;
return new EmptyEditor<TunerConfiguration>( "a tuner" );
case FUNCUBE_DONGLE_PRO_PLUS:
break;
return new EmptyEditor<TunerConfiguration>( "a tuner" );
case HACKRF:
break;
return new EmptyEditor<TunerConfiguration>( "a tuner" );
case RAFAELMICRO_R820T:
return new R820TTunerEditor( model, (RTL2832Tuner)tuner );
case UNKNOWN:
default:
break;
throw new IllegalArgumentException( "Unrecognized Tuner: " + tuner.getName() );
}
return new EmptyEditor<TunerConfiguration>( "a tuner" );
}
}

2
src/source/tuner/configuration/TunerConfigurationModel.java
View File

@@ -153,7 +153,6 @@ public class TunerConfigurationModel extends AbstractTableModel
{
if( config.isAssigned() )
{
mLog.debug( "Unassigning: " + config.getName() );
config.setAssigned( false );
int index = mTunerConfigurations.indexOf( config );
@@ -162,7 +161,6 @@ public class TunerConfigurationModel extends AbstractTableModel
}
}
mLog.debug( "Assigning: " + configToAssign.getName() );
configToAssign.setAssigned( true );
int index = mTunerConfigurations.indexOf( configToAssign );
fireTableCellUpdated( index, ASSIGNED );