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

Work in progress - updates channel component editors and changes

Browse Source 
functionality so that the editor starts up without a channel displayed
and as each channel row is selected in the channels table, the editor is
updated with the channel configuration.

Likewise, the channel editor is now a channel event listener on the
channel model and will maintain channel state if the user changes
channel configuration in any of the external channel controllers like
the spectral display or the channel list.
This commit is contained in:
denny
2016-01-11 20:35:53 -05:00
parent 4be63d4b95
commit 7d1ec344de
13 changed files with 381 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/record/RecordComponentEditor.java
View File

@@ -17,15 +17,16 @@
******************************************************************************/
package record;
import java.util.List;
import javax.swing.JCheckBox;
import record.config.RecordConfiguration;
import controller.channel.AbstractChannelEditor;
import controller.channel.Channel;
import controller.channel.ChannelConfigurationEditor;
import controller.channel.ConfigurationValidationException;
public class RecordComponentEditor extends AbstractChannelEditor
public class RecordComponentEditor extends ChannelConfigurationEditor
{
private static final long serialVersionUID = 1L;
@@ -33,74 +34,63 @@ public class RecordComponentEditor extends AbstractChannelEditor
private JCheckBox mBasebandRecorder = new JCheckBox( "Baseband I/Q" );
private JCheckBox mTrafficBasebandRecorder = new JCheckBox( "Traffic Channel Baseband I/Q" );
public RecordComponentEditor( Channel channel )
private Channel mChannel;
public RecordComponentEditor()
{
super( channel );
add( mAudioRecorder, "span" );
add( mBasebandRecorder, "span" );
add( mTrafficBasebandRecorder, "span" );
reset();
}
@Override
public void save()
{
RecordConfiguration config = getChannel().getRecordConfiguration();
config.clearRecorders();
if( mAudioRecorder.isSelected() )
if( mChannel != null )
{
config.addRecorder( RecorderType.AUDIO );
RecordConfiguration config = mChannel.getRecordConfiguration();
config.clearRecorders();
if( mAudioRecorder.isSelected() )
{
config.addRecorder( RecorderType.AUDIO );
}
if( mBasebandRecorder.isSelected() )
{
config.addRecorder( RecorderType.BASEBAND );
}
if( mTrafficBasebandRecorder.isSelected() )
{
config.addRecorder( RecorderType.TRAFFIC_BASEBAND );
}
}
if( mBasebandRecorder.isSelected() )
{
config.addRecorder( RecorderType.BASEBAND );
}
if( mTrafficBasebandRecorder.isSelected() )
{
config.addRecorder( RecorderType.TRAFFIC_BASEBAND );
}
}
@Override
public void reset()
{
javax.swing.SwingUtilities.invokeLater(new Runnable()
{
@Override
public void run()
{
RecordConfiguration config = getChannel().getRecordConfiguration();
mAudioRecorder.setSelected( config.getRecorders()
.contains( RecorderType.AUDIO ) );
mBasebandRecorder.setSelected( config.getRecorders()
.contains( RecorderType.BASEBAND ) );
mTrafficBasebandRecorder.setSelected( config.getRecorders()
.contains( RecorderType.TRAFFIC_BASEBAND ) );
}
});
}
@Override
public void setConfiguration( Channel channel )
{
// TODO Auto-generated method stub
mChannel = channel;
if( mChannel != null )
{
List<RecorderType> recorders = mChannel.getRecordConfiguration().getRecorders();
mAudioRecorder.setSelected( recorders.contains( RecorderType.AUDIO ) );
mBasebandRecorder.setSelected( recorders.contains( RecorderType.BASEBAND ) );
mTrafficBasebandRecorder.setSelected( recorders.contains( RecorderType.TRAFFIC_BASEBAND ) );
}
else
{
mAudioRecorder.setSelected( false );
mBasebandRecorder.setSelected( false );
mTrafficBasebandRecorder.setSelected( false );
}
}
@Override
public void validateConfiguration() throws ConfigurationValidationException
{
// TODO Auto-generated method stub
}
}

7
src/record/config/RecordConfiguration.java
View File

@@ -18,6 +18,7 @@
package record.config;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
@@ -28,19 +29,19 @@ import controller.config.Configuration;
@XmlRootElement( name = "record_configuration" )
public class RecordConfiguration extends Configuration
{
private ArrayList<RecorderType> mRecorders = new ArrayList<RecorderType>();
private List<RecorderType> mRecorders = new ArrayList<>();
public RecordConfiguration()
{
}
@XmlElement( name = "recorder" )
public ArrayList<RecorderType> getRecorders()
public List<RecorderType> getRecorders()
{
return mRecorders;
}
public void setRecorders( ArrayList<RecorderType> recorders )
public void setRecorders( List<RecorderType> recorders )
{
mRecorders = recorders;
}