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

Resolves issue with spectral and waterfall alignment with frequency

Browse Source 
overlay.

Minor edits to MPT and P25 config editors

Resolved issue with channels not accepting channel config changes 
between restarts (processing chain was not being deleted)

Minor edits to P25 decoder state
This commit is contained in:
denny
2015-11-22 11:29:05 -05:00
parent 4025f88951
commit dc3bcfd404
9 changed files with 120 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/spectrum/OverlayPanel.java
View File

@@ -446,16 +446,22 @@ public class OverlayPanel extends JPanel
*/
private double getAxisFromFrequency( long frequency )
{
//Determine frequency offset from middle
double frequencyOffset = frequency - getMinDisplayFrequency();
double screenWidth = (double)getSize().getWidth();
//Determine ratio of offset to bandwidth
double pixelsPerBin = screenWidth / (double)mDFTSize.getSize();
double pixelOffsetToMinDisplayFrequency = pixelsPerBin * 2.0d;
//Calculate frequency offset from the min frequency
double frequencyOffset = (double)( frequency - getMinDisplayFrequency() );
//Determine ratio of frequency offset to overall bandwidth
double ratio = frequencyOffset / (double)getDisplayBandwidth();
//Calculate offset against the total width
double xOffset = (double)getSize().getWidth() * ratio;
//Apply the ratio to the screen width minus 1 bin width
double screenOffset = screenWidth * ratio;
return xOffset;
return pixelOffsetToMinDisplayFrequency + screenOffset;
}
/**
@@ -749,9 +755,9 @@ public class OverlayPanel extends JPanel
private long getMinDisplayFrequency()
{
double bandwidthPerBin = (double)mBandwidth / (double)( mDFTSize.getSize() - 1 );
double bandwidthPerBin = (double)mBandwidth / (double)( mDFTSize.getSize() );
return getMinFrequency() + (int)( mDFTZoomWindowOffset * bandwidthPerBin );
return getMinFrequency() + (int)( ( mDFTZoomWindowOffset ) * bandwidthPerBin );
}
private long getMaxDisplayFrequency()