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

25
src/spectrum/WaterfallPanel.java
View File

@@ -261,20 +261,24 @@ public class WaterfallPanel extends JPanel implements DFTResultsListener,
* @param multiplier - current zoom multiplier
* @return x-axis pixel offset
*/
private int getPixelOffset( int multiplier )
private double getPixelOffset( int multiplier )
{
int offset = 0;
double offset = 0;
if( mZoom != 0 )
{
int zoomWidth = getWidth() * multiplier;
double binPixelWidth = getBinPixelWidth( multiplier );
offset = -(int)( (double)zoomWidth / (double)mDFTSize *
(double)( mDFTZoomWindowOffset ) );
offset = -binPixelWidth * (double)( mDFTZoomWindowOffset );
}
return offset;
}
private double getBinPixelWidth( int multiplier )
{
return ( (double)getWidth() * (double)multiplier ) / (double)mDFTSize;
}
/**
* Renders the screen at each refresh
@@ -283,15 +287,20 @@ public class WaterfallPanel extends JPanel implements DFTResultsListener,
{
int multiplier = getZoomMultiplier();
int offset = getPixelOffset( multiplier );
double binPixelWidth = getBinPixelWidth( multiplier );
int offset = (int)( getPixelOffset( multiplier ) - binPixelWidth );
// mLog.debug( "Offset:" + offset + " Pixel Offset:" + getPixelOffset( multiplier ) + " bin pixel width:" + binPixelWidth );
g.drawImage( mWaterfallImage,
offset,
0,
getWidth() * multiplier,
( getWidth() * multiplier ) + (int)binPixelWidth,
mImageHeight,
this );
Graphics2D graphics = (Graphics2D) g;
graphics.setColor( mColorSpectrumCursor );