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

wip #34 adds sort ordering to tuner table

Browse Source
This commit is contained in:
denny
2016-03-20 06:40:25 -04:00
parent 7a5dc5ad58
commit 4adffbdca7
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/source/tuner/TunerEditor.java
View File

@@ -7,6 +7,8 @@ import gui.editor.EmptyEditor;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.List;
import javax.swing.JButton; import javax.swing.JButton;
import javax.swing.JLabel; import javax.swing.JLabel;
@@ -15,7 +17,9 @@ import javax.swing.JPanel;
import javax.swing.JScrollPane; import javax.swing.JScrollPane;
import javax.swing.JTable; import javax.swing.JTable;
import javax.swing.RowFilter; import javax.swing.RowFilter;
import javax.swing.RowSorter;
import javax.swing.ScrollPaneConstants; import javax.swing.ScrollPaneConstants;
import javax.swing.SortOrder;
import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener; import javax.swing.event.ListSelectionListener;
import javax.swing.table.TableRowSorter; import javax.swing.table.TableRowSorter;
@@ -67,8 +71,8 @@ public class TunerEditor extends Editor<Tuner>
mFrequencyControl.setEnabled( false ); mFrequencyControl.setEnabled( false );
listPanel.add( mFrequencyControl, "span" ); listPanel.add( mFrequencyControl, "span" );
mTunerConfigurationTable = new JTable( mTunerConfigurationModel );
mRowSorter = new TableRowSorter<>( mTunerConfigurationModel ); mRowSorter = new TableRowSorter<>( mTunerConfigurationModel );
mTunerConfigurationTable = new JTable( mTunerConfigurationModel );
mTunerConfigurationTable.setRowSorter( mRowSorter ); mTunerConfigurationTable.setRowSorter( mRowSorter );
mTunerConfigurationTable.setEnabled( false ); mTunerConfigurationTable.setEnabled( false );
mTunerConfigurationTable.getSelectionModel().addListSelectionListener( new ListSelectionListener() mTunerConfigurationTable.getSelectionModel().addListSelectionListener( new ListSelectionListener()

13
src/source/tuner/TunerViewPanel.java
View File

@@ -5,16 +5,21 @@ import java.awt.Component;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.List;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JScrollPane; import javax.swing.JScrollPane;
import javax.swing.JTable; import javax.swing.JTable;
import javax.swing.ListSelectionModel; import javax.swing.ListSelectionModel;
import javax.swing.RowSorter;
import javax.swing.SortOrder;
import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener; import javax.swing.event.ListSelectionListener;
import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableCellRenderer; import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableRowSorter;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
@@ -32,6 +37,7 @@ public class TunerViewPanel extends JPanel
private TunerModel mTunerModel; private TunerModel mTunerModel;
private JTable mTunerTable; private JTable mTunerTable;
private TableRowSorter<TunerModel> mRowSorter;
private JideSplitPane mSplitPane; private JideSplitPane mSplitPane;
private TunerEditor mTunerEditor; private TunerEditor mTunerEditor;
@@ -47,7 +53,14 @@ public class TunerViewPanel extends JPanel
{ {
setLayout( new MigLayout( "insets 0 0 0 0", "[fill,grow]", "[fill,grow]" ) ); setLayout( new MigLayout( "insets 0 0 0 0", "[fill,grow]", "[fill,grow]" ) );
mRowSorter = new TableRowSorter<>( mTunerModel );
List<RowSorter.SortKey> sortKeys = new ArrayList<>();
sortKeys.add( new RowSorter.SortKey( TunerModel.TUNER_TYPE, SortOrder.ASCENDING ) );
sortKeys.add( new RowSorter.SortKey( TunerModel.TUNER_ID, SortOrder.ASCENDING ) );
mRowSorter.setSortKeys( sortKeys );
mTunerTable = new JTable( mTunerModel ); mTunerTable = new JTable( mTunerModel );
mTunerTable.setRowSorter( mRowSorter );
mTunerTable.setSelectionMode( ListSelectionModel.SINGLE_SELECTION ); mTunerTable.setSelectionMode( ListSelectionModel.SINGLE_SELECTION );
mTunerTable.getSelectionModel().addListSelectionListener( new ListSelectionListener() mTunerTable.getSelectionModel().addListSelectionListener( new ListSelectionListener()
{ {

6
src/source/tuner/configuration/TunerConfigurationModel.java
View File

@@ -18,9 +18,9 @@ public class TunerConfigurationModel extends AbstractTableModel
private final static Logger mLog = private final static Logger mLog =
LoggerFactory.getLogger( TunerConfigurationModel.class ); LoggerFactory.getLogger( TunerConfigurationModel.class );
private static final int TUNER_TYPE = 0; public static final int TUNER_TYPE = 0;
private static final int CONFIGURATION_NAME = 1; public static final int CONFIGURATION_NAME = 1;
private static final int ASSIGNED = 2; public static final int ASSIGNED = 2;
private static final String[] COLUMN_HEADERS = { "Tuner Type", "Name", "Assigned" }; private static final String[] COLUMN_HEADERS = { "Tuner Type", "Name", "Assigned" };
private List<Listener<TunerConfigurationEvent>> mConfigurationChangeListeners = private List<Listener<TunerConfigurationEvent>> mConfigurationChangeListeners =