Adjusted color gradient used in spectral display and some code cleanup.

This commit is contained in:
denny
2015-11-29 07:14:21 -05:00
parent ae10b5fc1c
commit 82a7155966
5 changed files with 17 additions and 38 deletions

View File

@@ -39,6 +39,8 @@ import source.tuner.TunerGroupNode;
import source.tuner.TunerNode; import source.tuner.TunerNode;
import source.tuner.TunerSelectionListener; import source.tuner.TunerSelectionListener;
import controller.channel.Channel; import controller.channel.Channel;
import controller.channel.ChannelEvent;
import controller.channel.ChannelEvent.Event;
import controller.channel.ChannelNode; import controller.channel.ChannelNode;
import controller.site.Site; import controller.site.Site;
import controller.system.System; import controller.system.System;
@@ -183,6 +185,7 @@ public class ConfigurationControllerModel extends DefaultTreeModel
SourceConfigTuner sourceConfig = new SourceConfigTuner(); SourceConfigTuner sourceConfig = new SourceConfigTuner();
sourceConfig.setFrequency( frequency ); sourceConfig.setFrequency( frequency );
channel.setSourceConfiguration( sourceConfig ); channel.setSourceConfiguration( sourceConfig );
mResourceManager.getChannelManager().channelChanged( new ChannelEvent( channel, Event.CHANNEL_ADDED ) );
channel.setEnabled( true, true ); channel.setEnabled( true, true );
site.addChannel( channel ); site.addChannel( channel );

View File

@@ -133,7 +133,10 @@ public class FMDemodulatorModule extends Module implements IComplexBufferListene
mDemodulator.dispose(); mDemodulator.dispose();
mDemodulator = null; mDemodulator = null;
mDCRemovalFilter.dispose(); if( mDCRemovalFilter != null )
{
mDCRemovalFilter.dispose();
}
mDCRemovalFilter = null; mDCRemovalFilter = null;
if( mAutomaticFrequencyControl != null ) if( mAutomaticFrequencyControl != null )

View File

@@ -492,37 +492,4 @@ public class ChannelSpectrumPanel extends JPanel
{ {
mSpectrumPanel.setSmoothingType( type ); mSpectrumPanel.setSmoothingType( type );
} }
public class SampleAssembler implements RealSampleListener
{
private Listener<ComplexBuffer> mListener;
public SampleAssembler( Listener<ComplexBuffer> listener )
{
mListener = listener;
}
@Override
public void receive( float sample )
{
mSamples[ mSamplePointer++ ] = sample;
if( mSamplePointer >= mSamples.length )
{
if( mEnabled.get() )
{
float[] copy = Arrays.copyOf( mSamples, mSamples.length );
mListener.receive( new ComplexBuffer( copy ) );
}
mSamplePointer = 0;
if( mSamples.length != mSampleBufferSize )
{
mSamples = new float[ mSampleBufferSize ];
}
}
}
}
} }

View File

@@ -75,7 +75,7 @@ public class OverlayPanel extends JPanel
} }
private final static BasicStroke DASHED_STROKE = new BasicStroke(0.8f, private final static BasicStroke DASHED_STROKE = new BasicStroke(0.8f,
BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 5.0f, new float[] {5.0f}, 0.0f); BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 5.0f, new float[] {2.0f, 4.0f}, 0.0f);
private static DecimalFormat CURSOR_FORMAT = new DecimalFormat( "000.00000" ); private static DecimalFormat CURSOR_FORMAT = new DecimalFormat( "000.00000" );
private long mFrequency = 0; private long mFrequency = 0;
@@ -342,7 +342,7 @@ public class OverlayPanel extends JPanel
{ {
Stroke currentStroke = graphics.getStroke(); Stroke currentStroke = graphics.getStroke();
graphics.setStroke( DASHED_STROKE ); // graphics.setStroke( DASHED_STROKE );
long minFrequency = getMinDisplayFrequency(); long minFrequency = getMinDisplayFrequency();
long maxFrequency = getMaxDisplayFrequency(); long maxFrequency = getMaxDisplayFrequency();
@@ -352,6 +352,12 @@ public class OverlayPanel extends JPanel
int major = mLabelSizeMonitor.getMajorTickIncrement( graphics ); int major = mLabelSizeMonitor.getMajorTickIncrement( graphics );
int minor = mLabelSizeMonitor.getMinorTickIncrement( graphics ); int minor = mLabelSizeMonitor.getMinorTickIncrement( graphics );
//Avoid divide by zero error
if( minor == 0 )
{
minor = 1;
}
//Adjust the start frequency to a multiple of the minor tick spacing //Adjust the start frequency to a multiple of the minor tick spacing
long frequency = minFrequency - ( minFrequency % minor ); long frequency = minFrequency - ( minFrequency % minor );
@@ -373,7 +379,7 @@ public class OverlayPanel extends JPanel
frequency += minor; frequency += minor;
} }
graphics.setStroke( currentStroke ); // graphics.setStroke( currentStroke );
} }
/** /**

View File

@@ -189,7 +189,7 @@ public class SpectrumPanel extends JPanel
//Define the gradient //Define the gradient
GradientPaint gradient = new GradientPaint( 0, GradientPaint gradient = new GradientPaint( 0,
getSize().height / 4, ( getSize().height - mSpectrumInset ) / 2,
mColorSpectrumGradientTop, mColorSpectrumGradientTop,
0, 0,
getSize().height, getSize().height,