#82 WIP - converted all classes to get icons from IconManager and removed icon management from the SettingsManager

This commit is contained in:
Denny
2017-01-08 21:06:02 -05:00
parent 488dc9da4c
commit b6498d048a
43 changed files with 4809 additions and 5084 deletions

View File

@@ -1,3 +1,21 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package alias;
import alias.AliasEvent.Event;
@@ -5,9 +23,9 @@ import gui.editor.Editor;
import icon.Icon;
import icon.IconCellRenderer;
import icon.IconManager;
import icon.IconModel;
import map.MapIcon;
import net.miginfocom.swing.MigLayout;
import settings.SettingsManager;
import javax.swing.*;
import javax.swing.event.DocumentEvent;
@@ -43,8 +61,7 @@ public class AliasNameEditor extends Editor<Alias>
private void init()
{
setLayout(new MigLayout("fill,wrap 2", "[right][grow,fill]",
"[][][][][][][grow]"));
setLayout(new MigLayout("fill,wrap 2", "[right][grow,fill]", "[][][][][][][grow]"));
add(new JLabel("Name:"));
mName = new JTextField();
@@ -179,6 +196,8 @@ public class AliasNameEditor extends Editor<Alias>
{
mName.setText(alias.getName());
mIconCombo.setModel(new DefaultComboBoxModel<>(mIconManager.getIcons()));
List<String> listNames = mAliasModel.getListNames();
if(listNames.isEmpty())
@@ -218,7 +237,7 @@ public class AliasNameEditor extends Editor<Alias>
if(iconName == null)
{
iconName = SettingsManager.DEFAULT_ICON;
iconName = IconModel.DEFAULT_ICON;
}
Icon savedIcon = mIconManager.getModel().getIcon(iconName);

View File

@@ -266,6 +266,8 @@ public class MultipleAliasEditor extends Editor<List<Alias>>
List<String> streamNames = mBroadcastModel.getBroadcastConfigurationNames();
mStreamCombo.setModel(new DefaultComboBoxModel<String>(streamNames.toArray(new String[streamNames.size()])));
mIconCombo.setModel(new DefaultComboBoxModel<>(mIconManager.getIcons()));
setCheckBoxesUnselected();
setModified(false);

View File

@@ -1,12 +1,29 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package audio;
import java.awt.Color;
import java.awt.EventQueue;
import java.awt.Font;
import javax.swing.JLabel;
import javax.swing.JPanel;
import alias.Alias;
import audio.metadata.AudioMetadata;
import audio.metadata.Metadata;
import audio.metadata.MetadataType;
import audio.output.AudioOutput;
import icon.IconManager;
import net.miginfocom.swing.MigLayout;
import sample.Listener;
import settings.ColorSetting;
@@ -14,11 +31,9 @@ import settings.ColorSetting.ColorSettingName;
import settings.Setting;
import settings.SettingChangeListener;
import settings.SettingsManager;
import alias.Alias;
import audio.metadata.AudioMetadata;
import audio.metadata.Metadata;
import audio.metadata.MetadataType;
import audio.output.AudioOutput;
import javax.swing.*;
import java.awt.*;
public class AudioChannelPanel extends JPanel
implements Listener<AudioEvent>, SettingChangeListener
@@ -29,6 +44,7 @@ public class AudioChannelPanel extends JPanel
private Color mLabelColor;
private Color mDetailsColor;
private IconManager mIconManager;
private SettingsManager mSettingsManager;
private AudioOutput mAudioOutput;
@@ -44,8 +60,9 @@ public class AudioChannelPanel extends JPanel
private boolean mConfigured = false;
public AudioChannelPanel( SettingsManager settingsManager, AudioOutput audioOutput )
public AudioChannelPanel(IconManager iconManager, SettingsManager settingsManager, AudioOutput audioOutput)
{
mIconManager = iconManager;
mSettingsManager = settingsManager;
mSettingsManager.addListener(this);
@@ -180,8 +197,7 @@ public class AudioChannelPanel extends JPanel
if(icon != null)
{
label.setIcon( mSettingsManager.getImageIcon( icon,
SettingsManager.DEFAULT_ICON_SIZE ) );
label.setIcon(mIconManager.getIcon(icon, IconManager.DEFAULT_ICON_SIZE));
}
else
{
@@ -287,5 +303,7 @@ public class AudioChannelPanel extends JPanel
}
@Override
public void settingDeleted( Setting setting ) {}
public void settingDeleted(Setting setting)
{
}
}

View File

@@ -1,21 +1,37 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package audio;
import java.awt.Color;
import java.util.List;
import javax.swing.JPanel;
import javax.swing.JSeparator;
import audio.output.AudioOutput;
import icon.IconManager;
import net.miginfocom.swing.MigLayout;
import settings.SettingsManager;
import audio.output.AudioOutput;
import javax.swing.*;
import java.awt.*;
import java.util.List;
public class AudioChannelsPanel extends JPanel
{
private static final long serialVersionUID = 1L;
public AudioChannelsPanel( SettingsManager settingsManager,
IAudioController controller )
public AudioChannelsPanel(IconManager iconManager, SettingsManager settingsManager, IAudioController controller)
{
setLayout(new MigLayout("insets 0 0 0 0", "[grow,fill]", "[]0[]"));
@@ -25,7 +41,7 @@ public class AudioChannelsPanel extends JPanel
for(int x = 0; x < outputs.size(); x++)
{
add( new AudioChannelPanel( settingsManager, outputs.get( x ) ), "wrap" );
add(new AudioChannelPanel(iconManager, settingsManager, outputs.get(x)), "wrap");
if(x < outputs.size() - 1)
{
@@ -38,7 +54,7 @@ public class AudioChannelsPanel extends JPanel
if(outputs.size() == 1)
{
addSeparator();
add( new AudioChannelPanel( settingsManager, null ), "wrap" );
add(new AudioChannelPanel(iconManager, settingsManager, null), "wrap");
}
}

View File

@@ -1,35 +1,42 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package audio;
import java.awt.Color;
import java.awt.EventQueue;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import javax.sound.sampled.FloatControl;
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JSlider;
import javax.swing.SwingUtilities;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import audio.output.AudioOutput;
import icon.IconManager;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sample.Listener;
import settings.SettingsManager;
import source.SourceManager;
import source.mixer.MixerChannelConfiguration;
import audio.output.AudioOutput;
import javax.sound.sampled.FloatControl;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
public class AudioPanel extends JPanel implements Listener<AudioEvent>
{
@@ -37,11 +44,12 @@ public class AudioPanel extends JPanel implements Listener<AudioEvent>
private static final Logger mLog = LoggerFactory.getLogger(AudioPanel.class);
private static ImageIcon MUTED_ICON = SettingsManager.getScaledIcon(
private static ImageIcon MUTED_ICON = IconManager.getScaledIcon(
new ImageIcon("images/audio_muted.png"), 38);
private static ImageIcon UNMUTED_ICON = SettingsManager.getScaledIcon(
private static ImageIcon UNMUTED_ICON = IconManager.getScaledIcon(
new ImageIcon("images/audio_unmuted.png"), 38);
private IconManager mIconManager;
private SettingsManager mSettingsManager;
private SourceManager mSourceManager;
private IAudioController mController;
@@ -49,10 +57,10 @@ public class AudioPanel extends JPanel implements Listener<AudioEvent>
private JButton mMuteButton;
private AudioChannelsPanel mAudioChannelsPanel;
public AudioPanel( SettingsManager settingsManager,
SourceManager sourceManager,
public AudioPanel(IconManager iconManager, SettingsManager settingsManager, SourceManager sourceManager,
IAudioController controller)
{
mIconManager = iconManager;
mSettingsManager = settingsManager;
mSourceManager = sourceManager;
mController = controller;
@@ -71,7 +79,7 @@ public class AudioPanel extends JPanel implements Listener<AudioEvent>
mMuteButton.setBackground(getBackground());
add(mMuteButton);
mAudioChannelsPanel = new AudioChannelsPanel( mSettingsManager, mController );
mAudioChannelsPanel = new AudioChannelsPanel(mIconManager, mSettingsManager, mController);
add(mAudioChannelsPanel);
@@ -93,8 +101,7 @@ public class AudioPanel extends JPanel implements Listener<AudioEvent>
{
remove(mAudioChannelsPanel);
mAudioChannelsPanel = new AudioChannelsPanel(
mSettingsManager, mController );
mAudioChannelsPanel = new AudioChannelsPanel(mIconManager, mSettingsManager, mController);
add(mAudioChannelsPanel);
@@ -200,13 +207,24 @@ public class AudioPanel extends JPanel implements Listener<AudioEvent>
}
@Override
public void mousePressed( MouseEvent e ) {}
public void mousePressed(MouseEvent e)
{
}
@Override
public void mouseReleased( MouseEvent e ) {}
public void mouseReleased(MouseEvent e)
{
}
@Override
public void mouseEntered( MouseEvent e ) {}
public void mouseEntered(MouseEvent e)
{
}
@Override
public void mouseExited( MouseEvent e ) {}
public void mouseExited(MouseEvent e)
{
}
}
/**
@@ -253,10 +271,21 @@ public class AudioPanel extends JPanel implements Listener<AudioEvent>
}
}
public void mouseReleased( MouseEvent arg0 ) {}
public void mousePressed( MouseEvent arg0 ) {}
public void mouseExited( MouseEvent arg0 ) {}
public void mouseEntered( MouseEvent arg0 ) {}
public void mouseReleased(MouseEvent arg0)
{
}
public void mousePressed(MouseEvent arg0)
{
}
public void mouseExited(MouseEvent arg0)
{
}
public void mouseEntered(MouseEvent arg0)
{
}
});
}

View File

@@ -19,24 +19,22 @@
package audio.broadcast;
import alias.AliasModel;
import audio.broadcast.broadcastify.BroadcastifyConfiguration;
import audio.broadcast.broadcastify.BroadcastifyConfigurationEditor;
import gui.editor.DocumentListenerEditor;
import settings.SettingsManager;
import icon.IconManager;
import javax.swing.*;
public abstract class BroadcastConfigurationEditor extends DocumentListenerEditor<BroadcastConfiguration>
{
protected SettingsManager mSettingsManager;
protected IconManager mIconManager;
protected BroadcastModel mBroadcastModel;
protected AliasModel mAliasModel;
public BroadcastConfigurationEditor(BroadcastModel broadcastModel, AliasModel aliasModel, SettingsManager settingsManager)
public BroadcastConfigurationEditor(BroadcastModel broadcastModel, AliasModel aliasModel, IconManager iconManager)
{
mBroadcastModel = broadcastModel;
mAliasModel = aliasModel;
mSettingsManager = settingsManager;
mIconManager = iconManager;
}
/**

View File

@@ -40,6 +40,7 @@ import audio.convert.MP3SilenceGenerator;
import controller.ThreadPoolManager;
import gui.editor.Editor;
import gui.editor.EmptyEditor;
import icon.IconManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import record.AudioRecorder;
@@ -155,26 +156,26 @@ public class BroadcastFactory
public static Editor<BroadcastConfiguration> getEditor(BroadcastConfiguration configuration,
BroadcastModel broadcastModel,
AliasModel aliasModel,
SettingsManager settingsManager)
IconManager iconManager)
{
Editor<BroadcastConfiguration> editor;
switch (configuration.getBroadcastServerType())
{
case BROADCASTIFY:
editor = new BroadcastifyConfigurationEditor(broadcastModel, aliasModel, settingsManager);
editor = new BroadcastifyConfigurationEditor(broadcastModel, aliasModel, iconManager);
break;
case ICECAST_TCP:
editor = new IcecastTCPConfigurationEditor(broadcastModel, aliasModel, settingsManager);
editor = new IcecastTCPConfigurationEditor(broadcastModel, aliasModel, iconManager);
break;
case ICECAST_HTTP:
editor = new IcecastHTTPConfigurationEditor(broadcastModel, aliasModel, settingsManager);
editor = new IcecastHTTPConfigurationEditor(broadcastModel, aliasModel, iconManager);
break;
case SHOUTCAST_V1:
editor = new ShoutcastV1ConfigurationEditor(broadcastModel, aliasModel, settingsManager);
editor = new ShoutcastV1ConfigurationEditor(broadcastModel, aliasModel, iconManager);
break;
case SHOUTCAST_V2:
editor = new ShoutcastV2ConfigurationEditor(broadcastModel, aliasModel, settingsManager);
editor = new ShoutcastV2ConfigurationEditor(broadcastModel, aliasModel, iconManager);
break;
default:
editor = new EmptyEditor<BroadcastConfiguration>();

View File

@@ -22,12 +22,12 @@ import alias.id.broadcast.BroadcastChannel;
import audio.AudioPacket;
import audio.metadata.AudioMetadata;
import controller.ThreadPoolManager;
import icon.IconManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import properties.SystemProperties;
import sample.Broadcaster;
import sample.Listener;
import settings.SettingsManager;
import javax.swing.*;
import javax.swing.table.AbstractTableModel;
@@ -67,17 +67,17 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
private Map<String,BroadcastConfiguration> mBroadcastConfigurationMap = new HashMap<>();
private Map<String,AudioBroadcaster> mBroadcasterMap = new HashMap<>();
private ThreadPoolManager mThreadPoolManager;
private SettingsManager mSettingsManager;
private IconManager mIconManager;
private StreamManager mStreamManager;
private Broadcaster<BroadcastEvent> mBroadcastEventBroadcaster = new Broadcaster<>();
/**
* Model for managing Broadcast configurations and any associated broadcaster instances.
*/
public BroadcastModel(ThreadPoolManager threadPoolManager, SettingsManager settingsManager)
public BroadcastModel(ThreadPoolManager threadPoolManager, IconManager iconManager)
{
mThreadPoolManager = threadPoolManager;
mSettingsManager = settingsManager;
mIconManager = iconManager;
mStreamManager = new StreamManager(threadPoolManager, new CompletedRecordingListener(), BroadcastFormat.MP3,
SystemProperties.getInstance().getApplicationFolder(TEMPORARY_STREAM_DIRECTORY));
mStreamManager.start();
@@ -497,11 +497,11 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
switch(columnIndex)
{
case COLUMN_SERVER_ICON:
String iconName = configuration.getBroadcastServerType().getIconName();
String iconPath = configuration.getBroadcastServerType().getIconPath();
if(iconName != null && mSettingsManager != null)
if(iconPath != null && mIconManager != null)
{
return mSettingsManager.getImageIcon(iconName, 14);
return mIconManager.getScaledIcon(new ImageIcon(iconPath), 14);
}
break;
case COLUMN_STREAM_NAME:

View File

@@ -22,19 +22,16 @@ import alias.AliasModel;
import com.jidesoft.swing.JideSplitPane;
import gui.editor.Editor;
import gui.editor.EmptyEditor;
import icon.IconManager;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import settings.SettingsManager;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.event.TableColumnModelEvent;
import javax.swing.event.TableColumnModelListener;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableCellRenderer;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -51,7 +48,7 @@ public class BroadcastPanel extends JPanel implements ActionListener, ListSelect
private BroadcastModel mBroadcastModel;
private AliasModel mAliasModel;
private SettingsManager mSettingsManager;
private IconManager mIconManager;
private JTable mBroadcastConfigurationTable;
private JideSplitPane mSplitPane;
@@ -61,11 +58,11 @@ public class BroadcastPanel extends JPanel implements ActionListener, ListSelect
private JButton mCopyButton = new JButton(COPY_BROADCAST_CONFIGURATION);
private JButton mDeleteButton = new JButton(DELETE_BROADCAST_CONFIGURATION);
public BroadcastPanel(BroadcastModel broadcastModel, AliasModel aliasModel, SettingsManager settingManager)
public BroadcastPanel(BroadcastModel broadcastModel, AliasModel aliasModel, IconManager iconManager)
{
mBroadcastModel = broadcastModel;
mAliasModel = aliasModel;
mSettingsManager = settingManager;
mIconManager = iconManager;
mEditor = mEmptyEditor;
init();
@@ -218,7 +215,7 @@ public class BroadcastPanel extends JPanel implements ActionListener, ListSelect
if (selectedConfiguration != null)
{
mEditor = BroadcastFactory.getEditor(selectedConfiguration, mBroadcastModel, mAliasModel,
mSettingsManager);
mIconManager);
}
else
{
@@ -239,7 +236,7 @@ public class BroadcastPanel extends JPanel implements ActionListener, ListSelect
public AddBroadcastConfigurationItem(BroadcastServerType type)
{
super(type.toString(), mSettingsManager.getImageIcon(type.getIconName(), 14));
super(type.toString(), mIconManager.getScaledIcon(new ImageIcon(type.getIconPath()), 14));
mBroadcastServerType = type;

View File

@@ -28,12 +28,12 @@ public enum BroadcastServerType
UNKNOWN("Unknown", null);
private String mLabel;
private String mIconName;
private String mIconPath;
BroadcastServerType(String label, String iconName)
BroadcastServerType(String label, String iconPath)
{
mLabel = label;
mIconName = iconName;
mIconPath = iconPath;
}
public String toString()
@@ -41,8 +41,8 @@ public enum BroadcastServerType
return mLabel;
}
public String getIconName()
public String getIconPath()
{
return mIconName;
return mIconPath;
}
}

View File

@@ -25,12 +25,11 @@ import audio.broadcast.BroadcastEvent;
import audio.broadcast.BroadcastModel;
import audio.broadcast.BroadcastServerType;
import com.radioreference.api.soap2.UserFeedBroadcast;
import gui.editor.DocumentListenerEditor;
import icon.IconManager;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sample.Listener;
import settings.SettingsManager;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
@@ -57,10 +56,9 @@ public class BroadcastifyConfigurationEditor extends BroadcastConfigurationEdito
private JButton mSaveButton;
private JButton mResetButton;
public BroadcastifyConfigurationEditor(BroadcastModel broadcastModel, AliasModel aliasModel,
SettingsManager settingsManager)
public BroadcastifyConfigurationEditor(BroadcastModel broadcastModel, AliasModel aliasModel, IconManager iconManager)
{
super(broadcastModel, aliasModel, settingsManager);
super(broadcastModel, aliasModel, iconManager);
init();
}
@@ -74,7 +72,8 @@ public class BroadcastifyConfigurationEditor extends BroadcastConfigurationEdito
JLabel channelLabel = new JLabel("Broadcastify Stream");
ImageIcon broadcastifyIcon = mSettingsManager.getImageIcon(BroadcastServerType.BROADCASTIFY.getIconName(), 25);
ImageIcon broadcastifyIcon = mIconManager.getScaledIcon(
new ImageIcon(BroadcastServerType.BROADCASTIFY.getIconPath()), 25);
channelLabel.setIcon(broadcastifyIcon);
add(channelLabel, "span, align center");

View File

@@ -24,6 +24,7 @@ import audio.broadcast.BroadcastConfigurationEditor;
import audio.broadcast.BroadcastEvent;
import audio.broadcast.BroadcastModel;
import audio.broadcast.BroadcastServerType;
import icon.IconManager;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -57,10 +58,9 @@ public class IcecastHTTPConfigurationEditor extends BroadcastConfigurationEditor
private JButton mSaveButton;
private JButton mResetButton;
public IcecastHTTPConfigurationEditor(BroadcastModel broadcastModel, AliasModel aliasModel,
SettingsManager settingsManager)
public IcecastHTTPConfigurationEditor(BroadcastModel broadcastModel, AliasModel aliasModel, IconManager iconManager)
{
super(broadcastModel, aliasModel, settingsManager);
super(broadcastModel, aliasModel, iconManager);
init();
}
@@ -72,7 +72,7 @@ public class IcecastHTTPConfigurationEditor extends BroadcastConfigurationEditor
JLabel channelLabel = new JLabel("Icecast 2 (v2.4+) Stream");
ImageIcon icon = mSettingsManager.getImageIcon(BroadcastServerType.ICECAST_HTTP.getIconName(), 25);
ImageIcon icon = mIconManager.getScaledIcon(new ImageIcon(BroadcastServerType.ICECAST_HTTP.getIconPath()), 25);
channelLabel.setIcon(icon);
add(channelLabel, "span, align center");

View File

@@ -24,8 +24,7 @@ import audio.broadcast.BroadcastConfigurationEditor;
import audio.broadcast.BroadcastEvent;
import audio.broadcast.BroadcastModel;
import audio.broadcast.BroadcastServerType;
import audio.broadcast.broadcastify.BroadcastifyConfiguration;
import gui.editor.DocumentListenerEditor;
import icon.IconManager;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,10 +57,9 @@ public class IcecastTCPConfigurationEditor extends BroadcastConfigurationEditor
private JButton mSaveButton;
private JButton mResetButton;
public IcecastTCPConfigurationEditor(BroadcastModel broadcastModel, AliasModel aliasModel,
SettingsManager settingsManager)
public IcecastTCPConfigurationEditor(BroadcastModel broadcastModel, AliasModel aliasModel, IconManager iconManager)
{
super(broadcastModel, aliasModel, settingsManager);
super(broadcastModel, aliasModel, iconManager);
init();
}
@@ -73,7 +71,7 @@ public class IcecastTCPConfigurationEditor extends BroadcastConfigurationEditor
JLabel channelLabel = new JLabel("Icecast (v2.3) Stream");
ImageIcon icon = mSettingsManager.getImageIcon(BroadcastServerType.ICECAST_TCP.getIconName(), 25);
ImageIcon icon = mIconManager.getScaledIcon(new ImageIcon(BroadcastServerType.ICECAST_TCP.getIconPath()), 25);
channelLabel.setIcon(icon);
add(channelLabel, "span, align center");

View File

@@ -24,10 +24,10 @@ import audio.broadcast.BroadcastConfigurationEditor;
import audio.broadcast.BroadcastEvent;
import audio.broadcast.BroadcastModel;
import audio.broadcast.BroadcastServerType;
import icon.IconManager;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import settings.SettingsManager;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
@@ -55,10 +55,9 @@ public class ShoutcastV1ConfigurationEditor extends BroadcastConfigurationEditor
private JButton mSaveButton;
private JButton mResetButton;
public ShoutcastV1ConfigurationEditor(BroadcastModel broadcastModel, AliasModel aliasModel,
SettingsManager settingsManager)
public ShoutcastV1ConfigurationEditor(BroadcastModel broadcastModel, AliasModel aliasModel, IconManager iconManager)
{
super(broadcastModel, aliasModel, settingsManager);
super(broadcastModel, aliasModel, iconManager);
init();
}
@@ -70,7 +69,7 @@ public class ShoutcastV1ConfigurationEditor extends BroadcastConfigurationEditor
JLabel channelLabel = new JLabel("Shoutcast (v1.x) Stream");
ImageIcon icon = mSettingsManager.getImageIcon(BroadcastServerType.SHOUTCAST_V1.getIconName(), 25);
ImageIcon icon = mIconManager.getScaledIcon(new ImageIcon(BroadcastServerType.SHOUTCAST_V1.getIconPath()), 25);
channelLabel.setIcon(icon);
add(channelLabel, "span, align center");

View File

@@ -24,10 +24,10 @@ import audio.broadcast.BroadcastConfigurationEditor;
import audio.broadcast.BroadcastEvent;
import audio.broadcast.BroadcastModel;
import audio.broadcast.BroadcastServerType;
import icon.IconManager;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import settings.SettingsManager;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
@@ -56,10 +56,9 @@ public class ShoutcastV2ConfigurationEditor extends BroadcastConfigurationEditor
private JButton mSaveButton;
private JButton mResetButton;
public ShoutcastV2ConfigurationEditor(BroadcastModel broadcastModel, AliasModel aliasModel,
SettingsManager settingsManager)
public ShoutcastV2ConfigurationEditor(BroadcastModel broadcastModel, AliasModel aliasModel, IconManager iconManager)
{
super(broadcastModel, aliasModel, settingsManager);
super(broadcastModel, aliasModel, iconManager);
init();
}
@@ -71,7 +70,7 @@ public class ShoutcastV2ConfigurationEditor extends BroadcastConfigurationEditor
JLabel channelLabel = new JLabel("Shoutcast (v2) Stream");
ImageIcon icon = mSettingsManager.getImageIcon(BroadcastServerType.SHOUTCAST_V2.getIconName(), 25);
ImageIcon icon = mIconManager.getScaledIcon(new ImageIcon(BroadcastServerType.SHOUTCAST_V2.getIconPath()), 25);
channelLabel.setIcon(icon);
add(channelLabel, "span, align center");

View File

@@ -87,20 +87,20 @@ public class ControllerPanel extends JPanel
{
mChannelModel = channelModel;
mAudioPanel = new AudioPanel(settingsManager, sourceManager, audioManager);
mAudioPanel = new AudioPanel(iconManager, settingsManager, sourceManager, audioManager);
mMapPanel = new MapPanel(mapService, settingsManager);
mMapPanel = new MapPanel(mapService, iconManager, settingsManager);
mMessageActivityPanel = new MessageActivityPanel(channelProcessingManager);
mBroadcastPanel = new BroadcastPanel(broadcastModel, aliasModel, settingsManager);
mBroadcastPanel = new BroadcastPanel(broadcastModel, aliasModel, iconManager);
mCallEventPanel = new CallEventPanel(settingsManager, channelProcessingManager);
mCallEventPanel = new CallEventPanel(iconManager, channelProcessingManager);
mChannelSpectrumPanel = new ChannelSpectrumPanel(settingsManager,
channelProcessingManager);
mChannelStateList = new ChannelList(channelModel, channelProcessingManager,
mChannelStateList = new ChannelList(channelModel, channelProcessingManager, iconManager,
settingsManager, mAudioPanel);
mChannelController = new ChannelController(channelModel, channelMapModel,

View File

@@ -139,11 +139,11 @@ public class SDRTrunk implements Listener<TunerEvent>
AudioManager audioManager = new AudioManager(threadPoolManager, sourceManager.getMixerManager());
channelProcessingManager.addAudioPacketListener(audioManager);
BroadcastModel broadcastModel = new BroadcastModel(threadPoolManager, mSettingsManager);
BroadcastModel broadcastModel = new BroadcastModel(threadPoolManager, mIconManager);
channelProcessingManager.addAudioPacketListener(broadcastModel);
MapService mapService = new MapService(mSettingsManager);
MapService mapService = new MapService(mIconManager);
channelProcessingManager.addMessageListener(mapService);
mControllerPanel = new ControllerPanel(audioManager, aliasModel, broadcastModel,

View File

@@ -45,6 +45,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
public class IconManager
{
private final static Logger mLog = LoggerFactory.getLogger(IconManager.class);
public static final int DEFAULT_ICON_SIZE = 12;
private Path mIconFolderPath;
private Path mIconFilePath;
@@ -99,6 +100,14 @@ public class IconManager
{
IconSet loadedIcons = load();
boolean saveRequired = false;
if(loadedIcons == null)
{
loadedIcons = getDefaultIconSet();
saveRequired = true;
}
mIconModel = new IconModel(loadedIcons);
mIconModel.addListDataListener(new ListDataListener()
{
@@ -120,6 +129,11 @@ public class IconManager
scheduleSave();
}
});
if(saveRequired)
{
scheduleSave();
}
}
return mIconModel;
@@ -170,7 +184,7 @@ public class IconManager
* @param height new height to scale the image (width will be scaled accordingly)
* @return
*/
private static ImageIcon getScaledIcon(ImageIcon original, int height)
public static ImageIcon getScaledIcon(ImageIcon original, int height)
{
double scale = (double) original.getIconHeight() / (double) height;
@@ -365,11 +379,6 @@ public class IconManager
mLog.info("Icons file not found at [" + getIconFilePath().toString() + "]");
}
if(iconSet == null)
{
iconSet = getDefaultIconSet();
}
return iconSet;
}

View File

@@ -20,7 +20,6 @@ package icon;
import javax.swing.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -31,7 +30,7 @@ public class IconModel extends DefaultListModel<Icon>
public static final String DEFAULT_ICON = "No Icon";
private Icon mDefaultIcon;
private Map<String,Icon> mIconMap = new HashMap();
private Map<String, Icon> mIconMap = new HashMap<>();
public IconModel(IconSet iconSet)
{
@@ -78,6 +77,7 @@ public class IconModel extends DefaultListModel<Icon>
/**
* Indicates if this model contains an icon with the specified name
*
* @param name to check
* @return true if name is not null and not empty and the internal map contains an icon matching name
*/

View File

@@ -20,7 +20,6 @@ package icon;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.ArrayList;
import java.util.List;
@@ -46,7 +45,6 @@ public class IconSet
mIcons.remove(icon);
}
@XmlElementWrapper(name="icons")
@XmlElement(name = "icon")
public List<Icon> getIcons()
{

View File

@@ -1,6 +1,6 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014 Dennis Sheirer
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,15 +14,12 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package map;
import java.awt.EventQueue;
import javax.swing.JPanel;
import icon.IconManager;
import net.miginfocom.swing.MigLayout;
import org.jdesktop.swingx.JXMapViewer;
import org.jdesktop.swingx.OSMTileFactoryInfo;
import org.jdesktop.swingx.input.PanKeyListener;
@@ -30,10 +27,12 @@ import org.jdesktop.swingx.input.ZoomMouseWheelListenerCursor;
import org.jdesktop.swingx.mapviewer.DefaultTileFactory;
import org.jdesktop.swingx.mapviewer.GeoPosition;
import org.jdesktop.swingx.mapviewer.TileFactoryInfo;
import settings.MapViewSetting;
import settings.SettingsManager;
import javax.swing.*;
import java.awt.*;
public class MapPanel extends JPanel implements PlottableUpdateListener
{
private static final long serialVersionUID = 1L;
@@ -43,19 +42,18 @@ public class MapPanel extends JPanel implements PlottableUpdateListener
private JXMapViewer mMapViewer = new JXMapViewer();
private PlottableEntityPainter mMapPainter;
public MapPanel( MapService mapService, SettingsManager settingsManager )
public MapPanel(MapService mapService, IconManager iconManager, SettingsManager settingsManager)
{
mSettingsManager = settingsManager;
mMapService = mapService;
mMapPainter = new PlottableEntityPainter( mSettingsManager );
mMapPainter = new PlottableEntityPainter(iconManager);
init();
}
private void init()
{
setLayout( new MigLayout( "insets 0 0 0 0",
"[grow,fill]", "[grow,fill]") );
setLayout(new MigLayout("insets 0 0 0 0", "[grow,fill]", "[grow,fill]"));
/**
* Set the entity painter as the overlay painter and register this panel
@@ -83,8 +81,7 @@ public class MapPanel extends JPanel implements PlottableUpdateListener
GeoPosition syracuse = new GeoPosition(43.048, -76.147);
int zoom = 7;
MapViewSetting view = mSettingsManager
.getMapViewSetting( "Default", syracuse, zoom );
MapViewSetting view = mSettingsManager.getMapViewSetting("Default", syracuse, zoom);
mMapViewer.setAddressLocation(view.getGeoPosition());
mMapViewer.setZoom(view.getZoom());
@@ -92,14 +89,12 @@ public class MapPanel extends JPanel implements PlottableUpdateListener
/**
* Add a mouse adapter for panning and scrolling
*/
MapMouseListener listener =
new MapMouseListener( mMapViewer, mSettingsManager );
MapMouseListener listener = new MapMouseListener(mMapViewer, mSettingsManager);
mMapViewer.addMouseListener(listener);
mMapViewer.addMouseMotionListener(listener);
/* Map zoom listener */
mMapViewer.addMouseWheelListener(
new ZoomMouseWheelListenerCursor( mMapViewer ) );
mMapViewer.addMouseWheelListener(new ZoomMouseWheelListenerCursor(mMapViewer));
/* Keyboard panning listener */
mMapViewer.addKeyListener(new PanKeyListener(mMapViewer));

View File

@@ -1,6 +1,6 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014 Dennis Sheirer
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,10 +14,18 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package map;
import java.awt.Color;
import alias.Alias;
import controller.NamingThreadFactory;
import icon.IconManager;
import message.Message;
import sample.Listener;
import settings.SettingsManager;
import java.awt.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -25,12 +33,6 @@ import java.util.Set;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import message.Message;
import sample.Listener;
import settings.SettingsManager;
import alias.Alias;
import controller.NamingThreadFactory;
public class MapService implements Listener<Message>
{
private int mMaxHistory = 2;
@@ -48,11 +50,11 @@ public class MapService implements Listener<Message>
private HashMap<String, PlottableEntity> mEntities =
new HashMap<String, PlottableEntity>();
private SettingsManager mSettingsManager;
private IconManager mIconManager;
public MapService( SettingsManager resourceManager )
public MapService(IconManager resourceManager)
{
mSettingsManager = resourceManager;
mIconManager = resourceManager;
// scheduler.scheduleAtFixedRate( new CullThread(), 5, 5, TimeUnit.MINUTES );
}
@@ -97,20 +99,10 @@ public class MapService implements Listener<Message>
Alias alias = plottable.getAlias();
Color color = null;
MapIcon icon = null;
if(alias != null)
{
color = alias.getMapColor();
String iconName = alias.getIconName();
if( iconName == null )
{
iconName = SettingsManager.DEFAULT_ICON;
}
icon = mSettingsManager.getMapIcon( iconName );
}
if(color == null)
@@ -135,7 +127,8 @@ public class MapService implements Listener<Message>
for(PlottableUpdateListener listener : mListeners)
{
listener.entitiesUpdated();;
listener.entitiesUpdated();
;
}
}
}

View File

@@ -1,33 +1,41 @@
/*
* WaypointMapOverlay.java
*
* Created on April 1, 2006, 4:59 PM
*
* To change this template, choose Tools | Template Manager
* and open the template in the editor.
*/
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package map;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import icon.IconManager;
import org.jdesktop.swingx.JXMapViewer;
import org.jdesktop.swingx.painter.AbstractPainter;
import settings.SettingsManager;
import java.awt.*;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
public class PlottableEntityPainter extends AbstractPainter<JXMapViewer>
{
private PlottableEntityRenderer mRenderer;
private Set<PlottableEntity> mEntities = new HashSet<PlottableEntity>();
public PlottableEntityPainter( SettingsManager settingsManager )
public PlottableEntityPainter(IconManager iconManager)
{
mRenderer = new PlottableEntityRenderer( settingsManager );
mRenderer = new PlottableEntityRenderer(iconManager);
setAntialiasing(true);
setCacheable(false);
}

View File

@@ -1,6 +1,6 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014 Dennis Sheirer
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,35 +14,28 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package map;
import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
import icon.IconManager;
import org.jdesktop.swingx.JXMapViewer;
import javax.swing.*;
import java.awt.*;
import java.awt.geom.Point2D;
import java.util.Set;
import javax.swing.ImageIcon;
import org.jdesktop.swingx.JXMapViewer;
import settings.SettingsManager;
public class PlottableEntityRenderer
{
private SettingsManager mSettingsManager;
private IconManager mIconManager;
public PlottableEntityRenderer( SettingsManager settingsManager )
public PlottableEntityRenderer(IconManager iconManager)
{
mSettingsManager = settingsManager;
mIconManager = iconManager;
}
public void paintPlottableEntity( Graphics2D g,
JXMapViewer viewer,
PlottableEntity entity,
boolean antiAliasing )
public void paintPlottableEntity(Graphics2D g, JXMapViewer viewer, PlottableEntity entity, boolean antiAliasing)
{
Graphics2D graphics = (Graphics2D) g.create();
@@ -71,7 +64,7 @@ public class PlottableEntityRenderer
/**
* Paint the icon at the current location
*/
ImageIcon icon = getIcon( entity ).getImageIcon();
ImageIcon icon = getIcon(entity);
paintIcon(graphics, point, icon);
@@ -86,9 +79,9 @@ public class PlottableEntityRenderer
graphics.dispose();
}
private MapIcon getIcon( PlottableEntity entity )
private ImageIcon getIcon(PlottableEntity entity)
{
return mSettingsManager.getMapIcon( entity.getMapIconName() );
return mIconManager.getIcon(entity.getMapIconName(), IconManager.DEFAULT_ICON_SIZE);
}
private void paintIcon(Graphics2D graphics,

View File

@@ -1,6 +1,6 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014-2016 Dennis Sheirer
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,13 +14,25 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import alias.AliasList;
import alias.AliasModel;
import audio.AudioModule;
import controller.channel.Channel;
import controller.channel.Channel.ChannelType;
import controller.channel.ChannelModel;
import controller.channel.ChannelProcessingManager;
import controller.channel.map.ChannelMap;
import controller.channel.map.ChannelMapModel;
import filter.AllPassFilter;
import filter.FilterSet;
import filter.IFilter;
import gui.editor.EmptyValidatingEditor;
import gui.editor.ValidatingEditor;
import icon.IconManager;
import message.Message;
import message.MessageDirection;
import module.Module;
@@ -95,20 +107,10 @@ import record.RecorderType;
import record.config.RecordConfiguration;
import settings.SettingsManager;
import util.TimeStamp;
import alias.AliasList;
import alias.AliasModel;
import audio.AudioModule;
import controller.channel.Channel;
import controller.channel.Channel.ChannelType;
import controller.channel.ChannelModel;
import controller.channel.ChannelProcessingManager;
import controller.channel.map.ChannelMap;
import controller.channel.map.ChannelMapModel;
import filter.AllPassFilter;
import filter.FilterSet;
import filter.IFilter;
import gui.editor.EmptyValidatingEditor;
import gui.editor.ValidatingEditor;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
public class DecoderFactory
{
@@ -322,42 +324,33 @@ public class DecoderFactory
return modules;
}
public static DecoderPanel getDecoderPanel( SettingsManager settingsManager,
public static DecoderPanel getDecoderPanel(IconManager iconManager, SettingsManager settingsManager,
DecoderState decoderState)
{
switch(decoderState.getDecoderType())
{
case AM:
return new AMDecoderPanel( settingsManager, decoderState );
return new AMDecoderPanel(iconManager, settingsManager, decoderState);
case FLEETSYNC2:
return new Fleetsync2DecoderPanel( settingsManager,
(Fleetsync2DecoderState)decoderState );
return new Fleetsync2DecoderPanel(iconManager, settingsManager, (Fleetsync2DecoderState) decoderState);
case LJ_1200:
return new LJ1200DecoderPanel( settingsManager,
(LJ1200DecoderState)decoderState );
return new LJ1200DecoderPanel(iconManager, settingsManager, (LJ1200DecoderState) decoderState);
case LTR_NET:
return new LTRNetDecoderPanel( settingsManager,
(LTRNetDecoderState)decoderState );
return new LTRNetDecoderPanel(iconManager, settingsManager, (LTRNetDecoderState) decoderState);
case LTR_STANDARD:
return new LTRStandardDecoderPanel( settingsManager,
(LTRStandardDecoderState)decoderState );
return new LTRStandardDecoderPanel(iconManager, settingsManager, (LTRStandardDecoderState) decoderState);
case MDC1200:
return new MDCDecoderPanel( settingsManager,
(MDCDecoderState)decoderState );
return new MDCDecoderPanel(iconManager, settingsManager, (MDCDecoderState) decoderState);
case MPT1327:
return new MPT1327DecoderPanel( settingsManager,
(MPT1327DecoderState)decoderState );
return new MPT1327DecoderPanel(iconManager, settingsManager, (MPT1327DecoderState) decoderState);
case NBFM:
return new NBFMDecoderPanel( settingsManager, decoderState );
return new NBFMDecoderPanel(iconManager, settingsManager, decoderState);
case P25_PHASE1:
return new P25DecoderPanel( settingsManager,
(P25DecoderState)decoderState );
return new P25DecoderPanel(iconManager, settingsManager, (P25DecoderState) decoderState);
case PASSPORT:
return new PassportDecoderPanel( settingsManager,
(PassportDecoderState)decoderState );
return new PassportDecoderPanel(iconManager, settingsManager, (PassportDecoderState) decoderState);
case TAIT_1200:
return new Tait1200DecoderPanel( settingsManager,
(Tait1200DecoderState)decoderState );
return new Tait1200DecoderPanel(iconManager, settingsManager, (Tait1200DecoderState) decoderState);
default:
throw new IllegalArgumentException("Unrecognized decoder: " +
decoderState.getDecoderType().getDisplayString());

View File

@@ -1,6 +1,6 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014 Dennis Sheirer
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,28 +14,30 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.am;
import javax.swing.JLabel;
import net.miginfocom.swing.MigLayout;
import icon.IconManager;
import module.decode.state.ChangedAttribute;
import module.decode.state.DecoderPanel;
import module.decode.state.DecoderState;
import net.miginfocom.swing.MigLayout;
import settings.ColorSetting;
import settings.Setting;
import settings.SettingsManager;
import javax.swing.*;
public class AMDecoderPanel extends DecoderPanel
{
private static final long serialVersionUID = 1L;
private JLabel mProtocol = new JLabel("AM");
public AMDecoderPanel( SettingsManager settingsManager, DecoderState decoderState )
public AMDecoderPanel(IconManager iconManager, SettingsManager settingsManager, DecoderState decoderState)
{
super( settingsManager, decoderState );
super(iconManager, settingsManager, decoderState);
init();
}

View File

@@ -1,6 +1,6 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014 Dennis Sheirer
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,14 +14,15 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.event;
import javax.swing.ImageIcon;
import javax.swing.table.DefaultTableCellRenderer;
import settings.SettingsManager;
import alias.Alias;
import icon.IconManager;
import javax.swing.*;
import javax.swing.table.DefaultTableCellRenderer;
/**
* Custom renderer for JTable cells that contain Alias objects. Renders the
@@ -32,12 +33,12 @@ public class CallEventAliasCellRenderer extends DefaultTableCellRenderer
{
private static final long serialVersionUID = 1L;
private SettingsManager mSettingsManager;
private IconManager mIconManager;
public CallEventAliasCellRenderer( SettingsManager settingsManager )
public CallEventAliasCellRenderer(IconManager iconManager)
{
super();
mSettingsManager = settingsManager;
mIconManager = iconManager;
}
public void setValue(Object obj)
@@ -48,7 +49,7 @@ public class CallEventAliasCellRenderer extends DefaultTableCellRenderer
setText(alias.getName());
ImageIcon icon = getIcon( alias, SettingsManager.DEFAULT_ICON_SIZE );
ImageIcon icon = getIcon(alias, IconManager.DEFAULT_ICON_SIZE);
if(icon != null)
{
@@ -64,9 +65,9 @@ public class CallEventAliasCellRenderer extends DefaultTableCellRenderer
private ImageIcon getIcon(Alias alias, int height)
{
if( mSettingsManager != null && alias != null )
if(mIconManager != null && alias != null)
{
return mSettingsManager.getImageIcon( alias.getIconName(), height );
return mIconManager.getIcon(alias.getIconName(), height);
}
return null;

View File

@@ -1,6 +1,6 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014 Dennis Sheirer
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,23 +14,21 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.event;
import java.awt.EventQueue;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
import module.ProcessingChain;
import net.miginfocom.swing.MigLayout;
import settings.SettingsManager;
import controller.channel.Channel;
import controller.channel.ChannelEvent;
import controller.channel.ChannelEvent.Event;
import controller.channel.ChannelEventListener;
import controller.channel.ChannelProcessingManager;
import icon.IconManager;
import module.ProcessingChain;
import net.miginfocom.swing.MigLayout;
import javax.swing.*;
import java.awt.*;
public class CallEventPanel extends JPanel implements ChannelEventListener
{
@@ -41,8 +39,7 @@ public class CallEventPanel extends JPanel implements ChannelEventListener
private CallEventAliasCellRenderer mRenderer;
private ChannelProcessingManager mChannelProcessingManager;
public CallEventPanel( SettingsManager settingsManager,
ChannelProcessingManager channelProcessingManager )
public CallEventPanel(IconManager iconManager, ChannelProcessingManager channelProcessingManager)
{
mChannelProcessingManager = channelProcessingManager;
@@ -52,13 +49,11 @@ public class CallEventPanel extends JPanel implements ChannelEventListener
table.setAutoCreateRowSorter(true);
table.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
mRenderer = new CallEventAliasCellRenderer( settingsManager );
mRenderer = new CallEventAliasCellRenderer(iconManager);
table.getColumnModel().getColumn( CallEventModel.FROM_ALIAS )
.setCellRenderer( mRenderer );
table.getColumnModel().getColumn(CallEventModel.FROM_ALIAS).setCellRenderer(mRenderer);
table.getColumnModel().getColumn( CallEventModel.TO_ALIAS )
.setCellRenderer( mRenderer );
table.getColumnModel().getColumn(CallEventModel.TO_ALIAS).setCellRenderer(mRenderer);
mEmptyScroller = new JScrollPane(table);
@@ -68,15 +63,11 @@ public class CallEventPanel extends JPanel implements ChannelEventListener
@Override
public void channelChanged(final ChannelEvent event)
{
if( event.getEvent() == Event.NOTIFICATION_SELECTION_CHANGE &&
event.getChannel().isSelected() )
if(event.getEvent() == Event.NOTIFICATION_SELECTION_CHANGE && event.getChannel().isSelected())
{
if( mDisplayedChannel == null ||
( mDisplayedChannel != null &&
mDisplayedChannel != event.getChannel() ) )
if(mDisplayedChannel == null || (mDisplayedChannel != null && mDisplayedChannel != event.getChannel()))
{
ProcessingChain chain = mChannelProcessingManager
.getProcessingChain( event.getChannel() );
ProcessingChain chain = mChannelProcessingManager.getProcessingChain(event.getChannel());
if(chain != null)
{
@@ -114,11 +105,9 @@ public class CallEventPanel extends JPanel implements ChannelEventListener
}
}
}
else if( event.getEvent() == Event.NOTIFICATION_PROCESSING_STOP ||
event.getEvent() == Event.REQUEST_DISABLE )
else if(event.getEvent() == Event.NOTIFICATION_PROCESSING_STOP || event.getEvent() == Event.REQUEST_DISABLE)
{
if( mDisplayedChannel != null &&
mDisplayedChannel == event.getChannel() )
if(mDisplayedChannel != null && mDisplayedChannel == event.getChannel())
{
mDisplayedChannel = null;

View File

@@ -1,6 +1,6 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014,2015 Dennis Sheirer
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,25 +14,24 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.fleetsync2;
import java.awt.EventQueue;
import javax.swing.JLabel;
import icon.IconManager;
import module.decode.state.ChangedAttribute;
import module.decode.state.DecoderPanel;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import settings.ColorSetting;
import settings.ColorSetting.ColorSettingName;
import settings.Setting;
import settings.SettingsManager;
import javax.swing.*;
import java.awt.*;
public class Fleetsync2DecoderPanel extends DecoderPanel
{
private final static Logger mLog = LoggerFactory.getLogger(Fleetsync2DecoderPanel.class);
@@ -52,10 +51,10 @@ public class Fleetsync2DecoderPanel extends DecoderPanel
private JLabel mMessage = new JLabel(" ");
private JLabel mMessageType = new JLabel(" ");
public Fleetsync2DecoderPanel( SettingsManager settingsManager,
public Fleetsync2DecoderPanel(IconManager iconManager, SettingsManager settingsManager,
Fleetsync2DecoderState decoderState)
{
super( settingsManager, decoderState );
super(iconManager, settingsManager, decoderState);
init();
}

View File

@@ -1,6 +1,6 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014,2015 Dennis Sheirer
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,12 +14,12 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.lj1200;
import javax.swing.JLabel;
import alias.Alias;
import icon.IconManager;
import module.decode.state.ChangedAttribute;
import module.decode.state.DecoderPanel;
import net.miginfocom.swing.MigLayout;
@@ -28,6 +28,8 @@ import settings.ColorSetting.ColorSettingName;
import settings.Setting;
import settings.SettingsManager;
import javax.swing.*;
public class LJ1200DecoderPanel extends DecoderPanel
{
private static final long serialVersionUID = 1L;
@@ -37,9 +39,9 @@ public class LJ1200DecoderPanel extends DecoderPanel
private JLabel mTo = new JLabel();
private JLabel mToAlias = new JLabel();
public LJ1200DecoderPanel( SettingsManager settingsManager, LJ1200DecoderState decoderState )
public LJ1200DecoderPanel(IconManager iconManager, SettingsManager settingsManager, LJ1200DecoderState decoderState)
{
super( settingsManager, decoderState );
super(iconManager, settingsManager, decoderState);
init();
}

View File

@@ -1,6 +1,6 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014 Dennis Sheirer
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,20 +14,21 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.ltrnet;
import java.awt.EventQueue;
import javax.swing.JLabel;
import alias.Alias;
import icon.IconManager;
import module.decode.state.ChangedAttribute;
import module.decode.state.DecoderPanel;
import net.miginfocom.swing.MigLayout;
import settings.ColorSetting;
import settings.Setting;
import settings.SettingsManager;
import alias.Alias;
import javax.swing.*;
import java.awt.*;
public class LTRNetDecoderPanel extends DecoderPanel
{
@@ -40,10 +41,9 @@ public class LTRNetDecoderPanel extends DecoderPanel
private JLabel mLCN = new JLabel("LCN:");
private JLabel mDescription = new JLabel();
public LTRNetDecoderPanel( SettingsManager settingsManager,
LTRNetDecoderState decoderState )
public LTRNetDecoderPanel(IconManager iconManager, SettingsManager settingsManager, LTRNetDecoderState decoderState)
{
super( settingsManager, decoderState );
super(iconManager, settingsManager, decoderState);
init();
}

View File

@@ -1,6 +1,6 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014 Dennis Sheirer
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,20 +14,21 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.ltrstandard;
import java.awt.EventQueue;
import javax.swing.JLabel;
import net.miginfocom.swing.MigLayout;
import alias.Alias;
import icon.IconManager;
import module.decode.state.ChangedAttribute;
import module.decode.state.DecoderPanel;
import net.miginfocom.swing.MigLayout;
import settings.ColorSetting;
import settings.Setting;
import settings.SettingsManager;
import alias.Alias;
import javax.swing.*;
import java.awt.*;
public class LTRStandardDecoderPanel extends DecoderPanel
{
@@ -39,10 +40,10 @@ public class LTRStandardDecoderPanel extends DecoderPanel
private JLabel mLCN = new JLabel("LCN:");
public LTRStandardDecoderPanel( SettingsManager settingsManager,
public LTRStandardDecoderPanel(IconManager iconManager, SettingsManager settingsManager,
LTRStandardDecoderState decoderState)
{
super( settingsManager, decoderState );
super(iconManager, settingsManager, decoderState);
init();
}
@@ -109,8 +110,8 @@ public class LTRStandardDecoderPanel extends DecoderPanel
if(alias != null)
{
mTalkgroupAlias.setText(alias.getName());
mTalkgroupAlias.setIcon( mSettingsManager
.getImageIcon( alias.getIconName(), SettingsManager.DEFAULT_ICON_SIZE ) );
mTalkgroupAlias.setIcon(mIconManager.getIcon(alias.getIconName(),
IconManager.DEFAULT_ICON_SIZE));
}
else
{

View File

@@ -1,6 +1,6 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014 Dennis Sheirer
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,14 +14,12 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.mdc1200;
import java.awt.EventQueue;
import javax.swing.JLabel;
import alias.Alias;
import icon.IconManager;
import module.decode.state.ChangedAttribute;
import module.decode.state.DecoderPanel;
import net.miginfocom.swing.MigLayout;
@@ -30,6 +28,9 @@ import settings.ColorSetting.ColorSettingName;
import settings.Setting;
import settings.SettingsManager;
import javax.swing.*;
import java.awt.*;
public class MDCDecoderPanel extends DecoderPanel
{
private static final long serialVersionUID = 1L;
@@ -47,10 +48,9 @@ public class MDCDecoderPanel extends DecoderPanel
private JLabel mMessage = new JLabel();
private JLabel mMessageType = new JLabel();
public MDCDecoderPanel( SettingsManager settingsManager,
MDCDecoderState decoderState )
public MDCDecoderPanel(IconManager iconManager, SettingsManager settingsManager, MDCDecoderState decoderState)
{
super( settingsManager, decoderState );
super(iconManager, settingsManager, decoderState);
init();
}

View File

@@ -1,6 +1,6 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014 Dennis Sheirer
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,20 +14,21 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.mpt1327;
import java.awt.EventQueue;
import javax.swing.JLabel;
import controller.channel.Channel.ChannelType;
import icon.IconManager;
import module.decode.state.ChangedAttribute;
import module.decode.state.DecoderPanel;
import net.miginfocom.swing.MigLayout;
import settings.ColorSetting;
import settings.Setting;
import settings.SettingsManager;
import controller.channel.Channel.ChannelType;
import javax.swing.*;
import java.awt.*;
public class MPT1327DecoderPanel extends DecoderPanel
{
@@ -41,10 +42,9 @@ public class MPT1327DecoderPanel extends DecoderPanel
private JLabel mFromTalkgroup = new JLabel("");
private JLabel mFromTalkgroupAliasLabel = new JLabel("");
public MPT1327DecoderPanel( SettingsManager settingsManager,
MPT1327DecoderState decoderState )
public MPT1327DecoderPanel(IconManager iconManager, SettingsManager settingsManager, MPT1327DecoderState decoderState)
{
super( settingsManager, decoderState );
super(iconManager, settingsManager, decoderState);
init();
}

View File

@@ -1,6 +1,6 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014 Dennis Sheirer
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,19 +14,20 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.mpt1327;
import java.awt.EventQueue;
import javax.swing.JLabel;
import alias.Alias;
import icon.IconManager;
import module.decode.state.ChangedAttribute;
import module.decode.state.DecoderPanel;
import settings.ColorSetting;
import settings.Setting;
import settings.SettingsManager;
import alias.Alias;
import javax.swing.*;
import java.awt.*;
public class MPT1327TrafficPanel extends DecoderPanel
{
@@ -40,9 +41,10 @@ public class MPT1327TrafficPanel extends DecoderPanel
private JLabel mToTalkgroupLabel;
private JLabel mToTalkgroupAliasLabel;
public MPT1327TrafficPanel( SettingsManager settingsManager, MPT1327DecoderState decoderState )
public MPT1327TrafficPanel(IconManager iconManager, SettingsManager settingsManager,
MPT1327DecoderState decoderState)
{
super( settingsManager, decoderState );
super(iconManager, settingsManager, decoderState);
init();
}
@@ -117,8 +119,7 @@ public class MPT1327TrafficPanel extends DecoderPanel
String icon = alias.getIconName();
mFromTalkgroupAliasLabel.setIcon( mSettingsManager
.getImageIcon( icon, SettingsManager.DEFAULT_ICON_SIZE ) );
mFromTalkgroupAliasLabel.setIcon(mIconManager.getIcon(icon, IconManager.DEFAULT_ICON_SIZE));
}
break;
case TO_TALKGROUP:
@@ -136,8 +137,7 @@ public class MPT1327TrafficPanel extends DecoderPanel
if(icon != null)
{
mToTalkgroupAliasLabel.setIcon( mSettingsManager
.getImageIcon( icon, 12 ) );
mToTalkgroupAliasLabel.setIcon(mIconManager.getIcon(icon, IconManager.DEFAULT_ICON_SIZE));
}
}
break;

View File

@@ -1,6 +1,6 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014,2015 Dennis Sheirer
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,11 +14,11 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.nbfm;
import javax.swing.JLabel;
import icon.IconManager;
import module.decode.state.ChangedAttribute;
import module.decode.state.DecoderPanel;
import module.decode.state.DecoderState;
@@ -28,16 +28,17 @@ import settings.ColorSetting.ColorSettingName;
import settings.Setting;
import settings.SettingsManager;
import javax.swing.*;
public class NBFMDecoderPanel extends DecoderPanel
{
private static final long serialVersionUID = 1L;
private JLabel mProtocol = new JLabel("NBFM");
public NBFMDecoderPanel( SettingsManager settingsManager,
DecoderState decoderState )
public NBFMDecoderPanel(IconManager iconManager, SettingsManager settingsManager, DecoderState decoderState)
{
super( settingsManager, decoderState );
super(iconManager, settingsManager, decoderState);
init();
}

View File

@@ -1,6 +1,6 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014 Dennis Sheirer
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,20 +14,21 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.p25;
import java.awt.EventQueue;
import javax.swing.JLabel;
import alias.Alias;
import icon.IconManager;
import module.decode.state.ChangedAttribute;
import module.decode.state.DecoderPanel;
import net.miginfocom.swing.MigLayout;
import settings.ColorSetting;
import settings.Setting;
import settings.SettingsManager;
import alias.Alias;
import javax.swing.*;
import java.awt.*;
public class P25DecoderPanel extends DecoderPanel
{
@@ -46,10 +47,9 @@ public class P25DecoderPanel extends DecoderPanel
private JLabel mSiteAlias = new JLabel("");
public P25DecoderPanel( SettingsManager settingsManager,
P25DecoderState decoderState )
public P25DecoderPanel(IconManager iconManager, SettingsManager settingsManager, P25DecoderState decoderState)
{
super( settingsManager, decoderState );
super(iconManager, settingsManager, decoderState);
mProtocol = new JLabel("P25-1 " + decoderState.getModulation().getShortLabel());
@@ -151,10 +151,9 @@ public class P25DecoderPanel extends DecoderPanel
final String icon = from.getIconName();
if( icon != null && mSettingsManager != null )
if(icon != null && mIconManager != null)
{
mFromAlias.setIcon( mSettingsManager.getImageIcon(
icon, SettingsManager.DEFAULT_ICON_SIZE ) );
mFromAlias.setIcon(mIconManager.getIcon(icon, IconManager.DEFAULT_ICON_SIZE));
}
}
else
@@ -182,10 +181,9 @@ public class P25DecoderPanel extends DecoderPanel
final String icon = to.getIconName();
if( icon != null && mSettingsManager != null )
if(icon != null && mIconManager != null)
{
mToAlias.setIcon( mSettingsManager.getImageIcon(
icon, SettingsManager.DEFAULT_ICON_SIZE ) );
mToAlias.setIcon(mIconManager.getIcon(icon, IconManager.DEFAULT_ICON_SIZE));
}
}
else

View File

@@ -1,6 +1,6 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014 Dennis Sheirer
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,20 +14,21 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.passport;
import java.awt.EventQueue;
import javax.swing.JLabel;
import net.miginfocom.swing.MigLayout;
import alias.Alias;
import icon.IconManager;
import module.decode.state.ChangedAttribute;
import module.decode.state.DecoderPanel;
import net.miginfocom.swing.MigLayout;
import settings.ColorSetting;
import settings.Setting;
import settings.SettingsManager;
import alias.Alias;
import javax.swing.*;
import java.awt.*;
public class PassportDecoderPanel extends DecoderPanel
{
@@ -41,10 +42,9 @@ public class PassportDecoderPanel extends DecoderPanel
private JLabel mFromTalkgroup = new JLabel();
private JLabel mFromTalkgroupAlias = new JLabel();
public PassportDecoderPanel( SettingsManager settingsManager,
PassportDecoderState decoderState )
public PassportDecoderPanel(IconManager iconManager, SettingsManager settingsManager, PassportDecoderState decoderState)
{
super( settingsManager, decoderState );
super(iconManager, settingsManager, decoderState);
init();
}
@@ -123,8 +123,7 @@ public class PassportDecoderPanel extends DecoderPanel
{
mToTalkgroupAlias.setText(toAlias.getName());
mToTalkgroupAlias.setIcon( mSettingsManager
.getImageIcon( toAlias.getIconName(), SettingsManager.DEFAULT_ICON_SIZE ) );
mToTalkgroupAlias.setIcon(mIconManager.getIcon(toAlias.getIconName(), IconManager.DEFAULT_ICON_SIZE));
}
else
{
@@ -151,8 +150,8 @@ public class PassportDecoderPanel extends DecoderPanel
{
mFromTalkgroupAlias.setText(fromAlias.getName());
mFromTalkgroupAlias.setIcon( mSettingsManager
.getImageIcon( fromAlias.getIconName(), SettingsManager.DEFAULT_ICON_SIZE ) );
mFromTalkgroupAlias.setIcon(mIconManager
.getIcon(fromAlias.getIconName(), IconManager.DEFAULT_ICON_SIZE));
}
else
{

View File

@@ -1,6 +1,6 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014 Dennis Sheirer
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,26 +14,10 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.state;
import java.awt.Color;
import java.awt.Component;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import javax.swing.JMenu;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JSeparator;
import net.miginfocom.swing.MigLayout;
import settings.ColorSetting.ColorSettingName;
import settings.ColorSettingMenuItem;
import settings.ColorSettingResetMenuItem;
import settings.SettingsManager;
import audio.AudioPanel;
import controller.channel.Channel;
import controller.channel.ChannelEvent;
@@ -41,6 +25,19 @@ import controller.channel.ChannelEvent.Event;
import controller.channel.ChannelEventListener;
import controller.channel.ChannelModel;
import controller.channel.ChannelProcessingManager;
import icon.IconManager;
import net.miginfocom.swing.MigLayout;
import settings.ColorSetting.ColorSettingName;
import settings.ColorSettingMenuItem;
import settings.ColorSettingResetMenuItem;
import settings.SettingsManager;
import javax.swing.*;
import java.awt.*;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
* Gui wrapper for the list of currently processing primary channels
@@ -53,16 +50,19 @@ public class ChannelList extends JPanel implements ChannelEventListener
private ChannelModel mChannelModel;
private ChannelProcessingManager mChannelProcessingManager;
private IconManager mIconManager;
private SettingsManager mSettingsManager;
private AudioPanel mAudioPanel;
public ChannelList(ChannelModel channelModel,
ChannelProcessingManager channelProcessingManager,
IconManager iconManager,
SettingsManager settingsManager,
AudioPanel audioPanel)
{
mChannelModel = channelModel;
mChannelProcessingManager = channelProcessingManager;
mIconManager = iconManager;
mSettingsManager = settingsManager;
mAudioPanel = audioPanel;
@@ -103,7 +103,7 @@ public class ChannelList extends JPanel implements ChannelEventListener
if(!mDisplayedPanels.containsKey(channel))
{
ChannelPanel channelPanel = new ChannelPanel(mChannelModel,
mChannelProcessingManager, mSettingsManager, channel );
mChannelProcessingManager, mIconManager, mSettingsManager, channel);
add(channelPanel);
@@ -298,9 +298,20 @@ public class ChannelList extends JPanel implements ChannelEventListener
}
}
public void mousePressed( MouseEvent e ) {}
public void mouseReleased( MouseEvent e ) {}
public void mouseEntered( MouseEvent e ) {}
public void mouseExited( MouseEvent e ) {}
public void mousePressed(MouseEvent e)
{
}
public void mouseReleased(MouseEvent e)
{
}
public void mouseEntered(MouseEvent e)
{
}
public void mouseExited(MouseEvent e)
{
}
}
}

View File

@@ -1,26 +1,36 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.state;
import java.awt.Color;
import java.awt.EventQueue;
import java.awt.Font;
import java.awt.GradientPaint;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Paint;
import java.util.ArrayList;
import java.util.List;
import javax.swing.JLabel;
import javax.swing.JMenu;
import javax.swing.JPanel;
import controller.channel.Channel;
import controller.channel.ChannelEvent;
import controller.channel.ChannelEvent.Event;
import controller.channel.ChannelEventListener;
import controller.channel.ChannelModel;
import controller.channel.ChannelProcessingManager;
import controller.channel.ChannelUtils;
import icon.IconManager;
import module.ProcessingChain;
import module.decode.DecoderFactory;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import record.RecorderType;
import record.config.RecordConfiguration;
import sample.Listener;
@@ -29,13 +39,11 @@ import settings.ColorSetting.ColorSettingName;
import settings.Setting;
import settings.SettingChangeListener;
import settings.SettingsManager;
import controller.channel.Channel;
import controller.channel.ChannelEvent;
import controller.channel.ChannelEvent.Event;
import controller.channel.ChannelEventListener;
import controller.channel.ChannelModel;
import controller.channel.ChannelProcessingManager;
import controller.channel.ChannelUtils;
import javax.swing.*;
import java.awt.*;
import java.util.ArrayList;
import java.util.List;
public class ChannelPanel extends JPanel
implements Listener<ChangedAttribute>,
@@ -76,6 +84,7 @@ public class ChannelPanel extends JPanel
private JLabel mChannelLabel;
protected SettingsManager mSettingsManager;
protected IconManager mIconManager;
private Channel mChannel;
private ChannelState mChannelState;
@@ -91,11 +100,13 @@ public class ChannelPanel extends JPanel
*/
public ChannelPanel(ChannelModel channelModel,
ChannelProcessingManager channelProcessingManager,
IconManager iconManager,
SettingsManager settingsManager,
Channel channel)
{
mChannelModel = channelModel;
mChannelProcessingManager = channelProcessingManager;
mIconManager = iconManager;
mSettingsManager = settingsManager;
mChannel = channel;
@@ -110,7 +121,7 @@ public class ChannelPanel extends JPanel
for(DecoderState decoderState : processingChain.getDecoderStates())
{
DecoderPanel panel = DecoderFactory.getDecoderPanel( mSettingsManager, decoderState );
DecoderPanel panel = DecoderFactory.getDecoderPanel(mIconManager, mSettingsManager, decoderState);
mDecoderPanels.add(panel);
add(panel, "grow,span");
}
@@ -432,7 +443,9 @@ public class ChannelPanel extends JPanel
}
@Override
public void settingDeleted( Setting setting ) {}
public void settingDeleted(Setting setting)
{
}
public JMenu getContextMenu()
{

View File

@@ -1,6 +1,6 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2015 Dennis Sheirer
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,22 +14,21 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.state;
import java.awt.Color;
import java.awt.Font;
import javax.swing.JLabel;
import javax.swing.JPanel;
import alias.Alias;
import icon.IconManager;
import sample.Listener;
import settings.ColorSetting;
import settings.ColorSetting.ColorSettingName;
import settings.Setting;
import settings.SettingChangeListener;
import settings.SettingsManager;
import alias.Alias;
import javax.swing.*;
import java.awt.*;
public abstract class DecoderPanel extends JPanel
implements Listener<ChangedAttribute>, SettingChangeListener
@@ -45,11 +44,13 @@ public abstract class DecoderPanel extends JPanel
protected Color mColorLabelDecoder;
protected Color mColorLabelAuxDecoder;
protected IconManager mIconManager;
protected SettingsManager mSettingsManager;
protected DecoderState mDecoderState;
public DecoderPanel( SettingsManager settingsManager, DecoderState decoderState )
public DecoderPanel(IconManager iconManager, SettingsManager settingsManager, DecoderState decoderState)
{
mIconManager = iconManager;
mSettingsManager = settingsManager;
mSettingsManager.addListener(this);
@@ -118,7 +119,9 @@ public abstract class DecoderPanel extends JPanel
}
@Override
public void settingDeleted( Setting setting ) {}
public void settingDeleted(Setting setting)
{
}
protected void setAliasLabel(final JLabel label, final Alias alias)
{
@@ -137,8 +140,7 @@ public abstract class DecoderPanel extends JPanel
if(iconName != null)
{
label.setIcon( mSettingsManager
.getImageIcon( iconName, SettingsManager.DEFAULT_ICON_SIZE ) );
label.setIcon(mIconManager.getIcon(iconName, IconManager.DEFAULT_ICON_SIZE));
}
else
{

View File

@@ -1,6 +1,6 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014,2015 Dennis Sheirer
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,14 +14,12 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.tait;
import java.awt.EventQueue;
import javax.swing.JLabel;
import alias.Alias;
import icon.IconManager;
import module.decode.state.ChangedAttribute;
import module.decode.state.DecoderPanel;
import net.miginfocom.swing.MigLayout;
@@ -30,6 +28,9 @@ import settings.ColorSetting.ColorSettingName;
import settings.Setting;
import settings.SettingsManager;
import javax.swing.*;
import java.awt.*;
public class Tait1200DecoderPanel extends DecoderPanel
{
private static final long serialVersionUID = 1L;
@@ -47,10 +48,9 @@ public class Tait1200DecoderPanel extends DecoderPanel
private JLabel mMessage = new JLabel();
private JLabel mMessageType = new JLabel();
public Tait1200DecoderPanel( SettingsManager settingsManager,
Tait1200DecoderState decoderState )
public Tait1200DecoderPanel(IconManager iconManager, SettingsManager settingsManager, Tait1200DecoderState decoderState)
{
super( settingsManager, decoderState );
super(iconManager, settingsManager, decoderState);
init();
}

View File

@@ -17,8 +17,22 @@
******************************************************************************/
package settings;
import java.awt.Color;
import java.awt.Image;
import controller.ThreadPoolManager;
import org.jdesktop.swingx.mapviewer.GeoPosition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import properties.SystemProperties;
import sample.Listener;
import settings.ColorSetting.ColorSettingName;
import source.recording.RecordingConfiguration;
import source.tuner.configuration.TunerConfigurationEvent;
import source.tuner.configuration.TunerConfigurationModel;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import java.awt.*;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -28,62 +42,26 @@ import java.io.OutputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.swing.ImageIcon;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import map.DefaultIcon;
import map.MapIcon;
import org.jdesktop.swingx.mapviewer.GeoPosition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import properties.SystemProperties;
import sample.Listener;
import settings.ColorSetting.ColorSettingName;
import source.recording.RecordingConfiguration;
import source.tuner.configuration.TunerConfigurationEvent;
import source.tuner.configuration.TunerConfigurationModel;
import controller.ThreadPoolManager;
public class SettingsManager implements Listener<TunerConfigurationEvent>
{
private final static Logger mLog =
LoggerFactory.getLogger( SettingsManager.class );
private final static Logger mLog = LoggerFactory.getLogger(SettingsManager.class);
private Settings mSettings = new Settings();
private ArrayList<SettingChangeListener> mListeners =
new ArrayList<SettingChangeListener>();
public static final String DEFAULT_ICON = "No Icon";
public String mCurrentDefaultIconName = DEFAULT_ICON;
public static final int DEFAULT_ICON_SIZE = 12;
private HashMap<String,MapIcon> mIcons = new HashMap<String,MapIcon>();
private HashMap<String,ImageIcon> mResizedIcons =
new HashMap<String,ImageIcon>();
private List<SettingChangeListener> mListeners = new ArrayList<>();
private TunerConfigurationModel mTunerConfigurationModel;
private ThreadPoolManager mThreadPoolManager;
private boolean mLoadingSettings = false;
private AtomicBoolean mSettingsSavePending = new AtomicBoolean();
public SettingsManager(ThreadPoolManager threadPoolManager,
TunerConfigurationModel tunerConfigurationModel)
{
//TODO: move settings and icons into a SettingsModel and an IconModel
//TODO: move settings into a SettingsModel
//and update this class to only provide loading, saving, and model
//change detection producing a save.
@@ -113,8 +91,6 @@ public class SettingsManager implements Listener<TunerConfigurationEvent>
props.get("settings.currentFilename", defaultSettingsFile);
load(settingsFolder.resolve(settingsFile));
refreshIcons();
}
@Override
@@ -126,39 +102,6 @@ public class SettingsManager implements Listener<TunerConfigurationEvent>
}
}
/**
* Reloads the icon hash map, and sets up the default iconology. If the
* saved default icon name is not part of the current set of icons, we
* set the default icon to the standard system default name, which should
* be guaranteed to be available.
*/
public void refreshIcons()
{
mIcons.clear();
mCurrentDefaultIconName = DEFAULT_ICON;
DefaultIcon defaultIcon = getDefaultIcon();
ArrayList<MapIcon> icons = mSettings.getMapIcons();
icons.addAll( getStandardIcons() );
for( MapIcon icon: icons )
{
mIcons.put( icon.getName(), icon );
if( icon.getName().contentEquals( defaultIcon.getName() ) )
{
mCurrentDefaultIconName = defaultIcon.getName();
icon.setDefaultIcon( true );
}
else
{
icon.setDefaultIcon( false );
}
}
}
public Settings getSettings()
{
return mSettings;
@@ -253,309 +196,9 @@ public class SettingsManager implements Listener<TunerConfigurationEvent>
scheduleSettingsSave();
}
public MapIcon[] getMapIcons()
{
MapIcon[] returnIcons = new MapIcon[mIcons.values().size() ];
return mIcons.values().toArray( returnIcons );
}
private ArrayList<MapIcon> getStandardIcons()
{
ArrayList<MapIcon> icons = new ArrayList<MapIcon>();
MapIcon defaultIcon = new MapIcon( DEFAULT_ICON, "images/no_icon.png", false );
icons.add( defaultIcon );
MapIcon ambulance =
new MapIcon( "Ambulance", "images/ambulance.png", false );
icons.add( ambulance );
MapIcon blockTruck =
new MapIcon( "Block Truck", "images/concrete_block_truck.png", false );
icons.add( blockTruck );
MapIcon cwid = new MapIcon( "CWID", "images/cwid.png", false );
icons.add( cwid );
MapIcon dispatcher =
new MapIcon( "Dispatcher", "images/dispatcher.png", false );
icons.add( dispatcher );
MapIcon dumpTruck =
new MapIcon( "Dump Truck", "images/dump_truck_red.png", false );
icons.add( dumpTruck );
MapIcon fireTruck =
new MapIcon( "Fire Truck", "images/fire_truck.png", false );
icons.add( fireTruck );
MapIcon garbageTruck =
new MapIcon( "Garbage Truck", "images/garbage_truck.png", false );
icons.add( garbageTruck );
MapIcon loader = new MapIcon( "Loader", "images/loader.png", false );
icons.add( loader );
MapIcon police =
new MapIcon( "Police", "images/police.png", false );
icons.add( police );
MapIcon propaneTruck =
new MapIcon( "Propane Truck", "images/propane_truck.png", false );
icons.add( propaneTruck );
MapIcon rescueTruck =
new MapIcon( "Rescue Truck", "images/rescue_truck.png", false );
icons.add( rescueTruck );
MapIcon schoolBus =
new MapIcon( "School Bus", "images/school_bus.png", false );
icons.add( schoolBus );
MapIcon taxi =
new MapIcon( "Taxi", "images/taxi.png", false );
icons.add( taxi );
MapIcon train =
new MapIcon( "Train", "images/train.png", false );
icons.add( train );
MapIcon transportBus =
new MapIcon( "Transport Bus", "images/opt_bus.png", false );
icons.add( transportBus );
MapIcon van =
new MapIcon( "Van", "images/van.png", false );
icons.add( van );
return icons;
}
/**
* Deletes the map icon
*/
public void deleteMapIcon( MapIcon icon )
{
MapIcon existing = mIcons.get( icon.getName() );
if( existing != null )
{
mIcons.remove( icon.getName() );
mSettings.removeSetting( existing );
broadcastSettingDeleted( existing );
scheduleSettingsSave();
}
}
/**
* Adds the icon, overwriting any existing icon with the same name
* @param icon
*/
public void addMapIcon( MapIcon icon )
{
MapIcon existing = mIcons.get( icon.getName() );
if( existing == null )
{
MapIcon newIcon = new MapIcon( icon.getName(), icon.getPath() );
mIcons.put( newIcon.getName(), newIcon );
addSetting( newIcon );
}
else
{
existing.setName( icon.getName() );
existing.setPath( icon.getPath() );
broadcastSettingChange( existing );
scheduleSettingsSave();
}
}
public void updatMapIcon( MapIcon icon, String newName, String newPath )
{
MapIcon existing = mSettings.getMapIcon( icon.getName() );
if( existing == null )
{
addMapIcon( new MapIcon( newName, newPath ) );
}
else
{
existing.setName( newName );
existing.setPath( newPath );
broadcastSettingChange( existing );
scheduleSettingsSave();
}
}
/**
* Returns named map icon scaled to height, if necessary.
* @param name - name of icon
* @param heigh - height of icon in pixels
*
* @return - ImageIcon or null
*/
public ImageIcon getImageIcon( String name, int height )
{
if( name != null )
{
String mergedName = name + height;
if( mResizedIcons.containsKey( mergedName ) )
{
return mResizedIcons.get( mergedName );
}
MapIcon mapIcon = mIcons.get( name );
if( mapIcon == null )
{
mapIcon = new MapIcon( name, name );
mIcons.put( name, mapIcon );
}
if( mapIcon != null )
{
if( mapIcon.getImageIcon().getIconHeight() > height )
{
ImageIcon scaled = getScaledIcon( mapIcon.getImageIcon(), height );
mResizedIcons.put( mergedName, scaled );
return scaled;
}
else
{
return mapIcon.getImageIcon();
}
}
/* Use the default Icon */
@SuppressWarnings( "unused" )
String mergedDefault = mCurrentDefaultIconName + height;
if( mResizedIcons.containsKey( mergedDefault ) )
{
return mResizedIcons.get( mergedDefault );
}
else
{
MapIcon defaultIcon = mIcons.get( mCurrentDefaultIconName );
if( defaultIcon != null )
{
if( defaultIcon.getImageIcon().getIconHeight() > height )
{
ImageIcon scaledDefault = getScaledIcon( defaultIcon.getImageIcon(), height );
mResizedIcons.put( mergedDefault, scaledDefault );
return scaledDefault;
}
else
{
mResizedIcons.put( mergedDefault, defaultIcon.getImageIcon() );
return defaultIcon.getImageIcon();
}
}
}
/* Something happened ... the above should always return an icon */
mLog.error( "SettingsManager - couldn't return an icon named [" +
name + "] of heigh [" + height + "]" );
}
return null;
}
public static ImageIcon getScaledIcon( ImageIcon original, int height )
{
double scale = (double)original.getIconHeight() / (double)height;
int scaledWidth = (int)( (double)original.getIconWidth() / scale );
Image scaledImage = original.getImage().getScaledInstance( scaledWidth,
height, java.awt.Image.SCALE_SMOOTH );
return new ImageIcon( scaledImage );
}
public MapIcon getMapIcon( String name )
{
if( mIcons.containsKey( name ) )
{
return mIcons.get( name );
}
/* Return the default */
if( mIcons.containsKey( mCurrentDefaultIconName ) )
{
return mIcons.get( mCurrentDefaultIconName );
}
/* Return the real default */
return mIcons.get( DEFAULT_ICON );
}
/**
* Returns the named map icon, or creates it with the default path
* @param name - name of the icon
* @param defaultPath - path to icon image file
* @return - map icon
*/
public MapIcon getMapIcon( String name, String defaultPath )
{
MapIcon icon = mSettings.getMapIcon( name );
if( icon == null )
{
icon = new MapIcon( name, defaultPath );
addSetting( icon );
}
return icon;
}
public DefaultIcon getDefaultIcon()
{
DefaultIcon icon = mSettings.getDefaultIcon();
if( icon == null )
{
icon = new DefaultIcon( DEFAULT_ICON );
addSetting( icon );
}
return icon;
}
public void setDefaultIcon( MapIcon icon )
{
if( mIcons.containsValue( icon ) )
{
MapIcon currentDefault = mIcons.get( mCurrentDefaultIconName );
currentDefault.setDefaultIcon( false );
icon.setDefaultIcon( true );
mCurrentDefaultIconName = icon.getName();
DefaultIcon defaultIconSetting = getDefaultIcon();
defaultIconSetting.setName( icon.getName() );
scheduleSettingsSave();
broadcastSettingChange( defaultIconSetting );
}
}
/**
* Adds the setting and stores the set of settings
*
* @param setting
*/
private void addSetting(Setting setting)