mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-19 20:17:25 -05:00
Updated Call Event handling/display for all decoders and updated channel display values for all decoders.
- Call events now show start-stop timestamps. (or START-In Progress if call is ongoing ) - Call start/stop events are now on the same event line. - Channel panels now display site and/or channel info - LTR call events are limited to CALLs on the current LCN, in order to cut down on false call events resulting from noise. - Passport display channels now show site/channel. - Changed default window used by the DFTProcessor to Cosine, which doesn't have as much FFT bin leakage.
This commit is contained in:
@@ -26,7 +26,8 @@ import decode.DecoderType;
|
|||||||
|
|
||||||
public abstract class CallEvent
|
public abstract class CallEvent
|
||||||
{
|
{
|
||||||
protected long mEventTime = System.currentTimeMillis();
|
protected long mEventStart = System.currentTimeMillis();
|
||||||
|
protected long mEventEnd;
|
||||||
|
|
||||||
private SimpleDateFormat mSDF = new SimpleDateFormat( "yyyyMMdd','HHmmss" );
|
private SimpleDateFormat mSDF = new SimpleDateFormat( "yyyyMMdd','HHmmss" );
|
||||||
|
|
||||||
@@ -52,6 +53,11 @@ public abstract class CallEvent
|
|||||||
mDetails = details;
|
mDetails = details;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setEnd( long end )
|
||||||
|
{
|
||||||
|
mEventEnd = end;
|
||||||
|
}
|
||||||
|
|
||||||
public DecoderType getDecoderType()
|
public DecoderType getDecoderType()
|
||||||
{
|
{
|
||||||
return mDecoderType;
|
return mDecoderType;
|
||||||
@@ -77,9 +83,14 @@ public abstract class CallEvent
|
|||||||
return mAliasList != null;
|
return mAliasList != null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public long getEventTime()
|
public long getEventStartTime()
|
||||||
{
|
{
|
||||||
return mEventTime;
|
return mEventStart;
|
||||||
|
}
|
||||||
|
|
||||||
|
public long getEventEndTime()
|
||||||
|
{
|
||||||
|
return mEventEnd;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getFromID()
|
public String getFromID()
|
||||||
@@ -122,7 +133,8 @@ public abstract class CallEvent
|
|||||||
|
|
||||||
public static String getCSVHeader()
|
public static String getCSVHeader()
|
||||||
{
|
{
|
||||||
return "DATE,TIME,DECODER,EVENT,FROM,FROM_ALIAS,TO,TO_ALIAS,"
|
return "START_DATE,START_TIME,END_DATE,END_TIME,"
|
||||||
|
+ "DECODER,EVENT,FROM,FROM_ALIAS,TO,TO_ALIAS,"
|
||||||
+ "CHANNEL,FREQUENCY,DETAILS";
|
+ "CHANNEL,FREQUENCY,DETAILS";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -131,7 +143,16 @@ public abstract class CallEvent
|
|||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
|
|
||||||
sb.append( "'" );
|
sb.append( "'" );
|
||||||
sb.append( mSDF.format( new Date( getEventTime() ) ) );
|
sb.append( mSDF.format( new Date( getEventStartTime() ) ) );
|
||||||
|
sb.append( "','" );
|
||||||
|
if( mEventEnd != 0 )
|
||||||
|
{
|
||||||
|
sb.append( mSDF.format( new Date( getEventEndTime() ) ) );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sb.append( "','" );
|
||||||
|
}
|
||||||
sb.append( "','" );
|
sb.append( "','" );
|
||||||
sb.append( getDecoderType().toString() );
|
sb.append( getDecoderType().toString() );
|
||||||
sb.append( "','" );
|
sb.append( "','" );
|
||||||
@@ -189,11 +210,11 @@ public abstract class CallEvent
|
|||||||
public enum CallEventType
|
public enum CallEventType
|
||||||
{
|
{
|
||||||
ACKNOWLEDGE( "Acknowledge" ),
|
ACKNOWLEDGE( "Acknowledge" ),
|
||||||
CALL_DETECT( "Call Detect" ),
|
CALL( "Call" ),
|
||||||
CALL_START( "Call Start" ),
|
|
||||||
CALL_START_UNIQUE_ID( "Call Start" ),
|
|
||||||
CALL_START_NO_TUNER( "Call - No Tuner" ),
|
|
||||||
CALL_END( "Call End" ),
|
CALL_END( "Call End" ),
|
||||||
|
CALL_DETECT( "Call Detect" ),
|
||||||
|
CALL_UNIQUE_ID( "UID Call" ),
|
||||||
|
CALL_NO_TUNER( "Call - No Tuner" ),
|
||||||
CALL_TIMEOUT( "Call Timeout" ),
|
CALL_TIMEOUT( "Call Timeout" ),
|
||||||
EMERGENCY( "EMERGENCY" ),
|
EMERGENCY( "EMERGENCY" ),
|
||||||
GPS( "GPS" ),
|
GPS( "GPS" ),
|
||||||
@@ -205,7 +226,8 @@ public abstract class CallEvent
|
|||||||
REQUEST( "Request" ),
|
REQUEST( "Request" ),
|
||||||
SDM( "SDM" ),
|
SDM( "SDM" ),
|
||||||
STATUS( "Status" ),
|
STATUS( "Status" ),
|
||||||
UNKNOWN( "Unknown" );
|
UNKNOWN( "Unknown" ),
|
||||||
|
INVALID( "Invalid" );
|
||||||
|
|
||||||
private String mLabel;
|
private String mLabel;
|
||||||
|
|
||||||
|
|||||||
@@ -18,29 +18,36 @@
|
|||||||
package controller.activity;
|
package controller.activity;
|
||||||
|
|
||||||
import java.awt.EventQueue;
|
import java.awt.EventQueue;
|
||||||
|
import java.text.DecimalFormat;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
|
import java.util.Collections;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
|
|
||||||
import javax.swing.table.AbstractTableModel;
|
import javax.swing.table.AbstractTableModel;
|
||||||
|
|
||||||
|
import log.Log;
|
||||||
import sample.Broadcaster;
|
import sample.Broadcaster;
|
||||||
import sample.Listener;
|
import sample.Listener;
|
||||||
|
import controller.activity.CallEvent.CallEventType;
|
||||||
|
|
||||||
public class CallEventModel extends AbstractTableModel
|
public class CallEventModel extends AbstractTableModel
|
||||||
{
|
{
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
private static DecimalFormat mFrequencyFormatter =
|
||||||
|
new DecimalFormat( "0.000000" );
|
||||||
|
|
||||||
private static final int DEFAULT_ICON_HEIGHT = 14;
|
private static final int DEFAULT_ICON_HEIGHT = 14;
|
||||||
|
|
||||||
private static final int sTIME = 0;
|
public static final int TIME = 0;
|
||||||
private static final int sEVENT = 1;
|
public static final int EVENT = 1;
|
||||||
private static final int sFROM_ID = 2;
|
public static final int FROM_ID = 2;
|
||||||
private static final int sFROM_ALIAS = 3;
|
public static final int FROM_ALIAS = 3;
|
||||||
private static final int sTO_ID = 4;
|
public static final int TO_ID = 4;
|
||||||
private static final int sTO_ALIAS =5;
|
public static final int TO_ALIAS = 5;
|
||||||
private static final int sCHANNEL = 6;
|
public static final int CHANNEL = 6;
|
||||||
private static final int sFREQUENCY = 7;
|
public static final int FREQUENCY = 7;
|
||||||
private static final int sDETAILS = 8;
|
public static final int DETAILS = 8;
|
||||||
|
|
||||||
protected int mMaxMessages = 500;
|
protected int mMaxMessages = 500;
|
||||||
|
|
||||||
@@ -49,9 +56,9 @@ public class CallEventModel extends AbstractTableModel
|
|||||||
protected String[] mHeaders = new String[] { "Time",
|
protected String[] mHeaders = new String[] { "Time",
|
||||||
"Event",
|
"Event",
|
||||||
"From",
|
"From",
|
||||||
"From Alias",
|
"Alias",
|
||||||
"To",
|
"To",
|
||||||
"To Alias",
|
"Alias",
|
||||||
"Channel",
|
"Channel",
|
||||||
"Frequency",
|
"Frequency",
|
||||||
"Details" };
|
"Details" };
|
||||||
@@ -67,16 +74,23 @@ public class CallEventModel extends AbstractTableModel
|
|||||||
|
|
||||||
public void dispose()
|
public void dispose()
|
||||||
{
|
{
|
||||||
mEvents.clear();
|
synchronized( mEvents )
|
||||||
|
{
|
||||||
|
mEvents.clear();
|
||||||
|
}
|
||||||
|
|
||||||
mBroadcaster.dispose();
|
mBroadcaster.dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void flush()
|
public void flush()
|
||||||
{
|
{
|
||||||
/* Flush all events to listeners ( normally the call event logger ) */
|
/* Flush all events to listeners ( normally the call event logger ) */
|
||||||
for( CallEvent event: mEvents )
|
synchronized( mEvents )
|
||||||
{
|
{
|
||||||
mBroadcaster.receive( event );
|
for( CallEvent event: mEvents )
|
||||||
|
{
|
||||||
|
mBroadcaster.receive( event );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -91,30 +105,137 @@ public class CallEventModel extends AbstractTableModel
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void add( final CallEvent event )
|
public void add( final CallEvent event )
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
synchronized ( mEvents )
|
||||||
|
{
|
||||||
|
mEvents.addFirst( event );
|
||||||
|
}
|
||||||
|
|
||||||
|
fireTableRowsInserted( 0, 0 );
|
||||||
|
|
||||||
|
prune();
|
||||||
|
}
|
||||||
|
catch( Exception e )
|
||||||
|
{
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void remove( final CallEvent event )
|
||||||
{
|
{
|
||||||
EventQueue.invokeLater( new Runnable()
|
EventQueue.invokeLater( new Runnable()
|
||||||
{
|
{
|
||||||
@Override
|
@Override
|
||||||
public void run()
|
public void run()
|
||||||
{
|
{
|
||||||
mEvents.addFirst( event );
|
synchronized ( mEvents )
|
||||||
|
{
|
||||||
CallEventModel.this.fireTableRowsInserted( 0, 0 );
|
final int row = mEvents.indexOf( event );
|
||||||
|
|
||||||
prune();
|
mEvents.remove( event );
|
||||||
|
|
||||||
|
if( row != -1 )
|
||||||
|
{
|
||||||
|
fireTableRowsDeleted( row, row );
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} );
|
} );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int indexOf( CallEvent event )
|
||||||
|
{
|
||||||
|
return mEvents.indexOf( event );
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setEnd( final CallEvent event )
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
EventQueue.invokeAndWait( new Runnable()
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public void run()
|
||||||
|
{
|
||||||
|
if( event != null )
|
||||||
|
{
|
||||||
|
event.setEnd( System.currentTimeMillis() );
|
||||||
|
|
||||||
|
synchronized ( mEvents )
|
||||||
|
{
|
||||||
|
int row = indexOf( event );
|
||||||
|
|
||||||
|
if( row != -1 )
|
||||||
|
{
|
||||||
|
fireTableCellUpdated( row, TIME );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Log.error( "CallEventModel - couldn't log end time - event was null" );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} );
|
||||||
|
}
|
||||||
|
catch( Exception e )
|
||||||
|
{
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setFromID( final CallEvent event, final String from )
|
||||||
|
{
|
||||||
|
EventQueue.invokeLater( new Runnable()
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public void run()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if( event != null )
|
||||||
|
{
|
||||||
|
event.setFromID( from );
|
||||||
|
|
||||||
|
synchronized ( mEvents )
|
||||||
|
{
|
||||||
|
int row = indexOf( event );
|
||||||
|
|
||||||
|
if( row != -1 )
|
||||||
|
{
|
||||||
|
fireTableCellUpdated( row, FROM_ID );
|
||||||
|
fireTableCellUpdated( row, FROM_ALIAS );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Log.error( "CallEventModel - tried to set from ID on "
|
||||||
|
+ "call event - couldn't find index of event" );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch( Exception e )
|
||||||
|
{
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} );
|
||||||
|
}
|
||||||
|
|
||||||
private void prune()
|
private void prune()
|
||||||
{
|
{
|
||||||
while( mEvents.size() > mMaxMessages )
|
synchronized( mEvents )
|
||||||
{
|
{
|
||||||
CallEvent event = mEvents.removeLast();
|
while( mEvents.size() > mMaxMessages )
|
||||||
|
{
|
||||||
mBroadcaster.receive( event );
|
CallEvent event = mEvents.removeLast();
|
||||||
|
|
||||||
super.fireTableRowsDeleted( mEvents.size(), mEvents.size() );
|
mBroadcaster.receive( event );
|
||||||
|
|
||||||
|
fireTableRowsDeleted( mEvents.size(), mEvents.size() );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -138,26 +259,64 @@ public class CallEventModel extends AbstractTableModel
|
|||||||
@Override
|
@Override
|
||||||
public Object getValueAt( int rowIndex, int columnIndex )
|
public Object getValueAt( int rowIndex, int columnIndex )
|
||||||
{
|
{
|
||||||
switch( columnIndex )
|
synchronized( mEvents )
|
||||||
{
|
{
|
||||||
case sTIME:
|
switch( columnIndex )
|
||||||
return mSDFTime.format( mEvents.get( rowIndex ).getEventTime() );
|
{
|
||||||
case sEVENT:
|
case TIME:
|
||||||
return mEvents.get( rowIndex ).getCallEventType();
|
StringBuilder sb = new StringBuilder();
|
||||||
case sFROM_ID:
|
|
||||||
return mEvents.get( rowIndex ).getFromID();
|
sb.append( mSDFTime.format(
|
||||||
case sFROM_ALIAS:
|
mEvents.get( rowIndex ).getEventStartTime() ) );
|
||||||
return mEvents.get( rowIndex ).getFromIDAlias();
|
|
||||||
case sTO_ID:
|
if( mEvents.get( rowIndex ).getEventEndTime() != 0 )
|
||||||
return mEvents.get( rowIndex ).getToID();
|
{
|
||||||
case sTO_ALIAS:
|
sb.append( " - " );
|
||||||
return mEvents.get( rowIndex ).getToIDAlias();
|
sb.append( mSDFTime.format(
|
||||||
case sCHANNEL:
|
mEvents.get( rowIndex ).getEventEndTime() ) );
|
||||||
return mEvents.get( rowIndex ).getChannel();
|
}
|
||||||
case sFREQUENCY:
|
else if( mEvents.get( rowIndex )
|
||||||
return mEvents.get( rowIndex ).getFrequency();
|
.getCallEventType() == CallEventType.CALL )
|
||||||
case sDETAILS:
|
{
|
||||||
return mEvents.get( rowIndex ).getDetails();
|
sb.append( " - In Progress" );
|
||||||
|
}
|
||||||
|
|
||||||
|
return sb.toString();
|
||||||
|
case EVENT:
|
||||||
|
return mEvents.get( rowIndex ).getCallEventType();
|
||||||
|
case FROM_ID:
|
||||||
|
return mEvents.get( rowIndex ).getFromID();
|
||||||
|
case FROM_ALIAS:
|
||||||
|
return mEvents.get( rowIndex ).getFromIDAlias();
|
||||||
|
case TO_ID:
|
||||||
|
return mEvents.get( rowIndex ).getToID();
|
||||||
|
case TO_ALIAS:
|
||||||
|
return mEvents.get( rowIndex ).getToIDAlias();
|
||||||
|
case CHANNEL:
|
||||||
|
int channel = mEvents.get( rowIndex ).getChannel();
|
||||||
|
|
||||||
|
if( channel != 0 )
|
||||||
|
{
|
||||||
|
return channel;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
case FREQUENCY:
|
||||||
|
long frequency = mEvents.get( rowIndex ).getFrequency();
|
||||||
|
|
||||||
|
if( frequency != 0 )
|
||||||
|
{
|
||||||
|
return mFrequencyFormatter.format( (double)frequency / 1E6d );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
case DETAILS:
|
||||||
|
return mEvents.get( rowIndex ).getDetails();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
package controller.state;
|
package controller.state;
|
||||||
|
|
||||||
|
import java.awt.EventQueue;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.concurrent.ScheduledFuture;
|
import java.util.concurrent.ScheduledFuture;
|
||||||
@@ -42,6 +43,7 @@ import controller.activity.CallEventModel;
|
|||||||
import controller.activity.MessageActivityModel;
|
import controller.activity.MessageActivityModel;
|
||||||
import controller.channel.Channel.ChannelType;
|
import controller.channel.Channel.ChannelType;
|
||||||
import controller.channel.ProcessingChain;
|
import controller.channel.ProcessingChain;
|
||||||
|
import decode.mpt1327.MPT1327CallEvent;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ChannelState provides a state machine for tracking a voice or data call
|
* ChannelState provides a state machine for tracking a voice or data call
|
||||||
@@ -98,7 +100,6 @@ public abstract class ChannelState implements Listener<Message>
|
|||||||
protected AudioTypeListener mAudioTypeListener;
|
protected AudioTypeListener mAudioTypeListener;
|
||||||
protected AudioType mAudioType = AudioType.NORMAL;
|
protected AudioType mAudioType = AudioType.NORMAL;
|
||||||
|
|
||||||
|
|
||||||
protected CallEventModel mCallEventModel = new CallEventModel();
|
protected CallEventModel mCallEventModel = new CallEventModel();
|
||||||
|
|
||||||
protected JTable mCallEventTable;
|
protected JTable mCallEventTable;
|
||||||
@@ -111,6 +112,8 @@ public abstract class ChannelState implements Listener<Message>
|
|||||||
|
|
||||||
protected AliasList mAliasList;
|
protected AliasList mAliasList;
|
||||||
|
|
||||||
|
protected CallEvent mCurrentCallEvent;
|
||||||
|
|
||||||
public ChannelState( ProcessingChain processingChain, AliasList aliasList )
|
public ChannelState( ProcessingChain processingChain, AliasList aliasList )
|
||||||
{
|
{
|
||||||
mProcessingChain = processingChain;
|
mProcessingChain = processingChain;
|
||||||
@@ -125,6 +128,16 @@ public abstract class ChannelState implements Listener<Message>
|
|||||||
mCallResetTimeout = props.get( "call.reset.timeout", 4000 );
|
mCallResetTimeout = props.get( "call.reset.timeout", 4000 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setCurrentCallEvent( CallEvent callEvent )
|
||||||
|
{
|
||||||
|
mCurrentCallEvent = callEvent;
|
||||||
|
}
|
||||||
|
|
||||||
|
public CallEvent getCurrentCallEvent()
|
||||||
|
{
|
||||||
|
return mCurrentCallEvent;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Allows setting the call event model to use for traffic channels, so that
|
* Allows setting the call event model to use for traffic channels, so that
|
||||||
* all traffic channels can share the parent control channel call event
|
* all traffic channels can share the parent control channel call event
|
||||||
@@ -190,12 +203,9 @@ public abstract class ChannelState implements Listener<Message>
|
|||||||
return mAliasList != null;
|
return mAliasList != null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void broadcastChange( ChangedAttribute attribute )
|
public void broadcastChange( final ChangedAttribute attribute )
|
||||||
{
|
{
|
||||||
if( mChangeBroadcaster != null )
|
mChangeBroadcaster.broadcast( attribute );
|
||||||
{
|
|
||||||
mChangeBroadcaster.broadcast( attribute );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setCallFadeTimeout( long milliseconds )
|
public void setCallFadeTimeout( long milliseconds )
|
||||||
@@ -648,6 +658,7 @@ public abstract class ChannelState implements Listener<Message>
|
|||||||
CHANNEL_SITE_NUMBER,
|
CHANNEL_SITE_NUMBER,
|
||||||
CHANNEL_SITE_NUMBER_ALIAS,
|
CHANNEL_SITE_NUMBER_ALIAS,
|
||||||
CHANNEL_STATE,
|
CHANNEL_STATE,
|
||||||
|
DESCRIPTION,
|
||||||
FROM_TALKGROUP,
|
FROM_TALKGROUP,
|
||||||
FROM_TALKGROUP_ALIAS,
|
FROM_TALKGROUP_ALIAS,
|
||||||
FROM_TALKGROUP_TYPE,
|
FROM_TALKGROUP_TYPE,
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
package decode.fleetsync2;
|
package decode.fleetsync2;
|
||||||
|
|
||||||
|
import log.Log;
|
||||||
import message.Message;
|
import message.Message;
|
||||||
import alias.Alias;
|
import alias.Alias;
|
||||||
import controller.state.AuxChannelState;
|
import controller.state.AuxChannelState;
|
||||||
|
|||||||
@@ -21,11 +21,13 @@ import alias.Alias;
|
|||||||
import alias.AliasList;
|
import alias.AliasList;
|
||||||
import controller.activity.CallEvent;
|
import controller.activity.CallEvent;
|
||||||
import decode.DecoderType;
|
import decode.DecoderType;
|
||||||
|
import decode.ltrstandard.LTRStandardMessage;
|
||||||
|
|
||||||
public class LTRCallEvent extends CallEvent
|
public class LTRCallEvent extends CallEvent
|
||||||
{
|
{
|
||||||
private int mChannel;
|
private int mChannel;
|
||||||
private long mFrequency;
|
private long mFrequency;
|
||||||
|
private int mValidCallMessages = 1;
|
||||||
|
|
||||||
public LTRCallEvent( CallEventType callEventType,
|
public LTRCallEvent( CallEventType callEventType,
|
||||||
AliasList aliasList,
|
AliasList aliasList,
|
||||||
@@ -41,6 +43,50 @@ public class LTRCallEvent extends CallEvent
|
|||||||
mChannel = channel;
|
mChannel = channel;
|
||||||
mFrequency = frequency;
|
mFrequency = frequency;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* LTR sends multiple CALL messages during a call. In order to detect noise
|
||||||
|
* bursts from valid calls, send every valid call message to this method
|
||||||
|
* and the event will keep a tally of valid call messages in order to
|
||||||
|
* determine if the call was a valid (and loggable) call event.
|
||||||
|
*/
|
||||||
|
public boolean addMessage( LTRStandardMessage message )
|
||||||
|
{
|
||||||
|
String talkgroup = message.getTalkgroupID();
|
||||||
|
|
||||||
|
if( talkgroup.contentEquals( getToID() ) )
|
||||||
|
{
|
||||||
|
mValidCallMessages++;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean addMessage( LTRNetMessage message )
|
||||||
|
{
|
||||||
|
String talkgroup = message.getTalkgroupID();
|
||||||
|
|
||||||
|
if( talkgroup.contentEquals( getToID() ) )
|
||||||
|
{
|
||||||
|
mValidCallMessages++;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isValid()
|
||||||
|
{
|
||||||
|
if( getCallEventType() == CallEventType.CALL )
|
||||||
|
{
|
||||||
|
return mValidCallMessages > 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
private Alias getAlias( String talkgroup )
|
private Alias getAlias( String talkgroup )
|
||||||
{
|
{
|
||||||
@@ -55,7 +101,7 @@ public class LTRCallEvent extends CallEvent
|
|||||||
@Override
|
@Override
|
||||||
public Alias getFromIDAlias()
|
public Alias getFromIDAlias()
|
||||||
{
|
{
|
||||||
if( mCallEventType == CallEventType.CALL_START ||
|
if( mCallEventType == CallEventType.CALL ||
|
||||||
mCallEventType == CallEventType.REGISTER ||
|
mCallEventType == CallEventType.REGISTER ||
|
||||||
mCallEventType == CallEventType.ID_UNIQUE )
|
mCallEventType == CallEventType.ID_UNIQUE )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -17,23 +17,27 @@
|
|||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
package decode.ltrnet;
|
package decode.ltrnet;
|
||||||
|
|
||||||
|
import java.awt.EventQueue;
|
||||||
|
import java.util.HashMap;
|
||||||
|
|
||||||
import message.Message;
|
import message.Message;
|
||||||
import alias.Alias;
|
import alias.Alias;
|
||||||
import alias.AliasList;
|
import alias.AliasList;
|
||||||
|
import controller.activity.CallEvent;
|
||||||
import controller.activity.CallEvent.CallEventType;
|
import controller.activity.CallEvent.CallEventType;
|
||||||
|
import controller.activity.CallEventModel;
|
||||||
import controller.channel.ProcessingChain;
|
import controller.channel.ProcessingChain;
|
||||||
import controller.state.AuxChannelState;
|
import controller.state.AuxChannelState;
|
||||||
import controller.state.ChannelState;
|
import controller.state.ChannelState;
|
||||||
|
import controller.state.ChannelState.State;
|
||||||
|
|
||||||
public class LTRNetChannelState extends ChannelState
|
public class LTRNetChannelState extends ChannelState
|
||||||
{
|
{
|
||||||
private String mToTalkgroup;
|
private String mTalkgroup;
|
||||||
private Alias mToTalkgroupAlias;
|
private Alias mTalkgroupAlias;
|
||||||
private String mFromTalkgroup;
|
private String mDescription;
|
||||||
private Alias mFromTalkgroupAlias;
|
|
||||||
private String mFromTalkgroupType;
|
|
||||||
private int mChannelNumber;
|
private int mChannelNumber;
|
||||||
private LTRCallEvent mCurrentCallEvent;
|
private HashMap<Integer,String> mActiveCalls = new HashMap<Integer,String>();
|
||||||
private LTRNetActivitySummary mActivitySummary;
|
private LTRNetActivitySummary mActivitySummary;
|
||||||
|
|
||||||
public LTRNetChannelState( ProcessingChain channel, AliasList aliasList )
|
public LTRNetChannelState( ProcessingChain channel, AliasList aliasList )
|
||||||
@@ -50,27 +54,47 @@ public class LTRNetChannelState extends ChannelState
|
|||||||
public void fade( final CallEventType type )
|
public void fade( final CallEventType type )
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* We can receive multiple call tear-down messages -- only post a call
|
* We can receive multiple call tear-down messages -- only respond to
|
||||||
* end event for the one that can change the state to fade
|
* the message that can change the state to fade
|
||||||
*/
|
*/
|
||||||
if( getState().canChangeTo( State.FADE ) )
|
if( getState().canChangeTo( State.FADE ) )
|
||||||
{
|
{
|
||||||
mCallEventModel.add(
|
LTRCallEvent current = getCurrentLTRCallEvent();
|
||||||
new LTRCallEvent.Builder( type )
|
|
||||||
.aliasList( getAliasList() )
|
if( current != null )
|
||||||
.channel( mChannelNumber )
|
{
|
||||||
.frequency( mProcessingChain.getChannel()
|
/* Close out the call event. If we only received 1 call
|
||||||
.getTunerChannel().getFrequency() )
|
* message, then flag it as noise and remove the call event */
|
||||||
.to( mToTalkgroup )
|
if( current.isValid() )
|
||||||
.build() );
|
{
|
||||||
|
mCallEventModel.setEnd( current );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
mCallEventModel.remove( current );
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
mCurrentCallEvent = null;
|
setCurrentCallEvent( null );
|
||||||
|
|
||||||
|
mActiveCalls.clear();
|
||||||
|
|
||||||
super.fade( type );
|
super.fade( type );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public LTRCallEvent getCurrentLTRCallEvent()
|
||||||
|
{
|
||||||
|
CallEvent current = getCurrentCallEvent();
|
||||||
|
|
||||||
|
if( current != null )
|
||||||
|
{
|
||||||
|
return (LTRCallEvent)current;
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getActivitySummary()
|
public String getActivitySummary()
|
||||||
{
|
{
|
||||||
@@ -103,64 +127,106 @@ public class LTRNetChannelState extends ChannelState
|
|||||||
switch( ltr.getMessageType() )
|
switch( ltr.getMessageType() )
|
||||||
{
|
{
|
||||||
case CA_STRT:
|
case CA_STRT:
|
||||||
mToTalkgroup = ltr.getTalkgroupID();
|
if( mChannelNumber == 0 )
|
||||||
broadcastChange( ChangedAttribute.TO_TALKGROUP );
|
|
||||||
|
|
||||||
if( talkgroupAlias != null )
|
|
||||||
{
|
{
|
||||||
mToTalkgroupAlias = talkgroupAlias;
|
mChannelNumber = ltr.getChannel();
|
||||||
broadcastChange( ChangedAttribute.TO_TALKGROUP_ALIAS );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
mChannelNumber = ltr.getChannel();
|
if( ltr.getChannel() == mChannelNumber )
|
||||||
broadcastChange( ChangedAttribute.CHANNEL_NUMBER );
|
|
||||||
|
|
||||||
if( getState() != ChannelState.State.CALL )
|
|
||||||
{
|
{
|
||||||
mCallEventModel.add(
|
processCallMessage( ltr );
|
||||||
new LTRCallEvent.Builder( CallEventType.CALL_START )
|
|
||||||
|
if( ltr.getGroup() == 253 )
|
||||||
|
{
|
||||||
|
mDescription = "REGISTER";
|
||||||
|
broadcastChange( ChangedAttribute.DESCRIPTION );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
mTalkgroup = ltr.getTalkgroupID();
|
||||||
|
broadcastChange( ChangedAttribute.TO_TALKGROUP );
|
||||||
|
|
||||||
|
if( talkgroupAlias != null )
|
||||||
|
{
|
||||||
|
mTalkgroupAlias = talkgroupAlias;
|
||||||
|
broadcastChange( ChangedAttribute.TO_TALKGROUP_ALIAS );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
//Call Detect
|
||||||
|
if( !mActiveCalls.containsKey( ltr.getChannel() ) ||
|
||||||
|
!mActiveCalls.get( ltr.getChannel() )
|
||||||
|
.contentEquals( ltr.getTalkgroupID() ) )
|
||||||
|
{
|
||||||
|
mActiveCalls.put( ltr.getChannel(),
|
||||||
|
ltr.getTalkgroupID() );
|
||||||
|
|
||||||
|
mCallEventModel.add(
|
||||||
|
new LTRCallEvent.Builder( CallEventType.CALL_DETECT )
|
||||||
.aliasList( mAliasList )
|
.aliasList( mAliasList )
|
||||||
.channel( ltr.getChannel() )
|
.channel( ltr.getChannel() )
|
||||||
.frequency( mProcessingChain.getChannel()
|
.to( ltr.getTalkgroupID() )
|
||||||
.getTunerChannel().getFrequency() )
|
|
||||||
.to( mToTalkgroup )
|
|
||||||
.build() );
|
.build() );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
setState( State.CALL );
|
|
||||||
break;
|
break;
|
||||||
case CA_ENDD:
|
case CA_ENDD:
|
||||||
mToTalkgroup = ltr.getTalkgroupID();
|
if( ltr.getGroup() != 253 )
|
||||||
broadcastChange( ChangedAttribute.TO_TALKGROUP );
|
|
||||||
|
|
||||||
if( talkgroupAlias != null )
|
|
||||||
{
|
{
|
||||||
mToTalkgroupAlias = talkgroupAlias;
|
mTalkgroup = ltr.getTalkgroupID();
|
||||||
broadcastChange( ChangedAttribute.TO_TALKGROUP_ALIAS );
|
broadcastChange( ChangedAttribute.TO_TALKGROUP );
|
||||||
|
|
||||||
|
if( talkgroupAlias != null )
|
||||||
|
{
|
||||||
|
mTalkgroupAlias = talkgroupAlias;
|
||||||
|
broadcastChange( ChangedAttribute.TO_TALKGROUP_ALIAS );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fade( CallEventType.CALL_END );
|
fade( CallEventType.CALL_END );
|
||||||
break;
|
break;
|
||||||
case ID_UNIQ:
|
case ID_UNIQ:
|
||||||
mFromTalkgroupType = "UID";
|
mDescription = "REGISTER UID";
|
||||||
broadcastChange( ChangedAttribute.FROM_TALKGROUP_TYPE );
|
broadcastChange( ChangedAttribute.DESCRIPTION );
|
||||||
|
|
||||||
mFromTalkgroup = String.valueOf( ltr.getRadioUniqueID() );
|
mTalkgroup = String.valueOf( ltr.getRadioUniqueID() );
|
||||||
broadcastChange( ChangedAttribute.FROM_TALKGROUP );
|
broadcastChange( ChangedAttribute.TO_TALKGROUP );
|
||||||
|
|
||||||
mFromTalkgroupAlias = ltr.getRadioUniqueIDAlias();
|
mTalkgroupAlias = ltr.getRadioUniqueIDAlias();
|
||||||
broadcastChange( ChangedAttribute.FROM_TALKGROUP_ALIAS );
|
broadcastChange( ChangedAttribute.TO_TALKGROUP_ALIAS );
|
||||||
|
|
||||||
mCallEventModel.add(
|
final LTRCallEvent currentEvent = getCurrentLTRCallEvent();
|
||||||
|
|
||||||
|
if( currentEvent != null &&
|
||||||
|
currentEvent.getCallEventType() == CallEventType.REGISTER )
|
||||||
|
{
|
||||||
|
final String uid = String.valueOf( ltr.getRadioUniqueID() );
|
||||||
|
|
||||||
|
if( uid != null )
|
||||||
|
{
|
||||||
|
mCallEventModel.setFromID( currentEvent, uid );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
mCallEventModel.add(
|
||||||
new LTRCallEvent.Builder( CallEventType.REGISTER )
|
new LTRCallEvent.Builder( CallEventType.REGISTER )
|
||||||
.aliasList( mAliasList )
|
.aliasList( mAliasList )
|
||||||
.details( "Radio Unique ID" )
|
.details( "Radio Unique ID" )
|
||||||
.frequency( mProcessingChain.getChannel()
|
.frequency( mProcessingChain.getChannel()
|
||||||
.getTunerChannel().getFrequency() )
|
.getTunerChannel().getFrequency() )
|
||||||
.from( String.valueOf( ltr.getRadioUniqueID() ) )
|
.from( String.valueOf( ltr.getRadioUniqueID() ) )
|
||||||
.build() );
|
.build() );
|
||||||
|
}
|
||||||
|
|
||||||
setState( State.CALL );
|
setState( State.CALL );
|
||||||
|
break;
|
||||||
|
case SY_IDLE:
|
||||||
|
mChannelNumber = ltr.getChannel();
|
||||||
|
broadcastChange( ChangedAttribute.CHANNEL_NUMBER );
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -177,85 +243,83 @@ public class LTRNetChannelState extends ChannelState
|
|||||||
switch( ltr.getMessageType() )
|
switch( ltr.getMessageType() )
|
||||||
{
|
{
|
||||||
case CA_STRT:
|
case CA_STRT:
|
||||||
mToTalkgroup = ltr.getTalkgroupID();
|
processCallMessage( ltr );
|
||||||
broadcastChange( ChangedAttribute.TO_TALKGROUP );
|
|
||||||
|
|
||||||
if( talkgroupAlias != null )
|
|
||||||
{
|
|
||||||
mToTalkgroupAlias = talkgroupAlias;
|
|
||||||
broadcastChange( ChangedAttribute.TO_TALKGROUP_ALIAS );
|
|
||||||
}
|
|
||||||
|
|
||||||
if( getState() != State.CALL )
|
if( ltr.getGroup() == 253 )
|
||||||
{
|
{
|
||||||
mCurrentCallEvent =
|
mDescription = "REGISTER";
|
||||||
new LTRCallEvent.Builder( CallEventType.CALL_START )
|
broadcastChange( ChangedAttribute.DESCRIPTION );
|
||||||
.aliasList( mAliasList )
|
}
|
||||||
.channel( ltr.getChannel() )
|
else
|
||||||
.frequency( mProcessingChain.getChannel()
|
{
|
||||||
.getTunerChannel().getFrequency() )
|
mTalkgroup = ltr.getTalkgroupID();
|
||||||
.to( mToTalkgroup )
|
broadcastChange( ChangedAttribute.TO_TALKGROUP );
|
||||||
.build();
|
|
||||||
|
if( talkgroupAlias != null )
|
||||||
mCallEventModel.add( mCurrentCallEvent );
|
{
|
||||||
|
mTalkgroupAlias = talkgroupAlias;
|
||||||
|
broadcastChange( ChangedAttribute.TO_TALKGROUP_ALIAS );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
setState( State.CALL );
|
|
||||||
break;
|
break;
|
||||||
case CA_ENDD:
|
case CA_ENDD:
|
||||||
mToTalkgroup = ltr.getTalkgroupID();
|
mTalkgroup = ltr.getTalkgroupID();
|
||||||
broadcastChange( ChangedAttribute.TO_TALKGROUP );
|
broadcastChange( ChangedAttribute.TO_TALKGROUP );
|
||||||
|
|
||||||
if( talkgroupAlias != null )
|
if( talkgroupAlias != null )
|
||||||
{
|
{
|
||||||
mToTalkgroupAlias = talkgroupAlias;
|
mTalkgroupAlias = talkgroupAlias;
|
||||||
broadcastChange( ChangedAttribute.TO_TALKGROUP_ALIAS );
|
broadcastChange( ChangedAttribute.TO_TALKGROUP_ALIAS );
|
||||||
}
|
}
|
||||||
fade( CallEventType.CALL_END );
|
fade( CallEventType.CALL_END );
|
||||||
break;
|
break;
|
||||||
case ID_UNIQ:
|
case ID_UNIQ:
|
||||||
mFromTalkgroupType = "UID";
|
mDescription = "REGISTER UID";
|
||||||
broadcastChange( ChangedAttribute.FROM_TALKGROUP_TYPE );
|
broadcastChange( ChangedAttribute.DESCRIPTION );
|
||||||
|
|
||||||
mFromTalkgroup = String.valueOf( ltr.getRadioUniqueID() );
|
mTalkgroup = String.valueOf( ltr.getRadioUniqueID() );
|
||||||
broadcastChange( ChangedAttribute.FROM_TALKGROUP );
|
broadcastChange( ChangedAttribute.TO_TALKGROUP );
|
||||||
|
|
||||||
mFromTalkgroupAlias = ltr.getRadioUniqueIDAlias();
|
mTalkgroupAlias = ltr.getRadioUniqueIDAlias();
|
||||||
broadcastChange( ChangedAttribute.FROM_TALKGROUP_ALIAS );
|
broadcastChange( ChangedAttribute.TO_TALKGROUP_ALIAS );
|
||||||
|
|
||||||
if( getState() != State.CALL )
|
if( getState() != State.DATA )
|
||||||
{
|
{
|
||||||
mCallEventModel.add( new LTRCallEvent.Builder(
|
LTRCallEvent event =
|
||||||
CallEventType.ID_UNIQUE )
|
new LTRCallEvent.Builder( CallEventType.REGISTER )
|
||||||
.aliasList( mAliasList )
|
.aliasList( mAliasList )
|
||||||
.details( "Unique ID" )
|
.channel( ltr.getChannel() )
|
||||||
.frequency( mProcessingChain.getChannel()
|
.frequency( mProcessingChain.getChannel()
|
||||||
.getTunerChannel().getFrequency() )
|
.getTunerChannel().getFrequency() )
|
||||||
.from( String.valueOf( ltr.getRadioUniqueID() ) )
|
.to( ltr.getTalkgroupID() )
|
||||||
.build() );
|
.build();
|
||||||
|
|
||||||
|
mCallEventModel.add( event );
|
||||||
|
|
||||||
|
setCurrentCallEvent( event );
|
||||||
|
|
||||||
|
setState( State.DATA );
|
||||||
}
|
}
|
||||||
else
|
|
||||||
|
if( mCurrentCallEvent != null )
|
||||||
{
|
{
|
||||||
if( mCurrentCallEvent != null )
|
mCurrentCallEvent.setFromID(
|
||||||
{
|
String.valueOf( ltr.getRadioUniqueID() ) );
|
||||||
mCurrentCallEvent.setFromID(
|
mCurrentCallEvent.setDetails( "Unique ID" );
|
||||||
String.valueOf( ltr.getRadioUniqueID() ) );
|
|
||||||
mCurrentCallEvent.setDetails( "Unique ID" );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
setState( State.CALL );
|
|
||||||
break;
|
break;
|
||||||
case ID_ESNH:
|
case ID_ESNH:
|
||||||
case ID_ESNL:
|
case ID_ESNL:
|
||||||
mFromTalkgroupType = "ESN";
|
mDescription = "ESN";
|
||||||
broadcastChange( ChangedAttribute.FROM_TALKGROUP_TYPE );
|
broadcastChange( ChangedAttribute.DESCRIPTION );
|
||||||
|
|
||||||
mFromTalkgroup = ltr.getESN();
|
mTalkgroup = ltr.getESN();
|
||||||
broadcastChange( ChangedAttribute.FROM_TALKGROUP );
|
broadcastChange( ChangedAttribute.TO_TALKGROUP );
|
||||||
|
|
||||||
mFromTalkgroupAlias = ltr.getESNAlias();
|
mTalkgroupAlias = ltr.getESNAlias();
|
||||||
broadcastChange( ChangedAttribute.FROM_TALKGROUP_ALIAS );
|
broadcastChange( ChangedAttribute.TO_TALKGROUP_ALIAS );
|
||||||
|
|
||||||
setState( State.CALL );
|
setState( State.DATA );
|
||||||
|
|
||||||
mCallEventModel.add(
|
mCallEventModel.add(
|
||||||
new LTRCallEvent.Builder( CallEventType.REGISTER_ESN )
|
new LTRCallEvent.Builder( CallEventType.REGISTER_ESN )
|
||||||
@@ -273,49 +337,88 @@ public class LTRNetChannelState extends ChannelState
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void processCallMessage( LTRNetMessage message )
|
||||||
|
{
|
||||||
|
LTRCallEvent current = getCurrentLTRCallEvent();
|
||||||
|
|
||||||
|
if( current == null || !current.addMessage( message ) )
|
||||||
|
{
|
||||||
|
if( current != null )
|
||||||
|
{
|
||||||
|
mCallEventModel.remove( current );
|
||||||
|
}
|
||||||
|
|
||||||
|
LTRCallEvent event;
|
||||||
|
|
||||||
|
if( message.getGroup() == 253 )
|
||||||
|
{
|
||||||
|
event = new LTRCallEvent.Builder( CallEventType.REGISTER )
|
||||||
|
.aliasList( mAliasList )
|
||||||
|
.channel( message.getChannel() )
|
||||||
|
.frequency( mProcessingChain.getChannel()
|
||||||
|
.getTunerChannel().getFrequency() )
|
||||||
|
.to( message.getTalkgroupID() )
|
||||||
|
.build();
|
||||||
|
|
||||||
|
setState( State.DATA );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
event = new LTRCallEvent.Builder( CallEventType.CALL )
|
||||||
|
.aliasList( mAliasList )
|
||||||
|
.channel( message.getChannel() )
|
||||||
|
.frequency( mProcessingChain.getChannel()
|
||||||
|
.getTunerChannel().getFrequency() )
|
||||||
|
.to( message.getTalkgroupID() )
|
||||||
|
.build();
|
||||||
|
|
||||||
|
setState( State.CALL );
|
||||||
|
}
|
||||||
|
|
||||||
|
mCallEventModel.add( event );
|
||||||
|
|
||||||
|
setCurrentCallEvent( event );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if( getState() == State.CALL )
|
||||||
|
{
|
||||||
|
setState( State.CALL );
|
||||||
|
}
|
||||||
|
else if( getState() == State.DATA )
|
||||||
|
{
|
||||||
|
setState( State.DATA );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void reset()
|
public void reset()
|
||||||
{
|
{
|
||||||
mToTalkgroup = null;
|
mTalkgroup = null;
|
||||||
broadcastChange( ChangedAttribute.TO_TALKGROUP );
|
broadcastChange( ChangedAttribute.TO_TALKGROUP );
|
||||||
|
|
||||||
mToTalkgroupAlias = null;
|
mTalkgroupAlias = null;
|
||||||
broadcastChange( ChangedAttribute.TO_TALKGROUP_ALIAS );
|
broadcastChange( ChangedAttribute.TO_TALKGROUP_ALIAS );
|
||||||
|
|
||||||
mFromTalkgroup = null;
|
mDescription = null;
|
||||||
broadcastChange( ChangedAttribute.FROM_TALKGROUP );
|
broadcastChange( ChangedAttribute.DESCRIPTION );
|
||||||
|
|
||||||
mFromTalkgroupAlias = null;
|
|
||||||
broadcastChange( ChangedAttribute.FROM_TALKGROUP_ALIAS );
|
|
||||||
|
|
||||||
mFromTalkgroupType = " ";
|
|
||||||
broadcastChange( ChangedAttribute.FROM_TALKGROUP_TYPE );
|
|
||||||
|
|
||||||
super.reset();
|
super.reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getToTalkgroup()
|
public String getToTalkgroup()
|
||||||
{
|
{
|
||||||
return mToTalkgroup;
|
return mTalkgroup;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Alias getToTalkgroupAlias()
|
public Alias getToTalkgroupAlias()
|
||||||
{
|
{
|
||||||
return mToTalkgroupAlias;
|
return mTalkgroupAlias;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getFromTalkgroup()
|
public String getDescription()
|
||||||
{
|
{
|
||||||
return mFromTalkgroup;
|
return mDescription;
|
||||||
}
|
|
||||||
|
|
||||||
public Alias getFromTalkgroupAlias()
|
|
||||||
{
|
|
||||||
return mFromTalkgroupAlias;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getFromTalkgroupType()
|
|
||||||
{
|
|
||||||
return mFromTalkgroupType;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean hasChannelNumber()
|
public boolean hasChannelNumber()
|
||||||
|
|||||||
@@ -37,12 +37,11 @@ public class LTRNetPanel extends ChannelStatePanel
|
|||||||
private JLabel mChannelLabel;
|
private JLabel mChannelLabel;
|
||||||
|
|
||||||
private JLabel mProtocol = new JLabel( "LTR-Net" );
|
private JLabel mProtocol = new JLabel( "LTR-Net" );
|
||||||
private JLabel mToTalkgroup = new JLabel();
|
private JLabel mTalkgroup = new JLabel();
|
||||||
private JLabel mToTalkgroupAlias = new JLabel();
|
private JLabel mTalkgroupAlias = new JLabel();
|
||||||
|
|
||||||
private JLabel mFromType = new JLabel( " " );
|
private JLabel mLCN = new JLabel( "LCN:" );
|
||||||
private JLabel mFromTalkgroup = new JLabel();
|
private JLabel mDescription = new JLabel();
|
||||||
private JLabel mFromTalkgroupAlias = new JLabel();
|
|
||||||
|
|
||||||
public LTRNetPanel( Channel channel )
|
public LTRNetPanel( Channel channel )
|
||||||
{
|
{
|
||||||
@@ -69,32 +68,28 @@ public class LTRNetPanel extends ChannelStatePanel
|
|||||||
mProtocol.setFont( mFontDecoder );
|
mProtocol.setFont( mFontDecoder );
|
||||||
mProtocol.setForeground( mColorLabelDecoder );
|
mProtocol.setForeground( mColorLabelDecoder );
|
||||||
|
|
||||||
mToTalkgroup.setFont( mFontDecoder );
|
mTalkgroup.setFont( mFontDecoder );
|
||||||
mToTalkgroup.setForeground( mColorLabelDecoder );
|
mTalkgroup.setForeground( mColorLabelDecoder );
|
||||||
|
|
||||||
mToTalkgroupAlias.setFont( mFontDecoder );
|
mTalkgroupAlias.setFont( mFontDecoder );
|
||||||
mToTalkgroupAlias.setForeground( mColorLabelDecoder );
|
mTalkgroupAlias.setForeground( mColorLabelDecoder );
|
||||||
|
|
||||||
mFromType.setFont( mFontDecoder );
|
mLCN.setFont( mFontDecoder );
|
||||||
mFromType.setForeground( mColorLabelDecoder );
|
mLCN.setForeground( mColorLabelDecoder );
|
||||||
|
|
||||||
mFromTalkgroup.setFont( mFontDecoder );
|
mDescription.setFont( mFontDecoder );
|
||||||
mFromTalkgroup.setForeground( mColorLabelDecoder );
|
mDescription.setForeground( mColorLabelDecoder );
|
||||||
|
|
||||||
mFromTalkgroupAlias.setFont( mFontDecoder );
|
|
||||||
mFromTalkgroupAlias.setForeground( mColorLabelDecoder );
|
|
||||||
|
|
||||||
add( mStateLabel );
|
add( mStateLabel );
|
||||||
add( mSourceLabel );
|
add( mSourceLabel );
|
||||||
add( mChannelLabel, "wrap" );
|
add( mChannelLabel, "wrap" );
|
||||||
|
|
||||||
add( mProtocol );
|
add( mProtocol );
|
||||||
add( mToTalkgroup );
|
add( mTalkgroup );
|
||||||
add( mToTalkgroupAlias, "wrap" );
|
add( mTalkgroupAlias, "wrap" );
|
||||||
|
|
||||||
add( mFromType );
|
add( mLCN );
|
||||||
add( mFromTalkgroup );
|
add( mDescription, "span,wrap" );
|
||||||
add( mFromTalkgroupAlias, "wrap" );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -122,47 +117,31 @@ public class LTRNetPanel extends ChannelStatePanel
|
|||||||
case SYSTEM_NAME:
|
case SYSTEM_NAME:
|
||||||
mChannelLabel.setText( mChannel.getChannelDisplayName() );
|
mChannelLabel.setText( mChannel.getChannelDisplayName() );
|
||||||
break;
|
break;
|
||||||
case FROM_TALKGROUP:
|
|
||||||
mFromTalkgroup.setText( state.getFromTalkgroup() );
|
|
||||||
break;
|
|
||||||
case FROM_TALKGROUP_ALIAS:
|
|
||||||
Alias fromAlias = state.getFromTalkgroupAlias();
|
|
||||||
|
|
||||||
if( fromAlias != null )
|
|
||||||
{
|
|
||||||
mFromTalkgroupAlias.setText( fromAlias.getName() );
|
|
||||||
String iconNameString = fromAlias.getIconName();
|
|
||||||
mFromTalkgroupAlias.setIcon( getSettingsManager()
|
|
||||||
.getImageIcon( iconNameString, 12 ) );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
mFromTalkgroupAlias.setText( null );
|
|
||||||
mFromTalkgroupAlias.setIcon( null );
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case FROM_TALKGROUP_TYPE:
|
|
||||||
mFromType.setText( state.getFromTalkgroupType() );
|
|
||||||
break;
|
|
||||||
case TO_TALKGROUP:
|
case TO_TALKGROUP:
|
||||||
mToTalkgroup.setText( state.getToTalkgroup() );
|
mTalkgroup.setText( state.getToTalkgroup() );
|
||||||
break;
|
break;
|
||||||
case TO_TALKGROUP_ALIAS:
|
case TO_TALKGROUP_ALIAS:
|
||||||
Alias tgAlias = state.getToTalkgroupAlias();
|
Alias tgAlias = state.getToTalkgroupAlias();
|
||||||
|
|
||||||
if( tgAlias != null )
|
if( tgAlias != null )
|
||||||
{
|
{
|
||||||
mToTalkgroupAlias.setText( tgAlias.getName() );
|
mTalkgroupAlias.setText( tgAlias.getName() );
|
||||||
String iconNameString = tgAlias.getIconName();
|
String iconNameString = tgAlias.getIconName();
|
||||||
mToTalkgroupAlias.setIcon( getSettingsManager()
|
mTalkgroupAlias.setIcon( getSettingsManager()
|
||||||
.getImageIcon( iconNameString, 12 ) );
|
.getImageIcon( iconNameString, 12 ) );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
mToTalkgroupAlias.setText( null );
|
mTalkgroupAlias.setText( null );
|
||||||
mToTalkgroupAlias.setIcon( null );
|
mTalkgroupAlias.setIcon( null );
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case DESCRIPTION:
|
||||||
|
mDescription.setText( state.getDescription() );
|
||||||
|
break;
|
||||||
|
case CHANNEL_NUMBER:
|
||||||
|
mLCN.setText( "LCN: " + state.getChannelNumber() );
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -192,25 +171,21 @@ public class LTRNetPanel extends ChannelStatePanel
|
|||||||
{
|
{
|
||||||
mProtocol.setForeground( mColorLabelDecoder );
|
mProtocol.setForeground( mColorLabelDecoder );
|
||||||
}
|
}
|
||||||
if( mToTalkgroup != null )
|
if( mTalkgroup != null )
|
||||||
{
|
{
|
||||||
mToTalkgroup.setForeground( mColorLabelDecoder );
|
mTalkgroup.setForeground( mColorLabelDecoder );
|
||||||
}
|
}
|
||||||
if( mToTalkgroupAlias != null )
|
if( mTalkgroupAlias != null )
|
||||||
{
|
{
|
||||||
mToTalkgroupAlias.setForeground( mColorLabelDecoder );
|
mTalkgroupAlias.setForeground( mColorLabelDecoder );
|
||||||
}
|
}
|
||||||
if( mFromType != null )
|
if( mLCN != null )
|
||||||
{
|
{
|
||||||
mFromType.setForeground( mColorLabelDecoder );
|
mLCN.setForeground( mColorLabelDecoder );
|
||||||
}
|
}
|
||||||
if( mFromTalkgroup != null )
|
if( mDescription != null )
|
||||||
{
|
{
|
||||||
mFromTalkgroup.setForeground( mColorLabelDecoder );
|
mDescription.setForeground( mColorLabelDecoder );
|
||||||
}
|
|
||||||
if( mFromTalkgroupAlias != null )
|
|
||||||
{
|
|
||||||
mFromTalkgroupAlias.setForeground( mColorLabelDecoder );
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case CHANNEL_STATE_LABEL_DETAILS:
|
case CHANNEL_STATE_LABEL_DETAILS:
|
||||||
|
|||||||
@@ -22,7 +22,9 @@ import java.util.HashMap;
|
|||||||
import message.Message;
|
import message.Message;
|
||||||
import alias.Alias;
|
import alias.Alias;
|
||||||
import alias.AliasList;
|
import alias.AliasList;
|
||||||
|
import controller.activity.CallEvent;
|
||||||
import controller.activity.CallEvent.CallEventType;
|
import controller.activity.CallEvent.CallEventType;
|
||||||
|
import controller.activity.CallEventModel;
|
||||||
import controller.channel.ProcessingChain;
|
import controller.channel.ProcessingChain;
|
||||||
import controller.state.AuxChannelState;
|
import controller.state.AuxChannelState;
|
||||||
import controller.state.ChannelState;
|
import controller.state.ChannelState;
|
||||||
@@ -72,19 +74,24 @@ public class LTRChannelState extends ChannelState
|
|||||||
|
|
||||||
switch( ltr.getMessageType() )
|
switch( ltr.getMessageType() )
|
||||||
{
|
{
|
||||||
|
/**
|
||||||
|
* Process Call Message
|
||||||
|
*
|
||||||
|
* States:
|
||||||
|
* 1) Call message with invalid LCN
|
||||||
|
* 2) State=IDLE/FADE, new CA_STRT
|
||||||
|
* 3) State=CALL, new CA_STRT, same talkgroup
|
||||||
|
* 4) State=CALL, new CA_STRT, different talkgroup
|
||||||
|
*/
|
||||||
case CA_STRT:
|
case CA_STRT:
|
||||||
if( 0 < ltr.getChannel() && ltr.getChannel() <=20 )
|
if( 0 < ltr.getChannel() && ltr.getChannel() <=20 )
|
||||||
{
|
{
|
||||||
/* If this channel is the same as the talkgroup's home
|
/* If we haven't captured the LCN yet ... */
|
||||||
* repeater, then the channel number refers to the
|
if( mChannelNumber == 0 )
|
||||||
* currently tuned frequency and we capture the channel
|
{
|
||||||
* number ... otherwise, it might be reflecting a call
|
|
||||||
* on another LCN */
|
|
||||||
if( ltr.getChannel() == ltr.getHomeRepeater() )
|
|
||||||
{
|
|
||||||
mChannelNumber = ltr.getChannel();
|
mChannelNumber = ltr.getChannel();
|
||||||
broadcastChange( ChangedAttribute.CHANNEL_NUMBER );
|
broadcastChange( ChangedAttribute.CHANNEL_NUMBER );
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If this call event is for this channel, then update
|
/* If this call event is for this channel, then update
|
||||||
* talkgroup and alias */
|
* talkgroup and alias */
|
||||||
@@ -95,32 +102,47 @@ public class LTRChannelState extends ChannelState
|
|||||||
|
|
||||||
mTalkgroupAlias = ltr.getTalkgroupIDAlias();
|
mTalkgroupAlias = ltr.getTalkgroupIDAlias();
|
||||||
broadcastChange( ChangedAttribute.FROM_TALKGROUP_ALIAS );
|
broadcastChange( ChangedAttribute.FROM_TALKGROUP_ALIAS );
|
||||||
|
|
||||||
|
LTRCallEvent current = getCurrentLTRCallEvent();
|
||||||
|
|
||||||
|
/* If we have an ongoing call, then add this message
|
||||||
|
* to the current event - if addMessage returns
|
||||||
|
* false, then we have a different talkgroup and a
|
||||||
|
* new call event, so close out the old one. */
|
||||||
|
if( current != null && !current.addMessage( ltr ) )
|
||||||
|
{
|
||||||
|
if( current.isValid() )
|
||||||
|
{
|
||||||
|
mCallEventModel.setEnd( current );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
mCallEventModel.remove( current );
|
||||||
|
}
|
||||||
|
|
||||||
|
setCallEventModel( null );
|
||||||
|
current = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if( current == null )
|
||||||
|
{
|
||||||
|
LTRCallEvent event =
|
||||||
|
new LTRCallEvent.Builder( CallEventType.CALL )
|
||||||
|
.to( ltr.getTalkgroupID() )
|
||||||
|
.aliasList( getAliasList() )
|
||||||
|
.channel( ltr.getChannel() )
|
||||||
|
.frequency( ( ltr.getChannel() == mChannelNumber ) ?
|
||||||
|
mProcessingChain.getChannel()
|
||||||
|
.getTunerChannel().getFrequency() : 0 )
|
||||||
|
.build();
|
||||||
|
|
||||||
|
mCallEventModel.add( event );
|
||||||
|
|
||||||
|
setCurrentCallEvent( event );
|
||||||
|
}
|
||||||
|
|
||||||
|
setState( State.CALL );
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If this is a new call, log a call event */
|
|
||||||
if( !mActiveCalls.containsKey( ltr.getChannel() ) ||
|
|
||||||
!mActiveCalls.get( ltr.getChannel() )
|
|
||||||
.contentEquals( ltr.getTalkgroupID() ) )
|
|
||||||
{
|
|
||||||
mActiveCalls.put( ltr.getChannel(), ltr.getTalkgroupID() );
|
|
||||||
|
|
||||||
CallEventType callEventType =
|
|
||||||
( ltr.getChannel() == mChannelNumber ) ?
|
|
||||||
CallEventType.CALL_START :
|
|
||||||
CallEventType.CALL_DETECT;
|
|
||||||
|
|
||||||
mCallEventModel.add(
|
|
||||||
new LTRCallEvent.Builder( callEventType )
|
|
||||||
.to( ltr.getTalkgroupID() )
|
|
||||||
.aliasList( getAliasList() )
|
|
||||||
.channel( ltr.getChannel() )
|
|
||||||
.frequency( ( ltr.getChannel() == mChannelNumber ) ?
|
|
||||||
mProcessingChain.getChannel()
|
|
||||||
.getTunerChannel().getFrequency() : 0 )
|
|
||||||
.build() );
|
|
||||||
}
|
|
||||||
|
|
||||||
setState( State.CALL );
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case CA_ENDD:
|
case CA_ENDD:
|
||||||
@@ -149,27 +171,47 @@ public class LTRChannelState extends ChannelState
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public LTRCallEvent getCurrentLTRCallEvent()
|
||||||
|
{
|
||||||
|
CallEvent current = getCurrentCallEvent();
|
||||||
|
|
||||||
|
if( current != null )
|
||||||
|
{
|
||||||
|
return (LTRCallEvent)current;
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Intercept the fade event so that we can generate a call end event
|
* Intercept the fade event so that we can generate a call end event
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void fade( final CallEventType type )
|
public void fade( final CallEventType type )
|
||||||
{
|
{
|
||||||
/*
|
/* We can receive multiple call tear-down messages -- only respond to
|
||||||
* We can receive multiple call tear-down messages -- only post a call
|
* the message that can change the state to fade */
|
||||||
* end event for the one that can change the state to fade
|
|
||||||
*/
|
|
||||||
if( getState().canChangeTo( State.FADE ) )
|
if( getState().canChangeTo( State.FADE ) )
|
||||||
{
|
{
|
||||||
mActiveCalls.clear();
|
mActiveCalls.clear();
|
||||||
|
|
||||||
mCallEventModel.add(
|
LTRCallEvent current = getCurrentLTRCallEvent();
|
||||||
new LTRCallEvent.Builder( type )
|
|
||||||
.aliasList( getAliasList() )
|
if( current != null )
|
||||||
.channel( mChannelNumber )
|
{
|
||||||
.frequency( mProcessingChain.getChannel().getTunerChannel().getFrequency() )
|
/* Close out the call event. If we only received 1 call
|
||||||
.to( mTalkgroup )
|
* message, then flag it as noise and remove the call event */
|
||||||
.build() );
|
if( current.isValid() )
|
||||||
|
{
|
||||||
|
mCallEventModel.setEnd( current );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
mCallEventModel.remove( current );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
setCurrentCallEvent( null );
|
||||||
}
|
}
|
||||||
|
|
||||||
super.fade( type );
|
super.fade( type );
|
||||||
|
|||||||
@@ -41,8 +41,7 @@ public class LTRPanel extends ChannelStatePanel
|
|||||||
private JLabel mTalkgroup = new JLabel();
|
private JLabel mTalkgroup = new JLabel();
|
||||||
private JLabel mTalkgroupAlias = new JLabel();
|
private JLabel mTalkgroupAlias = new JLabel();
|
||||||
|
|
||||||
private JLabel mLCNLabel = new JLabel( "LCN" );
|
private JLabel mLCN = new JLabel( "LCN:" );
|
||||||
private JLabel mLCN = new JLabel();
|
|
||||||
|
|
||||||
private SettingsManager mSettingsManager;
|
private SettingsManager mSettingsManager;
|
||||||
|
|
||||||
@@ -86,9 +85,6 @@ public class LTRPanel extends ChannelStatePanel
|
|||||||
mTalkgroupAlias.setFont( mFontDecoder );
|
mTalkgroupAlias.setFont( mFontDecoder );
|
||||||
mTalkgroupAlias.setForeground( mColorLabelDecoder );
|
mTalkgroupAlias.setForeground( mColorLabelDecoder );
|
||||||
|
|
||||||
mLCNLabel.setFont( mFontDecoder );
|
|
||||||
mLCNLabel.setForeground( mColorLabelDetails );
|
|
||||||
|
|
||||||
mLCN.setFont( mFontDecoder );
|
mLCN.setFont( mFontDecoder );
|
||||||
mLCN.setForeground( mColorLabelDecoder );
|
mLCN.setForeground( mColorLabelDecoder );
|
||||||
|
|
||||||
@@ -100,7 +96,6 @@ public class LTRPanel extends ChannelStatePanel
|
|||||||
add( mTalkgroup );
|
add( mTalkgroup );
|
||||||
add( mTalkgroupAlias, "wrap" );
|
add( mTalkgroupAlias, "wrap" );
|
||||||
|
|
||||||
add( mLCNLabel );
|
|
||||||
add( mLCN, "wrap" );
|
add( mLCN, "wrap" );
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -120,12 +115,7 @@ public class LTRPanel extends ChannelStatePanel
|
|||||||
case CHANNEL_NUMBER:
|
case CHANNEL_NUMBER:
|
||||||
if( state.getChannelNumber() != 0 )
|
if( state.getChannelNumber() != 0 )
|
||||||
{
|
{
|
||||||
mLCN.setText(
|
mLCN.setText( "LCN: " + state.getChannelNumber() );
|
||||||
String.valueOf( state.getChannelNumber() ) );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
mLCN.setText( "" );
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case FROM_TALKGROUP:
|
case FROM_TALKGROUP:
|
||||||
@@ -208,10 +198,6 @@ public class LTRPanel extends ChannelStatePanel
|
|||||||
{
|
{
|
||||||
mChannelLabel.setForeground( mColorLabelDetails );
|
mChannelLabel.setForeground( mColorLabelDetails );
|
||||||
}
|
}
|
||||||
if( mLCNLabel != null )
|
|
||||||
{
|
|
||||||
mLCNLabel.setForeground( mColorLabelDetails );
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ import source.config.SourceConfigTuner;
|
|||||||
import alias.AliasList;
|
import alias.AliasList;
|
||||||
import audio.SquelchListener;
|
import audio.SquelchListener;
|
||||||
import audio.SquelchListener.SquelchState;
|
import audio.SquelchListener.SquelchState;
|
||||||
|
import controller.activity.CallEvent;
|
||||||
import controller.activity.CallEvent.CallEventType;
|
import controller.activity.CallEvent.CallEventType;
|
||||||
import controller.channel.Channel;
|
import controller.channel.Channel;
|
||||||
import controller.channel.Channel.ChannelType;
|
import controller.channel.Channel.ChannelType;
|
||||||
@@ -43,7 +44,6 @@ public class MPT1327ChannelState extends ChannelState
|
|||||||
private ChannelMap mChannelMap;
|
private ChannelMap mChannelMap;
|
||||||
private MPT1327ActivitySummary mActivitySummary;
|
private MPT1327ActivitySummary mActivitySummary;
|
||||||
|
|
||||||
|
|
||||||
public MPT1327ChannelState( ProcessingChain processingChain,
|
public MPT1327ChannelState( ProcessingChain processingChain,
|
||||||
AliasList aliasList,
|
AliasList aliasList,
|
||||||
ChannelMap channelMap )
|
ChannelMap channelMap )
|
||||||
@@ -63,6 +63,12 @@ public class MPT1327ChannelState extends ChannelState
|
|||||||
|
|
||||||
mActivitySummary.dispose();
|
mActivitySummary.dispose();
|
||||||
mActivitySummary = null;
|
mActivitySummary = null;
|
||||||
|
mCurrentCallEvent = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCurrentCall( MPT1327CallEvent event )
|
||||||
|
{
|
||||||
|
mCurrentCallEvent = event;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -203,8 +209,8 @@ public class MPT1327ChannelState extends ChannelState
|
|||||||
traffic.addListener( (Listener<Message>)this );
|
traffic.addListener( (Listener<Message>)this );
|
||||||
|
|
||||||
CallEventType type = traffic.isProcessing() ?
|
CallEventType type = traffic.isProcessing() ?
|
||||||
CallEventType.CALL_START :
|
CallEventType.CALL :
|
||||||
CallEventType.CALL_START_NO_TUNER;
|
CallEventType.CALL_NO_TUNER;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Set the traffic channel's call event model to
|
* Set the traffic channel's call event model to
|
||||||
@@ -212,15 +218,20 @@ public class MPT1327ChannelState extends ChannelState
|
|||||||
*/
|
*/
|
||||||
traffic.getProcessingChain().getChannelState()
|
traffic.getProcessingChain().getChannelState()
|
||||||
.setCallEventModel( mCallEventModel );
|
.setCallEventModel( mCallEventModel );
|
||||||
|
|
||||||
|
MPT1327CallEvent callStartEvent =
|
||||||
|
new MPT1327CallEvent.Builder( type )
|
||||||
|
.aliasList( traffic.getProcessingChain().getAliasList() )
|
||||||
|
.channel( channelNumber )
|
||||||
|
.frequency( mChannelMap.getFrequency( channelNumber ) )
|
||||||
|
.from( mpt.getFromID() )
|
||||||
|
.to( mpt.getToID() )
|
||||||
|
.build();
|
||||||
|
|
||||||
mCallEventModel.add(
|
traffic.getProcessingChain().getChannelState()
|
||||||
new MPT1327CallEvent.Builder( type )
|
.setCurrentCallEvent( callStartEvent );
|
||||||
.aliasList( traffic.getProcessingChain().getAliasList() )
|
|
||||||
.channel( channelNumber )
|
mCallEventModel.add( callStartEvent );
|
||||||
.frequency( mChannelMap.getFrequency( channelNumber ) )
|
|
||||||
.from( mpt.getFromID() )
|
|
||||||
.to( mpt.getToID() )
|
|
||||||
.build() );
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -260,14 +271,25 @@ public class MPT1327ChannelState extends ChannelState
|
|||||||
*/
|
*/
|
||||||
if( getState().canChangeTo( State.FADE ) )
|
if( getState().canChangeTo( State.FADE ) )
|
||||||
{
|
{
|
||||||
mCallEventModel.add(
|
CallEvent current = getCurrentCallEvent();
|
||||||
new MPT1327CallEvent.Builder( type )
|
|
||||||
.aliasList( getAliasList() )
|
if( current != null )
|
||||||
.channel( mChannelNumber )
|
{
|
||||||
.frequency( mChannelMap.getFrequency( mChannelNumber ) )
|
mCallEventModel.setEnd( current );
|
||||||
.from( mFromTalkgroup )
|
}
|
||||||
.to( mToTalkgroup )
|
else
|
||||||
.build() );
|
{
|
||||||
|
mCallEventModel.add(
|
||||||
|
new MPT1327CallEvent.Builder( type )
|
||||||
|
.aliasList( getAliasList() )
|
||||||
|
.channel( mChannelNumber )
|
||||||
|
.frequency( mChannelMap.getFrequency( mChannelNumber ) )
|
||||||
|
.from( mFromTalkgroup )
|
||||||
|
.to( mToTalkgroup )
|
||||||
|
.build() );
|
||||||
|
}
|
||||||
|
|
||||||
|
setCurrentCall( null );
|
||||||
}
|
}
|
||||||
|
|
||||||
super.fade( type );
|
super.fade( type );
|
||||||
|
|||||||
@@ -17,6 +17,8 @@
|
|||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
package decode.passport;
|
package decode.passport;
|
||||||
|
|
||||||
|
import log.Log;
|
||||||
|
|
||||||
public enum PassportBand
|
public enum PassportBand
|
||||||
{
|
{
|
||||||
BAND_800( "800", 800000000 ),
|
BAND_800( "800", 800000000 ),
|
||||||
@@ -38,6 +40,8 @@ public enum PassportBand
|
|||||||
BAND_VHF( "VHF", 0 ),
|
BAND_VHF( "VHF", 0 ),
|
||||||
BAND_UNKNOWN( "UNK", 0 );
|
BAND_UNKNOWN( "UNK", 0 );
|
||||||
|
|
||||||
|
public static int CHANNEL_BANDWIDTH = 12500; //Hertz
|
||||||
|
|
||||||
private String mDescription;
|
private String mDescription;
|
||||||
private int mBase;
|
private int mBase;
|
||||||
|
|
||||||
@@ -59,6 +63,17 @@ public enum PassportBand
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public long getFrequency( int channel )
|
||||||
|
{
|
||||||
|
return ( mBase + ( channel * CHANNEL_BANDWIDTH ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getChannel( long frequency )
|
||||||
|
{
|
||||||
|
return Math.round( (float)( frequency - mBase ) /
|
||||||
|
(float)CHANNEL_BANDWIDTH );
|
||||||
|
}
|
||||||
|
|
||||||
public String getDescription()
|
public String getDescription()
|
||||||
{
|
{
|
||||||
return mDescription;
|
return mDescription;
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ public class PassportCallEvent extends CallEvent
|
|||||||
{
|
{
|
||||||
private int mChannel;
|
private int mChannel;
|
||||||
private long mFrequency;
|
private long mFrequency;
|
||||||
|
private int mValidCallMessages = 1;
|
||||||
|
|
||||||
public PassportCallEvent( CallEventType callEventType,
|
public PassportCallEvent( CallEventType callEventType,
|
||||||
AliasList aliasList,
|
AliasList aliasList,
|
||||||
@@ -42,6 +43,29 @@ public class PassportCallEvent extends CallEvent
|
|||||||
mFrequency = frequency;
|
mFrequency = frequency;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean addMessage( PassportMessage message )
|
||||||
|
{
|
||||||
|
String tg = message.getToID();
|
||||||
|
|
||||||
|
if( tg.contentEquals( getToID() ) )
|
||||||
|
{
|
||||||
|
mValidCallMessages++;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isValid()
|
||||||
|
{
|
||||||
|
if( getCallEventType() == CallEventType.CALL )
|
||||||
|
{
|
||||||
|
return mValidCallMessages > 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
private Alias getAlias( String talkgroup )
|
private Alias getAlias( String talkgroup )
|
||||||
{
|
{
|
||||||
if( hasAliasList() )
|
if( hasAliasList() )
|
||||||
|
|||||||
@@ -17,11 +17,15 @@
|
|||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
package decode.passport;
|
package decode.passport;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
|
||||||
|
import log.Log;
|
||||||
import message.Message;
|
import message.Message;
|
||||||
import alias.Alias;
|
import alias.Alias;
|
||||||
import alias.AliasList;
|
import alias.AliasList;
|
||||||
import audio.AudioType;
|
import audio.AudioType;
|
||||||
import audio.SquelchListener;
|
import audio.SquelchListener;
|
||||||
|
import controller.activity.CallEvent;
|
||||||
import controller.activity.CallEvent.CallEventType;
|
import controller.activity.CallEvent.CallEventType;
|
||||||
import controller.channel.ProcessingChain;
|
import controller.channel.ProcessingChain;
|
||||||
import controller.state.AuxChannelState;
|
import controller.state.AuxChannelState;
|
||||||
@@ -34,9 +38,10 @@ public class PassportChannelState extends ChannelState
|
|||||||
private String mMobileID;
|
private String mMobileID;
|
||||||
private Alias mMobileIDAlias;
|
private Alias mMobileIDAlias;
|
||||||
private int mChannelNumber;
|
private int mChannelNumber;
|
||||||
private long mFrequency;
|
private int mSiteNumber;
|
||||||
private PassportCallEvent mCurrentCallEvent;
|
private PassportBand mSiteBand;
|
||||||
private PassportActivitySummary mActivitySummary;
|
private PassportActivitySummary mActivitySummary;
|
||||||
|
private HashMap<Integer,String> mActiveCalls = new HashMap<Integer,String>();
|
||||||
|
|
||||||
public PassportChannelState( ProcessingChain channel, AliasList aliasList )
|
public PassportChannelState( ProcessingChain channel, AliasList aliasList )
|
||||||
{
|
{
|
||||||
@@ -44,7 +49,7 @@ public class PassportChannelState extends ChannelState
|
|||||||
|
|
||||||
mActivitySummary = new PassportActivitySummary( aliasList );
|
mActivitySummary = new PassportActivitySummary( aliasList );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getActivitySummary()
|
public String getActivitySummary()
|
||||||
{
|
{
|
||||||
@@ -66,7 +71,7 @@ public class PassportChannelState extends ChannelState
|
|||||||
public void receive( Message message )
|
public void receive( Message message )
|
||||||
{
|
{
|
||||||
super.receive( message );
|
super.receive( message );
|
||||||
|
|
||||||
if( message instanceof PassportMessage )
|
if( message instanceof PassportMessage )
|
||||||
{
|
{
|
||||||
mActivitySummary.receive( message );
|
mActivitySummary.receive( message );
|
||||||
@@ -78,44 +83,109 @@ public class PassportChannelState extends ChannelState
|
|||||||
switch( passport.getMessageType() )
|
switch( passport.getMessageType() )
|
||||||
{
|
{
|
||||||
case CA_STRT:
|
case CA_STRT:
|
||||||
setTalkgroup( String.valueOf( passport.getTalkgroupID() ) );
|
if( mChannelNumber == 0 )
|
||||||
setTalkgroupAlias( passport.getTalkgroupIDAlias() );
|
|
||||||
|
|
||||||
if( mTalkgroupAlias != null )
|
|
||||||
{
|
{
|
||||||
try
|
mChannelNumber = passport.getLCN();
|
||||||
{
|
}
|
||||||
if( mTalkgroupAlias.hasAudioType() )
|
|
||||||
|
if( passport.getLCN() == mChannelNumber )
|
||||||
|
{
|
||||||
|
setTalkgroup( String.valueOf( passport.getTalkgroupID() ) );
|
||||||
|
setTalkgroupAlias( passport.getTalkgroupIDAlias() );
|
||||||
|
|
||||||
|
if( mTalkgroupAlias != null )
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
mAudioTypeListener.setAudioType(
|
if( mTalkgroupAlias.hasAudioType() )
|
||||||
mTalkgroupAlias.getAudioType() );
|
{
|
||||||
|
mAudioTypeListener.setAudioType(
|
||||||
|
mTalkgroupAlias.getAudioType() );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
catch( Exception e )
|
||||||
catch( Exception e )
|
{
|
||||||
{
|
Log.error( "Error setting audio for "
|
||||||
e.printStackTrace();
|
+ "passport call", e );
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
PassportCallEvent current =
|
||||||
|
getCurrentPassportCallEvent();
|
||||||
|
|
||||||
|
/* If we're already in a call event, add the message
|
||||||
|
* to the current call event ... if false, then we
|
||||||
|
* have a different call ... cleanup the old one. */
|
||||||
|
if( current != null && !current.addMessage( passport ) )
|
||||||
|
{
|
||||||
|
Log.info( "Current call event - testing" );
|
||||||
|
|
||||||
|
if( current.isValid() )
|
||||||
|
{
|
||||||
|
final PassportCallEvent endEvent =
|
||||||
|
getCurrentPassportCallEvent();
|
||||||
|
|
||||||
|
mCallEventModel.setEnd( endEvent );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
mCallEventModel.remove( current );
|
||||||
|
}
|
||||||
|
|
||||||
|
current = null;
|
||||||
|
setCurrentCallEvent( null );
|
||||||
|
}
|
||||||
|
|
||||||
|
if( current == null )
|
||||||
|
{
|
||||||
|
mCurrentCallEvent = new PassportCallEvent
|
||||||
|
.Builder( CallEventType.CALL )
|
||||||
|
.aliasList( mAliasList )
|
||||||
|
.channel( mChannelNumber )
|
||||||
|
.frequency( passport.getLCNFrequency() )
|
||||||
|
.to( String.valueOf( passport.getTalkgroupID() ) )
|
||||||
|
.build();
|
||||||
|
|
||||||
|
mCallEventModel.add( mCurrentCallEvent );
|
||||||
|
}
|
||||||
|
|
||||||
|
State state = getState();
|
||||||
|
|
||||||
|
if( state == State.IDLE || state == State.CALL )
|
||||||
|
{
|
||||||
|
setState( State.CALL );
|
||||||
|
}
|
||||||
|
else if( state == State.DATA )
|
||||||
|
{
|
||||||
|
setState( State.DATA );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
mChannelNumber = passport.getLCN();
|
|
||||||
mFrequency = passport.getLCNFrequency();
|
|
||||||
|
|
||||||
if( getState() != State.CALL )
|
|
||||||
{
|
{
|
||||||
mCurrentCallEvent = new PassportCallEvent
|
//Call Detection
|
||||||
.Builder( CallEventType.CALL_START )
|
int lcn = passport.getLCN();
|
||||||
.aliasList( mAliasList )
|
String tg = String.valueOf( passport.getTalkgroupID() );
|
||||||
.channel( mChannelNumber )
|
|
||||||
.frequency( mFrequency )
|
|
||||||
.to( String.valueOf( passport.getTalkgroupID() ) )
|
|
||||||
.build();
|
|
||||||
|
|
||||||
mCallEventModel.add( mCurrentCallEvent );
|
if( !mActiveCalls.containsKey( lcn ) ||
|
||||||
|
!mActiveCalls.get( lcn ).contentEquals( tg ) )
|
||||||
|
{
|
||||||
|
mActiveCalls.put( lcn, tg );
|
||||||
|
|
||||||
|
PassportCallEvent event = new PassportCallEvent
|
||||||
|
.Builder( CallEventType.CALL_DETECT )
|
||||||
|
.aliasList( mAliasList )
|
||||||
|
.channel( lcn )
|
||||||
|
.details( "Site: " + passport.getSite() )
|
||||||
|
.frequency( passport.getLCNFrequency() )
|
||||||
|
.to( tg )
|
||||||
|
.build();
|
||||||
|
|
||||||
|
mCallEventModel.add( event );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
setState( State.CALL );
|
|
||||||
break;
|
break;
|
||||||
case DA_STRT:
|
case DA_STRT:
|
||||||
|
//TODO: add channel number checking and log a call event if on another site
|
||||||
setTalkgroup( String.valueOf( passport.getTalkgroupID() ) );
|
setTalkgroup( String.valueOf( passport.getTalkgroupID() ) );
|
||||||
setTalkgroupAlias( passport.getTalkgroupIDAlias() );
|
setTalkgroupAlias( passport.getTalkgroupIDAlias() );
|
||||||
setState( State.DATA );
|
setState( State.DATA );
|
||||||
@@ -129,12 +199,48 @@ public class PassportChannelState extends ChannelState
|
|||||||
setMobileID( passport.getMobileID() );
|
setMobileID( passport.getMobileID() );
|
||||||
setMobileIDAlias( passport.getMobileIDAlias() );
|
setMobileIDAlias( passport.getMobileIDAlias() );
|
||||||
|
|
||||||
if( mCurrentCallEvent != null )
|
final String mid = passport.getMobileID();
|
||||||
|
|
||||||
|
final PassportCallEvent event =
|
||||||
|
getCurrentPassportCallEvent();
|
||||||
|
|
||||||
|
if( event != null && mid != null )
|
||||||
{
|
{
|
||||||
mCurrentCallEvent.setFromID( mMobileID );
|
mCallEventModel.setFromID( event, mid );
|
||||||
}
|
}
|
||||||
|
|
||||||
setState( State.CALL );
|
setState( State.CALL );
|
||||||
break;
|
break;
|
||||||
|
case RA_REGI:
|
||||||
|
mCallEventModel.add( new PassportCallEvent
|
||||||
|
.Builder( CallEventType.REGISTER )
|
||||||
|
.aliasList( mAliasList )
|
||||||
|
.channel( passport.getLCN() )
|
||||||
|
.frequency( passport.getLCNFrequency() )
|
||||||
|
.to( passport.getToID() )
|
||||||
|
.build() );
|
||||||
|
//TODO: add logic to recognize the register event and suppress the subsequent
|
||||||
|
//call messages, but capture the group assignments.
|
||||||
|
setState( State.DATA );
|
||||||
|
break;
|
||||||
|
case SY_IDLE:
|
||||||
|
PassportBand band = passport.getSiteBand();
|
||||||
|
|
||||||
|
if( mSiteBand == null || mSiteBand != band )
|
||||||
|
{
|
||||||
|
mSiteBand = band;
|
||||||
|
|
||||||
|
mSiteNumber = passport.getSite();
|
||||||
|
|
||||||
|
long frequency = mProcessingChain.getChannel()
|
||||||
|
.getTunerChannel().getFrequency();
|
||||||
|
|
||||||
|
mChannelNumber = mSiteBand.getChannel( frequency );
|
||||||
|
|
||||||
|
broadcastChange( ChangedAttribute.CHANNEL_NUMBER );
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -152,21 +258,33 @@ public class PassportChannelState extends ChannelState
|
|||||||
*/
|
*/
|
||||||
if( getState().canChangeTo( State.FADE ) )
|
if( getState().canChangeTo( State.FADE ) )
|
||||||
{
|
{
|
||||||
mCallEventModel.add(
|
final PassportCallEvent current = getCurrentPassportCallEvent();
|
||||||
new PassportCallEvent.Builder( type )
|
|
||||||
.aliasList( getAliasList() )
|
if( current != null )
|
||||||
.channel( mChannelNumber )
|
{
|
||||||
.frequency( mProcessingChain.getChannel()
|
mCallEventModel.setEnd( current );
|
||||||
.getTunerChannel().getFrequency() )
|
}
|
||||||
.to( mTalkgroup )
|
|
||||||
.build() );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setCurrentCallEvent( null );
|
||||||
|
|
||||||
|
mActiveCalls.clear();
|
||||||
|
|
||||||
super.fade( type );
|
super.fade( type );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public PassportCallEvent getCurrentPassportCallEvent()
|
||||||
|
{
|
||||||
|
CallEvent current = getCurrentCallEvent();
|
||||||
|
|
||||||
|
if( current != null )
|
||||||
|
{
|
||||||
|
return (PassportCallEvent)current;
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Make the ConventionalChannelState always unsquelched
|
* Make the ConventionalChannelState always unsquelched
|
||||||
*/
|
*/
|
||||||
@@ -190,6 +308,16 @@ public class PassportChannelState extends ChannelState
|
|||||||
super.reset();
|
super.reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int getChannelNumber()
|
||||||
|
{
|
||||||
|
return mChannelNumber;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getSiteNumber()
|
||||||
|
{
|
||||||
|
return mSiteNumber;
|
||||||
|
}
|
||||||
|
|
||||||
public String getTalkgroup()
|
public String getTalkgroup()
|
||||||
{
|
{
|
||||||
return mTalkgroup;
|
return mTalkgroup;
|
||||||
|
|||||||
@@ -207,11 +207,6 @@ public class PassportMessage extends Message
|
|||||||
return PassportBand.lookup( getInt( sNEIGHBOR_BAND ) );
|
return PassportBand.lookup( getInt( sNEIGHBOR_BAND ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
public long getFrequency( int base, int channel )
|
|
||||||
{
|
|
||||||
return ( base + ( channel * 12500 ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getFree()
|
public int getFree()
|
||||||
{
|
{
|
||||||
return getInt( sFREE );
|
return getInt( sFREE );
|
||||||
@@ -233,7 +228,7 @@ public class PassportMessage extends Message
|
|||||||
{
|
{
|
||||||
PassportBand band = getNeighborBand();
|
PassportBand band = getNeighborBand();
|
||||||
|
|
||||||
return getFrequency( band.getBase(), getFree() );
|
return band.getFrequency( getFree() );
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@@ -377,15 +372,13 @@ public class PassportMessage extends Message
|
|||||||
@Override
|
@Override
|
||||||
public String getToID()
|
public String getToID()
|
||||||
{
|
{
|
||||||
// TODO Auto-generated method stub
|
return String.valueOf( getTalkgroupID() );
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Alias getToIDAlias()
|
public Alias getToIDAlias()
|
||||||
{
|
{
|
||||||
// TODO Auto-generated method stub
|
return getTalkgroupIDAlias();
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public long getSiteFrequency( int channel )
|
public long getSiteFrequency( int channel )
|
||||||
@@ -396,9 +389,7 @@ public class PassportMessage extends Message
|
|||||||
|
|
||||||
if( band != PassportBand.BAND_UNKNOWN )
|
if( band != PassportBand.BAND_UNKNOWN )
|
||||||
{
|
{
|
||||||
int base = band.getBase();
|
return band.getFrequency( channel );
|
||||||
|
|
||||||
return getFrequency( base, channel );
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -493,7 +484,7 @@ public class PassportMessage extends Message
|
|||||||
sb.append( getFreeFrequencyFormatted() );
|
sb.append( getFreeFrequencyFormatted() );
|
||||||
break;
|
break;
|
||||||
case CA_ENDD:
|
case CA_ENDD:
|
||||||
sb.append( "END TG:" );
|
sb.append( "END TG:" );
|
||||||
sb.append( format( getTalkgroupID(), 5 ) );
|
sb.append( format( getTalkgroupID(), 5 ) );
|
||||||
sb.append( "/" );
|
sb.append( "/" );
|
||||||
Alias endAlias = getTalkgroupIDAlias();
|
Alias endAlias = getTalkgroupIDAlias();
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ package decode.passport;
|
|||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
|
||||||
|
import log.Log;
|
||||||
import message.Message;
|
import message.Message;
|
||||||
import message.MessageType;
|
import message.MessageType;
|
||||||
import sample.Broadcaster;
|
import sample.Broadcaster;
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ public class PassportPanel extends ChannelStatePanel
|
|||||||
private JLabel mToTalkgroup = new JLabel();
|
private JLabel mToTalkgroup = new JLabel();
|
||||||
private JLabel mToTalkgroupAlias = new JLabel();
|
private JLabel mToTalkgroupAlias = new JLabel();
|
||||||
|
|
||||||
private JLabel mFromTalkgroupType = new JLabel( " " );
|
private JLabel mSiteAndChannel = new JLabel( "Site:" );
|
||||||
private JLabel mFromTalkgroup = new JLabel();
|
private JLabel mFromTalkgroup = new JLabel();
|
||||||
private JLabel mFromTalkgroupAlias = new JLabel();
|
private JLabel mFromTalkgroupAlias = new JLabel();
|
||||||
|
|
||||||
@@ -86,8 +86,8 @@ public class PassportPanel extends ChannelStatePanel
|
|||||||
mToTalkgroupAlias.setFont( mFontDecoder );
|
mToTalkgroupAlias.setFont( mFontDecoder );
|
||||||
mToTalkgroupAlias.setForeground( mColorLabelDecoder );
|
mToTalkgroupAlias.setForeground( mColorLabelDecoder );
|
||||||
|
|
||||||
mFromTalkgroupType.setFont( mFontDecoder );
|
mSiteAndChannel.setFont( mFontDecoder );
|
||||||
mFromTalkgroupType.setForeground( mColorLabelDecoder );
|
mSiteAndChannel.setForeground( mColorLabelDecoder );
|
||||||
|
|
||||||
mFromTalkgroup.setFont( mFontDecoder );
|
mFromTalkgroup.setFont( mFontDecoder );
|
||||||
mFromTalkgroup.setForeground( mColorLabelDecoder );
|
mFromTalkgroup.setForeground( mColorLabelDecoder );
|
||||||
@@ -103,7 +103,7 @@ public class PassportPanel extends ChannelStatePanel
|
|||||||
add( mToTalkgroup );
|
add( mToTalkgroup );
|
||||||
add( mToTalkgroupAlias, "wrap" );
|
add( mToTalkgroupAlias, "wrap" );
|
||||||
|
|
||||||
add( mFromTalkgroupType );
|
add( mSiteAndChannel );
|
||||||
add( mFromTalkgroup );
|
add( mFromTalkgroup );
|
||||||
add( mFromTalkgroupAlias, "wrap" );
|
add( mFromTalkgroupAlias, "wrap" );
|
||||||
}
|
}
|
||||||
@@ -135,7 +135,16 @@ public class PassportPanel extends ChannelStatePanel
|
|||||||
mChannelLabel.setText( mChannel.getChannelDisplayName() );
|
mChannelLabel.setText( mChannel.getChannelDisplayName() );
|
||||||
break;
|
break;
|
||||||
case TO_TALKGROUP:
|
case TO_TALKGROUP:
|
||||||
mToTalkgroup.setText( state.getTalkgroup() );
|
String tg = state.getTalkgroup();
|
||||||
|
|
||||||
|
if( tg != null )
|
||||||
|
{
|
||||||
|
mToTalkgroup.setText( "TG:" + tg );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
mToTalkgroup.setText( null );
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case TO_TALKGROUP_ALIAS:
|
case TO_TALKGROUP_ALIAS:
|
||||||
Alias toAlias = state.getTalkgroupAlias();
|
Alias toAlias = state.getTalkgroupAlias();
|
||||||
@@ -156,16 +165,14 @@ public class PassportPanel extends ChannelStatePanel
|
|||||||
case FROM_TALKGROUP:
|
case FROM_TALKGROUP:
|
||||||
String mid = state.getMobileID();
|
String mid = state.getMobileID();
|
||||||
|
|
||||||
mFromTalkgroup.setText( state.getMobileID() );
|
if( mid != null )
|
||||||
|
{
|
||||||
if( mid != null )
|
mFromTalkgroup.setText( "MIN:" + mid );
|
||||||
{
|
}
|
||||||
mFromTalkgroupType.setText( "Mobile ID" );
|
else
|
||||||
}
|
{
|
||||||
else
|
mFromTalkgroup.setText( null );
|
||||||
{
|
}
|
||||||
mFromTalkgroupType.setText( " " );
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case FROM_TALKGROUP_ALIAS:
|
case FROM_TALKGROUP_ALIAS:
|
||||||
Alias fromAlias = state.getMobileIDAlias();
|
Alias fromAlias = state.getMobileIDAlias();
|
||||||
@@ -183,6 +190,15 @@ public class PassportPanel extends ChannelStatePanel
|
|||||||
mFromTalkgroupAlias.setIcon( null );
|
mFromTalkgroupAlias.setIcon( null );
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case CHANNEL_NUMBER:
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
sb.append( "Site: " );
|
||||||
|
sb.append( state.getSiteNumber() );
|
||||||
|
sb.append( "/" );
|
||||||
|
sb.append( state.getChannelNumber() );
|
||||||
|
|
||||||
|
mSiteAndChannel.setText( sb.toString() );
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -222,9 +238,9 @@ public class PassportPanel extends ChannelStatePanel
|
|||||||
{
|
{
|
||||||
mToTalkgroupAlias.setForeground( mColorLabelDecoder );
|
mToTalkgroupAlias.setForeground( mColorLabelDecoder );
|
||||||
}
|
}
|
||||||
if( mFromTalkgroupType != null )
|
if( mSiteAndChannel != null )
|
||||||
{
|
{
|
||||||
mFromTalkgroupType.setForeground( mColorLabelDecoder );
|
mSiteAndChannel.setForeground( mColorLabelDecoder );
|
||||||
}
|
}
|
||||||
if( mFromTalkgroup != null )
|
if( mFromTalkgroup != null )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ import java.util.concurrent.RejectedExecutionException;
|
|||||||
import java.util.concurrent.ScheduledFuture;
|
import java.util.concurrent.ScheduledFuture;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
import log.Log;
|
|
||||||
import sample.Listener;
|
import sample.Listener;
|
||||||
import sample.complex.ComplexSample;
|
import sample.complex.ComplexSample;
|
||||||
import sample.complex.ComplexSampleAssembler;
|
import sample.complex.ComplexSampleAssembler;
|
||||||
@@ -52,7 +51,6 @@ public class TunerChannelSource extends ComplexSource
|
|||||||
private TunerChannel mTunerChannel;
|
private TunerChannel mTunerChannel;
|
||||||
private Oscillator mSineWaveGenerator;
|
private Oscillator mSineWaveGenerator;
|
||||||
private ComplexFilter[] mDecimationFilters;
|
private ComplexFilter[] mDecimationFilters;
|
||||||
private DecimationProcessor mDecimationProcessor = new DecimationProcessor();
|
|
||||||
|
|
||||||
private ComplexSampleAssembler mBufferAssembler =
|
private ComplexSampleAssembler mBufferAssembler =
|
||||||
new ComplexSampleAssembler( 3000 );
|
new ComplexSampleAssembler( 3000 );
|
||||||
@@ -188,7 +186,7 @@ public class TunerChannelSource extends ComplexSource
|
|||||||
if( bandwidth != mTunerSampleRate )
|
if( bandwidth != mTunerSampleRate )
|
||||||
{
|
{
|
||||||
/* Get the original decimation filter output listener */
|
/* Get the original decimation filter output listener */
|
||||||
Listener<ComplexSample> listener = null;
|
// Listener<ComplexSample> listener = null;
|
||||||
|
|
||||||
/* Get new decimation filters */
|
/* Get new decimation filters */
|
||||||
mDecimationFilters = FilterFactory
|
mDecimationFilters = FilterFactory
|
||||||
@@ -277,9 +275,6 @@ public class TunerChannelSource extends ComplexSource
|
|||||||
mTunerFrequencyError = error;
|
mTunerFrequencyError = error;
|
||||||
frequencyChanged( mTunerFrequency, mTunerSampleRate );
|
frequencyChanged( mTunerFrequency, mTunerSampleRate );
|
||||||
}
|
}
|
||||||
|
|
||||||
Log.info( "TunerChannelSource - mistuned quantity:" +
|
|
||||||
mTunerFrequencyError + " Hz" );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ public class DFTProcessor implements Listener<Float[]>,
|
|||||||
private FFTWidth mNewFFTWidth = FFTWidth.FFT04096;
|
private FFTWidth mNewFFTWidth = FFTWidth.FFT04096;
|
||||||
|
|
||||||
private double[] mWindow;
|
private double[] mWindow;
|
||||||
private WindowType mWindowType = Window.WindowType.BLACKMAN;
|
private WindowType mWindowType = Window.WindowType.COSINE;
|
||||||
|
|
||||||
private FloatFFT_1D mFFT = new FloatFFT_1D( mFFTWidth.getWidth() );
|
private FloatFFT_1D mFFT = new FloatFFT_1D( mFFTWidth.getWidth() );
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user