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

Resolved issue with LTR-Net talkgroup alias labels not displaying in the Activity Summary.

Browse Source
This commit is contained in:
dennis.sheirer
2014-05-02 12:41:38 +00:00
parent da1db8a804
commit 30f14e735f
2 changed files with 4 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/decode/ltrnet/LTRNetActivitySummary.java
View File

@@ -71,7 +71,7 @@ public class LTRNetActivitySummary implements ActivitySummaryProvider
{
case CA_STRT:
case CA_ENDD:
String talkgroup = ltr.getTalkgroupID( false );
String talkgroup = ltr.getTalkgroupID();
if( mTalkgroupsFirstHeard.contains( talkgroup ) )
{
@@ -298,7 +298,7 @@ public class LTRNetActivitySummary implements ActivitySummaryProvider
String tgid = it.next();
sb.append( " " );
sb.append( formatTalkgroup( tgid ) );
sb.append( tgid );
sb.append( " " );
Alias alias = mAliasList.getTalkgroupAlias( tgid );
@@ -401,24 +401,4 @@ public class LTRNetActivitySummary implements ActivitySummaryProvider
return sb.toString();
}
public static String formatTalkgroup( String talkgroup )
{
StringBuilder sb = new StringBuilder();
if( talkgroup.length() == 6 )
{
sb.append( talkgroup.substring( 0, 1 ) );
sb.append( "-" );
sb.append( talkgroup.substring( 1, 3 ) );
sb.append( "-" );
sb.append( talkgroup.substring( 3, 6 ) );
return sb.toString();
}
else
{
return talkgroup;
}
}
}

19
src/decode/ltrnet/LTRNetOSWMessage.java
View File

@@ -241,28 +241,13 @@ public class LTRNetOSWMessage extends LTRNetMessage
}
public String getTalkgroupID()
{
return getTalkgroupID( true );
}
public String getTalkgroupID( boolean format )
{
StringBuilder sb = new StringBuilder();
sb.append( getArea() );
if( format )
{
sb.append( "-" );
}
sb.append( "-" );
sb.append( format( getHomeRepeater(), 2 ) );
if( format )
{
sb.append( "-" );
}
sb.append( "-" );
sb.append( format( getGroup(), 3 ) );
return sb.toString();