Resolves #625. Updates handling of recording tuners. (#626)

This commit is contained in:
Denny Sheirer
2019-12-21 09:22:04 -05:00
committed by GitHub
parent 2163d0f822
commit 83e518d503
3 changed files with 37 additions and 64 deletions

View File

@@ -29,13 +29,16 @@ import io.github.dsheirer.record.RecorderManager;
import io.github.dsheirer.sample.Listener; import io.github.dsheirer.sample.Listener;
import io.github.dsheirer.source.tuner.TunerEvent.Event; import io.github.dsheirer.source.tuner.TunerEvent.Event;
import io.github.dsheirer.source.tuner.recording.AddRecordingTunerDialog; import io.github.dsheirer.source.tuner.recording.AddRecordingTunerDialog;
import io.github.dsheirer.source.tuner.recording.RecordingTuner;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import javax.swing.JButton; import javax.swing.JButton;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JMenuItem;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JScrollPane; import javax.swing.JScrollPane;
import javax.swing.JTable; import javax.swing.JTable;
import javax.swing.ListSelectionModel; import javax.swing.ListSelectionModel;
@@ -143,6 +146,8 @@ public class TunerViewPanel extends JPanel
{ {
@Override @Override
public void mouseClicked(MouseEvent e) public void mouseClicked(MouseEvent e)
{
if(e.getButton() == MouseEvent.BUTTON1) //Left-Click
{ {
int column = mTunerTable.columnAtPoint(e.getPoint()); int column = mTunerTable.columnAtPoint(e.getPoint());
@@ -160,6 +165,30 @@ public class TunerViewPanel extends JPanel
} }
} }
} }
else if(e.getButton() == MouseEvent.BUTTON3) //Right-Click
{
int tableRow = mTunerTable.rowAtPoint(e.getPoint());
int modelRow = mTunerTable.convertRowIndexToModel(tableRow);
final Tuner tuner = mTunerModel.getTuner(modelRow);
if(tuner instanceof RecordingTuner && tuner.getChannelSourceManager().getTunerChannelCount() == 0)
{
JPopupMenu popupMenu = new JPopupMenu();
JMenuItem removeTunerItem = new JMenuItem("Remove Recording Tuner");
removeTunerItem.addActionListener(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
{
mTunerModel.removeTuner(tuner);
}
});
popupMenu.add(removeTunerItem);
popupMenu.show(mTunerTable, e.getX(), e.getY());
}
}
}
}); });
TableCellRenderer renderer = new LinkCellRenderer(); TableCellRenderer renderer = new LinkCellRenderer();

View File

@@ -30,16 +30,10 @@ import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import javax.swing.JButton;
import javax.swing.JFileChooser;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JTextField; import javax.swing.JTextField;
import javax.swing.filechooser.FileFilter;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.FocusEvent; import java.awt.event.FocusEvent;
import java.awt.event.FocusListener; import java.awt.event.FocusListener;
import java.io.File;
public class RecordingTunerConfigurationEditor extends TunerConfigurationEditor public class RecordingTunerConfigurationEditor extends TunerConfigurationEditor
{ {
@@ -48,7 +42,6 @@ public class RecordingTunerConfigurationEditor extends TunerConfigurationEditor
private final static Logger mLog = LoggerFactory.getLogger(RecordingTunerConfigurationEditor.class); private final static Logger mLog = LoggerFactory.getLogger(RecordingTunerConfigurationEditor.class);
private JTextField mConfigurationName; private JTextField mConfigurationName;
private JButton mRecordingChooserButton;
private JLabel mRecordingPath; private JLabel mRecordingPath;
private boolean mLoading; private boolean mLoading;
@@ -105,44 +98,7 @@ public class RecordingTunerConfigurationEditor extends TunerConfigurationEditor
add(new JLabel("Name:")); add(new JLabel("Name:"));
add(mConfigurationName, "span, wrap"); add(mConfigurationName, "span, wrap");
mRecordingChooserButton = new JButton("Recording"); add(new JLabel("File:"));
mRecordingChooserButton.setEnabled(false);
mRecordingChooserButton.addActionListener(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
{
final JFileChooser chooser = new JFileChooser();
chooser.setFileFilter(new FileFilter()
{
@Override
public boolean accept(File f)
{
return f.isDirectory() || f.getName().matches(".*.wav");
}
@Override
public String getDescription()
{
return "Baseband Recordings (*.wav)";
}
});
int returnVal = chooser.showOpenDialog(RecordingTunerConfigurationEditor.this);
if (returnVal == JFileChooser.APPROVE_OPTION)
{
File file = chooser.getSelectedFile();
if(file != null)
{
mRecordingPath.setText(file.getAbsolutePath());
save();
}
}
}
});
add(mRecordingChooserButton);
mRecordingPath = new JLabel(); mRecordingPath = new JLabel();
add(mRecordingPath); add(mRecordingPath);
} }
@@ -156,11 +112,6 @@ public class RecordingTunerConfigurationEditor extends TunerConfigurationEditor
{ {
mConfigurationName.setEnabled(enabled); mConfigurationName.setEnabled(enabled);
} }
if(mRecordingChooserButton.isEnabled() != enabled)
{
mRecordingChooserButton.setEnabled(enabled);
}
} }
@Override @Override

View File

@@ -184,16 +184,9 @@ public class RecordingTunerController extends TunerController
@Override @Override
public void setFrequency(long frequency) throws SourceException public void setFrequency(long frequency) throws SourceException
{
if(hasBufferListeners())
{ {
mLog.debug("Set frequency [" + frequency + "] request ignored"); mLog.debug("Set frequency [" + frequency + "] request ignored");
} }
else
{
super.setFrequency(frequency);
}
}
/** /**
* Current center frequency for this tuner * Current center frequency for this tuner