mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-16 18:47:33 -05:00
Co-authored-by: Denny <denny@denny-desktop>
This commit is contained in:
@@ -114,11 +114,20 @@ public class DecodeEventLogger extends EventLogger implements IDecodeEventListen
|
|||||||
|
|
||||||
if(toIdentifiers != null && !toIdentifiers.isEmpty())
|
if(toIdentifiers != null && !toIdentifiers.isEmpty())
|
||||||
{
|
{
|
||||||
Identifier identifier = event.getIdentifierCollection().getIdentifier(IdentifierClass.CONFIGURATION,Form.ALIAS_LIST,Role.ANY);
|
Identifier identifier = event.getIdentifierCollection()
|
||||||
|
.getIdentifier(IdentifierClass.CONFIGURATION,Form.ALIAS_LIST,Role.ANY);
|
||||||
mAliasList = mAliasModel.getAliasList((AliasListConfigurationIdentifier)identifier);
|
mAliasList = mAliasModel.getAliasList((AliasListConfigurationIdentifier)identifier);
|
||||||
|
|
||||||
String mystring = (!mAliasList.getAliases(toIdentifiers.get(0)).isEmpty()) ? mAliasList.getAliases(toIdentifiers.get(0)).get(0).toString() : "";
|
if(mAliasList != null)
|
||||||
sb.append(",\"").append(mystring).append(" (").append(toIdentifiers.get(0)).append(")\"");
|
{
|
||||||
|
String mystring = (!mAliasList.getAliases(toIdentifiers.get(0)).isEmpty()) ?
|
||||||
|
mAliasList.getAliases(toIdentifiers.get(0)).get(0).toString() : "";
|
||||||
|
sb.append(",\"").append(mystring).append(" (").append(toIdentifiers.get(0)).append(")\"");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sb.append(",\"\"");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -129,11 +138,13 @@ public class DecodeEventLogger extends EventLogger implements IDecodeEventListen
|
|||||||
|
|
||||||
sb.append(",\"").append(descriptor != null ? descriptor : "").append("\"");
|
sb.append(",\"").append(descriptor != null ? descriptor : "").append("\"");
|
||||||
|
|
||||||
Identifier frequency = event.getIdentifierCollection().getIdentifier(IdentifierClass.CONFIGURATION, Form.CHANNEL_FREQUENCY, Role.ANY);
|
Identifier frequency = event.getIdentifierCollection()
|
||||||
|
.getIdentifier(IdentifierClass.CONFIGURATION, Form.CHANNEL_FREQUENCY, Role.ANY);
|
||||||
|
|
||||||
if(frequency instanceof FrequencyConfigurationIdentifier)
|
if(frequency instanceof FrequencyConfigurationIdentifier)
|
||||||
{
|
{
|
||||||
sb.append(",\"").append(mFrequencyFormat.format(((FrequencyConfigurationIdentifier)frequency).getValue() / 1e6d)).append("\"");
|
sb.append(",\"").append(mFrequencyFormat
|
||||||
|
.format(((FrequencyConfigurationIdentifier)frequency).getValue() / 1e6d)).append("\"");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user