GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 16:47:31 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Resolves issue with channel being deleted when disabled via context menu

Browse Source 
on channel panel, or on channel node in configuration tree.
This commit is contained in:
denny
2015-11-22 12:50:35 -05:00
parent dc3bcfd404
commit 547da54340
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/controller/channel/ChannelNode.java
View File

@@ -24,6 +24,9 @@ import javax.swing.JMenu;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import source.tuner.TunerChannel;
import controller.ConfigurableNode;
import controller.site.SiteNode;
@@ -36,6 +39,8 @@ import controller.system.SystemNode;
public class ChannelNode extends ConfigurableNode implements ChannelEventListener
{
private static final long serialVersionUID = 1L;
private final static Logger mLog = LoggerFactory.getLogger( ChannelNode.class );
private static DecimalFormat sFORMAT = new DecimalFormat( "0.0000" );
@@ -84,12 +89,13 @@ public class ChannelNode extends ConfigurableNode implements ChannelEventListene
case CHANGE_SITE:
case CHANGE_SYSTEM:
case CHANNEL_ENABLED:
case CHANNEL_DISABLED:
case CHANNEL_PROCESSING_STARTED:
case CHANNEL_PROCESSING_STOPPED:
this.refresh();
break;
/* We're being deleted, so cleanup */
case CHANNEL_DISABLED:
case CHANNEL_DELETED:
delete();
break;
default:

1
src/module/ProcessingChain.java
View File

@@ -41,7 +41,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sample.Broadcaster;
import sample.Buffer;
import sample.Listener;
import sample.complex.ComplexBuffer;
import sample.complex.IComplexBufferListener;

5
src/spectrum/WaterfallPanel.java
View File

@@ -23,13 +23,10 @@ import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Image;
import java.awt.Point;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.geom.Line2D;
import java.awt.image.ColorModel;
import java.awt.image.MemoryImageSource;
import java.text.DecimalFormat;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.swing.JPanel;
@@ -291,8 +288,6 @@ public class WaterfallPanel extends JPanel implements DFTResultsListener,
int offset = (int)( getPixelOffset( multiplier ) - binPixelWidth );
// mLog.debug( "Offset:" + offset + " Pixel Offset:" + getPixelOffset( multiplier ) + " bin pixel width:" + binPixelWidth );
g.drawImage( mWaterfallImage,
offset,
0,