mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-15 01:57:39 -05:00
#7 WIP - removes (debug) equalizer buttons fromn the channel spectrum panel
This commit is contained in:
@@ -63,7 +63,6 @@ import org.slf4j.LoggerFactory;
|
|||||||
import javax.swing.JButton;
|
import javax.swing.JButton;
|
||||||
import javax.swing.JLabel;
|
import javax.swing.JLabel;
|
||||||
import javax.swing.JLayeredPane;
|
import javax.swing.JLayeredPane;
|
||||||
import javax.swing.JOptionPane;
|
|
||||||
import javax.swing.JPanel;
|
import javax.swing.JPanel;
|
||||||
import javax.swing.JSpinner;
|
import javax.swing.JSpinner;
|
||||||
import javax.swing.JSplitPane;
|
import javax.swing.JSplitPane;
|
||||||
@@ -103,8 +102,6 @@ public class ChannelSpectrumPanel extends JPanel implements Listener<ProcessingC
|
|||||||
private final JFXPanel mNoiseSquelchPanel;
|
private final JFXPanel mNoiseSquelchPanel;
|
||||||
private final JFXPanel mSymbolPanel;
|
private final JFXPanel mSymbolPanel;
|
||||||
private JSplitPane mSplitPane;
|
private JSplitPane mSplitPane;
|
||||||
private JButton mAButton;
|
|
||||||
private JButton mBButton;
|
|
||||||
private FeedbackDecoder mFeedbackDecoder;
|
private FeedbackDecoder mFeedbackDecoder;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -143,30 +140,6 @@ public class ChannelSpectrumPanel extends JPanel implements Listener<ProcessingC
|
|||||||
|
|
||||||
labelPanel.add(mDummyLabel);
|
labelPanel.add(mDummyLabel);
|
||||||
|
|
||||||
mAButton = new JButton("EQ");
|
|
||||||
mAButton.setToolTipText("Display the current equalizer tap values");
|
|
||||||
mAButton.addActionListener(e -> {
|
|
||||||
String message = "Not Implemented";
|
|
||||||
|
|
||||||
if(mFeedbackDecoder != null)
|
|
||||||
{
|
|
||||||
message = mFeedbackDecoder.getEqualizerSettings();
|
|
||||||
}
|
|
||||||
|
|
||||||
JOptionPane.showMessageDialog(this, message);
|
|
||||||
});
|
|
||||||
|
|
||||||
mBButton = new JButton("Reset");
|
|
||||||
mBButton.setToolTipText("Resets the equalizer to default tap values");
|
|
||||||
mBButton.addActionListener(e -> {
|
|
||||||
if(mFeedbackDecoder != null)
|
|
||||||
{
|
|
||||||
mFeedbackDecoder.resetEqualizer();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
labelPanel.add(mAButton);
|
|
||||||
labelPanel.add(mBButton);
|
|
||||||
|
|
||||||
mNoiseFloorSpinnerModel = new SpinnerNumberModel(18, 8, 36, 1);
|
mNoiseFloorSpinnerModel = new SpinnerNumberModel(18, 8, 36, 1);
|
||||||
mNoiseFloorSpinnerModel.addChangeListener(e -> {
|
mNoiseFloorSpinnerModel.addChangeListener(e -> {
|
||||||
Number number = mNoiseFloorSpinnerModel.getNumber();
|
Number number = mNoiseFloorSpinnerModel.getNumber();
|
||||||
|
|||||||
@@ -122,14 +122,4 @@ public abstract class FeedbackDecoder extends PrimaryDecoder implements ISourceE
|
|||||||
mSymbolListener.receive(symbol);
|
mSymbolListener.receive(symbol);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getEqualizerSettings()
|
|
||||||
{
|
|
||||||
return "Not implemented";
|
|
||||||
}
|
|
||||||
|
|
||||||
public void resetEqualizer()
|
|
||||||
{
|
|
||||||
//No-op, unless implemented in subclass.
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -87,18 +87,6 @@ public class NXDNDecoder extends FeedbackDecoder implements IByteBufferProvider,
|
|||||||
mSymbolProcessor = new NXDNSymbolProcessor(mMessageFramer, this);
|
mSymbolProcessor = new NXDNSymbolProcessor(mMessageFramer, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void resetEqualizer()
|
|
||||||
{
|
|
||||||
mSymbolProcessor.resetEqualizer();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getEqualizerSettings()
|
|
||||||
{
|
|
||||||
return mSymbolProcessor.getEqualizerSettings();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Preloads NXDN channel details passed from the control channel used to resolve channel frequency information
|
* Preloads NXDN channel details passed from the control channel used to resolve channel frequency information
|
||||||
* in traffic channel broadcast messaging.
|
* in traffic channel broadcast messaging.
|
||||||
|
|||||||
@@ -93,19 +93,6 @@ public class NXDNSymbolProcessor
|
|||||||
DF.setPositivePrefix(" ");
|
DF.setPositivePrefix(" ");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Resets the symbol equalizer.
|
|
||||||
*/
|
|
||||||
public void resetEqualizer()
|
|
||||||
{
|
|
||||||
mSymbolEqualizer.reset();
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getEqualizerSettings()
|
|
||||||
{
|
|
||||||
return mSymbolEqualizer.getTapsDescription();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Finalize and prepare for shutdown.
|
* Finalize and prepare for shutdown.
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user