From 61d9698ca54c6de88afdccd0e273709f14adc82f Mon Sep 17 00:00:00 2001 From: Denny Date: Mon, 30 May 2016 07:30:17 -0400 Subject: [PATCH] Code cleanup for waterfall and overlay panels --- src/spectrum/OverlayPanel.java | 3 --- src/spectrum/WaterfallPanel.java | 9 +++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/spectrum/OverlayPanel.java b/src/spectrum/OverlayPanel.java index ded12c2a..d826a61c 100644 --- a/src/spectrum/OverlayPanel.java +++ b/src/spectrum/OverlayPanel.java @@ -96,9 +96,6 @@ public class OverlayPanel extends JPanel private Color mColorSpectrumCursor; private Color mColorSpectrumLine; -// //All channels -// private List mChannels = new ArrayList(); -// //Currently visible/displayable channels private CopyOnWriteArrayList mVisibleChannels = new CopyOnWriteArrayList(); private ChannelDisplay mChannelDisplay = ChannelDisplay.ALL; diff --git a/src/spectrum/WaterfallPanel.java b/src/spectrum/WaterfallPanel.java index 336e8c6c..a1c55421 100644 --- a/src/spectrum/WaterfallPanel.java +++ b/src/spectrum/WaterfallPanel.java @@ -278,26 +278,27 @@ public class WaterfallPanel extends JPanel implements DFTResultsListener, { return ( (double)getWidth() * (double)multiplier ) / (double)mDFTSize; } - + /** * Renders the screen at each refresh */ public void paintComponent( Graphics g ) { + super.paintComponent( g ); + int multiplier = getZoomMultiplier(); double binPixelWidth = getBinPixelWidth( multiplier ); int offset = (int)( getPixelOffset( multiplier ) - binPixelWidth ); - + g.drawImage( mWaterfallImage, offset, 0, ( getWidth() * multiplier ) + (int)binPixelWidth, - mImageHeight, + mImageHeight, this ); - Graphics2D graphics = (Graphics2D) g; graphics.setColor( mColorSpectrumCursor );