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

Merge pull request #425 from DSheirer/417-channel-overflow-state-processing

Browse Source 
417 Channel Overflow State Processing - Part 2
This commit is contained in:
Denny Sheirer
2018-09-16 10:23:15 -04:00
committed by GitHub
parent 84d0b827d8 9e1de922e4
commit 58ecb83e2c
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/io/github/dsheirer/channel/metadata/ChannelMetadataModel.java
View File

@@ -18,6 +18,8 @@ package io.github.dsheirer.channel.metadata;
import io.github.dsheirer.channel.state.State; import io.github.dsheirer.channel.state.State;
import io.github.dsheirer.controller.channel.Channel; import io.github.dsheirer.controller.channel.Channel;
import io.github.dsheirer.sample.Listener; import io.github.dsheirer.sample.Listener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.swing.table.AbstractTableModel; import javax.swing.table.AbstractTableModel;
import java.awt.EventQueue; import java.awt.EventQueue;
@@ -29,6 +31,8 @@ import java.util.Map;
public class ChannelMetadataModel extends AbstractTableModel implements Listener<MutableMetadataChangeEvent> public class ChannelMetadataModel extends AbstractTableModel implements Listener<MutableMetadataChangeEvent>
{ {
private final static Logger mLog = LoggerFactory.getLogger(ChannelMetadataModel.class);
private final DecimalFormat FREQUENCY_FORMATTER = new DecimalFormat( "#.00000" ); private final DecimalFormat FREQUENCY_FORMATTER = new DecimalFormat( "#.00000" );
public static final int COLUMN_STATE = 0; public static final int COLUMN_STATE = 0;
@@ -163,14 +167,7 @@ public class ChannelMetadataModel extends AbstractTableModel implements Listener
switch(columnIndex) switch(columnIndex)
{ {
case COLUMN_STATE: case COLUMN_STATE:
if(metadata.isBufferOverflow()) return metadata.getState();
{
return metadata.getState() + " *OVERFLOW*";
}
else
{
return metadata.getState();
}
case COLUMN_DECODER: case COLUMN_DECODER:
if(metadata.hasPrimaryDecoderType()) if(metadata.hasPrimaryDecoderType())
{ {
@@ -188,7 +185,11 @@ public class ChannelMetadataModel extends AbstractTableModel implements Listener
return null; return null;
case COLUMN_MESSAGE: case COLUMN_MESSAGE:
if(metadata.hasMessageType() | metadata.hasMessage()) if(metadata.isBufferOverflow())
{
return "**OVERFLOW**";
}
else if(metadata.hasMessageType() || metadata.hasMessage())
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
if(metadata.hasMessageType()) if(metadata.hasMessageType())
@@ -252,6 +253,7 @@ public class ChannelMetadataModel extends AbstractTableModel implements Listener
case CHANNEL_STATE: case CHANNEL_STATE:
fireTableCellUpdated(rowIndex, COLUMN_STATE); fireTableCellUpdated(rowIndex, COLUMN_STATE);
break; break;
case BUFFER_OVERFLOW:
case MESSAGE: case MESSAGE:
case MESSAGE_TYPE: case MESSAGE_TYPE:
fireTableCellUpdated(rowIndex, COLUMN_MESSAGE); fireTableCellUpdated(rowIndex, COLUMN_MESSAGE);

6
src/main/java/io/github/dsheirer/channel/state/State.java
View File

@@ -175,4 +175,10 @@ public enum State
{ {
return mDisplayValue; return mDisplayValue;
} }
@Override
public String toString()
{
return mDisplayValue;
}
} }