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

Channel editor and sub editors updates.

Browse Source
This commit is contained in:
denny
2016-02-15 20:12:23 -05:00
parent 691e4c3383
commit c8328b3eff
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controller/channel/ChannelEditor.java
View File

@@ -52,7 +52,7 @@ public class ChannelEditor extends JPanel
private final static Logger mLog = LoggerFactory.getLogger( ChannelEditor.class ); private final static Logger mLog = LoggerFactory.getLogger( ChannelEditor.class );
private ChannelConfigurationEditor mNameConfigurationEditor; private NameConfigurationEditor mNameConfigurationEditor;
private DecodeComponentEditor mDecodeEditor; private DecodeComponentEditor mDecodeEditor;
private AuxDecodeComponentEditor mAuxDecodeEditor; private AuxDecodeComponentEditor mAuxDecodeEditor;
private EventLogComponentEditor mEventLogEditor; private EventLogComponentEditor mEventLogEditor;

5
src/module/decode/AuxDecodeComponentEditor.java
View File

@@ -23,6 +23,7 @@ import java.util.List;
import javax.swing.JCheckBox; import javax.swing.JCheckBox;
import net.miginfocom.swing.MigLayout;
import module.decode.config.AuxDecodeConfiguration; import module.decode.config.AuxDecodeConfiguration;
import controller.channel.Channel; import controller.channel.Channel;
import controller.channel.ChannelConfigurationEditor; import controller.channel.ChannelConfigurationEditor;
@@ -38,6 +39,8 @@ public class AuxDecodeComponentEditor extends ChannelConfigurationEditor
public AuxDecodeComponentEditor() public AuxDecodeComponentEditor()
{ {
setLayout( new MigLayout( "fill,wrap 1", "[]", "[][][][][grow]" ) );
List<DecoderType> decoders = DecoderType.getAuxDecoders(); List<DecoderType> decoders = DecoderType.getAuxDecoders();
Collections.sort( decoders ); Collections.sort( decoders );
@@ -46,7 +49,7 @@ public class AuxDecodeComponentEditor extends ChannelConfigurationEditor
{ {
AuxDecoderCheckBox control = new AuxDecoderCheckBox( decoder ); AuxDecoderCheckBox control = new AuxDecoderCheckBox( decoder );
add( control, "wrap" ); add( control );
mControls.add( control ); mControls.add( control );
} }

9
src/module/log/EventLogComponentEditor.java
View File

@@ -21,6 +21,7 @@ import java.util.List;
import javax.swing.JCheckBox; import javax.swing.JCheckBox;
import net.miginfocom.swing.MigLayout;
import module.log.config.EventLogConfiguration; import module.log.config.EventLogConfiguration;
import controller.channel.Channel; import controller.channel.Channel;
import controller.channel.ChannelConfigurationEditor; import controller.channel.ChannelConfigurationEditor;
@@ -38,9 +39,11 @@ public class EventLogComponentEditor extends ChannelConfigurationEditor
public EventLogComponentEditor() public EventLogComponentEditor()
{ {
add( mBinaryLogger, "span" ); setLayout( new MigLayout( "fill,wrap 1", "[]", "[][][][grow]" ) );
add( mDecodedLogger, "span" );
add( mCallEventLogger, "span" ); add( mBinaryLogger );
add( mDecodedLogger );
add( mCallEventLogger );
} }
/** /**

9
src/record/RecordComponentEditor.java
View File

@@ -21,6 +21,7 @@ import java.util.List;
import javax.swing.JCheckBox; import javax.swing.JCheckBox;
import net.miginfocom.swing.MigLayout;
import record.config.RecordConfiguration; import record.config.RecordConfiguration;
import controller.channel.Channel; import controller.channel.Channel;
import controller.channel.ChannelConfigurationEditor; import controller.channel.ChannelConfigurationEditor;
@@ -38,9 +39,11 @@ public class RecordComponentEditor extends ChannelConfigurationEditor
public RecordComponentEditor() public RecordComponentEditor()
{ {
add( mAudioRecorder, "span" ); setLayout( new MigLayout( "fill,wrap 1", "[]", "[][][][grow]" ) );
add( mBasebandRecorder, "span" );
add( mTrafficBasebandRecorder, "span" ); add( mAudioRecorder );
add( mBasebandRecorder );
add( mTrafficBasebandRecorder );
} }
@Override @Override