mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-20 04:27:48 -05:00
Resolves issue with channel being deleted when disabled via context menu
on channel panel, or on channel node in configuration tree.
This commit is contained in:
@@ -24,6 +24,9 @@ import javax.swing.JMenu;
|
|||||||
import javax.swing.JPanel;
|
import javax.swing.JPanel;
|
||||||
import javax.swing.JPopupMenu;
|
import javax.swing.JPopupMenu;
|
||||||
|
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import source.tuner.TunerChannel;
|
import source.tuner.TunerChannel;
|
||||||
import controller.ConfigurableNode;
|
import controller.ConfigurableNode;
|
||||||
import controller.site.SiteNode;
|
import controller.site.SiteNode;
|
||||||
@@ -36,6 +39,8 @@ import controller.system.SystemNode;
|
|||||||
public class ChannelNode extends ConfigurableNode implements ChannelEventListener
|
public class ChannelNode extends ConfigurableNode implements ChannelEventListener
|
||||||
{
|
{
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
private final static Logger mLog = LoggerFactory.getLogger( ChannelNode.class );
|
||||||
|
|
||||||
private static DecimalFormat sFORMAT = new DecimalFormat( "0.0000" );
|
private static DecimalFormat sFORMAT = new DecimalFormat( "0.0000" );
|
||||||
|
|
||||||
@@ -84,12 +89,13 @@ public class ChannelNode extends ConfigurableNode implements ChannelEventListene
|
|||||||
case CHANGE_SITE:
|
case CHANGE_SITE:
|
||||||
case CHANGE_SYSTEM:
|
case CHANGE_SYSTEM:
|
||||||
case CHANNEL_ENABLED:
|
case CHANNEL_ENABLED:
|
||||||
|
case CHANNEL_DISABLED:
|
||||||
case CHANNEL_PROCESSING_STARTED:
|
case CHANNEL_PROCESSING_STARTED:
|
||||||
case CHANNEL_PROCESSING_STOPPED:
|
case CHANNEL_PROCESSING_STOPPED:
|
||||||
this.refresh();
|
this.refresh();
|
||||||
break;
|
break;
|
||||||
/* We're being deleted, so cleanup */
|
/* We're being deleted, so cleanup */
|
||||||
case CHANNEL_DISABLED:
|
case CHANNEL_DELETED:
|
||||||
delete();
|
delete();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -41,7 +41,6 @@ import org.slf4j.Logger;
|
|||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import sample.Broadcaster;
|
import sample.Broadcaster;
|
||||||
import sample.Buffer;
|
|
||||||
import sample.Listener;
|
import sample.Listener;
|
||||||
import sample.complex.ComplexBuffer;
|
import sample.complex.ComplexBuffer;
|
||||||
import sample.complex.IComplexBufferListener;
|
import sample.complex.IComplexBufferListener;
|
||||||
|
|||||||
@@ -23,13 +23,10 @@ import java.awt.Graphics;
|
|||||||
import java.awt.Graphics2D;
|
import java.awt.Graphics2D;
|
||||||
import java.awt.Image;
|
import java.awt.Image;
|
||||||
import java.awt.Point;
|
import java.awt.Point;
|
||||||
import java.awt.event.MouseEvent;
|
|
||||||
import java.awt.event.MouseListener;
|
|
||||||
import java.awt.geom.Line2D;
|
import java.awt.geom.Line2D;
|
||||||
import java.awt.image.ColorModel;
|
import java.awt.image.ColorModel;
|
||||||
import java.awt.image.MemoryImageSource;
|
import java.awt.image.MemoryImageSource;
|
||||||
import java.text.DecimalFormat;
|
import java.text.DecimalFormat;
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
|
||||||
|
|
||||||
import javax.swing.JPanel;
|
import javax.swing.JPanel;
|
||||||
|
|
||||||
@@ -291,8 +288,6 @@ public class WaterfallPanel extends JPanel implements DFTResultsListener,
|
|||||||
|
|
||||||
int offset = (int)( getPixelOffset( multiplier ) - binPixelWidth );
|
int offset = (int)( getPixelOffset( multiplier ) - binPixelWidth );
|
||||||
|
|
||||||
// mLog.debug( "Offset:" + offset + " Pixel Offset:" + getPixelOffset( multiplier ) + " bin pixel width:" + binPixelWidth );
|
|
||||||
|
|
||||||
g.drawImage( mWaterfallImage,
|
g.drawImage( mWaterfallImage,
|
||||||
offset,
|
offset,
|
||||||
0,
|
0,
|
||||||
|
|||||||
Reference in New Issue
Block a user