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

#90 [WIP] on redesigning the channel processing gui components and backing model. Simplifies channel state by introducing a new Metadata class that tracks all metadata for all decoders.

Browse Source
This commit is contained in:
Denny
2017-01-14 11:21:53 -05:00
parent 6a9e522d77
commit 7115b4feb1
57 changed files with 1534 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/module/decode/mpt1327/MPT1327DecoderPanel.java
View File

@@ -20,8 +20,8 @@ package module.decode.mpt1327;
import controller.channel.Channel.ChannelType;
import icon.IconManager;
import module.decode.state.ChangedAttribute;
import module.decode.state.DecoderPanel;
import channel.metadata.Attribute;
import channel.state.DecoderPanel;
import net.miginfocom.swing.MigLayout;
import settings.ColorSetting;
import settings.Setting;
@@ -120,7 +120,7 @@ public class MPT1327DecoderPanel extends DecoderPanel
}
@Override
public void receive(final ChangedAttribute changedAttribute)
public void receive(final Attribute attribute)
{
final MPT1327DecoderState state = getDecoderState();
@@ -129,7 +129,7 @@ public class MPT1327DecoderPanel extends DecoderPanel
@Override
public void run()
{
switch(changedAttribute)
switch(attribute)
{
case CHANNEL_SITE_NUMBER:
mSiteOrToTalkgroup.setText(String.valueOf(state.getSite()));

34
src/module/decode/mpt1327/MPT1327DecoderState.java
View File

@@ -31,13 +31,13 @@ import module.decode.config.DecodeConfiguration;
import module.decode.event.CallEvent;
import module.decode.event.CallEvent.CallEventType;
import module.decode.mpt1327.MPT1327Message.IdentType;
import module.decode.state.ChangeChannelTimeoutEvent;
import module.decode.state.ChangedAttribute;
import module.decode.state.DecoderState;
import module.decode.state.DecoderStateEvent;
import module.decode.state.DecoderStateEvent.Event;
import module.decode.state.State;
import module.decode.state.TrafficChannelAllocationEvent;
import channel.state.ChangeChannelTimeoutEvent;
import channel.metadata.Attribute;
import channel.state.DecoderState;
import channel.state.DecoderStateEvent;
import channel.state.DecoderStateEvent.Event;
import channel.state.State;
import channel.traffic.TrafficChannelAllocationEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -184,7 +184,7 @@ public class MPT1327DecoderState extends DecoderState
if( site != null && ( mSite == null || !site.contentEquals( mSite ) ) )
{
mSite = site;
broadcast( ChangedAttribute.CHANNEL_SITE_NUMBER );
broadcast( Attribute.CHANNEL_SITE_NUMBER );
}
mSite = mpt.getSiteID();
@@ -314,10 +314,10 @@ public class MPT1327DecoderState extends DecoderState
private void resetState()
{
mFromTalkgroup = null;
broadcast( ChangedAttribute.FROM_TALKGROUP );
broadcast( Attribute.FROM_TALKGROUP );
mToTalkgroup = null;
broadcast( ChangedAttribute.TO_TALKGROUP );
broadcast( Attribute.TO_TALKGROUP );
/**
* If this is a standard channel, reset the fade timeout to the default
@@ -378,7 +378,7 @@ public class MPT1327DecoderState extends DecoderState
{
mFromTalkgroup = fromTalkgroup;
broadcast( ChangedAttribute.FROM_TALKGROUP );
broadcast( Attribute.FROM_TALKGROUP );
}
public Alias getFromTalkgroupAlias()
@@ -405,7 +405,7 @@ public class MPT1327DecoderState extends DecoderState
{
mToTalkgroup = toTalkgroup;
broadcast( ChangedAttribute.TO_TALKGROUP );
broadcast( Attribute.TO_TALKGROUP );
}
public Alias getToTalkgroupAlias()
@@ -432,7 +432,7 @@ public class MPT1327DecoderState extends DecoderState
{
mChannelNumber = channel;
broadcast( ChangedAttribute.CHANNEL_NUMBER );
broadcast( Attribute.CHANNEL_NUMBER );
}
@Override
@@ -590,7 +590,7 @@ public class MPT1327DecoderState extends DecoderState
try
{
mChannelNumber = Integer.valueOf( channel );
broadcast( ChangedAttribute.CHANNEL_NUMBER );
broadcast( Attribute.CHANNEL_NUMBER );
}
catch( Exception e )
{
@@ -599,13 +599,13 @@ public class MPT1327DecoderState extends DecoderState
}
mFrequency = allocationEvent.getCallEvent().getFrequency();
broadcast( ChangedAttribute.SOURCE );
broadcast( Attribute.SOURCE );
mFromTalkgroup = allocationEvent.getCallEvent().getFromID();
broadcast( ChangedAttribute.FROM_TALKGROUP );
broadcast( Attribute.FROM_TALKGROUP );
mToTalkgroup = allocationEvent.getCallEvent().getToID();
broadcast( ChangedAttribute.TO_TALKGROUP );
broadcast( Attribute.TO_TALKGROUP );
}
}
break;

8
src/module/decode/mpt1327/MPT1327TrafficPanel.java
View File

@@ -20,8 +20,8 @@ package module.decode.mpt1327;
import alias.Alias;
import icon.IconManager;
import module.decode.state.ChangedAttribute;
import module.decode.state.DecoderPanel;
import channel.metadata.Attribute;
import channel.state.DecoderPanel;
import settings.ColorSetting;
import settings.Setting;
import settings.SettingsManager;
@@ -95,7 +95,7 @@ public class MPT1327TrafficPanel extends DecoderPanel
}
@Override
public void receive(final ChangedAttribute changedAttribute)
public void receive(final Attribute attribute)
{
final MPT1327DecoderState state = getDecoderState();
@@ -104,7 +104,7 @@ public class MPT1327TrafficPanel extends DecoderPanel
@Override
public void run()
{
switch(changedAttribute)
switch(attribute)
{
case FROM_TALKGROUP:
String talkgroup = state.getFromTalkgroup();