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

37
src/spectrum/SpectralDisplayPanel.java
View File

@@ -64,9 +64,8 @@ import source.tuner.TunerSelectionListener;
import spectrum.OverlayPanel.ChannelDisplay;
import spectrum.converter.ComplexDecibelConverter;
import spectrum.converter.DFTResultsConverter;
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;
@@ -591,42 +590,24 @@ public class SpectralDisplayPanel extends JPanel
JMenu displayMenu = new JMenu( "Display" );
contextMenu.add( displayMenu );
if( event.getComponent() == mWaterfallPanel )
if( event.getComponent() != mWaterfallPanel )
{
/**
* Baseline menu
* DB Scale menu
*/
JMenu baselineMenu = new JMenu( "Baseline" );
baselineMenu.add(
new BaselineItem( mWaterfallPanel, 50 ) );
displayMenu.add( baselineMenu );
}
else
{
/**
* Amplification menu
*/
JMenu amplificationMenu = new JMenu( "Amplify" );
amplificationMenu.add(
new AmplificationItem( mSpectrumPanel, 50 ) );
displayMenu.add( amplificationMenu );
JMenu dbScaleMenu = new JMenu( "Scale: 0 to dBm" );
dbScaleMenu.add(
new DBScaleItem( mSpectrumPanel, -100 ) );
displayMenu.add( dbScaleMenu );
/**
* Averaging menu
*/
JMenu averagingMenu = new JMenu( "Average" );
JMenu averagingMenu = new JMenu( "Averaging" );
averagingMenu.add(
new AveragingItem( mSpectrumPanel, 4 ) );
displayMenu.add( averagingMenu );
/**
* Baseline menu
*/
JMenu baselineMenu = new JMenu( "Baseline" );
baselineMenu.add(
new BaselineItem( mSpectrumPanel, 50 ) );
displayMenu.add( baselineMenu );
/**
* Channel Display setting menu
*/