[WIP] Adds locking mechanism to tuner controllers so that the

polyphase channel manager can block users from changing frequency and/or
sample rate when polyphase channels are allocated.
This commit is contained in:
Denny
2018-02-04 06:30:25 -05:00
parent 85691edacb
commit 96d9d6f750
14 changed files with 3271 additions and 3031 deletions

View File

@@ -147,6 +147,7 @@ public class PolyphaseChannelManager implements ISourceEventProcessor
mChannelCalculator.getChannelSampleRate()); mChannelCalculator.getChannelSampleRate());
mChannelSources.add(channelSource); mChannelSources.add(channelSource);
mSourceEventBroadcaster.broadcast(SourceEvent.channelCountChange(getTunerChannelCount()));
} }
} }
catch(IllegalArgumentException iae) catch(IllegalArgumentException iae)
@@ -225,7 +226,6 @@ public class PolyphaseChannelManager implements ISourceEventProcessor
synchronized(mBufferProcessor) synchronized(mBufferProcessor)
{ {
mPolyphaseChannelizer.addChannel(channelSource); mPolyphaseChannelizer.addChannel(channelSource);
mSourceEventBroadcaster.broadcast(SourceEvent.channelCountChange(getTunerChannelCount()));
if(mPolyphaseChannelizer.getRegisteredChannelCount() == 1) if(mPolyphaseChannelizer.getRegisteredChannelCount() == 1)
{ {

View File

@@ -20,7 +20,6 @@ package io.github.dsheirer.gui.control;
import io.github.dsheirer.source.ISourceEventProcessor; import io.github.dsheirer.source.ISourceEventProcessor;
import io.github.dsheirer.source.InvalidFrequencyException; import io.github.dsheirer.source.InvalidFrequencyException;
import io.github.dsheirer.source.SourceEvent; import io.github.dsheirer.source.SourceEvent;
import io.github.dsheirer.source.SourceEvent.Event;
import io.github.dsheirer.source.SourceException; import io.github.dsheirer.source.SourceException;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -32,6 +31,7 @@ import javax.swing.JPanel;
import javax.swing.JTextField; import javax.swing.JTextField;
import java.awt.Color; import java.awt.Color;
import java.awt.Cursor; import java.awt.Cursor;
import java.awt.EventQueue;
import java.awt.Font; import java.awt.Font;
import java.awt.Image; import java.awt.Image;
import java.awt.Point; import java.awt.Point;
@@ -146,10 +146,39 @@ public class JFrequencyControl extends JPanel implements ISourceEventProcessor
@Override @Override
public void process(SourceEvent event) public void process(SourceEvent event)
{ {
if(event.getEvent() == Event.NOTIFICATION_FREQUENCY_CHANGE) switch(event.getEvent())
{
case NOTIFICATION_FREQUENCY_CHANGE:
EventQueue.invokeLater(new Runnable()
{
@Override
public void run()
{ {
setFrequency(event.getValue().longValue(), false); setFrequency(event.getValue().longValue(), false);
} }
});
break;
case NOTIFICATION_FREQUENCY_AND_SAMPLE_RATE_LOCKED:
EventQueue.invokeLater(new Runnable()
{
@Override
public void run()
{
setEnabled(false);
}
});
break;
case NOTIFICATION_FREQUENCY_AND_SAMPLE_RATE_UNLOCKED:
EventQueue.invokeLater(new Runnable()
{
@Override
public void run()
{
setEnabled(true);
}
});
break;
}
} }
/** /**

View File

@@ -27,6 +27,8 @@ public class SourceEvent
NOTIFICATION_CHANNEL_COUNT_CHANGE, NOTIFICATION_CHANNEL_COUNT_CHANGE,
NOTIFICATION_CHANNEL_FREQUENCY_CORRECTION_CHANGE, NOTIFICATION_CHANNEL_FREQUENCY_CORRECTION_CHANGE,
NOTIFICATION_CHANNEL_SAMPLE_RATE_CHANGE, NOTIFICATION_CHANNEL_SAMPLE_RATE_CHANGE,
NOTIFICATION_FREQUENCY_AND_SAMPLE_RATE_LOCKED,
NOTIFICATION_FREQUENCY_AND_SAMPLE_RATE_UNLOCKED,
NOTIFICATION_FREQUENCY_CHANGE, NOTIFICATION_FREQUENCY_CHANGE,
NOTIFICATION_FREQUENCY_CORRECTION_CHANGE, NOTIFICATION_FREQUENCY_CORRECTION_CHANGE,
NOTIFICATION_SAMPLE_RATE_CHANGE, NOTIFICATION_SAMPLE_RATE_CHANGE,
@@ -119,6 +121,22 @@ public class SourceEvent
return mSource != null; return mSource != null;
} }
/**
* Creates a new locked state change event
*/
public static SourceEvent lockedState()
{
return new SourceEvent(Event.NOTIFICATION_FREQUENCY_AND_SAMPLE_RATE_LOCKED, 1);
}
/**
* Creates a new unlocked state change event
*/
public static SourceEvent unlockedState()
{
return new SourceEvent(Event.NOTIFICATION_FREQUENCY_AND_SAMPLE_RATE_UNLOCKED, 0);
}
/** /**
* Creates a new frequency change event * Creates a new frequency change event
* *

View File

@@ -104,6 +104,37 @@ public abstract class TunerController implements Tunable, ISourceEventProcessor,
} }
} }
/**
* Indicates if the frequency and sample rate controls are locked by another process. User interface controls
* should monitor source events and check the locked state via this method to correctly render the enabled state
* of the frequency and sample rate controls.
*
* @return true if the tuner controller is locked.
*/
public boolean isLocked()
{
return mFrequencyController.isLocked();
}
/**
* Sets the frequency and sample rate locked state to the locked argument value. This should only be changed
* by a downstream consumer of samples to prevent users or other processes from modifying the center frequency
* and/or sample rate of the tuner while processing samples.
*
* @param locked true to indicate the tuner controller is in a locked state, otherwise false.
*/
public void setLocked(boolean locked)
{
try
{
mFrequencyController.setLocked(locked);
}
catch(SourceException se)
{
mLog.error("Couldn't set frequency controller locked state to: " + locked);
}
}
public int getBandwidth() public int getBandwidth()
{ {
return mFrequencyController.getBandwidth(); return mFrequencyController.getBandwidth();

View File

@@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* sdr-trunk * sdr-trunk
* Copyright (C) 2014-2017 Dennis Sheirer * Copyright (C) 2014-2018 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
@@ -46,21 +46,21 @@ public class TunerEditor extends Editor<Tuner>
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private final static Logger mLog = LoggerFactory.getLogger( TunerEditor.class ); private final static Logger mLog = LoggerFactory.getLogger(TunerEditor.class);
private TunerConfigurationModel mTunerConfigurationModel; private TunerConfigurationModel mTunerConfigurationModel;
private JTable mTunerConfigurationTable; private JTable mTunerConfigurationTable;
private TableRowSorter<TunerConfigurationModel> mRowSorter; private TableRowSorter<TunerConfigurationModel> mRowSorter;
private JFrequencyControl mFrequencyControl = new JFrequencyControl(); private JFrequencyControl mFrequencyControl = new JFrequencyControl();
private JLabel mSelectedTunerType = new JLabel( "No Tuner Selected" ); private JLabel mSelectedTunerType = new JLabel("No Tuner Selected");
private JButton mNewConfigurationButton = new JButton( "New" ); private JButton mNewConfigurationButton = new JButton("New");
private JButton mDeleteConfigurationButton = new JButton( "Delete" ); private JButton mDeleteConfigurationButton = new JButton("Delete");
private JButton mAssignConfigurationButton = new JButton( "Assign" ); private JButton mAssignConfigurationButton = new JButton("Assign");
private JScrollPane mEditorScroller; private JScrollPane mEditorScroller;
private Editor<TunerConfiguration> mEditor = new EmptyEditor<>( "a tuner" ); private Editor<TunerConfiguration> mEditor = new EmptyEditor<>("a tuner");
private JideSplitPane mEditorSplitPane = new JideSplitPane(); private JideSplitPane mEditorSplitPane = new JideSplitPane();
public TunerEditor( TunerConfigurationModel tunerConfigurationModel ) public TunerEditor(TunerConfigurationModel tunerConfigurationModel)
{ {
mTunerConfigurationModel = tunerConfigurationModel; mTunerConfigurationModel = tunerConfigurationModel;
init(); init();
@@ -68,132 +68,132 @@ public class TunerEditor extends Editor<Tuner>
public void init() public void init()
{ {
setLayout( new MigLayout( "insets 0 0 0 0", "[grow,fill]", "[grow,fill]" ) ); setLayout(new MigLayout("insets 0 0 0 0", "[grow,fill]", "[grow,fill]"));
JPanel listPanel = new JPanel(); JPanel listPanel = new JPanel();
listPanel.setLayout( new MigLayout( "fill,wrap 3", "[grow,fill]", "[][][][grow,fill][]" ) ); listPanel.setLayout(new MigLayout("fill,wrap 3", "[grow,fill]", "[][][][grow,fill][]"));
listPanel.add( mSelectedTunerType, "span" ); listPanel.add(mSelectedTunerType, "span");
mFrequencyControl.setEnabled( false ); mFrequencyControl.setEnabled(false);
listPanel.add( mFrequencyControl, "span" ); listPanel.add(mFrequencyControl, "span");
mRowSorter = new TableRowSorter<>( mTunerConfigurationModel ); mRowSorter = new TableRowSorter<>(mTunerConfigurationModel);
mTunerConfigurationTable = new JTable( mTunerConfigurationModel ); mTunerConfigurationTable = new JTable(mTunerConfigurationModel);
mTunerConfigurationTable.setRowSorter( mRowSorter ); mTunerConfigurationTable.setRowSorter(mRowSorter);
mTunerConfigurationTable.setEnabled( false ); mTunerConfigurationTable.setEnabled(false);
mTunerConfigurationTable.getSelectionModel().addListSelectionListener( new ListSelectionListener() mTunerConfigurationTable.getSelectionModel().addListSelectionListener(new ListSelectionListener()
{ {
@Override @Override
public void valueChanged( ListSelectionEvent event ) public void valueChanged(ListSelectionEvent event)
{ {
if( !event.getValueIsAdjusting() ) if(!event.getValueIsAdjusting())
{ {
int row = mTunerConfigurationTable.getSelectedRow(); int row = mTunerConfigurationTable.getSelectedRow();
if( row >= 0 ) if(row >= 0)
{ {
int modelRow = mTunerConfigurationTable.convertRowIndexToModel( row ); int modelRow = mTunerConfigurationTable.convertRowIndexToModel(row);
if( modelRow >= 0 ) if(modelRow >= 0)
{ {
setTunerConfiguration( mTunerConfigurationModel.getTunerConfiguration( modelRow ) ); setTunerConfiguration(mTunerConfigurationModel.getTunerConfiguration(modelRow));
} }
} }
} }
} }
} ); });
JScrollPane tableScroller = new JScrollPane( mTunerConfigurationTable ); JScrollPane tableScroller = new JScrollPane(mTunerConfigurationTable);
tableScroller.setHorizontalScrollBarPolicy( tableScroller.setHorizontalScrollBarPolicy(
ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER ); ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
listPanel.add( new JLabel( "Tuner Configurations" ), "span" ); listPanel.add(new JLabel("Tuner Configurations"), "span");
listPanel.add( tableScroller, "span" ); listPanel.add(tableScroller, "span");
mNewConfigurationButton.setEnabled( false ); mNewConfigurationButton.setEnabled(false);
mNewConfigurationButton.setToolTipText( "Create a new configuration for the currently selected tuner" ); mNewConfigurationButton.setToolTipText("Create a new configuration for the currently selected tuner");
mNewConfigurationButton.addActionListener( new ActionListener() mNewConfigurationButton.addActionListener(new ActionListener()
{ {
@Override @Override
public void actionPerformed( ActionEvent e ) public void actionPerformed(ActionEvent e)
{ {
Tuner tuner = getItem(); Tuner tuner = getItem();
String name = mTunerConfigurationModel String name = mTunerConfigurationModel
.getDistinctName( tuner.getTunerType(), tuner.getUniqueID() ); .getDistinctName(tuner.getTunerType(), tuner.getUniqueID());
TunerConfiguration config = TunerConfigurationFactory TunerConfiguration config = TunerConfigurationFactory
.getTunerConfiguration( tuner.getTunerType(), .getTunerConfiguration(tuner.getTunerType(),
tuner.getUniqueID(), name ); tuner.getUniqueID(), name);
mTunerConfigurationModel.addTunerConfiguration( config ); mTunerConfigurationModel.addTunerConfiguration(config);
} }
} ); });
listPanel.add( mNewConfigurationButton ); listPanel.add(mNewConfigurationButton);
mDeleteConfigurationButton.setEnabled( false ); mDeleteConfigurationButton.setEnabled(false);
mDeleteConfigurationButton.setToolTipText( "Deletes the currently selected tuner" ); mDeleteConfigurationButton.setToolTipText("Deletes the currently selected tuner");
mDeleteConfigurationButton.addActionListener( new ActionListener() mDeleteConfigurationButton.addActionListener(new ActionListener()
{ {
@Override @Override
public void actionPerformed( ActionEvent e ) public void actionPerformed(ActionEvent e)
{ {
int choice = JOptionPane.showConfirmDialog( TunerEditor.this, int choice = JOptionPane.showConfirmDialog(TunerEditor.this,
"Do you want to delete this tuner configuration?", "Do you want to delete this tuner configuration?",
"Delete Tuner Configuration?", JOptionPane.YES_NO_OPTION ); "Delete Tuner Configuration?", JOptionPane.YES_NO_OPTION);
if( choice == JOptionPane.YES_OPTION ) if(choice == JOptionPane.YES_OPTION)
{ {
TunerConfiguration selected = getSelectedTunerConfiguration(); TunerConfiguration selected = getSelectedTunerConfiguration();
mTunerConfigurationModel.removeTunerConfiguration( selected ); mTunerConfigurationModel.removeTunerConfiguration(selected);
mTunerConfigurationTable.setRowSelectionInterval( 0, 0 ); mTunerConfigurationTable.setRowSelectionInterval(0, 0);
} }
} }
} ); });
listPanel.add( mDeleteConfigurationButton ); listPanel.add(mDeleteConfigurationButton);
mAssignConfigurationButton.setEnabled( false ); mAssignConfigurationButton.setEnabled(false);
mAssignConfigurationButton.setToolTipText( "Assigns to the currently selected tuner configuration to the selected tuner" ); mAssignConfigurationButton.setToolTipText("Assigns to the currently selected tuner configuration to the selected tuner");
mAssignConfigurationButton.addActionListener( new ActionListener() mAssignConfigurationButton.addActionListener(new ActionListener()
{ {
@Override @Override
public void actionPerformed( ActionEvent e ) public void actionPerformed(ActionEvent e)
{ {
TunerConfiguration selected = getSelectedTunerConfiguration(); TunerConfiguration selected = getSelectedTunerConfiguration();
mTunerConfigurationModel.assignTunerConfiguration( selected ); mTunerConfigurationModel.assignTunerConfiguration(selected);
setTunerConfiguration( getSelectedTunerConfiguration() ); setTunerConfiguration(getSelectedTunerConfiguration());
} }
} ); });
listPanel.add( mAssignConfigurationButton ); listPanel.add(mAssignConfigurationButton);
//Set preferred size on both scrollers to same width, so they split the space //Set preferred size on both scrollers to same width, so they split the space
listPanel.setPreferredSize( new Dimension( 100, 80 ) ); listPanel.setPreferredSize(new Dimension(100, 80));
JScrollPane listScroller = new JScrollPane( listPanel ); JScrollPane listScroller = new JScrollPane(listPanel);
listScroller.setPreferredSize( new Dimension( 100, 80 ) ); listScroller.setPreferredSize(new Dimension(100, 80));
mEditorScroller = new JScrollPane( mEditor ); mEditorScroller = new JScrollPane(mEditor);
mEditorScroller.setPreferredSize( new Dimension( 100, 80 ) ); mEditorScroller.setPreferredSize(new Dimension(100, 80));
mEditorSplitPane = new JideSplitPane( JideSplitPane.HORIZONTAL_SPLIT ); mEditorSplitPane = new JideSplitPane(JideSplitPane.HORIZONTAL_SPLIT);
mEditorSplitPane.add( listScroller ); mEditorSplitPane.add(listScroller);
mEditorSplitPane.add( mEditorScroller ); mEditorSplitPane.add(mEditorScroller);
add( mEditorSplitPane ); add(mEditorSplitPane);
} }
private TunerConfiguration getSelectedTunerConfiguration() private TunerConfiguration getSelectedTunerConfiguration()
{ {
int tableRow = mTunerConfigurationTable.getSelectedRow(); int tableRow = mTunerConfigurationTable.getSelectedRow();
if( tableRow >= 0 ) if(tableRow >= 0)
{ {
int modelRow = mTunerConfigurationTable.convertRowIndexToModel( tableRow ); int modelRow = mTunerConfigurationTable.convertRowIndexToModel(tableRow);
if( modelRow >= 0 ) if(modelRow >= 0)
{ {
return mTunerConfigurationModel.getTunerConfiguration( modelRow ); return mTunerConfigurationModel.getTunerConfiguration(modelRow);
} }
} }
@@ -207,118 +207,117 @@ public class TunerEditor extends Editor<Tuner>
} }
@Override @Override
public void setItem( Tuner tuner ) public void setItem(Tuner tuner)
{ {
//Cleanup previously selected tuner //Cleanup previously selected tuner
if( hasItem() ) if(hasItem())
{ {
Tuner previous = getItem(); Tuner previous = getItem();
previous.getTunerController().removeListener( mFrequencyControl ); previous.getTunerController().removeListener(mFrequencyControl);
mFrequencyControl.removeListener( previous.getTunerController() ); mFrequencyControl.removeListener(previous.getTunerController());
} }
super.setItem( tuner ); super.setItem(tuner);
if( hasItem() ) if(hasItem())
{ {
mSelectedTunerType.setText( tuner.getName() ); mSelectedTunerType.setText(tuner.getName());
mFrequencyControl.setEnabled( true ); mTunerConfigurationTable.setEnabled(true);
mTunerConfigurationTable.setEnabled( true ); mNewConfigurationButton.setEnabled(true);
mNewConfigurationButton.setEnabled( true );
//Change to an editor for this config's tuner type //Change to an editor for this config's tuner type
mEditor = TunerConfigurationFactory.getEditor( getItem(), mTunerConfigurationModel ); mEditor = TunerConfigurationFactory.getEditor(getItem(), mTunerConfigurationModel);
mRowSorter.setRowFilter( new ConfigurationRowFilter( tuner.getTunerType(), mRowSorter.setRowFilter(new ConfigurationRowFilter(tuner.getTunerType(),
tuner.getUniqueID() ) ); tuner.getUniqueID()));
TunerConfiguration assigned = mTunerConfigurationModel TunerConfiguration assigned = mTunerConfigurationModel
.getTunerConfiguration( tuner.getTunerType(), tuner.getUniqueID() ); .getTunerConfiguration(tuner.getTunerType(), tuner.getUniqueID());
int modelIndex = mTunerConfigurationModel.getRowIndex( assigned ); int modelIndex = mTunerConfigurationModel.getRowIndex(assigned);
if( modelIndex >= 0 ) if(modelIndex >= 0)
{ {
int viewIndex = mTunerConfigurationTable int viewIndex = mTunerConfigurationTable
.convertRowIndexToView( modelIndex ); .convertRowIndexToView(modelIndex);
if( viewIndex >= 0 ) if(viewIndex >= 0)
{ {
mTunerConfigurationTable mTunerConfigurationTable
.setRowSelectionInterval( viewIndex, viewIndex ); .setRowSelectionInterval(viewIndex, viewIndex);
} }
} }
//Link frequency control to the tuner //Link frequency control to the tuner and set enabled state
mFrequencyControl.addListener( tuner.getTunerController() ); mFrequencyControl.addListener(tuner.getTunerController());
mFrequencyControl.setEnabled(!tuner.getTunerController().isLocked());
//Link tuner to frequency control //Link tuner to frequency control
tuner.getTunerController().addListener( mFrequencyControl ); tuner.getTunerController().addListener(mFrequencyControl);
//Set the displayed frequency without adjusting the tuner's frequency //Set the displayed frequency without adjusting the tuner's frequency
mFrequencyControl.setFrequency( mFrequencyControl.setFrequency(tuner.getTunerController().getFrequency(), false);
tuner.getTunerController().getFrequency(), false );
} }
else else
{ {
mSelectedTunerType.setText( "No Tuner Selected" ); mSelectedTunerType.setText("No Tuner Selected");
mFrequencyControl.setEnabled( false ); mFrequencyControl.setEnabled(false);
mTunerConfigurationTable.setEnabled( false ); mTunerConfigurationTable.setEnabled(false);
mNewConfigurationButton.setEnabled( false ); mNewConfigurationButton.setEnabled(false);
mRowSorter.setRowFilter( null ); mRowSorter.setRowFilter(null);
mEditor = new EmptyEditor<TunerConfiguration>(); mEditor = new EmptyEditor<TunerConfiguration>();
} }
//Swap out the editor //Swap out the editor
int split = mEditorSplitPane.getDividerLocation( 0 ); int split = mEditorSplitPane.getDividerLocation(0);
mEditorSplitPane.remove( mEditorScroller ); mEditorSplitPane.remove(mEditorScroller);
mEditorScroller = new JScrollPane( mEditor ); mEditorScroller = new JScrollPane(mEditor);
mEditorSplitPane.add( mEditorScroller ); mEditorSplitPane.add(mEditorScroller);
mEditorSplitPane.setDividerLocation( 0, split ); mEditorSplitPane.setDividerLocation(0, split);
} }
private void setTunerConfiguration( TunerConfiguration config ) private void setTunerConfiguration(TunerConfiguration config)
{ {
if( config != null ) if(config != null)
{ {
if( !config.isAssigned() ) if(!config.isAssigned())
{ {
if( !mAssignConfigurationButton.isEnabled() ) if(!mAssignConfigurationButton.isEnabled())
{ {
mAssignConfigurationButton.setEnabled( true ); mAssignConfigurationButton.setEnabled(true);
} }
if( !mDeleteConfigurationButton.isEnabled() ) if(!mDeleteConfigurationButton.isEnabled())
{ {
mDeleteConfigurationButton.setEnabled( true ); mDeleteConfigurationButton.setEnabled(true);
} }
} }
else else
{ {
if( mAssignConfigurationButton.isEnabled() ) if(mAssignConfigurationButton.isEnabled())
{ {
mAssignConfigurationButton.setEnabled( false ); mAssignConfigurationButton.setEnabled(false);
} }
if( mDeleteConfigurationButton.isEnabled() ) if(mDeleteConfigurationButton.isEnabled())
{ {
mDeleteConfigurationButton.setEnabled( false ); mDeleteConfigurationButton.setEnabled(false);
} }
} }
} }
else else
{ {
if( mDeleteConfigurationButton.isEnabled() ) if(mDeleteConfigurationButton.isEnabled())
{ {
mDeleteConfigurationButton.setEnabled( false ); mDeleteConfigurationButton.setEnabled(false);
} }
if( mAssignConfigurationButton.isEnabled() ) if(mAssignConfigurationButton.isEnabled())
{ {
mAssignConfigurationButton.setEnabled( false ); mAssignConfigurationButton.setEnabled(false);
} }
} }
mEditor.setItem( config ); mEditor.setItem(config);
} }
public class ConfigurationRowFilter extends RowFilter<TunerConfigurationModel,Integer> public class ConfigurationRowFilter extends RowFilter<TunerConfigurationModel,Integer>
@@ -326,23 +325,23 @@ public class TunerEditor extends Editor<Tuner>
private TunerType mTunerType; private TunerType mTunerType;
private String mUniqueID; private String mUniqueID;
public ConfigurationRowFilter( TunerType type, String uniqueID ) public ConfigurationRowFilter(TunerType type, String uniqueID)
{ {
mTunerType = type; mTunerType = type;
mUniqueID = uniqueID; mUniqueID = uniqueID;
} }
@Override @Override
public boolean include( javax.swing.RowFilter.Entry<? extends TunerConfigurationModel, public boolean include(javax.swing.RowFilter.Entry<? extends TunerConfigurationModel,
? extends Integer> entry ) ? extends Integer> entry)
{ {
TunerConfiguration config = entry.getModel() TunerConfiguration config = entry.getModel()
.getTunerConfiguration( entry.getIdentifier() ); .getTunerConfiguration(entry.getIdentifier());
return config != null && return config != null &&
config.getTunerType() == mTunerType && config.getTunerType() == mTunerType &&
config.getUniqueID() != null && config.getUniqueID() != null &&
config.getUniqueID().contentEquals( mUniqueID ); config.getUniqueID().contentEquals(mUniqueID);
} }
} }

View File

@@ -1,3 +1,18 @@
/*******************************************************************************
* sdr-trunk
* Copyright (C) 2014-2018 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
* later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with this program.
* If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package io.github.dsheirer.source.tuner.configuration; package io.github.dsheirer.source.tuner.configuration;
import io.github.dsheirer.gui.editor.Editor; import io.github.dsheirer.gui.editor.Editor;
@@ -8,7 +23,7 @@ public abstract class TunerConfigurationEditor extends Editor<TunerConfiguration
private TunerConfigurationModel mTunerConfigurationModel; private TunerConfigurationModel mTunerConfigurationModel;
public TunerConfigurationEditor( TunerConfigurationModel model ) public TunerConfigurationEditor(TunerConfigurationModel model)
{ {
mTunerConfigurationModel = model; mTunerConfigurationModel = model;
} }
@@ -17,4 +32,12 @@ public abstract class TunerConfigurationEditor extends Editor<TunerConfiguration
{ {
return mTunerConfigurationModel; return mTunerConfigurationModel;
} }
/**
* Sets the state of the sample rate editor control. When enabled, users are allowed to change the sample rate
* of the tuner. When disabled, user controls should NOT allow sample rate changes.
*
* @param enabled state for the sample rate control
*/
public abstract void setSampleRateControl(boolean enabled);
} }

View File

@@ -52,7 +52,7 @@ import java.text.DecimalFormat;
public class FCD1TunerEditor extends TunerConfigurationEditor public class FCD1TunerEditor extends TunerConfigurationEditor
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private final static Logger mLog = LoggerFactory.getLogger( FCD1TunerEditor.class ); private final static Logger mLog = LoggerFactory.getLogger(FCD1TunerEditor.class);
private JTextField mConfigurationName; private JTextField mConfigurationName;
private JButton mTunerInfo; private JButton mTunerInfo;
@@ -68,9 +68,9 @@ public class FCD1TunerEditor extends TunerConfigurationEditor
private FCD1TunerController mController; private FCD1TunerController mController;
public FCD1TunerEditor( TunerConfigurationModel tunerConfigurationModel, FCDTuner tuner ) public FCD1TunerEditor(TunerConfigurationModel tunerConfigurationModel, FCDTuner tuner)
{ {
super( tunerConfigurationModel ); super(tunerConfigurationModel);
mController = (FCD1TunerController)tuner.getController(); mController = (FCD1TunerController)tuner.getController();
init(); init();
@@ -78,7 +78,7 @@ public class FCD1TunerEditor extends TunerConfigurationEditor
private FCD1TunerConfiguration getConfiguration() private FCD1TunerConfiguration getConfiguration()
{ {
if( hasItem() ) if(hasItem())
{ {
return (FCD1TunerConfiguration)getItem(); return (FCD1TunerConfiguration)getItem();
} }
@@ -86,273 +86,282 @@ public class FCD1TunerEditor extends TunerConfigurationEditor
return null; return null;
} }
@Override
public void setSampleRateControl(boolean enabled)
{
//no-op
}
private void init() private void init()
{ {
setLayout( new MigLayout( "fill,wrap 4", "[right][grow,fill][right][grow,fill]", setLayout(new MigLayout("fill,wrap 4", "[right][grow,fill][right][grow,fill]",
"[][][][][][][][][][][][grow]" ) ); "[][][][][][][][][][][][grow]"));
add( new JLabel( "FCD Pro Tuner Configuration" ), "span,align center" ); add(new JLabel("FCD Pro Tuner Configuration"), "span,align center");
mConfigurationName = new JTextField(); mConfigurationName = new JTextField();
mConfigurationName.setEnabled( false ); mConfigurationName.setEnabled(false);
mConfigurationName.addFocusListener( new FocusListener() mConfigurationName.addFocusListener(new FocusListener()
{ {
@Override @Override
public void focusLost( FocusEvent e ) public void focusLost(FocusEvent e)
{ {
save(); save();
} }
@Override
public void focusGained( FocusEvent e ) {}
} );
add( new JLabel( "Name:" ) );
add( mConfigurationName, "span 2" );
mTunerInfo = new JButton( "Tuner Info" );
mTunerInfo.setEnabled( false );
mTunerInfo.addActionListener( new ActionListener()
{
@Override @Override
public void actionPerformed( ActionEvent e ) public void focusGained(FocusEvent e)
{ {
JOptionPane.showMessageDialog( FCD1TunerEditor.this, getTunerInfo(),
"Tuner Info", JOptionPane.INFORMATION_MESSAGE );
} }
} ); });
add( mTunerInfo );
SpinnerModel model = new SpinnerNumberModel( 0.0, //initial value add(new JLabel("Name:"));
add(mConfigurationName, "span 2");
mTunerInfo = new JButton("Tuner Info");
mTunerInfo.setEnabled(false);
mTunerInfo.addActionListener(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
{
JOptionPane.showMessageDialog(FCD1TunerEditor.this, getTunerInfo(),
"Tuner Info", JOptionPane.INFORMATION_MESSAGE);
}
});
add(mTunerInfo);
SpinnerModel model = new SpinnerNumberModel(0.0, //initial value
-1000.0, //min -1000.0, //min
1000.0, //max 1000.0, //max
0.1 ); //step 0.1); //step
mFrequencyCorrection = new JSpinner( model ); mFrequencyCorrection = new JSpinner(model);
mFrequencyCorrection.setEnabled( false ); mFrequencyCorrection.setEnabled(false);
JSpinner.NumberEditor editor = JSpinner.NumberEditor editor =
(JSpinner.NumberEditor)mFrequencyCorrection.getEditor(); (JSpinner.NumberEditor)mFrequencyCorrection.getEditor();
DecimalFormat format = editor.getFormat(); DecimalFormat format = editor.getFormat();
format.setMinimumFractionDigits( 1 ); format.setMinimumFractionDigits(1);
editor.getTextField().setHorizontalAlignment( SwingConstants.CENTER ); editor.getTextField().setHorizontalAlignment(SwingConstants.CENTER);
mFrequencyCorrection.addChangeListener( new ChangeListener() mFrequencyCorrection.addChangeListener(new ChangeListener()
{ {
@Override @Override
public void stateChanged( ChangeEvent e ) public void stateChanged(ChangeEvent e)
{ {
double value = ((SpinnerNumberModel)mFrequencyCorrection double value = ((SpinnerNumberModel)mFrequencyCorrection
.getModel()).getNumber().doubleValue(); .getModel()).getNumber().doubleValue();
try try
{ {
mController.setFrequencyCorrection( value ); mController.setFrequencyCorrection(value);
save(); save();
} }
catch ( SourceException e1 ) catch(SourceException e1)
{ {
JOptionPane.showMessageDialog( FCD1TunerEditor.this, "FCD Pro Tuner " JOptionPane.showMessageDialog(FCD1TunerEditor.this, "FCD Pro Tuner "
+ "Controller - couldn't apply frequency correction value: " + value + + "Controller - couldn't apply frequency correction value: " + value +
e1.getLocalizedMessage() ); e1.getLocalizedMessage());
mLog.error( "FuncubeDonglePro Controller - couldn't apply " mLog.error("FuncubeDonglePro Controller - couldn't apply "
+ "frequency correction value: " + value, e1 ); + "frequency correction value: " + value, e1);
} }
} }
} ); });
add( new JLabel( "PPM:" ) ); add(new JLabel("PPM:"));
add( mFrequencyCorrection, "wrap" ); add(mFrequencyCorrection, "wrap");
add( new JSeparator( JSeparator.HORIZONTAL ), "span,grow" ); add(new JSeparator(JSeparator.HORIZONTAL), "span,grow");
add( new JLabel( "Gain" ), "span,align center" ); add(new JLabel("Gain"), "span,align center");
mComboLNAGain = new JComboBox<LNAGain>( LNAGain.values() ); mComboLNAGain = new JComboBox<LNAGain>(LNAGain.values());
mComboLNAGain.setEnabled( false ); mComboLNAGain.setEnabled(false);
mComboLNAGain.setToolTipText( "Adjust the low noise amplifier gain setting." ); mComboLNAGain.setToolTipText("Adjust the low noise amplifier gain setting.");
mComboLNAGain.addActionListener( new ActionListener() mComboLNAGain.addActionListener(new ActionListener()
{ {
@Override @Override
public void actionPerformed( ActionEvent arg0 ) public void actionPerformed(ActionEvent arg0)
{ {
LNAGain gain = (LNAGain)mComboLNAGain.getSelectedItem(); LNAGain gain = (LNAGain)mComboLNAGain.getSelectedItem();
try try
{ {
mController.setLNAGain( gain ); mController.setLNAGain(gain);
save(); save();
} }
catch ( Exception e ) catch(Exception e)
{ {
JOptionPane.showMessageDialog( FCD1TunerEditor.this, "FCD Pro Tuner Controller" JOptionPane.showMessageDialog(FCD1TunerEditor.this, "FCD Pro Tuner Controller"
+ " - error setting LNA gain [" + gain.toString() + "]" ); + " - error setting LNA gain [" + gain.toString() + "]");
mLog.error( "FuncubeDonglePro Controller - error setting gain [" + gain.toString() + "]", e ); mLog.error("FuncubeDonglePro Controller - error setting gain [" + gain.toString() + "]", e);
} }
} }
} ); });
add( new JLabel( "LNA:" ) ); add(new JLabel("LNA:"));
add( mComboLNAGain ); add(mComboLNAGain);
/** /**
* LNA Enhance * LNA Enhance
*/ */
mComboLNAEnhance = new JComboBox<LNAEnhance>( LNAEnhance.values() ); mComboLNAEnhance = new JComboBox<LNAEnhance>(LNAEnhance.values());
mComboLNAEnhance.setToolTipText( "Adjust the LNA enhance setting. Default value is OFF" ); mComboLNAEnhance.setToolTipText("Adjust the LNA enhance setting. Default value is OFF");
mComboLNAEnhance.addActionListener( new ActionListener() mComboLNAEnhance.addActionListener(new ActionListener()
{ {
@Override @Override
public void actionPerformed( ActionEvent arg0 ) public void actionPerformed(ActionEvent arg0)
{ {
LNAEnhance enhance = (LNAEnhance)mComboLNAEnhance.getSelectedItem(); LNAEnhance enhance = (LNAEnhance)mComboLNAEnhance.getSelectedItem();
try try
{ {
mController.setLNAEnhance( enhance ); mController.setLNAEnhance(enhance);
save(); save();
} }
catch ( Exception e1 ) catch(Exception e1)
{ {
JOptionPane.showMessageDialog( FCD1TunerEditor.this, "FCD Pro Tuner" JOptionPane.showMessageDialog(FCD1TunerEditor.this, "FCD Pro Tuner"
+ " error setting LNA enhance gain [" + enhance.toString() + "]" ); + " error setting LNA enhance gain [" + enhance.toString() + "]");
mLog.error( "FCDPro - error setting LNA enhance [" + enhance.toString() + "]", e1 ); mLog.error("FCDPro - error setting LNA enhance [" + enhance.toString() + "]", e1);
} }
} }
} ); });
add( new JLabel( "Enhance:" ) ); add(new JLabel("Enhance:"));
add( mComboLNAEnhance ); add(mComboLNAEnhance);
/** /**
* Mixer Gain * Mixer Gain
*/ */
mComboMixerGain = new JComboBox<MixerGain>( MixerGain.values() ); mComboMixerGain = new JComboBox<MixerGain>(MixerGain.values());
mComboMixerGain.setToolTipText( "Adjust mixer gain setting" ); mComboMixerGain.setToolTipText("Adjust mixer gain setting");
mComboMixerGain.addActionListener( new ActionListener() mComboMixerGain.addActionListener(new ActionListener()
{ {
@Override @Override
public void actionPerformed( ActionEvent arg0 ) public void actionPerformed(ActionEvent arg0)
{ {
MixerGain gain = (MixerGain)mComboMixerGain.getSelectedItem(); MixerGain gain = (MixerGain)mComboMixerGain.getSelectedItem();
try try
{ {
mController.setMixerGain( gain ); mController.setMixerGain(gain);
save(); save();
} }
catch ( Exception e1 ) catch(Exception e1)
{ {
JOptionPane.showMessageDialog( FCD1TunerEditor.this, "FCDPro - error setting" JOptionPane.showMessageDialog(FCD1TunerEditor.this, "FCDPro - error setting"
+ " mixer gain [" + gain.toString() + "]" ); + " mixer gain [" + gain.toString() + "]");
mLog.error( "FCDPro - error setting mixer gain [" + gain.toString() + "]", e1 ); mLog.error("FCDPro - error setting mixer gain [" + gain.toString() + "]", e1);
} }
} }
} ); });
add( new JLabel( "Mixer:" ) ); add(new JLabel("Mixer:"));
add( mComboMixerGain, "wrap" ); add(mComboMixerGain, "wrap");
add( new JSeparator( JSeparator.HORIZONTAL ), "span,grow" ); add(new JSeparator(JSeparator.HORIZONTAL), "span,grow");
add( new JLabel( "Correction" ), "span,align center" ); add(new JLabel("Correction"), "span,align center");
/** /**
* Inphase DC Correction * Inphase DC Correction
*/ */
mCorrectionDCI = new CorrectionSpinner( Correction.DC_INPHASE, 0.0, 0.00001, 5 ); mCorrectionDCI = new CorrectionSpinner(Correction.DC_INPHASE, 0.0, 0.00001, 5);
mCorrectionDCI.setEnabled( false ); mCorrectionDCI.setEnabled(false);
mCorrectionDCI.setToolTipText( "DC Bias Correction/Inphase " mCorrectionDCI.setToolTipText("DC Bias Correction/Inphase "
+ "Component: valid values are -1.0 to 1.0 (default: 0.0)" ); + "Component: valid values are -1.0 to 1.0 (default: 0.0)");
add( new JLabel( "DC Inphase:" ) ); add(new JLabel("DC Inphase:"));
add( mCorrectionDCI ); add(mCorrectionDCI);
/** /**
* Quadrature DC Correction * Quadrature DC Correction
*/ */
mCorrectionDCQ = new CorrectionSpinner( Correction.DC_QUADRATURE, 0.0, 0.00001, 5 ); mCorrectionDCQ = new CorrectionSpinner(Correction.DC_QUADRATURE, 0.0, 0.00001, 5);
mCorrectionDCQ.setToolTipText( "DC Bias Correction/Quadrature " mCorrectionDCQ.setToolTipText("DC Bias Correction/Quadrature "
+ "Component: valid values are -1.0 to 1.0 (default: 0.0)" ); + "Component: valid values are -1.0 to 1.0 (default: 0.0)");
add( new JLabel( "DC Quadrature:" ) ); add(new JLabel("DC Quadrature:"));
add( mCorrectionDCQ ); add(mCorrectionDCQ);
/** /**
* Gain Correction * Gain Correction
*/ */
mCorrectionGain = new CorrectionSpinner( Correction.GAIN, 0.0, 0.00001, 5 ); mCorrectionGain = new CorrectionSpinner(Correction.GAIN, 0.0, 0.00001, 5);
mCorrectionGain.setToolTipText( "Gain Correction: valid values are " mCorrectionGain.setToolTipText("Gain Correction: valid values are "
+ "-1.0 to 1.0 (default: 0.0)" ); + "-1.0 to 1.0 (default: 0.0)");
add( new JLabel( "Gain:" ) ); add(new JLabel("Gain:"));
add( mCorrectionGain ); add(mCorrectionGain);
/** /**
* Phase Correction * Phase Correction
*/ */
mCorrectionPhase = new CorrectionSpinner( Correction.PHASE, 0.0, 0.00001, 5 ); mCorrectionPhase = new CorrectionSpinner(Correction.PHASE, 0.0, 0.00001, 5);
mCorrectionPhase.setToolTipText( "Phase Correction: valid values are " mCorrectionPhase.setToolTipText("Phase Correction: valid values are "
+ "-1.0 to 1.0 (default: 0.0)" ); + "-1.0 to 1.0 (default: 0.0)");
add( new JLabel( "Phase:" ) ); add(new JLabel("Phase:"));
add( mCorrectionPhase ); add(mCorrectionPhase);
} }
/** /**
* Sets each of the tuner configuration controls to the enabled argument state * Sets each of the tuner configuration controls to the enabled argument state
*/ */
private void setControlsEnabled( boolean enabled ) private void setControlsEnabled(boolean enabled)
{ {
if( mConfigurationName.isEnabled() != enabled ) if(mConfigurationName.isEnabled() != enabled)
{ {
mConfigurationName.setEnabled( enabled ); mConfigurationName.setEnabled(enabled);
} }
if( mTunerInfo.isEnabled() != enabled ) if(mTunerInfo.isEnabled() != enabled)
{ {
mTunerInfo.setEnabled( enabled ); mTunerInfo.setEnabled(enabled);
} }
if( mFrequencyCorrection.isEnabled() != enabled ) if(mFrequencyCorrection.isEnabled() != enabled)
{ {
mFrequencyCorrection.setEnabled( enabled ); mFrequencyCorrection.setEnabled(enabled);
} }
if( mComboLNAEnhance.isEnabled() != enabled ) if(mComboLNAEnhance.isEnabled() != enabled)
{ {
mComboLNAEnhance.setEnabled( enabled ); mComboLNAEnhance.setEnabled(enabled);
} }
if( mComboLNAGain.isEnabled() != enabled ) if(mComboLNAGain.isEnabled() != enabled)
{ {
mComboLNAGain.setEnabled( enabled ); mComboLNAGain.setEnabled(enabled);
} }
if( mComboMixerGain.isEnabled() != enabled ) if(mComboMixerGain.isEnabled() != enabled)
{ {
mComboMixerGain.setEnabled( enabled ); mComboMixerGain.setEnabled(enabled);
} }
if( mCorrectionDCI.isEnabled() != enabled ) if(mCorrectionDCI.isEnabled() != enabled)
{ {
mCorrectionDCI.setEnabled( enabled ); mCorrectionDCI.setEnabled(enabled);
} }
if( mCorrectionDCQ.isEnabled() != enabled ) if(mCorrectionDCQ.isEnabled() != enabled)
{ {
mCorrectionDCQ.setEnabled( enabled ); mCorrectionDCQ.setEnabled(enabled);
} }
if( mCorrectionGain.isEnabled() != enabled ) if(mCorrectionGain.isEnabled() != enabled)
{ {
mCorrectionGain.setEnabled( enabled ); mCorrectionGain.setEnabled(enabled);
} }
if( mCorrectionPhase.isEnabled() != enabled ) if(mCorrectionPhase.isEnabled() != enabled)
{ {
mCorrectionPhase.setEnabled( enabled ); mCorrectionPhase.setEnabled(enabled);
} }
} }
@@ -360,27 +369,27 @@ public class FCD1TunerEditor extends TunerConfigurationEditor
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append( "<html><h3>Funcube Dongle Pro Tuner</h3>" ); sb.append("<html><h3>Funcube Dongle Pro Tuner</h3>");
sb.append( "<b>USB ID: </b>" ); sb.append("<b>USB ID: </b>");
sb.append( mController.getUSBID() ); sb.append(mController.getUSBID());
sb.append( "<br>" ); sb.append("<br>");
sb.append( "<b>USB Address: </b>" ); sb.append("<b>USB Address: </b>");
sb.append( mController.getUSBAddress() ); sb.append(mController.getUSBAddress());
sb.append( "<br>" ); sb.append("<br>");
sb.append( "<b>USB Speed: </b>" ); sb.append("<b>USB Speed: </b>");
sb.append( mController.getUSBSpeed() ); sb.append(mController.getUSBSpeed());
sb.append( "<br>" ); sb.append("<br>");
sb.append( "<b>Cellular Band: </b>" ); sb.append("<b>Cellular Band: </b>");
sb.append( mController.getConfiguration().getBandBlocking() ); sb.append(mController.getConfiguration().getBandBlocking());
sb.append( "<br>" ); sb.append("<br>");
sb.append( "<b>Firmware: </b>" ); sb.append("<b>Firmware: </b>");
sb.append( mController.getConfiguration().getFirmware() ); sb.append(mController.getConfiguration().getFirmware());
sb.append( "<br>" ); sb.append("<br>");
return sb.toString(); return sb.toString();
} }
@@ -388,76 +397,81 @@ public class FCD1TunerEditor extends TunerConfigurationEditor
@Override @Override
public void save() public void save()
{ {
if( hasItem() && !mLoading ) if(hasItem() && !mLoading)
{ {
FCD1TunerConfiguration config = getConfiguration(); FCD1TunerConfiguration config = getConfiguration();
config.setName( mConfigurationName.getText() ); config.setName(mConfigurationName.getText());
double value = ((SpinnerNumberModel)mFrequencyCorrection double value = ((SpinnerNumberModel)mFrequencyCorrection
.getModel()).getNumber().doubleValue(); .getModel()).getNumber().doubleValue();
config.setFrequencyCorrection( value ); config.setFrequencyCorrection(value);
config.setLNAEnhance( (LNAEnhance)mComboLNAEnhance.getSelectedItem() ); config.setLNAEnhance((LNAEnhance)mComboLNAEnhance.getSelectedItem());
config.setLNAGain( (LNAGain)mComboLNAGain.getSelectedItem() ); config.setLNAGain((LNAGain)mComboLNAGain.getSelectedItem());
config.setMixerGain( (MixerGain)mComboMixerGain.getSelectedItem() ); config.setMixerGain((MixerGain)mComboMixerGain.getSelectedItem());
double dci = ((SpinnerNumberModel)mCorrectionDCI.getModel()).getNumber().doubleValue(); double dci = ((SpinnerNumberModel)mCorrectionDCI.getModel()).getNumber().doubleValue();
config.setInphaseDCCorrection( dci ); config.setInphaseDCCorrection(dci);
double dcq = ((SpinnerNumberModel)mCorrectionDCQ.getModel()).getNumber().doubleValue(); double dcq = ((SpinnerNumberModel)mCorrectionDCQ.getModel()).getNumber().doubleValue();
config.setQuadratureDCCorrection( dcq ); config.setQuadratureDCCorrection(dcq);
double gain = ((SpinnerNumberModel)mCorrectionGain.getModel()).getNumber().doubleValue(); double gain = ((SpinnerNumberModel)mCorrectionGain.getModel()).getNumber().doubleValue();
config.setGainCorrection( gain ); config.setGainCorrection(gain);
double phase = ((SpinnerNumberModel)mCorrectionPhase.getModel()).getNumber().doubleValue(); double phase = ((SpinnerNumberModel)mCorrectionPhase.getModel()).getNumber().doubleValue();
config.setPhaseCorrection( phase ); config.setPhaseCorrection(phase);
getTunerConfigurationModel().broadcast( new TunerConfigurationEvent( getConfiguration(), Event.CHANGE ) ); getTunerConfigurationModel().broadcast(new TunerConfigurationEvent(getConfiguration(), Event.CHANGE));
} }
} }
@Override @Override
public void setItem( TunerConfiguration tunerConfiguration ) public void setItem(TunerConfiguration tunerConfiguration)
{ {
super.setItem( tunerConfiguration ); super.setItem(tunerConfiguration);
//Toggle loading so that we don't fire a change event and schedule a settings file save //Toggle loading so that we don't fire a change event and schedule a settings file save
mLoading = true; mLoading = true;
if( hasItem() ) if(hasItem())
{ {
FCD1TunerConfiguration config = getConfiguration(); FCD1TunerConfiguration config = getConfiguration();
if( tunerConfiguration.isAssigned() ) if(tunerConfiguration.isAssigned())
{ {
setControlsEnabled( true ); setControlsEnabled(true);
mConfigurationName.setText( config.getName() ); mConfigurationName.setText(config.getName());
mFrequencyCorrection.setValue( config.getFrequencyCorrection() ); mFrequencyCorrection.setValue(config.getFrequencyCorrection());
mComboLNAEnhance.setSelectedItem( config.getLNAEnhance() ); mComboLNAEnhance.setSelectedItem(config.getLNAEnhance());
mComboLNAGain.setSelectedItem( config.getLNAGain() ); mComboLNAGain.setSelectedItem(config.getLNAGain());
mComboMixerGain.setSelectedItem( config.getMixerGain() ); mComboMixerGain.setSelectedItem(config.getMixerGain());
mCorrectionDCI.setValue( config.getInphaseDCCorrection() ); mCorrectionDCI.setValue(config.getInphaseDCCorrection());
mCorrectionDCQ.setValue( config.getQuadratureDCCorrection() ); mCorrectionDCQ.setValue(config.getQuadratureDCCorrection());
mCorrectionGain.setValue( config.getGainCorrection() ); mCorrectionGain.setValue(config.getGainCorrection());
mCorrectionPhase.setValue( config.getPhaseCorrection() ); mCorrectionPhase.setValue(config.getPhaseCorrection());
} }
else else
{ {
setControlsEnabled( false ); setControlsEnabled(false);
mConfigurationName.setText( config.getName() ); mConfigurationName.setText(config.getName());
} }
} }
else else
{ {
setControlsEnabled( false ); setControlsEnabled(false);
mConfigurationName.setText( "" ); mConfigurationName.setText("");
} }
mLoading = false; mLoading = false;
} }
public enum Correction { GAIN, PHASE, DC_INPHASE, DC_QUADRATURE }; public enum Correction
{
GAIN, PHASE, DC_INPHASE, DC_QUADRATURE
}
;
public class CorrectionSpinner extends JSpinner public class CorrectionSpinner extends JSpinner
{ {
@@ -467,59 +481,59 @@ public class FCD1TunerEditor extends TunerConfigurationEditor
private Correction mCorrectionComponent; private Correction mCorrectionComponent;
public CorrectionSpinner( Correction component, double initialValue, double step, int decimalPlaces ) public CorrectionSpinner(Correction component, double initialValue, double step, int decimalPlaces)
{ {
mCorrectionComponent = component; mCorrectionComponent = component;
SpinnerModel model = new SpinnerNumberModel( initialValue, MIN_VALUE, MAX_VALUE, step ); SpinnerModel model = new SpinnerNumberModel(initialValue, MIN_VALUE, MAX_VALUE, step);
setModel( model ); setModel(model);
JSpinner.NumberEditor editor = (JSpinner.NumberEditor)getEditor(); JSpinner.NumberEditor editor = (JSpinner.NumberEditor)getEditor();
DecimalFormat format = editor.getFormat(); DecimalFormat format = editor.getFormat();
format.setMinimumFractionDigits( decimalPlaces ); format.setMinimumFractionDigits(decimalPlaces);
editor.getTextField().setHorizontalAlignment( SwingConstants.CENTER ); editor.getTextField().setHorizontalAlignment(SwingConstants.CENTER);
addChangeListener( new ChangeListener() addChangeListener(new ChangeListener()
{ {
@Override @Override
public void stateChanged( ChangeEvent e ) public void stateChanged(ChangeEvent e)
{ {
double value = double value =
((SpinnerNumberModel)getModel()).getNumber().doubleValue(); ((SpinnerNumberModel)getModel()).getNumber().doubleValue();
try try
{ {
switch( mCorrectionComponent ) switch(mCorrectionComponent)
{ {
case DC_INPHASE: case DC_INPHASE:
mController.setDCCorrectionInPhase( value ); mController.setDCCorrectionInPhase(value);
break; break;
case DC_QUADRATURE: case DC_QUADRATURE:
mController.setDCCorrectionQuadrature( value ); mController.setDCCorrectionQuadrature(value);
break; break;
case GAIN: case GAIN:
mController.setGainCorrection( value ); mController.setGainCorrection(value);
break; break;
case PHASE: case PHASE:
mController.setPhaseCorrection( value ); mController.setPhaseCorrection(value);
break; break;
} }
save(); save();
} }
catch ( Exception e1 ) catch(Exception e1)
{ {
JOptionPane.showMessageDialog( FCD1TunerEditor.this, "FCDPro - error " JOptionPane.showMessageDialog(FCD1TunerEditor.this, "FCDPro - error "
+ "applying " + mCorrectionComponent.toString() + " correction value [" + "applying " + mCorrectionComponent.toString() + " correction value ["
+ value + "]" ); + value + "]");
mLog.error( "FCDPro - error applying "+ mCorrectionComponent.toString() mLog.error("FCDPro - error applying " + mCorrectionComponent.toString()
+ " correction value [" + value + "]", e1 ); + " correction value [" + value + "]", e1);
} }
} }
} ); });
} }
} }
} }

View File

@@ -1,19 +1,17 @@
/******************************************************************************* /*******************************************************************************
* SDR Trunk * sdr-trunk
* Copyright (C) 2014-2016 Dennis Sheirer * Copyright (C) 2014-2018 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public
* it under the terms of the GNU General Public License as published by * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
* the Free Software Foundation, either version 3 of the License, or * later version.
* (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
* but WITHOUT ANY WARRANTY; without even the implied warranty of * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. * You should have received a copy of the GNU General Public License along with this program.
* If not, see <http://www.gnu.org/licenses/>
* *
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
******************************************************************************/ ******************************************************************************/
package io.github.dsheirer.source.tuner.fcd.proplusV2; package io.github.dsheirer.source.tuner.fcd.proplusV2;
@@ -48,7 +46,7 @@ import java.text.DecimalFormat;
public class FCD2TunerEditor extends TunerConfigurationEditor public class FCD2TunerEditor extends TunerConfigurationEditor
{ {
private final static Logger mLog = LoggerFactory.getLogger( FCD2TunerEditor.class ); private final static Logger mLog = LoggerFactory.getLogger(FCD2TunerEditor.class);
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private JTextField mConfigurationName; private JTextField mConfigurationName;
@@ -60,9 +58,9 @@ public class FCD2TunerEditor extends TunerConfigurationEditor
private FCD2TunerController mController; private FCD2TunerController mController;
public FCD2TunerEditor( TunerConfigurationModel tunerConfigurationModel, FCDTuner tuner ) public FCD2TunerEditor(TunerConfigurationModel tunerConfigurationModel, FCDTuner tuner)
{ {
super( tunerConfigurationModel ); super(tunerConfigurationModel);
mController = (FCD2TunerController)tuner.getController(); mController = (FCD2TunerController)tuner.getController();
init(); init();
@@ -70,7 +68,7 @@ public class FCD2TunerEditor extends TunerConfigurationEditor
private FCD2TunerConfiguration getConfiguration() private FCD2TunerConfiguration getConfiguration()
{ {
if( hasItem() ) if(hasItem())
{ {
return (FCD2TunerConfiguration)getItem(); return (FCD2TunerConfiguration)getItem();
} }
@@ -78,162 +76,171 @@ public class FCD2TunerEditor extends TunerConfigurationEditor
return null; return null;
} }
@Override
public void setSampleRateControl(boolean enabled)
{
//no-op
}
private void init() private void init()
{ {
setLayout( new MigLayout( "fill,wrap 4", "[right][grow,fill][right][grow,fill]", setLayout(new MigLayout("fill,wrap 4", "[right][grow,fill][right][grow,fill]",
"[][][][][][grow]" ) ); "[][][][][][grow]"));
add( new JLabel( "FCD Pro+ Tuner Configuration" ), "span,align center" ); add(new JLabel("FCD Pro+ Tuner Configuration"), "span,align center");
mConfigurationName = new JTextField(); mConfigurationName = new JTextField();
mConfigurationName.setEnabled( false ); mConfigurationName.setEnabled(false);
mConfigurationName.addFocusListener( new FocusListener() mConfigurationName.addFocusListener(new FocusListener()
{ {
@Override @Override
public void focusLost( FocusEvent e ) public void focusLost(FocusEvent e)
{ {
save(); save();
} }
@Override
public void focusGained( FocusEvent e ) {}
} );
add( new JLabel( "Name:" ) );
add( mConfigurationName, "span 2" );
mTunerInfo = new JButton( "Tuner Info" );
mTunerInfo.setEnabled( false );
mTunerInfo.addActionListener( new ActionListener()
{
@Override @Override
public void actionPerformed( ActionEvent e ) public void focusGained(FocusEvent e)
{ {
JOptionPane.showMessageDialog( FCD2TunerEditor.this, getTunerInfo(),
"Tuner Info", JOptionPane.INFORMATION_MESSAGE );
} }
} ); });
add( mTunerInfo );
SpinnerModel model = new SpinnerNumberModel( 0.0, //initial value add(new JLabel("Name:"));
add(mConfigurationName, "span 2");
mTunerInfo = new JButton("Tuner Info");
mTunerInfo.setEnabled(false);
mTunerInfo.addActionListener(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
{
JOptionPane.showMessageDialog(FCD2TunerEditor.this, getTunerInfo(),
"Tuner Info", JOptionPane.INFORMATION_MESSAGE);
}
});
add(mTunerInfo);
SpinnerModel model = new SpinnerNumberModel(0.0, //initial value
-1000.0, //min -1000.0, //min
1000.0, //max 1000.0, //max
0.1 ); //step 0.1); //step
mFrequencyCorrection = new JSpinner( model ); mFrequencyCorrection = new JSpinner(model);
mFrequencyCorrection.setEnabled( false ); mFrequencyCorrection.setEnabled(false);
JSpinner.NumberEditor editor = JSpinner.NumberEditor editor =
(JSpinner.NumberEditor)mFrequencyCorrection.getEditor(); (JSpinner.NumberEditor)mFrequencyCorrection.getEditor();
DecimalFormat format = editor.getFormat(); DecimalFormat format = editor.getFormat();
format.setMinimumFractionDigits( 1 ); format.setMinimumFractionDigits(1);
editor.getTextField().setHorizontalAlignment( SwingConstants.CENTER ); editor.getTextField().setHorizontalAlignment(SwingConstants.CENTER);
mFrequencyCorrection.addChangeListener( new ChangeListener() mFrequencyCorrection.addChangeListener(new ChangeListener()
{ {
@Override @Override
public void stateChanged( ChangeEvent e ) public void stateChanged(ChangeEvent e)
{ {
double value = ((SpinnerNumberModel)mFrequencyCorrection double value = ((SpinnerNumberModel)mFrequencyCorrection
.getModel()).getNumber().doubleValue(); .getModel()).getNumber().doubleValue();
try try
{ {
mController.setFrequencyCorrection( value ); mController.setFrequencyCorrection(value);
save(); save();
} }
catch ( SourceException e1 ) catch(SourceException e1)
{ {
JOptionPane.showMessageDialog( FCD2TunerEditor.this, "FCD Pro Plus Tuner " JOptionPane.showMessageDialog(FCD2TunerEditor.this, "FCD Pro Plus Tuner "
+ "Controller - couldn't apply frequency correction value: " + value + + "Controller - couldn't apply frequency correction value: " + value +
e1.getLocalizedMessage() ); e1.getLocalizedMessage());
mLog.error( "FuncubeDongleProPlus Controller - couldn't apply " mLog.error("FuncubeDongleProPlus Controller - couldn't apply "
+ "frequency correction value: " + value, e1 ); + "frequency correction value: " + value, e1);
} }
} }
} ); });
add( new JLabel( "PPM:" ) ); add(new JLabel("PPM:"));
add( mFrequencyCorrection, "wrap" ); add(mFrequencyCorrection, "wrap");
add( new JSeparator( JSeparator.HORIZONTAL ), "span,grow" ); add(new JSeparator(JSeparator.HORIZONTAL), "span,grow");
mLNAGain = new JCheckBox( "LNA Gain" ); mLNAGain = new JCheckBox("LNA Gain");
mLNAGain.setEnabled( false ); mLNAGain.setEnabled(false);
mLNAGain.addActionListener( new ActionListener() mLNAGain.addActionListener(new ActionListener()
{ {
@Override @Override
public void actionPerformed( ActionEvent event ) public void actionPerformed(ActionEvent event)
{ {
try try
{ {
mController.setLNAGain( mLNAGain.isSelected() ); mController.setLNAGain(mLNAGain.isSelected());
save(); save();
} }
catch( SourceException e ) catch(SourceException e)
{ {
mLog.error( "Couldn't set LNA gain for FCD2", e ); mLog.error("Couldn't set LNA gain for FCD2", e);
} }
} }
} ); });
add( new JLabel( "" ) ); add(new JLabel(""));
add( mLNAGain ); add(mLNAGain);
/** /**
* Mixer Gain * Mixer Gain
*/ */
mMixerGain = new JCheckBox( "Mixer Gain" ); mMixerGain = new JCheckBox("Mixer Gain");
mMixerGain.addActionListener( new ActionListener() mMixerGain.addActionListener(new ActionListener()
{ {
@Override @Override
public void actionPerformed( ActionEvent event ) public void actionPerformed(ActionEvent event)
{ {
try try
{ {
mController.setMixerGain( mMixerGain.isSelected() ); mController.setMixerGain(mMixerGain.isSelected());
save(); save();
} }
catch( SourceException e ) catch(SourceException e)
{ {
mLog.error( "Couldn't set mixer gain for FCD2", e ); mLog.error("Couldn't set mixer gain for FCD2", e);
} }
} }
} ); });
add( new JLabel( "" ) ); add(new JLabel(""));
add( mMixerGain ); add(mMixerGain);
} }
/** /**
* Sets each of the tuner configuration controls to the enabled argument state * Sets each of the tuner configuration controls to the enabled argument state
*/ */
private void setControlsEnabled( boolean enabled ) private void setControlsEnabled(boolean enabled)
{ {
if( mConfigurationName.isEnabled() != enabled ) if(mConfigurationName.isEnabled() != enabled)
{ {
mConfigurationName.setEnabled( enabled ); mConfigurationName.setEnabled(enabled);
} }
if( mTunerInfo.isEnabled() != enabled ) if(mTunerInfo.isEnabled() != enabled)
{ {
mTunerInfo.setEnabled( enabled ); mTunerInfo.setEnabled(enabled);
} }
if( mFrequencyCorrection.isEnabled() != enabled ) if(mFrequencyCorrection.isEnabled() != enabled)
{ {
mFrequencyCorrection.setEnabled( enabled ); mFrequencyCorrection.setEnabled(enabled);
} }
if( mLNAGain.isEnabled() != enabled ) if(mLNAGain.isEnabled() != enabled)
{ {
mLNAGain.setEnabled( enabled ); mLNAGain.setEnabled(enabled);
} }
if( mMixerGain.isEnabled() != enabled ) if(mMixerGain.isEnabled() != enabled)
{ {
mMixerGain.setEnabled( enabled ); mMixerGain.setEnabled(enabled);
} }
} }
@@ -241,27 +248,27 @@ public class FCD2TunerEditor extends TunerConfigurationEditor
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append( "<html><h3>Funcube Dongle Pro Plus Tuner</h3>" ); sb.append("<html><h3>Funcube Dongle Pro Plus Tuner</h3>");
sb.append( "<b>USB ID: </b>" ); sb.append("<b>USB ID: </b>");
sb.append( mController.getUSBID() ); sb.append(mController.getUSBID());
sb.append( "<br>" ); sb.append("<br>");
sb.append( "<b>USB Address: </b>" ); sb.append("<b>USB Address: </b>");
sb.append( mController.getUSBAddress() ); sb.append(mController.getUSBAddress());
sb.append( "<br>" ); sb.append("<br>");
sb.append( "<b>USB Speed: </b>" ); sb.append("<b>USB Speed: </b>");
sb.append( mController.getUSBSpeed() ); sb.append(mController.getUSBSpeed());
sb.append( "<br>" ); sb.append("<br>");
sb.append( "<b>Cellular Band: </b>" ); sb.append("<b>Cellular Band: </b>");
sb.append( mController.getConfiguration().getBandBlocking() ); sb.append(mController.getConfiguration().getBandBlocking());
sb.append( "<br>" ); sb.append("<br>");
sb.append( "<b>Firmware: </b>" ); sb.append("<b>Firmware: </b>");
sb.append( mController.getConfiguration().getFirmware() ); sb.append(mController.getConfiguration().getFirmware());
sb.append( "<br>" ); sb.append("<br>");
return sb.toString(); return sb.toString();
} }
@@ -269,55 +276,55 @@ public class FCD2TunerEditor extends TunerConfigurationEditor
@Override @Override
public void save() public void save()
{ {
if( hasItem() && !mLoading ) if(hasItem() && !mLoading)
{ {
FCD2TunerConfiguration config = getConfiguration(); FCD2TunerConfiguration config = getConfiguration();
config.setName( mConfigurationName.getText() ); config.setName(mConfigurationName.getText());
double value = ((SpinnerNumberModel)mFrequencyCorrection double value = ((SpinnerNumberModel)mFrequencyCorrection
.getModel()).getNumber().doubleValue(); .getModel()).getNumber().doubleValue();
config.setFrequencyCorrection( value ); config.setFrequencyCorrection(value);
config.setGainLNA( mLNAGain.isSelected() ); config.setGainLNA(mLNAGain.isSelected());
config.setGainMixer( mMixerGain.isSelected() ); config.setGainMixer(mMixerGain.isSelected());
getTunerConfigurationModel().broadcast( getTunerConfigurationModel().broadcast(
new TunerConfigurationEvent( getConfiguration(), Event.CHANGE ) ); new TunerConfigurationEvent(getConfiguration(), Event.CHANGE));
} }
} }
@Override @Override
public void setItem( TunerConfiguration tunerConfiguration ) public void setItem(TunerConfiguration tunerConfiguration)
{ {
super.setItem( tunerConfiguration ); super.setItem(tunerConfiguration);
//Toggle loading so that we don't fire a change event and schedule a settings file save //Toggle loading so that we don't fire a change event and schedule a settings file save
mLoading = true; mLoading = true;
if( hasItem() ) if(hasItem())
{ {
FCD2TunerConfiguration config = getConfiguration(); FCD2TunerConfiguration config = getConfiguration();
if( tunerConfiguration.isAssigned() ) if(tunerConfiguration.isAssigned())
{ {
setControlsEnabled( true ); setControlsEnabled(true);
mConfigurationName.setText( config.getName() ); mConfigurationName.setText(config.getName());
mFrequencyCorrection.setValue( config.getFrequencyCorrection() ); mFrequencyCorrection.setValue(config.getFrequencyCorrection());
mLNAGain.setSelected( config.getGainLNA() ); mLNAGain.setSelected(config.getGainLNA());
mMixerGain.setSelected( config.getGainMixer() ); mMixerGain.setSelected(config.getGainMixer());
} }
else else
{ {
setControlsEnabled( false ); setControlsEnabled(false);
mConfigurationName.setText( config.getName() ); mConfigurationName.setText(config.getName());
} }
} }
else else
{ {
setControlsEnabled( false ); setControlsEnabled(false);
mConfigurationName.setText( "" ); mConfigurationName.setText("");
} }
mLoading = false; mLoading = false;

View File

@@ -1,7 +1,6 @@
/******************************************************************************* /*******************************************************************************
* *********************************************************************************************************************
* sdr-trunk * sdr-trunk
* Copyright (C) 2014-2017 Dennis Sheirer * Copyright (C) 2014-2018 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
@@ -12,7 +11,7 @@
* *
* You should have received a copy of the GNU General Public License along with this program. * You should have received a copy of the GNU General Public License along with this program.
* If not, see <http://www.gnu.org/licenses/> * If not, see <http://www.gnu.org/licenses/>
* ********************************************************************************************************************* *
******************************************************************************/ ******************************************************************************/
package io.github.dsheirer.source.tuner.frequency; package io.github.dsheirer.source.tuner.frequency;
@@ -37,6 +36,7 @@ public class FrequencyController
private long mMaximumFrequency; private long mMaximumFrequency;
private double mFrequencyCorrection = 0.0d; private double mFrequencyCorrection = 0.0d;
private double mSampleRate = 0.0d; private double mSampleRate = 0.0d;
private boolean mLocked = false;
private List<ISourceEventProcessor> mProcessors = new ArrayList<>(); private List<ISourceEventProcessor> mProcessors = new ArrayList<>();
@@ -48,6 +48,40 @@ public class FrequencyController
mFrequencyCorrection = frequencyCorrection; mFrequencyCorrection = frequencyCorrection;
} }
/**
* Indicates if this frequency controller is locked by a remote process. A locked state indicates that neither
* the frequency nor the sample rate should be changed. The remote process will typically be a downstream
* consumer of the data produced by the device being controlled (ie polyphase channelizer) that does not want
* the sample rate or frequency to be changed while processing is ongoing.
*
* @return true if locked or false if not locked.
*/
public boolean isLocked()
{
return mLocked;
}
/**
* Sets the lock state for this frequency controller. Set to true when a consumer process requires that the
* frequency and sample rate controls be locked so that only the singular consumer process makes changes. This
* is primarily to lock down user interface controls when the polyphase channelizer is producing channels.
*
* @param locked state
*/
public void setLocked(boolean locked) throws SourceException
{
mLocked = locked;
if(mLocked)
{
broadcast(SourceEvent.lockedState());
}
else
{
broadcast(SourceEvent.unlockedState());
}
}
/** /**
* Get bandwidth in hertz * Get bandwidth in hertz
*/ */
@@ -96,6 +130,7 @@ public class FrequencyController
/** /**
* Indicates if the specified frequency can be tuned (ie is within min/max frequency) by this controller. * Indicates if the specified frequency can be tuned (ie is within min/max frequency) by this controller.
*
* @param frequency to evaluate * @param frequency to evaluate
* @return true if the frequency falls within the tuning range of this controller * @return true if the frequency falls within the tuning range of this controller
*/ */

View File

@@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* sdr-trunk * sdr-trunk
* Copyright (C) 2014-2017 Dennis Sheirer * Copyright (C) 2014-2018 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
@@ -41,6 +41,7 @@ import javax.swing.SwingConstants;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener; import javax.swing.event.ChangeListener;
import javax.usb.UsbException; import javax.usb.UsbException;
import java.awt.EventQueue;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.awt.event.FocusEvent; import java.awt.event.FocusEvent;
@@ -51,7 +52,7 @@ public class HackRFTunerEditor extends TunerConfigurationEditor
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private final static Logger mLog = LoggerFactory.getLogger( HackRFTunerEditor.class ); private final static Logger mLog = LoggerFactory.getLogger(HackRFTunerEditor.class);
private JTextField mConfigurationName; private JTextField mConfigurationName;
private JButton mTunerInfo; private JButton mTunerInfo;
@@ -64,9 +65,9 @@ public class HackRFTunerEditor extends TunerConfigurationEditor
private HackRFTunerController mController; private HackRFTunerController mController;
public HackRFTunerEditor( TunerConfigurationModel tunerConfigurationModel, HackRFTuner tuner ) public HackRFTunerEditor(TunerConfigurationModel tunerConfigurationModel, HackRFTuner tuner)
{ {
super( tunerConfigurationModel ); super(tunerConfigurationModel);
mController = tuner.getController(); mController = tuner.getController();
@@ -75,7 +76,7 @@ public class HackRFTunerEditor extends TunerConfigurationEditor
private HackRFTunerConfiguration getConfiguration() private HackRFTunerConfiguration getConfiguration()
{ {
if( hasItem() ) if(hasItem())
{ {
return (HackRFTunerConfiguration)getItem(); return (HackRFTunerConfiguration)getItem();
} }
@@ -83,241 +84,257 @@ public class HackRFTunerEditor extends TunerConfigurationEditor
return null; return null;
} }
private void init() @Override
public void setSampleRateControl(boolean enabled)
{ {
setLayout( new MigLayout( "fill,wrap 4", "[right][grow,fill][right][grow,fill]", EventQueue.invokeLater(new Runnable()
"[][][][][][][grow]" ) );
add( new JLabel( "HackRF Tuner Configuration" ), "span,align center" );
mConfigurationName = new JTextField();
mConfigurationName.setEnabled( false );
mConfigurationName.addFocusListener( new FocusListener()
{ {
@Override @Override
public void focusLost( FocusEvent e ) public void run()
{
mComboSampleRate.setEnabled(enabled);
}
});
}
private void init()
{
setLayout(new MigLayout("fill,wrap 4", "[right][grow,fill][right][grow,fill]",
"[][][][][][][grow]"));
add(new JLabel("HackRF Tuner Configuration"), "span,align center");
mConfigurationName = new JTextField();
mConfigurationName.setEnabled(false);
mConfigurationName.addFocusListener(new FocusListener()
{
@Override
public void focusLost(FocusEvent e)
{ {
save(); save();
} }
@Override
public void focusGained( FocusEvent e ) {}
} );
add( new JLabel( "Name:" ) );
add( mConfigurationName, "span 2" );
mTunerInfo = new JButton( "Tuner Info" );
mTunerInfo.setEnabled( false );
mTunerInfo.addActionListener( new ActionListener()
{
@Override @Override
public void actionPerformed( ActionEvent e ) public void focusGained(FocusEvent e)
{ {
JOptionPane.showMessageDialog( HackRFTunerEditor.this, getTunerInfo(),
"Tuner Info", JOptionPane.INFORMATION_MESSAGE );
} }
} ); });
add( mTunerInfo );
mComboSampleRate = new JComboBox<>( HackRFSampleRate.values() ); add(new JLabel("Name:"));
mComboSampleRate.setEnabled( false ); add(mConfigurationName, "span 2");
mComboSampleRate.addActionListener( new ActionListener()
mTunerInfo = new JButton("Tuner Info");
mTunerInfo.setEnabled(false);
mTunerInfo.addActionListener(new ActionListener()
{ {
@Override @Override
public void actionPerformed( ActionEvent e ) public void actionPerformed(ActionEvent e)
{
JOptionPane.showMessageDialog(HackRFTunerEditor.this, getTunerInfo(),
"Tuner Info", JOptionPane.INFORMATION_MESSAGE);
}
});
add(mTunerInfo);
mComboSampleRate = new JComboBox<>(HackRFSampleRate.values());
mComboSampleRate.setEnabled(false);
mComboSampleRate.addActionListener(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
{ {
HackRFSampleRate sampleRate = HackRFSampleRate sampleRate =
(HackRFSampleRate)mComboSampleRate.getSelectedItem(); (HackRFSampleRate)mComboSampleRate.getSelectedItem();
try try
{ {
mController.setSampleRate( sampleRate ); mController.setSampleRate(sampleRate);
save(); save();
} }
catch ( SourceException|UsbException e2 ) catch(SourceException | UsbException e2)
{ {
JOptionPane.showMessageDialog( HackRFTunerEditor.this, "HackRF Tuner Controller" JOptionPane.showMessageDialog(HackRFTunerEditor.this, "HackRF Tuner Controller"
+ " - couldn't apply the sample rate setting [" + sampleRate.getLabel() + + " - couldn't apply the sample rate setting [" + sampleRate.getLabel() +
"] " + e2.getLocalizedMessage() ); "] " + e2.getLocalizedMessage());
mLog.error( "HackRF Tuner Controller - couldn't apply sample rate setting [" + mLog.error("HackRF Tuner Controller - couldn't apply sample rate setting [" +
sampleRate.getLabel() + "]", e ); sampleRate.getLabel() + "]", e);
} }
} }
} ); });
add( new JLabel( "Sample Rate:" ) ); add(new JLabel("Sample Rate:"));
add( mComboSampleRate ); add(mComboSampleRate);
SpinnerModel model = new SpinnerNumberModel( 0.0, //initial value SpinnerModel model = new SpinnerNumberModel(0.0, //initial value
-1000.0, //min -1000.0, //min
1000.0, //max 1000.0, //max
0.1 ); //step 0.1); //step
mFrequencyCorrection = new JSpinner( model ); mFrequencyCorrection = new JSpinner(model);
mFrequencyCorrection.setEnabled( false ); mFrequencyCorrection.setEnabled(false);
JSpinner.NumberEditor editor = (JSpinner.NumberEditor)mFrequencyCorrection.getEditor(); JSpinner.NumberEditor editor = (JSpinner.NumberEditor)mFrequencyCorrection.getEditor();
DecimalFormat format = editor.getFormat(); DecimalFormat format = editor.getFormat();
format.setMinimumFractionDigits( 1 ); format.setMinimumFractionDigits(1);
editor.getTextField().setHorizontalAlignment( SwingConstants.CENTER ); editor.getTextField().setHorizontalAlignment(SwingConstants.CENTER);
mFrequencyCorrection.addChangeListener( new ChangeListener() mFrequencyCorrection.addChangeListener(new ChangeListener()
{ {
@Override @Override
public void stateChanged( ChangeEvent e ) public void stateChanged(ChangeEvent e)
{ {
final double value = ((SpinnerNumberModel)mFrequencyCorrection final double value = ((SpinnerNumberModel)mFrequencyCorrection
.getModel()).getNumber().doubleValue(); .getModel()).getNumber().doubleValue();
try try
{ {
mController.setFrequencyCorrection( value ); mController.setFrequencyCorrection(value);
save(); save();
} }
catch ( SourceException e1 ) catch(SourceException e1)
{ {
JOptionPane.showMessageDialog( HackRFTunerEditor.this, "HackRF Tuner Controller" JOptionPane.showMessageDialog(HackRFTunerEditor.this, "HackRF Tuner Controller"
+ " - couldn't apply frequency correction value: " + value + + " - couldn't apply frequency correction value: " + value +
e1.getLocalizedMessage() ); e1.getLocalizedMessage());
mLog.error( "HackRF Tuner Controller - couldn't apply frequency correction " mLog.error("HackRF Tuner Controller - couldn't apply frequency correction "
+ "value: " + value, e1 ); + "value: " + value, e1);
} }
} }
} ); });
add( new JLabel( "PPM:" ) ); add(new JLabel("PPM:"));
add( mFrequencyCorrection ); add(mFrequencyCorrection);
add( new JSeparator( JSeparator.HORIZONTAL ), "span,grow" ); add(new JSeparator(JSeparator.HORIZONTAL), "span,grow");
add( new JLabel( "Gain" ) ); add(new JLabel("Gain"));
add( new JLabel( "" ), "span 2" ); //filler add(new JLabel(""), "span 2"); //filler
mAmplifier = new JToggleButton( "Amplifier" ); mAmplifier = new JToggleButton("Amplifier");
mAmplifier.setEnabled( false ); mAmplifier.setEnabled(false);
mAmplifier.addActionListener( new ActionListener() mAmplifier.addActionListener(new ActionListener()
{ {
@Override @Override
public void actionPerformed( ActionEvent arg0 ) public void actionPerformed(ActionEvent arg0)
{ {
try try
{ {
mController.setAmplifierEnabled( mAmplifier.isSelected() ); mController.setAmplifierEnabled(mAmplifier.isSelected());
save(); save();
} }
catch ( UsbException e ) catch(UsbException e)
{ {
mLog.error( "couldn't enable/disable amplifier", e ); mLog.error("couldn't enable/disable amplifier", e);
JOptionPane.showMessageDialog( HackRFTunerEditor.this, "Couldn't change amplifier setting", JOptionPane.showMessageDialog(HackRFTunerEditor.this, "Couldn't change amplifier setting",
"Error changing amplifier setting", JOptionPane.ERROR_MESSAGE ); "Error changing amplifier setting", JOptionPane.ERROR_MESSAGE);
} }
} }
} ); });
add( mAmplifier ); add(mAmplifier);
mComboLNAGain = new JComboBox<HackRFLNAGain>( HackRFLNAGain.values() ); mComboLNAGain = new JComboBox<HackRFLNAGain>(HackRFLNAGain.values());
mComboLNAGain.setEnabled( false ); mComboLNAGain.setEnabled(false);
mComboLNAGain.addActionListener( new ActionListener() mComboLNAGain.addActionListener(new ActionListener()
{ {
@Override @Override
public void actionPerformed( ActionEvent arg0 ) public void actionPerformed(ActionEvent arg0)
{ {
try try
{ {
HackRFLNAGain lnaGain = (HackRFLNAGain)mComboLNAGain.getSelectedItem(); HackRFLNAGain lnaGain = (HackRFLNAGain)mComboLNAGain.getSelectedItem();
if ( lnaGain == null ) if(lnaGain == null)
{ {
lnaGain = HackRFLNAGain.GAIN_0; lnaGain = HackRFLNAGain.GAIN_0;
} }
mController.setLNAGain( lnaGain ); mController.setLNAGain(lnaGain);
save(); save();
} }
catch ( UsbException e ) catch(UsbException e)
{ {
JOptionPane.showMessageDialog( HackRFTunerEditor.this, "HackRF Tuner Controller" JOptionPane.showMessageDialog(HackRFTunerEditor.this, "HackRF Tuner Controller"
+ " - couldn't apply the LNA gain setting - " + e.getLocalizedMessage() ); + " - couldn't apply the LNA gain setting - " + e.getLocalizedMessage());
mLog.error( "HackRF Tuner Controller - couldn't apply LNA gain setting - ", e ); mLog.error("HackRF Tuner Controller - couldn't apply LNA gain setting - ", e);
} }
} }
} ); });
mComboLNAGain.setToolTipText( "<html>LNA Gain. Adjust to set the IF gain</html>" ); mComboLNAGain.setToolTipText("<html>LNA Gain. Adjust to set the IF gain</html>");
add( new JLabel( "LNA:" ) ); add(new JLabel("LNA:"));
add( mComboLNAGain ); add(mComboLNAGain);
mComboVGAGain = new JComboBox<HackRFVGAGain>( HackRFVGAGain.values() ); mComboVGAGain = new JComboBox<HackRFVGAGain>(HackRFVGAGain.values());
mComboVGAGain.addActionListener( new ActionListener() mComboVGAGain.addActionListener(new ActionListener()
{ {
@Override @Override
public void actionPerformed( ActionEvent arg0 ) public void actionPerformed(ActionEvent arg0)
{ {
try try
{ {
HackRFVGAGain vgaGain = (HackRFVGAGain)mComboVGAGain.getSelectedItem(); HackRFVGAGain vgaGain = (HackRFVGAGain)mComboVGAGain.getSelectedItem();
if( vgaGain == null ) if(vgaGain == null)
{ {
vgaGain = HackRFVGAGain.GAIN_4; vgaGain = HackRFVGAGain.GAIN_4;
} }
mController.setVGAGain( vgaGain ); mController.setVGAGain(vgaGain);
save(); save();
} }
catch ( UsbException e ) catch(UsbException e)
{ {
JOptionPane.showMessageDialog( HackRFTunerEditor.this, "HackRF Tuner Controller" JOptionPane.showMessageDialog(HackRFTunerEditor.this, "HackRF Tuner Controller"
+ " - couldn't apply the VGA gain setting - " + e.getLocalizedMessage() ); + " - couldn't apply the VGA gain setting - " + e.getLocalizedMessage());
mLog.error( "HackRF Tuner Controller - couldn't apply VGA gain setting", e ); mLog.error("HackRF Tuner Controller - couldn't apply VGA gain setting", e);
} }
} }
} ); });
mComboVGAGain.setToolTipText( "<html>VGA Gain. Adjust to set the baseband gain</html>" ); mComboVGAGain.setToolTipText("<html>VGA Gain. Adjust to set the baseband gain</html>");
add( new JLabel( "VGA:" ) ); add(new JLabel("VGA:"));
add( mComboVGAGain ); add(mComboVGAGain);
} }
/** /**
* Sets each of the tuner configuration controls to the enabled argument state * Sets each of the tuner configuration controls to the enabled argument state
*/ */
private void setControlsEnabled( boolean enabled ) private void setControlsEnabled(boolean enabled)
{ {
if( mConfigurationName.isEnabled() != enabled ) if(mConfigurationName.isEnabled() != enabled)
{ {
mConfigurationName.setEnabled( enabled ); mConfigurationName.setEnabled(enabled);
} }
if( mTunerInfo.isEnabled() != enabled ) if(mTunerInfo.isEnabled() != enabled)
{ {
mTunerInfo.setEnabled( enabled ); mTunerInfo.setEnabled(enabled);
} }
if( mFrequencyCorrection.isEnabled() != enabled ) if(mFrequencyCorrection.isEnabled() != enabled)
{ {
mFrequencyCorrection.setEnabled( enabled ); mFrequencyCorrection.setEnabled(enabled);
} }
if( mComboSampleRate.isEnabled() != enabled ) if(mComboSampleRate.isEnabled() != enabled)
{ {
mComboSampleRate.setEnabled( enabled ); mComboSampleRate.setEnabled(enabled);
} }
if( mAmplifier.isEnabled() != enabled ) if(mAmplifier.isEnabled() != enabled)
{ {
mAmplifier.setEnabled( enabled ); mAmplifier.setEnabled(enabled);
} }
if( mComboLNAGain.isEnabled() != enabled ) if(mComboLNAGain.isEnabled() != enabled)
{ {
mComboLNAGain.setEnabled( enabled ); mComboLNAGain.setEnabled(enabled);
} }
if( mComboVGAGain.isEnabled() != enabled ) if(mComboVGAGain.isEnabled() != enabled)
{ {
mComboVGAGain.setEnabled( enabled ); mComboVGAGain.setEnabled(enabled);
} }
} }
@@ -329,18 +346,18 @@ public class HackRFTunerEditor extends TunerConfigurationEditor
{ {
board = mController.getBoardID(); board = mController.getBoardID();
} }
catch ( UsbException e ) catch(UsbException e)
{ {
mLog.error( "couldn't read HackRF board identifier", e ); mLog.error("couldn't read HackRF board identifier", e);
} }
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append( "<html><h3>HackRF Tuner</h3>" ); sb.append("<html><h3>HackRF Tuner</h3>");
sb.append( "<b>Board: </b>" ); sb.append("<b>Board: </b>");
sb.append( board.getLabel() ); sb.append(board.getLabel());
sb.append( "<br>" ); sb.append("<br>");
HackRFTunerController.Serial serial = null; HackRFTunerController.Serial serial = null;
@@ -348,25 +365,25 @@ public class HackRFTunerEditor extends TunerConfigurationEditor
{ {
serial = mController.getSerial(); serial = mController.getSerial();
} }
catch( Exception e ) catch(Exception e)
{ {
mLog.error( "couldn't read HackRF serial number", e ); mLog.error("couldn't read HackRF serial number", e);
} }
if( serial != null ) if(serial != null)
{ {
sb.append( "<b>Serial: </b>" ); sb.append("<b>Serial: </b>");
sb.append( serial.getSerialNumber() ); sb.append(serial.getSerialNumber());
sb.append( "<br>" ); sb.append("<br>");
sb.append( "<b>Part: </b>" ); sb.append("<b>Part: </b>");
sb.append( serial.getPartID() ); sb.append(serial.getPartID());
sb.append( "<br>" ); sb.append("<br>");
} }
else else
{ {
sb.append( "<b>Serial: Unknown</b><br>" ); sb.append("<b>Serial: Unknown</b><br>");
sb.append( "<b>Part: Unknown</b><br>" ); sb.append("<b>Part: Unknown</b><br>");
} }
String firmware = null; String firmware = null;
@@ -375,58 +392,61 @@ public class HackRFTunerEditor extends TunerConfigurationEditor
{ {
firmware = mController.getFirmwareVersion(); firmware = mController.getFirmwareVersion();
} }
catch( Exception e ) catch(Exception e)
{ {
mLog.error( "couldn't read HackRF firmware version", e ); mLog.error("couldn't read HackRF firmware version", e);
} }
if( firmware != null ) if(firmware != null)
{ {
sb.append( "<b>Firmware: </b>" ); sb.append("<b>Firmware: </b>");
sb.append( firmware ); sb.append(firmware);
sb.append( "<br>" ); sb.append("<br>");
} }
else else
{ {
sb.append( "<b>Firmware: Unknown</b><br>" ); sb.append("<b>Firmware: Unknown</b><br>");
} }
return sb.toString(); return sb.toString();
} }
@Override @Override
public void setItem( TunerConfiguration tunerConfiguration ) public void setItem(TunerConfiguration tunerConfiguration)
{ {
super.setItem( tunerConfiguration ); super.setItem(tunerConfiguration);
//Toggle loading so that we don't fire a change event and schedule a settings file save //Toggle loading so that we don't fire a change event and schedule a settings file save
mLoading = true; mLoading = true;
if( hasItem() ) if(hasItem())
{ {
HackRFTunerConfiguration config = getConfiguration(); HackRFTunerConfiguration config = getConfiguration();
if( tunerConfiguration.isAssigned() ) if(tunerConfiguration.isAssigned())
{ {
setControlsEnabled( true ); setControlsEnabled(true);
mConfigurationName.setText( config.getName() ); mConfigurationName.setText(config.getName());
mComboSampleRate.setSelectedItem( config.getSampleRate() ); mComboSampleRate.setSelectedItem(config.getSampleRate());
mFrequencyCorrection.setValue( config.getFrequencyCorrection() ); mFrequencyCorrection.setValue(config.getFrequencyCorrection());
mAmplifier.setSelected( config.getAmplifierEnabled() ); mAmplifier.setSelected(config.getAmplifierEnabled());
mComboLNAGain.setSelectedItem( config.getLNAGain() ); mComboLNAGain.setSelectedItem(config.getLNAGain());
mComboVGAGain.setSelectedItem( config.getVGAGain() ); mComboVGAGain.setSelectedItem(config.getVGAGain());
//Update enabled state to reflect when frequency and sample rate controls are locked
mComboSampleRate.setEnabled(!mController.isLocked());
} }
else else
{ {
setControlsEnabled( false ); setControlsEnabled(false);
mConfigurationName.setText( config.getName() ); mConfigurationName.setText(config.getName());
} }
} }
else else
{ {
setControlsEnabled( false ); setControlsEnabled(false);
mConfigurationName.setText( "" ); mConfigurationName.setText("");
} }
mLoading = false; mLoading = false;
@@ -435,22 +455,22 @@ public class HackRFTunerEditor extends TunerConfigurationEditor
@Override @Override
public void save() public void save()
{ {
if( hasItem() && !mLoading ) if(hasItem() && !mLoading)
{ {
HackRFTunerConfiguration config = getConfiguration(); HackRFTunerConfiguration config = getConfiguration();
config.setName( mConfigurationName.getText() ); config.setName(mConfigurationName.getText());
double value = ((SpinnerNumberModel)mFrequencyCorrection double value = ((SpinnerNumberModel)mFrequencyCorrection
.getModel()).getNumber().doubleValue(); .getModel()).getNumber().doubleValue();
config.setFrequencyCorrection( value ); config.setFrequencyCorrection(value);
config.setSampleRate( (HackRFSampleRate)mComboSampleRate.getSelectedItem() ); config.setSampleRate((HackRFSampleRate)mComboSampleRate.getSelectedItem());
config.setAmplifierEnabled( mAmplifier.isSelected() ); config.setAmplifierEnabled(mAmplifier.isSelected());
config.setLNAGain( (HackRFLNAGain)mComboLNAGain.getSelectedItem() ); config.setLNAGain((HackRFLNAGain)mComboLNAGain.getSelectedItem());
config.setVGAGain( (HackRFVGAGain)mComboVGAGain.getSelectedItem() ); config.setVGAGain((HackRFVGAGain)mComboVGAGain.getSelectedItem());
getTunerConfigurationModel().broadcast( getTunerConfigurationModel().broadcast(
new TunerConfigurationEvent( getConfiguration(), TunerConfigurationEvent.Event.CHANGE ) ); new TunerConfigurationEvent(getConfiguration(), TunerConfigurationEvent.Event.CHANGE));
} }
} }
} }

View File

@@ -433,6 +433,9 @@ public class TunerChannelSourceManager extends ChannelSourceManager
case NOTIFICATION_CHANNEL_COUNT_CHANGE: case NOTIFICATION_CHANNEL_COUNT_CHANGE:
//Rebroadcast this event to any registered listeners (ie tuner and tuner controller) //Rebroadcast this event to any registered listeners (ie tuner and tuner controller)
broadcast(sourceEvent); broadcast(sourceEvent);
//Lock the frequency and sample rate controls on the tuner controller so users can't change them
//when the polyphase manager has channels allocated
mTunerController.setLocked(getTunerChannelCount() > 0);
break; break;
default: default:
mLog.info("Unrecognized source event: " + sourceEvent); mLog.info("Unrecognized source event: " + sourceEvent);

View File

@@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* sdr-trunk * sdr-trunk
* Copyright (C) 2014-2017 Dennis Sheirer * Copyright (C) 2014-2018 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
@@ -45,6 +45,7 @@ import javax.swing.SwingConstants;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener; import javax.swing.event.ChangeListener;
import javax.usb.UsbException; import javax.usb.UsbException;
import java.awt.EventQueue;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.awt.event.FocusEvent; import java.awt.event.FocusEvent;
@@ -53,7 +54,7 @@ import java.text.DecimalFormat;
public class E4KTunerEditor extends TunerConfigurationEditor public class E4KTunerEditor extends TunerConfigurationEditor
{ {
private final static Logger mLog = LoggerFactory.getLogger( E4KTunerEditor.class ); private final static Logger mLog = LoggerFactory.getLogger(E4KTunerEditor.class);
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@@ -69,9 +70,9 @@ public class E4KTunerEditor extends TunerConfigurationEditor
private E4KTunerController mController; private E4KTunerController mController;
private boolean mLoading; private boolean mLoading;
public E4KTunerEditor( TunerConfigurationModel tunerConfigurationModel, RTL2832Tuner tuner ) public E4KTunerEditor(TunerConfigurationModel tunerConfigurationModel, RTL2832Tuner tuner)
{ {
super( tunerConfigurationModel ); super(tunerConfigurationModel);
mController = (E4KTunerController)tuner.getController(); mController = (E4KTunerController)tuner.getController();
init(); init();
@@ -79,7 +80,7 @@ public class E4KTunerEditor extends TunerConfigurationEditor
private E4KTunerConfiguration getConfiguration() private E4KTunerConfiguration getConfiguration()
{ {
if( hasItem() ) if(hasItem())
{ {
return (E4KTunerConfiguration)getItem(); return (E4KTunerConfiguration)getItem();
} }
@@ -87,299 +88,315 @@ public class E4KTunerEditor extends TunerConfigurationEditor
return null; return null;
} }
@Override
public void setSampleRateControl(boolean enabled)
{
EventQueue.invokeLater(new Runnable()
{
@Override
public void run()
{
mComboSampleRate.setEnabled(enabled);
}
});
}
private void init() private void init()
{ {
setLayout( new MigLayout( "fill,wrap 4", "[right][grow,fill][right][grow,fill]", setLayout(new MigLayout("fill,wrap 4", "[right][grow,fill][right][grow,fill]",
"[][][][][][][][grow]" ) ); "[][][][][][][][grow]"));
add( new JLabel( "E4000 Tuner Configuration" ), "span,align center" ); add(new JLabel("E4000 Tuner Configuration"), "span,align center");
/** /**
* Tuner Configuration Name * Tuner Configuration Name
*/ */
add( new JLabel( "Name:" ) ); add(new JLabel("Name:"));
mConfigurationName = new JTextField(); mConfigurationName = new JTextField();
mConfigurationName.setEnabled( false ); mConfigurationName.setEnabled(false);
mConfigurationName.addFocusListener( new FocusListener() mConfigurationName.addFocusListener(new FocusListener()
{ {
@Override @Override
public void focusLost( FocusEvent e ) public void focusLost(FocusEvent e)
{ {
save(); save();
} }
@Override
public void focusGained( FocusEvent e ) {}
} );
add( mConfigurationName, "span 2" );
mTunerInfo = new JButton( "Tuner Info" );
mTunerInfo.setEnabled( false );
mTunerInfo.addActionListener( new ActionListener()
{
@Override @Override
public void actionPerformed( ActionEvent e ) public void focusGained(FocusEvent e)
{ {
JOptionPane.showMessageDialog( E4KTunerEditor.this, getTunerInfo(),
"Tuner Info", JOptionPane.INFORMATION_MESSAGE );
} }
} ); });
add( mTunerInfo );
mComboSampleRate = new JComboBox<>( SampleRate.values() ); add(mConfigurationName, "span 2");
mComboSampleRate.setEnabled( false );
mComboSampleRate.addActionListener( new ActionListener() mTunerInfo = new JButton("Tuner Info");
mTunerInfo.setEnabled(false);
mTunerInfo.addActionListener(new ActionListener()
{ {
@Override @Override
public void actionPerformed( ActionEvent e ) public void actionPerformed(ActionEvent e)
{
JOptionPane.showMessageDialog(E4KTunerEditor.this, getTunerInfo(),
"Tuner Info", JOptionPane.INFORMATION_MESSAGE);
}
});
add(mTunerInfo);
mComboSampleRate = new JComboBox<>(SampleRate.values());
mComboSampleRate.setEnabled(false);
mComboSampleRate.addActionListener(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
{ {
SampleRate sampleRate = (SampleRate)mComboSampleRate.getSelectedItem(); SampleRate sampleRate = (SampleRate)mComboSampleRate.getSelectedItem();
try try
{ {
mController.setSampleRate( sampleRate ); mController.setSampleRate(sampleRate);
save(); save();
} }
catch ( SourceException | LibUsbException eSampleRate ) catch(SourceException | LibUsbException eSampleRate)
{ {
JOptionPane.showMessageDialog( E4KTunerEditor.this, JOptionPane.showMessageDialog(E4KTunerEditor.this,
"E4K Tuner Controller - couldn't apply the sample rate setting [" + "E4K Tuner Controller - couldn't apply the sample rate setting [" +
sampleRate.getLabel() + "] " + eSampleRate.getLocalizedMessage() ); sampleRate.getLabel() + "] " + eSampleRate.getLocalizedMessage());
mLog.error( "E4K Tuner Controller - couldn't apply sample rate setting [" + mLog.error("E4K Tuner Controller - couldn't apply sample rate setting [" +
sampleRate.getLabel() + "]", eSampleRate ); sampleRate.getLabel() + "]", eSampleRate);
} }
} }
} ); });
add( new JLabel( "Sample Rate:" ) ); add(new JLabel("Sample Rate:"));
add( mComboSampleRate ); add(mComboSampleRate);
SpinnerModel model = new SpinnerNumberModel( 0.0, //initial value SpinnerModel model = new SpinnerNumberModel(0.0, //initial value
-1000.0, //min -1000.0, //min
1000.0, //max 1000.0, //max
0.1 ); //step 0.1); //step
mFrequencyCorrection = new JSpinner( model ); mFrequencyCorrection = new JSpinner(model);
mFrequencyCorrection.setEnabled( false ); mFrequencyCorrection.setEnabled(false);
JSpinner.NumberEditor editor = JSpinner.NumberEditor editor =
(JSpinner.NumberEditor)mFrequencyCorrection.getEditor(); (JSpinner.NumberEditor)mFrequencyCorrection.getEditor();
DecimalFormat format = editor.getFormat(); DecimalFormat format = editor.getFormat();
format.setMinimumFractionDigits( 1 ); format.setMinimumFractionDigits(1);
editor.getTextField().setHorizontalAlignment( SwingConstants.CENTER ); editor.getTextField().setHorizontalAlignment(SwingConstants.CENTER);
mFrequencyCorrection.addChangeListener( new ChangeListener() mFrequencyCorrection.addChangeListener(new ChangeListener()
{ {
@Override @Override
public void stateChanged( ChangeEvent e ) public void stateChanged(ChangeEvent e)
{ {
final double value = ((SpinnerNumberModel)mFrequencyCorrection final double value = ((SpinnerNumberModel)mFrequencyCorrection
.getModel()).getNumber().doubleValue(); .getModel()).getNumber().doubleValue();
try try
{ {
mController.setFrequencyCorrection( value ); mController.setFrequencyCorrection(value);
save(); save();
} }
catch ( SourceException e1 ) catch(SourceException e1)
{ {
JOptionPane.showMessageDialog( E4KTunerEditor.this, "E4K Tuner Controller - " JOptionPane.showMessageDialog(E4KTunerEditor.this, "E4K Tuner Controller - "
+ "couldn't apply frequency correction value: " + value + e1.getLocalizedMessage() ); + "couldn't apply frequency correction value: " + value + e1.getLocalizedMessage());
mLog.error( "E4K Tuner Controller - couldn't apply frequency correction value:" mLog.error("E4K Tuner Controller - couldn't apply frequency correction value:"
+ value, e1 ); + value, e1);
} }
} }
} ); });
add( new JLabel( "PPM:" ) ); add(new JLabel("PPM:"));
add( mFrequencyCorrection ); add(mFrequencyCorrection);
add( new JSeparator( JSeparator.HORIZONTAL ), "span,grow" ); add(new JSeparator(JSeparator.HORIZONTAL), "span,grow");
add( new JLabel( "Gain" ), "wrap" ); add(new JLabel("Gain"), "wrap");
mComboMasterGain = new JComboBox<E4KGain>( E4KGain.values() ); mComboMasterGain = new JComboBox<E4KGain>(E4KGain.values());
mComboMasterGain.setEnabled( false ); mComboMasterGain.setEnabled(false);
mComboMasterGain.addActionListener( new ActionListener() mComboMasterGain.addActionListener(new ActionListener()
{ {
@Override @Override
public void actionPerformed( ActionEvent arg0 ) public void actionPerformed(ActionEvent arg0)
{ {
try try
{ {
E4KGain gain = (E4KGain)mComboMasterGain.getSelectedItem(); E4KGain gain = (E4KGain)mComboMasterGain.getSelectedItem();
mController.setGain( (E4KGain)mComboMasterGain.getSelectedItem(), true ); mController.setGain((E4KGain)mComboMasterGain.getSelectedItem(), true);
if( gain == E4KGain.MANUAL ) if(gain == E4KGain.MANUAL)
{ {
mComboMixerGain.setSelectedItem( mController.getMixerGain( true ) ); mComboMixerGain.setSelectedItem(mController.getMixerGain(true));
mComboMixerGain.setEnabled( true ); mComboMixerGain.setEnabled(true);
mComboLNAGain.setSelectedItem( mController.getLNAGain( true ) ); mComboLNAGain.setSelectedItem(mController.getLNAGain(true));
mComboLNAGain.setEnabled( true ); mComboLNAGain.setEnabled(true);
mComboEnhanceGain.setSelectedItem( mController.getEnhanceGain( true ) ); mComboEnhanceGain.setSelectedItem(mController.getEnhanceGain(true));
mComboEnhanceGain.setEnabled( true ); mComboEnhanceGain.setEnabled(true);
} }
else else
{ {
mComboMixerGain.setEnabled( false ); mComboMixerGain.setEnabled(false);
mComboMixerGain.setSelectedItem( gain.getMixerGain() ); mComboMixerGain.setSelectedItem(gain.getMixerGain());
mComboLNAGain.setEnabled( false ); mComboLNAGain.setEnabled(false);
mComboLNAGain.setSelectedItem( gain.getLNAGain() ); mComboLNAGain.setSelectedItem(gain.getLNAGain());
mComboEnhanceGain.setEnabled( false ); mComboEnhanceGain.setEnabled(false);
mComboEnhanceGain.setSelectedItem( gain.getEnhanceGain() ); mComboEnhanceGain.setSelectedItem(gain.getEnhanceGain());
} }
save(); save();
} }
catch ( UsbException e ) catch(UsbException e)
{ {
JOptionPane.showMessageDialog( E4KTunerEditor.this, "E4K Tuner Controller - " JOptionPane.showMessageDialog(E4KTunerEditor.this, "E4K Tuner Controller - "
+ "couldn't apply the gain setting - " + e.getLocalizedMessage() ); + "couldn't apply the gain setting - " + e.getLocalizedMessage());
mLog.error( "E4K Tuner Controller - couldn't apply gain setting", e ); mLog.error("E4K Tuner Controller - couldn't apply gain setting", e);
} }
} }
} ); });
mComboMasterGain.setToolTipText( "<html>Select <b>AUTOMATIC</b> for auto " mComboMasterGain.setToolTipText("<html>Select <b>AUTOMATIC</b> for auto "
+ "gain, <b>MANUAL</b> to enable<br> independent control of " + "gain, <b>MANUAL</b> to enable<br> independent control of "
+ "<i>Mixer</i>, <i>LNA</i> and <i>Enhance</i> gain<br>" + "<i>Mixer</i>, <i>LNA</i> and <i>Enhance</i> gain<br>"
+ "settings, or one of the individual gain settings for<br>" + "settings, or one of the individual gain settings for<br>"
+ "semi-manual gain control</html>" ); + "semi-manual gain control</html>");
add( new JLabel( "Master:" ) ); add(new JLabel("Master:"));
add( mComboMasterGain ); add(mComboMasterGain);
mComboMixerGain = new JComboBox<E4KMixerGain>( E4KMixerGain.values() ); mComboMixerGain = new JComboBox<E4KMixerGain>(E4KMixerGain.values());
mComboMixerGain.addActionListener( new ActionListener() mComboMixerGain.addActionListener(new ActionListener()
{ {
@Override @Override
public void actionPerformed( ActionEvent arg0 ) public void actionPerformed(ActionEvent arg0)
{ {
try try
{ {
E4KMixerGain mixerGain = (E4KMixerGain)mComboMixerGain.getSelectedItem(); E4KMixerGain mixerGain = (E4KMixerGain)mComboMixerGain.getSelectedItem();
mController.setMixerGain( mixerGain, true ); mController.setMixerGain(mixerGain, true);
save(); save();
} }
catch ( UsbException e ) catch(UsbException e)
{ {
JOptionPane.showMessageDialog( E4KTunerEditor.this, "E4K Tuner Controller - " JOptionPane.showMessageDialog(E4KTunerEditor.this, "E4K Tuner Controller - "
+ "couldn't apply the mixer gain setting - " + e.getLocalizedMessage() ); + "couldn't apply the mixer gain setting - " + e.getLocalizedMessage());
mLog.error( "E4K Tuner Controller - couldn't apply mixer gain setting", e ); mLog.error("E4K Tuner Controller - couldn't apply mixer gain setting", e);
} }
} }
} ); });
mComboMixerGain.setToolTipText( "<html>Mixer Gain. Set master gain " mComboMixerGain.setToolTipText("<html>Mixer Gain. Set master gain "
+ "to <b>MASTER</b> to enable adjustment</html>" ); + "to <b>MASTER</b> to enable adjustment</html>");
mComboMixerGain.setEnabled( false ); mComboMixerGain.setEnabled(false);
add( new JLabel( "Mixer:" ) ); add(new JLabel("Mixer:"));
add( mComboMixerGain ); add(mComboMixerGain);
mComboLNAGain = new JComboBox<E4KLNAGain>( E4KLNAGain.values() ); mComboLNAGain = new JComboBox<E4KLNAGain>(E4KLNAGain.values());
mComboLNAGain.addActionListener( new ActionListener() mComboLNAGain.addActionListener(new ActionListener()
{ {
@Override @Override
public void actionPerformed( ActionEvent arg0 ) public void actionPerformed(ActionEvent arg0)
{ {
try try
{ {
E4KLNAGain lnaGain = (E4KLNAGain)mComboLNAGain.getSelectedItem(); E4KLNAGain lnaGain = (E4KLNAGain)mComboLNAGain.getSelectedItem();
mController.setLNAGain( lnaGain, true ); mController.setLNAGain(lnaGain, true);
save(); save();
} }
catch ( UsbException e ) catch(UsbException e)
{ {
JOptionPane.showMessageDialog( E4KTunerEditor.this, "E4K Tuner Controller - " JOptionPane.showMessageDialog(E4KTunerEditor.this, "E4K Tuner Controller - "
+ "couldn't apply the LNA gain setting - " + e.getLocalizedMessage() ); + "couldn't apply the LNA gain setting - " + e.getLocalizedMessage());
mLog.error( "E4K Tuner Controller - couldn't apply LNA gain setting - ", e ); mLog.error("E4K Tuner Controller - couldn't apply LNA gain setting - ", e);
} }
} }
} ); });
mComboLNAGain.setToolTipText( "<html>LNA Gain. Set master gain " mComboLNAGain.setToolTipText("<html>LNA Gain. Set master gain "
+ "to <b>MANUAL</b> to enable adjustment</html>" ); + "to <b>MANUAL</b> to enable adjustment</html>");
mComboLNAGain.setEnabled( false ); mComboLNAGain.setEnabled(false);
add( new JLabel( "LNA:" ) ); add(new JLabel("LNA:"));
add( mComboLNAGain ); add(mComboLNAGain);
mComboEnhanceGain = new JComboBox<E4KEnhanceGain>( E4KEnhanceGain.values() ); mComboEnhanceGain = new JComboBox<E4KEnhanceGain>(E4KEnhanceGain.values());
mComboEnhanceGain.addActionListener( new ActionListener() mComboEnhanceGain.addActionListener(new ActionListener()
{ {
@Override @Override
public void actionPerformed( ActionEvent arg0 ) public void actionPerformed(ActionEvent arg0)
{ {
try try
{ {
E4KEnhanceGain enhance = (E4KEnhanceGain)mComboEnhanceGain.getSelectedItem(); E4KEnhanceGain enhance = (E4KEnhanceGain)mComboEnhanceGain.getSelectedItem();
mController.setEnhanceGain( enhance, true ); mController.setEnhanceGain(enhance, true);
save(); save();
} }
catch ( UsbException e ) catch(UsbException e)
{ {
JOptionPane.showMessageDialog( E4KTunerEditor.this, "E4K Tuner Controller - " JOptionPane.showMessageDialog(E4KTunerEditor.this, "E4K Tuner Controller - "
+ "couldn't apply the enhance gain setting - " + e.getLocalizedMessage() ); + "couldn't apply the enhance gain setting - " + e.getLocalizedMessage());
mLog.error( "E4K Tuner Controller - couldn't apply enhance gain setting", e ); mLog.error("E4K Tuner Controller - couldn't apply enhance gain setting", e);
} }
} }
} ); });
mComboEnhanceGain.setToolTipText( "<html>Enhance Gain. Set master gain " mComboEnhanceGain.setToolTipText("<html>Enhance Gain. Set master gain "
+ "to <b>MANUAL</b> to enable adjustment</html>" ); + "to <b>MANUAL</b> to enable adjustment</html>");
mComboEnhanceGain.setEnabled( false ); mComboEnhanceGain.setEnabled(false);
add( new JLabel( "Enhance:" ) ); add(new JLabel("Enhance:"));
add( mComboEnhanceGain ); add(mComboEnhanceGain);
} }
/** /**
* Sets each of the tuner configuration controls to the enabled argument state * Sets each of the tuner configuration controls to the enabled argument state
*/ */
private void setControlsEnabled( boolean enabled ) private void setControlsEnabled(boolean enabled)
{ {
if( mConfigurationName.isEnabled() != enabled ) if(mConfigurationName.isEnabled() != enabled)
{ {
mConfigurationName.setEnabled( enabled ); mConfigurationName.setEnabled(enabled);
} }
if( mTunerInfo.isEnabled() != enabled ) if(mTunerInfo.isEnabled() != enabled)
{ {
mTunerInfo.setEnabled( enabled ); mTunerInfo.setEnabled(enabled);
} }
if( mFrequencyCorrection.isEnabled() != enabled ) if(mFrequencyCorrection.isEnabled() != enabled)
{ {
mFrequencyCorrection.setEnabled( enabled ); mFrequencyCorrection.setEnabled(enabled);
} }
if( mComboSampleRate.isEnabled() != enabled ) if(mComboSampleRate.isEnabled() != enabled)
{ {
mComboSampleRate.setEnabled( enabled ); mComboSampleRate.setEnabled(enabled);
} }
if( mComboMasterGain.isEnabled() != enabled ) if(mComboMasterGain.isEnabled() != enabled)
{ {
mComboMasterGain.setEnabled( enabled ); mComboMasterGain.setEnabled(enabled);
} }
if( mComboMixerGain.isEnabled() != enabled ) if(mComboMixerGain.isEnabled() != enabled)
{ {
mComboMixerGain.setEnabled( enabled ); mComboMixerGain.setEnabled(enabled);
} }
if( mComboLNAGain.isEnabled() != enabled ) if(mComboLNAGain.isEnabled() != enabled)
{ {
mComboLNAGain.setEnabled( enabled ); mComboLNAGain.setEnabled(enabled);
} }
if( mComboEnhanceGain.isEnabled() != enabled ) if(mComboEnhanceGain.isEnabled() != enabled)
{ {
mComboEnhanceGain.setEnabled( enabled ); mComboEnhanceGain.setEnabled(enabled);
} }
} }
@@ -389,39 +406,39 @@ public class E4KTunerEditor extends TunerConfigurationEditor
RTL2832TunerController.Descriptor descriptor = mController.getDescriptor(); RTL2832TunerController.Descriptor descriptor = mController.getDescriptor();
sb.append( "<html><h3>RTL-2832 with E4000 Tuner</h3>" ); sb.append("<html><h3>RTL-2832 with E4000 Tuner</h3>");
if( descriptor == null ) if(descriptor == null)
{ {
sb.append( "No EEPROM Descriptor Available" ); sb.append("No EEPROM Descriptor Available");
} }
else else
{ {
sb.append( "<b>USB ID: </b>" ); sb.append("<b>USB ID: </b>");
sb.append( descriptor.getVendorID() ); sb.append(descriptor.getVendorID());
sb.append( ":" ); sb.append(":");
sb.append( descriptor.getProductID() ); sb.append(descriptor.getProductID());
sb.append( "<br>" ); sb.append("<br>");
sb.append( "<b>Vendor: </b>" ); sb.append("<b>Vendor: </b>");
sb.append( descriptor.getVendorLabel() ); sb.append(descriptor.getVendorLabel());
sb.append( "<br>" ); sb.append("<br>");
sb.append( "<b>Product: </b>" ); sb.append("<b>Product: </b>");
sb.append( descriptor.getProductLabel() ); sb.append(descriptor.getProductLabel());
sb.append( "<br>" ); sb.append("<br>");
sb.append( "<b>Serial: </b>" ); sb.append("<b>Serial: </b>");
sb.append( descriptor.getSerial() ); sb.append(descriptor.getSerial());
sb.append( "<br>" ); sb.append("<br>");
sb.append( "<b>IR Enabled: </b>" ); sb.append("<b>IR Enabled: </b>");
sb.append( descriptor.irEnabled() ); sb.append(descriptor.irEnabled());
sb.append( "<br>" ); sb.append("<br>");
sb.append( "<b>Remote Wake: </b>" ); sb.append("<b>Remote Wake: </b>");
sb.append( descriptor.remoteWakeupEnabled() ); sb.append(descriptor.remoteWakeupEnabled());
sb.append( "<br>" ); sb.append("<br>");
} }
return sb.toString(); return sb.toString();
@@ -430,63 +447,66 @@ public class E4KTunerEditor extends TunerConfigurationEditor
@Override @Override
public void save() public void save()
{ {
if( hasItem() && !mLoading ) if(hasItem() && !mLoading)
{ {
E4KTunerConfiguration config = getConfiguration(); E4KTunerConfiguration config = getConfiguration();
config.setName( mConfigurationName.getText() ); config.setName(mConfigurationName.getText());
config.setSampleRate( (SampleRate)mComboSampleRate.getSelectedItem() ); config.setSampleRate((SampleRate)mComboSampleRate.getSelectedItem());
double value = ((SpinnerNumberModel)mFrequencyCorrection double value = ((SpinnerNumberModel)mFrequencyCorrection
.getModel()).getNumber().doubleValue(); .getModel()).getNumber().doubleValue();
config.setFrequencyCorrection( value ); config.setFrequencyCorrection(value);
config.setMasterGain( (E4KGain)mComboMasterGain.getSelectedItem() ); config.setMasterGain((E4KGain)mComboMasterGain.getSelectedItem());
config.setMixerGain( (E4KMixerGain)mComboMixerGain.getSelectedItem() ); config.setMixerGain((E4KMixerGain)mComboMixerGain.getSelectedItem());
config.setLNAGain( (E4KLNAGain)mComboLNAGain.getSelectedItem() ); config.setLNAGain((E4KLNAGain)mComboLNAGain.getSelectedItem());
config.setEnhanceGain( (E4KEnhanceGain)mComboEnhanceGain.getSelectedItem() ); config.setEnhanceGain((E4KEnhanceGain)mComboEnhanceGain.getSelectedItem());
getTunerConfigurationModel().broadcast( new TunerConfigurationEvent( getTunerConfigurationModel().broadcast(new TunerConfigurationEvent(
getConfiguration(), TunerConfigurationEvent.Event.CHANGE ) ); getConfiguration(), TunerConfigurationEvent.Event.CHANGE));
} }
} }
@Override @Override
public void setItem( TunerConfiguration tunerConfiguration ) public void setItem(TunerConfiguration tunerConfiguration)
{ {
super.setItem( tunerConfiguration ); super.setItem(tunerConfiguration);
//Toggle loading so that we don't fire a change event and schedule a settings file save //Toggle loading so that we don't fire a change event and schedule a settings file save
mLoading = true; mLoading = true;
if( hasItem() ) if(hasItem())
{ {
E4KTunerConfiguration config = getConfiguration(); E4KTunerConfiguration config = getConfiguration();
if( tunerConfiguration.isAssigned() ) if(tunerConfiguration.isAssigned())
{ {
setControlsEnabled( true ); setControlsEnabled(true);
mConfigurationName.setText( config.getName() ); mConfigurationName.setText(config.getName());
mFrequencyCorrection.setValue( config.getFrequencyCorrection() ); mFrequencyCorrection.setValue(config.getFrequencyCorrection());
mComboSampleRate.setSelectedItem( config.getSampleRate() ); mComboSampleRate.setSelectedItem(config.getSampleRate());
mComboMasterGain.setSelectedItem( config.getMasterGain() ); mComboMasterGain.setSelectedItem(config.getMasterGain());
mComboMixerGain.setSelectedItem( config.getMixerGain() ); mComboMixerGain.setSelectedItem(config.getMixerGain());
mComboLNAGain.setSelectedItem( config.getLNAGain() ); mComboLNAGain.setSelectedItem(config.getLNAGain());
mComboEnhanceGain.setSelectedItem( config.getEnhanceGain() ); mComboEnhanceGain.setSelectedItem(config.getEnhanceGain());
//Update enabled state to reflect when frequency and sample rate controls are locked
mComboSampleRate.setEnabled(!mController.isLocked());
} }
else else
{ {
setControlsEnabled( false ); setControlsEnabled(false);
mConfigurationName.setText( config.getName() ); mConfigurationName.setText(config.getName());
} }
} }
else else
{ {
setControlsEnabled( false ); setControlsEnabled(false);
mConfigurationName.setText( "" ); mConfigurationName.setText("");
} }
mLoading = false; mLoading = false;

View File

@@ -1,19 +1,17 @@
/******************************************************************************* /*******************************************************************************
* SDR Trunk * sdr-trunk
* Copyright (C) 2014-2016 Dennis Sheirer * Copyright (C) 2014-2018 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public
* it under the terms of the GNU General Public License as published by * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
* the Free Software Foundation, either version 3 of the License, or * later version.
* (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
* but WITHOUT ANY WARRANTY; without even the implied warranty of * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. * You should have received a copy of the GNU General Public License along with this program.
* If not, see <http://www.gnu.org/licenses/>
* *
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
******************************************************************************/ ******************************************************************************/
package io.github.dsheirer.source.tuner.rtl.r820t; package io.github.dsheirer.source.tuner.rtl.r820t;
@@ -47,6 +45,7 @@ import javax.swing.SwingConstants;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener; import javax.swing.event.ChangeListener;
import javax.usb.UsbException; import javax.usb.UsbException;
import java.awt.EventQueue;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.awt.event.FocusEvent; import java.awt.event.FocusEvent;
@@ -55,7 +54,7 @@ import java.text.DecimalFormat;
public class R820TTunerEditor extends TunerConfigurationEditor public class R820TTunerEditor extends TunerConfigurationEditor
{ {
private final static Logger mLog = LoggerFactory.getLogger( R820TTunerEditor.class ); private final static Logger mLog = LoggerFactory.getLogger(R820TTunerEditor.class);
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final R820TGain DEFAULT_GAIN = R820TGain.GAIN_279; private static final R820TGain DEFAULT_GAIN = R820TGain.GAIN_279;
@@ -72,9 +71,9 @@ public class R820TTunerEditor extends TunerConfigurationEditor
private JComboBox<R820TVGAGain> mComboVGAGain; private JComboBox<R820TVGAGain> mComboVGAGain;
private boolean mLoading; private boolean mLoading;
public R820TTunerEditor( TunerConfigurationModel tunerConfigurationModel, RTL2832Tuner tuner ) public R820TTunerEditor(TunerConfigurationModel tunerConfigurationModel, RTL2832Tuner tuner)
{ {
super( tunerConfigurationModel ); super(tunerConfigurationModel);
mController = (R820TTunerController)tuner.getController(); mController = (R820TTunerController)tuner.getController();
init(); init();
@@ -82,7 +81,7 @@ public class R820TTunerEditor extends TunerConfigurationEditor
private R820TTunerConfiguration getConfiguration() private R820TTunerConfiguration getConfiguration()
{ {
if( hasItem() ) if(hasItem())
{ {
return (R820TTunerConfiguration)getItem(); return (R820TTunerConfiguration)getItem();
} }
@@ -90,352 +89,368 @@ public class R820TTunerEditor extends TunerConfigurationEditor
return null; return null;
} }
private void init() @Override
public void setSampleRateControl(boolean enabled)
{ {
setLayout( new MigLayout( "fill,wrap 4", "[right][grow,fill][right][grow,fill]", EventQueue.invokeLater(new Runnable()
"[][][][][][][][grow]" ) );
add( new JLabel( "R820T Tuner Configuration" ), "span,align center" );
mConfigurationName = new JTextField();
mConfigurationName.setEnabled( false );
mConfigurationName.addFocusListener( new FocusListener()
{ {
@Override @Override
public void focusLost( FocusEvent e ) public void run()
{
mComboSampleRate.setEnabled(enabled);
}
});
}
private void init()
{
setLayout(new MigLayout("fill,wrap 4", "[right][grow,fill][right][grow,fill]",
"[][][][][][][][grow]"));
add(new JLabel("R820T Tuner Configuration"), "span,align center");
mConfigurationName = new JTextField();
mConfigurationName.setEnabled(false);
mConfigurationName.addFocusListener(new FocusListener()
{
@Override
public void focusLost(FocusEvent e)
{ {
save(); save();
} }
@Override
public void focusGained( FocusEvent e ) {}
} );
add( new JLabel( "Name:" ) );
add( mConfigurationName, "span 2" );
mTunerInfo = new JButton( "Tuner Info" );
mTunerInfo.setEnabled( false );
mTunerInfo.addActionListener( new ActionListener()
{
@Override @Override
public void actionPerformed( ActionEvent e ) public void focusGained(FocusEvent e)
{ {
JOptionPane.showMessageDialog( R820TTunerEditor.this, getTunerInfo(),
"Tuner Info", JOptionPane.INFORMATION_MESSAGE );
} }
} ); });
add( mTunerInfo );
mComboSampleRate = new JComboBox<>( SampleRate.values() ); add(new JLabel("Name:"));
mComboSampleRate.setEnabled( false ); add(mConfigurationName, "span 2");
mComboSampleRate.addActionListener( new ActionListener()
mTunerInfo = new JButton("Tuner Info");
mTunerInfo.setEnabled(false);
mTunerInfo.addActionListener(new ActionListener()
{ {
@Override @Override
public void actionPerformed( ActionEvent e ) public void actionPerformed(ActionEvent e)
{
JOptionPane.showMessageDialog(R820TTunerEditor.this, getTunerInfo(),
"Tuner Info", JOptionPane.INFORMATION_MESSAGE);
}
});
add(mTunerInfo);
mComboSampleRate = new JComboBox<>(SampleRate.values());
mComboSampleRate.setEnabled(false);
mComboSampleRate.addActionListener(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
{ {
SampleRate sampleRate = SampleRate sampleRate =
(SampleRate)mComboSampleRate.getSelectedItem(); (SampleRate)mComboSampleRate.getSelectedItem();
try try
{ {
mController.setSampleRate( sampleRate ); mController.setSampleRate(sampleRate);
save(); save();
} }
catch ( SourceException | LibUsbException eSampleRate ) catch(SourceException | LibUsbException eSampleRate)
{ {
JOptionPane.showMessageDialog( JOptionPane.showMessageDialog(
R820TTunerEditor.this, R820TTunerEditor.this,
"R820T Tuner Controller - couldn't apply the sample " "R820T Tuner Controller - couldn't apply the sample "
+ "rate setting [" + sampleRate.getLabel() + "] " + + "rate setting [" + sampleRate.getLabel() + "] " +
eSampleRate.getLocalizedMessage() ); eSampleRate.getLocalizedMessage());
mLog.error( "R820T Tuner Controller - couldn't apply sample " mLog.error("R820T Tuner Controller - couldn't apply sample "
+ "rate setting [" + sampleRate.getLabel() + "]", + "rate setting [" + sampleRate.getLabel() + "]",
eSampleRate ); eSampleRate);
} }
} }
} ); });
add( new JLabel( "Sample Rate:" ) ); add(new JLabel("Sample Rate:"));
add( mComboSampleRate ); add(mComboSampleRate);
/** /**
* Frequency Correction * Frequency Correction
*/ */
SpinnerModel model = SpinnerModel model =
new SpinnerNumberModel( 0.0, //initial value new SpinnerNumberModel(0.0, //initial value
-1000.0, //min -1000.0, //min
1000.0, //max 1000.0, //max
0.1 ); //step 0.1); //step
mFrequencyCorrection = new JSpinner( model ); mFrequencyCorrection = new JSpinner(model);
mFrequencyCorrection.setEnabled( false ); mFrequencyCorrection.setEnabled(false);
JSpinner.NumberEditor editor = JSpinner.NumberEditor editor =
(JSpinner.NumberEditor)mFrequencyCorrection.getEditor(); (JSpinner.NumberEditor)mFrequencyCorrection.getEditor();
DecimalFormat format = editor.getFormat(); DecimalFormat format = editor.getFormat();
format.setMinimumFractionDigits( 1 ); format.setMinimumFractionDigits(1);
editor.getTextField().setHorizontalAlignment( SwingConstants.CENTER ); editor.getTextField().setHorizontalAlignment(SwingConstants.CENTER);
mFrequencyCorrection.addChangeListener( new ChangeListener() mFrequencyCorrection.addChangeListener(new ChangeListener()
{ {
@Override @Override
public void stateChanged( ChangeEvent e ) public void stateChanged(ChangeEvent e)
{ {
final double value = ((SpinnerNumberModel)mFrequencyCorrection final double value = ((SpinnerNumberModel)mFrequencyCorrection
.getModel()).getNumber().doubleValue(); .getModel()).getNumber().doubleValue();
try try
{ {
mController.setFrequencyCorrection( value ); mController.setFrequencyCorrection(value);
} }
catch ( SourceException e1 ) catch(SourceException e1)
{ {
mLog.error( "Error setting frequency correction value", e1 ); mLog.error("Error setting frequency correction value", e1);
} }
save(); save();
} }
} ); });
add( new JLabel( "PPM:" ) ); add(new JLabel("PPM:"));
add( mFrequencyCorrection ); add(mFrequencyCorrection);
add( new JSeparator( JSeparator.HORIZONTAL ), "span,grow" ); add(new JSeparator(JSeparator.HORIZONTAL), "span,grow");
/** /**
* Gain Controls * Gain Controls
*/ */
add( new JLabel( "Gain" ), "wrap" ); add(new JLabel("Gain"), "wrap");
/* Master Gain Control */ /* Master Gain Control */
mComboMasterGain = new JComboBox<R820TGain>( R820TGain.values() ); mComboMasterGain = new JComboBox<R820TGain>(R820TGain.values());
mComboMasterGain.setEnabled( false ); mComboMasterGain.setEnabled(false);
mComboMasterGain.addActionListener( new ActionListener() mComboMasterGain.addActionListener(new ActionListener()
{ {
@Override @Override
public void actionPerformed( ActionEvent arg0 ) public void actionPerformed(ActionEvent arg0)
{ {
try try
{ {
R820TGain gain = (R820TGain)mComboMasterGain.getSelectedItem(); R820TGain gain = (R820TGain)mComboMasterGain.getSelectedItem();
mController.setGain( (R820TGain)mComboMasterGain.getSelectedItem(), true ); mController.setGain((R820TGain)mComboMasterGain.getSelectedItem(), true);
if( gain == R820TGain.MANUAL ) if(gain == R820TGain.MANUAL)
{ {
mComboMixerGain.setSelectedItem( gain.getMixerGain() ); mComboMixerGain.setSelectedItem(gain.getMixerGain());
mComboMixerGain.setEnabled( true ); mComboMixerGain.setEnabled(true);
mComboLNAGain.setSelectedItem( gain.getLNAGain() ); mComboLNAGain.setSelectedItem(gain.getLNAGain());
mComboLNAGain.setEnabled( true ); mComboLNAGain.setEnabled(true);
mComboVGAGain.setSelectedItem( gain.getVGAGain() ); mComboVGAGain.setSelectedItem(gain.getVGAGain());
mComboVGAGain.setEnabled( true ); mComboVGAGain.setEnabled(true);
} }
else else
{ {
mComboMixerGain.setEnabled( false ); mComboMixerGain.setEnabled(false);
mComboMixerGain.setSelectedItem( gain.getMixerGain() ); mComboMixerGain.setSelectedItem(gain.getMixerGain());
mComboLNAGain.setEnabled( false ); mComboLNAGain.setEnabled(false);
mComboLNAGain.setSelectedItem( gain.getLNAGain() ); mComboLNAGain.setSelectedItem(gain.getLNAGain());
mComboVGAGain.setEnabled( false ); mComboVGAGain.setEnabled(false);
mComboVGAGain.setSelectedItem( gain.getVGAGain() ); mComboVGAGain.setSelectedItem(gain.getVGAGain());
} }
save(); save();
} }
catch ( UsbException e ) catch(UsbException e)
{ {
JOptionPane.showMessageDialog( JOptionPane.showMessageDialog(
R820TTunerEditor.this, R820TTunerEditor.this,
"R820T Tuner Controller - couldn't apply the gain " "R820T Tuner Controller - couldn't apply the gain "
+ "setting - " + e.getLocalizedMessage() ); + "setting - " + e.getLocalizedMessage());
mLog.error( "R820T Tuner Controller - couldn't apply " mLog.error("R820T Tuner Controller - couldn't apply "
+ "gain setting - ", e ); + "gain setting - ", e);
} }
} }
} ); });
mComboMasterGain.setToolTipText( "<html>Select <b>AUTOMATIC</b> for auto " mComboMasterGain.setToolTipText("<html>Select <b>AUTOMATIC</b> for auto "
+ "gain, <b>MANUAL</b> to enable<br> independent control of " + "gain, <b>MANUAL</b> to enable<br> independent control of "
+ "<i>Mixer</i>, <i>LNA</i> and <i>Enhance</i> gain<br>" + "<i>Mixer</i>, <i>LNA</i> and <i>Enhance</i> gain<br>"
+ "settings, or one of the individual gain settings for<br>" + "settings, or one of the individual gain settings for<br>"
+ "semi-manual gain control</html>" ); + "semi-manual gain control</html>");
add( new JLabel( "Master:" ) ); add(new JLabel("Master:"));
add( mComboMasterGain ); add(mComboMasterGain);
/* Mixer Gain Control */ /* Mixer Gain Control */
mComboMixerGain = new JComboBox<R820TMixerGain>( R820TMixerGain.values() ); mComboMixerGain = new JComboBox<R820TMixerGain>(R820TMixerGain.values());
mComboMixerGain.setEnabled( false ); mComboMixerGain.setEnabled(false);
mComboMixerGain.addActionListener( new ActionListener() mComboMixerGain.addActionListener(new ActionListener()
{ {
@Override @Override
public void actionPerformed( ActionEvent arg0 ) public void actionPerformed(ActionEvent arg0)
{ {
try try
{ {
R820TMixerGain mixerGain = R820TMixerGain mixerGain =
(R820TMixerGain)mComboMixerGain.getSelectedItem(); (R820TMixerGain)mComboMixerGain.getSelectedItem();
if( mixerGain == null ) if(mixerGain == null)
{ {
mixerGain = DEFAULT_GAIN.getMixerGain(); mixerGain = DEFAULT_GAIN.getMixerGain();
} }
if( mComboMixerGain.isEnabled() ) if(mComboMixerGain.isEnabled())
{ {
mController.setMixerGain( mixerGain, true ); mController.setMixerGain(mixerGain, true);
} }
save(); save();
} }
catch ( UsbException e ) catch(UsbException e)
{ {
JOptionPane.showMessageDialog( R820TTunerEditor.this, JOptionPane.showMessageDialog(R820TTunerEditor.this,
"R820T Tuner Controller - couldn't apply the mixer " "R820T Tuner Controller - couldn't apply the mixer "
+ "gain setting - " + e.getLocalizedMessage() ); + "gain setting - " + e.getLocalizedMessage());
mLog.error( "R820T Tuner Controller - couldn't apply mixer " mLog.error("R820T Tuner Controller - couldn't apply mixer "
+ "gain setting - ", e ); + "gain setting - ", e);
} }
} }
} ); });
mComboMixerGain.setToolTipText( "<html>Mixer Gain. Set master gain " mComboMixerGain.setToolTipText("<html>Mixer Gain. Set master gain "
+ "to <b>MANUAL</b> to enable adjustment</html>" ); + "to <b>MANUAL</b> to enable adjustment</html>");
add( new JLabel( "Mixer:" ) ); add(new JLabel("Mixer:"));
add( mComboMixerGain ); add(mComboMixerGain);
/* LNA Gain Control */ /* LNA Gain Control */
mComboLNAGain = new JComboBox<R820TLNAGain>( R820TLNAGain.values() ); mComboLNAGain = new JComboBox<R820TLNAGain>(R820TLNAGain.values());
mComboLNAGain.setEnabled( false ); mComboLNAGain.setEnabled(false);
mComboLNAGain.addActionListener( new ActionListener() mComboLNAGain.addActionListener(new ActionListener()
{ {
@Override @Override
public void actionPerformed( ActionEvent arg0 ) public void actionPerformed(ActionEvent arg0)
{ {
try try
{ {
R820TLNAGain lnaGain = R820TLNAGain lnaGain =
(R820TLNAGain)mComboLNAGain.getSelectedItem(); (R820TLNAGain)mComboLNAGain.getSelectedItem();
if ( lnaGain == null ) if(lnaGain == null)
{ {
lnaGain = DEFAULT_GAIN.getLNAGain(); lnaGain = DEFAULT_GAIN.getLNAGain();
} }
if( mComboLNAGain.isEnabled() ) if(mComboLNAGain.isEnabled())
{ {
mController.setLNAGain( lnaGain, true ); mController.setLNAGain(lnaGain, true);
} }
save(); save();
} }
catch ( UsbException e ) catch(UsbException e)
{ {
JOptionPane.showMessageDialog( R820TTunerEditor.this, JOptionPane.showMessageDialog(R820TTunerEditor.this,
"R820T Tuner Controller - couldn't apply the LNA " "R820T Tuner Controller - couldn't apply the LNA "
+ "gain setting - " + e.getLocalizedMessage() ); + "gain setting - " + e.getLocalizedMessage());
mLog.error( "R820T Tuner Controller - couldn't apply LNA " mLog.error("R820T Tuner Controller - couldn't apply LNA "
+ "gain setting - ", e ); + "gain setting - ", e);
} }
} }
} ); });
mComboLNAGain.setToolTipText( "<html>LNA Gain. Set master gain " mComboLNAGain.setToolTipText("<html>LNA Gain. Set master gain "
+ "to <b>MANUAL</b> to enable adjustment</html>" ); + "to <b>MANUAL</b> to enable adjustment</html>");
add( new JLabel( "LNA:" ) ); add(new JLabel("LNA:"));
add( mComboLNAGain ); add(mComboLNAGain);
/* VGA Gain Control */ /* VGA Gain Control */
mComboVGAGain = new JComboBox<R820TVGAGain>( R820TVGAGain.values() ); mComboVGAGain = new JComboBox<R820TVGAGain>(R820TVGAGain.values());
mComboVGAGain.setEnabled( false ); mComboVGAGain.setEnabled(false);
mComboVGAGain.addActionListener( new ActionListener() mComboVGAGain.addActionListener(new ActionListener()
{ {
@Override @Override
public void actionPerformed( ActionEvent arg0 ) public void actionPerformed(ActionEvent arg0)
{ {
try try
{ {
R820TVGAGain vgaGain = R820TVGAGain vgaGain =
(R820TVGAGain)mComboVGAGain.getSelectedItem(); (R820TVGAGain)mComboVGAGain.getSelectedItem();
if( vgaGain == null ) if(vgaGain == null)
{ {
vgaGain = DEFAULT_GAIN.getVGAGain(); vgaGain = DEFAULT_GAIN.getVGAGain();
} }
if( mComboVGAGain.isEnabled() ) if(mComboVGAGain.isEnabled())
{ {
mController.setVGAGain( vgaGain, true ); mController.setVGAGain(vgaGain, true);
} }
save(); save();
} }
catch ( UsbException e ) catch(UsbException e)
{ {
JOptionPane.showMessageDialog( R820TTunerEditor.this, JOptionPane.showMessageDialog(R820TTunerEditor.this,
"R820T Tuner Controller - couldn't apply the VGA " "R820T Tuner Controller - couldn't apply the VGA "
+ "gain setting - " + e.getLocalizedMessage() ); + "gain setting - " + e.getLocalizedMessage());
mLog.error( "R820T Tuner Controller - couldn't apply VGA " mLog.error("R820T Tuner Controller - couldn't apply VGA "
+ "gain setting", e ); + "gain setting", e);
} }
} }
} ); });
mComboVGAGain.setToolTipText( "<html>VGA Gain. Set master gain " mComboVGAGain.setToolTipText("<html>VGA Gain. Set master gain "
+ "to <b>MANUAL</b> to enable adjustment</html>" ); + "to <b>MANUAL</b> to enable adjustment</html>");
add( new JLabel( "VGA:" ) ); add(new JLabel("VGA:"));
add( mComboVGAGain ); add(mComboVGAGain);
} }
/** /**
* Sets each of the tuner configuration controls to the enabled argument state * Sets each of the tuner configuration controls to the enabled argument state
*/ */
private void setControlsEnabled( boolean enabled ) private void setControlsEnabled(boolean enabled)
{ {
if( mConfigurationName.isEnabled() != enabled ) if(mConfigurationName.isEnabled() != enabled)
{ {
mConfigurationName.setEnabled( enabled ); mConfigurationName.setEnabled(enabled);
} }
if( mTunerInfo.isEnabled() != enabled ) if(mTunerInfo.isEnabled() != enabled)
{ {
mTunerInfo.setEnabled( enabled ); mTunerInfo.setEnabled(enabled);
} }
if( mFrequencyCorrection.isEnabled() != enabled ) if(mFrequencyCorrection.isEnabled() != enabled)
{ {
mFrequencyCorrection.setEnabled( enabled ); mFrequencyCorrection.setEnabled(enabled);
} }
if( mComboSampleRate.isEnabled() != enabled ) if(mComboSampleRate.isEnabled() != enabled)
{ {
mComboSampleRate.setEnabled( enabled ); mComboSampleRate.setEnabled(enabled);
} }
if( mComboMasterGain.isEnabled() != enabled ) if(mComboMasterGain.isEnabled() != enabled)
{ {
mComboMasterGain.setEnabled( enabled ); mComboMasterGain.setEnabled(enabled);
} }
if( mComboMixerGain.isEnabled() != enabled ) if(mComboMixerGain.isEnabled() != enabled)
{ {
mComboMixerGain.setEnabled( enabled ); mComboMixerGain.setEnabled(enabled);
} }
if( mComboLNAGain.isEnabled() != enabled ) if(mComboLNAGain.isEnabled() != enabled)
{ {
mComboLNAGain.setEnabled( enabled ); mComboLNAGain.setEnabled(enabled);
} }
if( mComboVGAGain.isEnabled() != enabled ) if(mComboVGAGain.isEnabled() != enabled)
{ {
mComboVGAGain.setEnabled( enabled ); mComboVGAGain.setEnabled(enabled);
} }
} }
@@ -445,39 +460,39 @@ public class R820TTunerEditor extends TunerConfigurationEditor
RTL2832TunerController.Descriptor descriptor = mController.getDescriptor(); RTL2832TunerController.Descriptor descriptor = mController.getDescriptor();
sb.append( "<html><h3>RTL-2832 with R820T Tuner</h3>" ); sb.append("<html><h3>RTL-2832 with R820T Tuner</h3>");
if( descriptor == null ) if(descriptor == null)
{ {
sb.append( "No EEPROM Descriptor Available" ); sb.append("No EEPROM Descriptor Available");
} }
else else
{ {
sb.append( "<b>USB ID: </b>" ); sb.append("<b>USB ID: </b>");
sb.append( descriptor.getVendorID() ); sb.append(descriptor.getVendorID());
sb.append( ":" ); sb.append(":");
sb.append( descriptor.getProductID() ); sb.append(descriptor.getProductID());
sb.append( "<br>" ); sb.append("<br>");
sb.append( "<b>Vendor: </b>" ); sb.append("<b>Vendor: </b>");
sb.append( descriptor.getVendorLabel() ); sb.append(descriptor.getVendorLabel());
sb.append( "<br>" ); sb.append("<br>");
sb.append( "<b>Product: </b>" ); sb.append("<b>Product: </b>");
sb.append( descriptor.getProductLabel() ); sb.append(descriptor.getProductLabel());
sb.append( "<br>" ); sb.append("<br>");
sb.append( "<b>Serial: </b>" ); sb.append("<b>Serial: </b>");
sb.append( descriptor.getSerial() ); sb.append(descriptor.getSerial());
sb.append( "<br>" ); sb.append("<br>");
sb.append( "<b>IR Enabled: </b>" ); sb.append("<b>IR Enabled: </b>");
sb.append( descriptor.irEnabled() ); sb.append(descriptor.irEnabled());
sb.append( "<br>" ); sb.append("<br>");
sb.append( "<b>Remote Wake: </b>" ); sb.append("<b>Remote Wake: </b>");
sb.append( descriptor.remoteWakeupEnabled() ); sb.append(descriptor.remoteWakeupEnabled());
sb.append( "<br>" ); sb.append("<br>");
} }
return sb.toString(); return sb.toString();
@@ -486,68 +501,71 @@ public class R820TTunerEditor extends TunerConfigurationEditor
@Override @Override
public void save() public void save()
{ {
if( hasItem() && !mLoading ) if(hasItem() && !mLoading)
{ {
R820TTunerConfiguration config = getConfiguration(); R820TTunerConfiguration config = getConfiguration();
config.setName( mConfigurationName.getText() ); config.setName(mConfigurationName.getText());
double value = ((SpinnerNumberModel)mFrequencyCorrection double value = ((SpinnerNumberModel)mFrequencyCorrection
.getModel()).getNumber().doubleValue(); .getModel()).getNumber().doubleValue();
config.setFrequencyCorrection( value ); config.setFrequencyCorrection(value);
config.setSampleRate( (SampleRate)mComboSampleRate.getSelectedItem() ); config.setSampleRate((SampleRate)mComboSampleRate.getSelectedItem());
R820TGain gain = (R820TGain)mComboMasterGain.getSelectedItem(); R820TGain gain = (R820TGain)mComboMasterGain.getSelectedItem();
config.setMasterGain( gain ); config.setMasterGain(gain);
R820TMixerGain mixerGain = (R820TMixerGain)mComboMixerGain.getSelectedItem(); R820TMixerGain mixerGain = (R820TMixerGain)mComboMixerGain.getSelectedItem();
config.setMixerGain( mixerGain ); config.setMixerGain(mixerGain);
R820TLNAGain lnaGain = (R820TLNAGain)mComboLNAGain.getSelectedItem(); R820TLNAGain lnaGain = (R820TLNAGain)mComboLNAGain.getSelectedItem();
config.setLNAGain( lnaGain ); config.setLNAGain(lnaGain);
R820TVGAGain vgaGain = (R820TVGAGain)mComboVGAGain.getSelectedItem(); R820TVGAGain vgaGain = (R820TVGAGain)mComboVGAGain.getSelectedItem();
config.setVGAGain( vgaGain ); config.setVGAGain(vgaGain);
getTunerConfigurationModel().broadcast( getTunerConfigurationModel().broadcast(
new TunerConfigurationEvent( getConfiguration(), TunerConfigurationEvent.Event.CHANGE ) ); new TunerConfigurationEvent(getConfiguration(), TunerConfigurationEvent.Event.CHANGE));
} }
} }
@Override @Override
public void setItem( TunerConfiguration tunerConfiguration ) public void setItem(TunerConfiguration tunerConfiguration)
{ {
super.setItem( tunerConfiguration ); super.setItem(tunerConfiguration);
//Toggle loading so that we don't fire a change event and schedule a settings file save //Toggle loading so that we don't fire a change event and schedule a settings file save
mLoading = true; mLoading = true;
if( hasItem() ) if(hasItem())
{ {
R820TTunerConfiguration config = getConfiguration(); R820TTunerConfiguration config = getConfiguration();
if( tunerConfiguration.isAssigned() ) if(tunerConfiguration.isAssigned())
{ {
setControlsEnabled( true ); setControlsEnabled(true);
mConfigurationName.setText( config.getName() ); mConfigurationName.setText(config.getName());
mFrequencyCorrection.setValue( config.getFrequencyCorrection() ); mFrequencyCorrection.setValue(config.getFrequencyCorrection());
mComboSampleRate.setSelectedItem( config.getSampleRate() ); mComboSampleRate.setSelectedItem(config.getSampleRate());
mComboMasterGain.setSelectedItem( config.getMasterGain() ); mComboMasterGain.setSelectedItem(config.getMasterGain());
mComboMixerGain.setSelectedItem( config.getMixerGain() ); mComboMixerGain.setSelectedItem(config.getMixerGain());
mComboLNAGain.setSelectedItem( config.getLNAGain() ); mComboLNAGain.setSelectedItem(config.getLNAGain());
mComboVGAGain.setSelectedItem( config.getVGAGain() ); mComboVGAGain.setSelectedItem(config.getVGAGain());
//Update enabled state to reflect when frequency and sample rate controls are locked
mComboSampleRate.setEnabled(!mController.isLocked());
} }
else else
{ {
setControlsEnabled( false ); setControlsEnabled(false);
mConfigurationName.setText( config.getName() ); mConfigurationName.setText(config.getName());
} }
} }
else else
{ {
setControlsEnabled( false ); setControlsEnabled(false);
mConfigurationName.setText( "" ); mConfigurationName.setText("");
} }
mLoading = false; mLoading = false;