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

Work in progress.

Browse Source 
-Started work on new channel editor channel viewer/controller
-Removed a number of unused buffer package classes
-Moved automatic frequency control to be a module and removed special
handling
-Added IUnfilteredRealBufferListener & Provider interfaces
-Completely removed the ResourceManager class
This commit is contained in:
denny
2016-01-10 18:02:04 -05:00
parent c405ddad96
commit 4be63d4b95
197 changed files with 4181 additions and 4439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/module/decode/mpt1327/MPT1327ConfigEditor.java
View File

@@ -31,7 +31,7 @@ import module.decode.DecodeEditor;
import module.decode.config.DecodeConfiguration;
import module.decode.mpt1327.MPT1327Decoder.Sync;
import playlist.PlaylistManager;
import controller.channel.ChannelNode;
import controller.channel.Channel;
import controller.channel.map.ChannelMap;
public class MPT1327ConfigEditor extends DecodeEditor
@@ -44,16 +44,16 @@ public class MPT1327ConfigEditor extends DecodeEditor
private JSlider mCallTimeout;
private JLabel mTrafficChannelPoolSizeLabel;
private JSlider mTrafficChannelPoolSize;
private ChannelNode mChannelNode;
private Channel mChannel;
private PlaylistManager mPlaylistManager;
public MPT1327ConfigEditor( DecodeConfiguration config,
ChannelNode channelNode,
Channel channel,
PlaylistManager playlistManager )
{
super( config );
mChannelNode = channelNode;
mChannel = channel;
mPlaylistManager = playlistManager;
initGUI();
@@ -140,7 +140,7 @@ public class MPT1327ConfigEditor extends DecodeEditor
add( mTrafficChannelPoolSizeLabel );
add( mTrafficChannelPoolSize, "wrap,grow" );
reset();
// reset();
}
@Override
@@ -167,36 +167,35 @@ public class MPT1327ConfigEditor extends DecodeEditor
config.setTrafficChannelPoolSize( mTrafficChannelPoolSize.getValue() );
}
@Override
public void reset()
{
DecodeConfigMPT1327 config = (DecodeConfigMPT1327)mConfig;
String name = config.getChannelMapName();
ChannelMap selected = null;
if( name != null )
{
for( ChannelMap map: mChannelNode.getModel().getResourceManager()
.getPlaylistManager().getPlayist().getChannelMapList()
.getChannelMap() )
{
if( map.getName().equalsIgnoreCase( name ) )
{
selected = map;
}
}
}
mComboChannelMaps.setSelectedItem( selected );
mComboChannelMaps.requestFocus();
mComboChannelMaps.requestFocusInWindow();
mComboSync.setSelectedItem( config.getSync() );
mCallTimeout.setValue( config.getCallTimeout() );
mTrafficChannelPoolSize.setValue( config.getTrafficChannelPoolSize() );
}
// @Override
// public void reset()
// {
// DecodeConfigMPT1327 config = (DecodeConfigMPT1327)mConfig;
//
// String name = config.getChannelMapName();
//
// ChannelMap selected = null;
//
// if( name != null )
// {
// for( ChannelMap map: mPlaylistManager.getPlayist().getChannelMapList()
// .getChannelMap() )
// {
// if( map.getName().equalsIgnoreCase( name ) )
// {
// selected = map;
// }
// }
// }
//
// mComboChannelMaps.setSelectedItem( selected );
// mComboChannelMaps.requestFocus();
// mComboChannelMaps.requestFocusInWindow();
//
// mComboSync.setSelectedItem( config.getSync() );
//
// mCallTimeout.setValue( config.getCallTimeout() );
//
// mTrafficChannelPoolSize.setValue( config.getTrafficChannelPoolSize() );
// }
}

6
src/module/decode/mpt1327/MPT1327Decoder.java
View File

@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
import sample.Broadcaster;
import sample.Listener;
import sample.real.IRealBufferListener;
import sample.real.IFilteredRealBufferListener;
import sample.real.RealBuffer;
import alias.AliasList;
import bits.MessageFramer;
@@ -55,7 +55,7 @@ import dsp.fsk.FSK2Decoder.Output;
* traffic messages.
*/
public class MPT1327Decoder extends Decoder
implements IRealBufferListener, Instrumentable
implements IFilteredRealBufferListener, Instrumentable
{
private final static Logger mLog = LoggerFactory.getLogger( MPT1327Decoder.class );
@@ -146,7 +146,7 @@ public class MPT1327Decoder extends Decoder
}
@Override
public Listener<RealBuffer> getRealBufferListener()
public Listener<RealBuffer> getFilteredRealBufferListener()
{
return mDecimationFilter;
}