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

WIP #34 - updates tuners and tuner model to provide details on

Browse Source 
frequency, sample rate, sourced channels, and spectral display in the
tuner view tab.
This commit is contained in:
denny
2016-03-11 07:16:29 -05:00
parent 6fa3089bc9
commit 9d4afb8c1f
12 changed files with 296 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/controller/ControllerPanel.java
View File

@@ -1,6 +1,6 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014 Dennis Sheirer
* Copyright (C) 2014-2016 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -71,9 +71,9 @@ public class ControllerPanel extends JPanel
private JideTabbedPane mTabbedPane;
protected ConfigurationTreePanel mSystemControlViewPanel;
protected OldConfigurationEditor mConfigurationEditor;
protected JideSplitPane mSystemControlSplitPane;
// protected ConfigurationTreePanel mSystemControlViewPanel;
// protected OldConfigurationEditor mConfigurationEditor;
// protected JideSplitPane mSystemControlSplitPane;
protected JTable mChannelActivityTable = new JTable();
private AudioPanel mAudioPanel;
@@ -128,25 +128,25 @@ public class ControllerPanel extends JPanel
"[grow,fill]",
"[grow,fill]") );
//System Configuration View and Editor
mConfigurationEditor = new OldConfigurationEditor();
// //System Configuration View and Editor
// mConfigurationEditor = new OldConfigurationEditor();
//
// mSystemControlViewPanel = new ConfigurationTreePanel( mController );
// mSystemControlViewPanel.addTreeSelectionListener( mConfigurationEditor );
mSystemControlViewPanel = new ConfigurationTreePanel( mController );
mSystemControlViewPanel.addTreeSelectionListener( mConfigurationEditor );
mSystemControlSplitPane = new JideSplitPane( JideSplitPane.HORIZONTAL_SPLIT );
mSystemControlSplitPane.setDividerSize( 5 );
mSystemControlSplitPane.add( mSystemControlViewPanel );
mSystemControlSplitPane.add( mConfigurationEditor );
// mSystemControlSplitPane = new JideSplitPane( JideSplitPane.HORIZONTAL_SPLIT );
// mSystemControlSplitPane.setDividerSize( 5 );
// mSystemControlSplitPane.add( mSystemControlViewPanel );
// mSystemControlSplitPane.add( mConfigurationEditor );
//Tabbed View - configuration, calls, messages, map
mTabbedPane = new JideTabbedPane();
mTabbedPane.setFont( this.getFont() );
mTabbedPane.setForeground( Color.BLACK );
mTabbedPane.addTab( "Tuners", mTunerManagerPanel );
mTabbedPane.addTab( "Channels", mChannelController );
mTabbedPane.addTab( "Aliases", mAliasController );
mTabbedPane.addTab( "Tuners", mTunerManagerPanel );
mTabbedPane.addTab( "Configuration", mSystemControlSplitPane );
// mTabbedPane.addTab( "Configuration", mSystemControlSplitPane );
mTabbedPane.addTab( "Channel Spectrum", mChannelSpectrumPanel );
mTabbedPane.addTab( "Events", mCallEventPanel );
mTabbedPane.addTab( "Messages", mMessageActivityPanel );