GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 08:37:25 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Updated spectral display to used dBm scale and removed baseline/amplification items.

Browse Source 
Updated sample handling code to use -1.0 to 1.0 float values throughout, to support P25 decoder and symbol filter.
This commit is contained in:
dennis.sheirer
2014-11-01 17:39:06 +00:00
parent 86f374bb88
commit ae0568ff3b
34 changed files with 821 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/spectrum/ChannelSpectrumPanel.java
View File

@@ -29,9 +29,8 @@ import source.tuner.FrequencyChangeEvent;
import source.tuner.FrequencyChangeEvent.Attribute;
import spectrum.converter.DFTResultsConverter;
import spectrum.converter.RealDecibelConverter;
import spectrum.menu.AmplificationItem;
import spectrum.menu.AveragingItem;
import spectrum.menu.BaselineItem;
import spectrum.menu.DBScaleItem;
import spectrum.menu.FFTWidthItem;
import spectrum.menu.FFTWindowTypeItem;
import spectrum.menu.FrameRateItem;
@@ -359,14 +358,6 @@ public class ChannelSpectrumPanel extends JPanel
JMenu displayMenu = new JMenu( "Display" );
contextMenu.add( displayMenu );
/**
* Amplification menu
*/
JMenu amplificationMenu = new JMenu( "Amplification" );
amplificationMenu.add(
new AmplificationItem( ChannelSpectrumPanel.this, 50 ) );
displayMenu.add( amplificationMenu );
/**
* Averaging menu
*/
@@ -380,7 +371,7 @@ public class ChannelSpectrumPanel extends JPanel
*/
JMenu baselineMenu = new JMenu( "Baseline" );
baselineMenu.add(
new BaselineItem( ChannelSpectrumPanel.this, 50 ) );
new DBScaleItem( ChannelSpectrumPanel.this, 50 ) );
displayMenu.add( baselineMenu );
/**
@@ -436,18 +427,6 @@ public class ChannelSpectrumPanel extends JPanel
public void mouseReleased( MouseEvent e ) {}
}
@Override
public int getAmplification()
{
return mSpectrumPanel.getAmplification();
}
@Override
public void setAmplification( int amplification )
{
mSpectrumPanel.setAmplification( amplification );
}
@Override
public int getAveraging()
{
@@ -461,15 +440,15 @@ public class ChannelSpectrumPanel extends JPanel
}
@Override
public int getBaseline()
public int getDBScale()
{
return mSpectrumPanel.getBaseline();
return mSpectrumPanel.getDBScale();
}
@Override
public void setBaseline( int baseline )
public void setDBScale( int baseline )
{
mSpectrumPanel.setBaseline( baseline );
mSpectrumPanel.setDBScale( baseline );
}
public class DecimatingSampleAssembler