-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revisited VVT TAB logic and added smoothing checkbox and max rpm filt…
…er to VVT Tab filters
- Loading branch information
vimsh
committed
Jan 22, 2018
1 parent
5156a5e
commit 2a3749c
Showing
14 changed files
with
38,409 additions
and
38,375 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <classpath> | ||
| <classpathentry kind="src" path="src"/> | ||
| <classpathentry kind="src" path="resources"/> | ||
| <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0"/> | ||
| <classpathentry kind="lib" path="lib/jcommon-1.0.21.jar"/> | ||
| <classpathentry kind="lib" path="lib/jfreechart-1.0.17.jar"/> | ||
| <classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/> | ||
| <classpathentry kind="lib" path="lib/jmathplot.jar"/> | ||
| <classpathentry kind="lib" path="lib/quicktable-3.0.jar"/> | ||
| <classpathentry kind="lib" path="lib/JTattoo-1.6.11.jar"/> | ||
| <classpathentry kind="lib" path="lib/CheckBoxTree_1.0.0.jar"/> | ||
| <classpathentry kind="lib" path="lib/jmathio.jar"/> | ||
| <classpathentry kind="lib" path="lib/commons-math3-3.6.1.jar"/> | ||
| <classpathentry kind="output" path="bin"/> | ||
| </classpath> | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <classpath> | ||
| <classpathentry kind="src" path="src"/> | ||
| <classpathentry kind="src" path="resources"/> | ||
| <classpathentry kind="lib" path="lib/jcommon-1.0.21.jar"/> | ||
| <classpathentry kind="lib" path="lib/jfreechart-1.0.17.jar"/> | ||
| <classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/> | ||
| <classpathentry kind="lib" path="lib/jmathplot.jar"/> | ||
| <classpathentry kind="lib" path="lib/quicktable-3.0.jar"/> | ||
| <classpathentry kind="lib" path="lib/JTattoo-1.6.11.jar"/> | ||
| <classpathentry kind="lib" path="lib/CheckBoxTree_1.0.0.jar"/> | ||
| <classpathentry kind="lib" path="lib/jmathio.jar"/> | ||
| <classpathentry kind="lib" path="lib/commons-math3-3.6.1.jar"/> | ||
| <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> | ||
| <classpathentry kind="output" path="bin"/> | ||
| </classpath> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,105 +1,105 @@ | ||
| package com.vgi.mafscaling; | ||
|
|
||
| import java.awt.Color; | ||
| import java.awt.GridBagConstraints; | ||
| import java.awt.GridBagLayout; | ||
| import java.awt.Insets; | ||
|
|
||
| import javax.swing.JLabel; | ||
| import javax.swing.JPanel; | ||
| import javax.swing.JScrollPane; | ||
| import javax.swing.JTable; | ||
| import javax.swing.ListSelectionModel; | ||
| import javax.swing.ScrollPaneConstants; | ||
| import javax.swing.border.LineBorder; | ||
| import javax.swing.border.TitledBorder; | ||
| import javax.swing.table.DefaultTableModel; | ||
|
|
||
| public class MafTablePane extends JScrollPane { | ||
| private static final long serialVersionUID = 4656913571229048807L; | ||
| public static final int MafTableColumnCount = 35; | ||
| JTable mafTable = null; | ||
| JLabel voltLabel = null; | ||
| JLabel gsLabel = null; | ||
|
|
||
| public MafTablePane(int columnWidth, String tableName, boolean editableFirstRow, boolean editableSecondRow) { | ||
| Insets insets0 = new Insets(0, 0, 0, 0); | ||
| JPanel dataMafPanel = new JPanel(); | ||
| GridBagLayout gbl_dataMafPanel = new GridBagLayout(); | ||
| gbl_dataMafPanel.columnWidths = new int[]{0, 0}; | ||
| gbl_dataMafPanel.rowHeights = new int[] {0, 0}; | ||
| gbl_dataMafPanel.columnWeights = new double[]{0.0, 1.0}; | ||
| gbl_dataMafPanel.rowWeights = new double[]{0.0, 0.0}; | ||
| dataMafPanel.setLayout(gbl_dataMafPanel); | ||
|
|
||
| GridBagConstraints gbc_label = new GridBagConstraints(); | ||
| gbc_label.anchor = GridBagConstraints.EAST; | ||
| gbc_label.insets = insets0; | ||
| gbc_label.gridx = 0; | ||
| gbc_label.gridy = 0; | ||
| voltLabel = new JLabel("volt "); | ||
| dataMafPanel.add(voltLabel, gbc_label); | ||
| gbc_label.gridy = 1; | ||
| gsLabel = new JLabel("g/s "); | ||
| dataMafPanel.add(gsLabel, gbc_label); | ||
|
|
||
| if (editableFirstRow && editableSecondRow) | ||
| mafTable = new JTable(); | ||
| else if (editableFirstRow) { | ||
| mafTable = new JTable() { | ||
| private static final long serialVersionUID = 7749582128758153892L; | ||
| public boolean isCellEditable(int row, int column) { if (row == 1) return true; return false; }; | ||
| }; | ||
| } | ||
| else if (editableSecondRow) { | ||
| mafTable = new JTable() { | ||
| private static final long serialVersionUID = 7749582128758153892L; | ||
| public boolean isCellEditable(int row, int column) { if (row == 1) return false; return true; }; | ||
| }; | ||
| } | ||
| else { | ||
| mafTable = new JTable() { | ||
| private static final long serialVersionUID = -7484222189491449568L; | ||
| public boolean isCellEditable(int row, int column) { return false; }; | ||
| }; | ||
| } | ||
|
|
||
| mafTable.setColumnSelectionAllowed(true); | ||
| mafTable.setCellSelectionEnabled(true); | ||
| mafTable.setBorder(new LineBorder(new Color(0, 0, 0))); | ||
| mafTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF); | ||
| mafTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); | ||
| mafTable.setModel(new DefaultTableModel(2, MafTableColumnCount)); | ||
| mafTable.setTableHeader(null); | ||
| mafTable.putClientProperty("terminateEditOnFocusLost", true); | ||
| Utils.initializeTable(mafTable, columnWidth); | ||
| GridBagConstraints gbc_mafTable = new GridBagConstraints(); | ||
| gbc_mafTable.insets = insets0; | ||
| gbc_mafTable.fill = GridBagConstraints.HORIZONTAL; | ||
| gbc_mafTable.weightx = 1.0; | ||
| gbc_mafTable.gridx = 1; | ||
| gbc_mafTable.gridy = 0; | ||
| gbc_mafTable.gridheight = 2; | ||
| dataMafPanel.add(mafTable, gbc_mafTable); | ||
|
|
||
| setViewportView(dataMafPanel); | ||
| if (tableName != null) | ||
| setViewportBorder(new TitledBorder(null, tableName, TitledBorder.LEADING, TitledBorder.TOP, null, null)); | ||
| setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); | ||
| setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_ALWAYS); | ||
| } | ||
|
|
||
| public void hideRowHeaders() { | ||
| voltLabel.setVisible(false); | ||
| gsLabel.setVisible(false); | ||
| } | ||
|
|
||
| public void showRowHeaders() { | ||
| voltLabel.setVisible(true); | ||
| gsLabel.setVisible(true); | ||
| } | ||
|
|
||
| public JTable getJTable() { | ||
| return mafTable; | ||
| } | ||
| } | ||
| package com.vgi.mafscaling; | ||
|
|
||
| import java.awt.Color; | ||
| import java.awt.GridBagConstraints; | ||
| import java.awt.GridBagLayout; | ||
| import java.awt.Insets; | ||
|
|
||
| import javax.swing.JLabel; | ||
| import javax.swing.JPanel; | ||
| import javax.swing.JScrollPane; | ||
| import javax.swing.JTable; | ||
| import javax.swing.ListSelectionModel; | ||
| import javax.swing.ScrollPaneConstants; | ||
| import javax.swing.border.LineBorder; | ||
| import javax.swing.border.TitledBorder; | ||
| import javax.swing.table.DefaultTableModel; | ||
|
|
||
| public class MafTablePane extends JScrollPane { | ||
| private static final long serialVersionUID = 4656913571229048807L; | ||
| public static final int MafTableColumnCount = 35; | ||
| JTable mafTable = null; | ||
| JLabel voltLabel = null; | ||
| JLabel gsLabel = null; | ||
|
|
||
| public MafTablePane(int columnWidth, String tableName, boolean editableFirstRow, boolean editableSecondRow) { | ||
| Insets insets0 = new Insets(0, 0, 0, 0); | ||
| JPanel dataMafPanel = new JPanel(); | ||
| GridBagLayout gbl_dataMafPanel = new GridBagLayout(); | ||
| gbl_dataMafPanel.columnWidths = new int[]{0, 0}; | ||
| gbl_dataMafPanel.rowHeights = new int[] {0, 0}; | ||
| gbl_dataMafPanel.columnWeights = new double[]{0.0, 1.0}; | ||
| gbl_dataMafPanel.rowWeights = new double[]{0.0, 0.0}; | ||
| dataMafPanel.setLayout(gbl_dataMafPanel); | ||
|
|
||
| GridBagConstraints gbc_label = new GridBagConstraints(); | ||
| gbc_label.anchor = GridBagConstraints.EAST; | ||
| gbc_label.insets = insets0; | ||
| gbc_label.gridx = 0; | ||
| gbc_label.gridy = 0; | ||
| voltLabel = new JLabel("volt "); | ||
| dataMafPanel.add(voltLabel, gbc_label); | ||
| gbc_label.gridy = 1; | ||
| gsLabel = new JLabel("g/s "); | ||
| dataMafPanel.add(gsLabel, gbc_label); | ||
|
|
||
| if (editableFirstRow && editableSecondRow) | ||
| mafTable = new JTable(); | ||
| else if (editableFirstRow) { | ||
| mafTable = new JTable() { | ||
| private static final long serialVersionUID = 7749582128758153892L; | ||
| public boolean isCellEditable(int row, int column) { if (row == 1) return true; return false; }; | ||
| }; | ||
| } | ||
| else if (editableSecondRow) { | ||
| mafTable = new JTable() { | ||
| private static final long serialVersionUID = 7749582128758153892L; | ||
| public boolean isCellEditable(int row, int column) { if (row == 1) return false; return true; }; | ||
| }; | ||
| } | ||
| else { | ||
| mafTable = new JTable() { | ||
| private static final long serialVersionUID = -7484222189491449568L; | ||
| public boolean isCellEditable(int row, int column) { return false; }; | ||
| }; | ||
| } | ||
|
|
||
| mafTable.setColumnSelectionAllowed(true); | ||
| mafTable.setCellSelectionEnabled(true); | ||
| mafTable.setBorder(new LineBorder(new Color(0, 0, 0))); | ||
| mafTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF); | ||
| mafTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); | ||
| mafTable.setModel(new DefaultTableModel(2, MafTableColumnCount)); | ||
| mafTable.setTableHeader(null); | ||
| mafTable.putClientProperty("terminateEditOnFocusLost", true); | ||
| Utils.initializeTable(mafTable, columnWidth); | ||
| GridBagConstraints gbc_mafTable = new GridBagConstraints(); | ||
| gbc_mafTable.insets = insets0; | ||
| gbc_mafTable.fill = GridBagConstraints.HORIZONTAL; | ||
| gbc_mafTable.weightx = 1.0; | ||
| gbc_mafTable.gridx = 1; | ||
| gbc_mafTable.gridy = 0; | ||
| gbc_mafTable.gridheight = 2; | ||
| dataMafPanel.add(mafTable, gbc_mafTable); | ||
|
|
||
| setViewportView(dataMafPanel); | ||
| if (tableName != null) | ||
| setViewportBorder(new TitledBorder(null, tableName, TitledBorder.LEADING, TitledBorder.TOP, null, null)); | ||
| setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); | ||
| setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_ALWAYS); | ||
| } | ||
|
|
||
| public void hideRowHeaders() { | ||
| voltLabel.setVisible(false); | ||
| gsLabel.setVisible(false); | ||
| } | ||
|
|
||
| public void showRowHeaders() { | ||
| voltLabel.setVisible(true); | ||
| gsLabel.setVisible(true); | ||
| } | ||
|
|
||
| public JTable getJTable() { | ||
| return mafTable; | ||
| } | ||
| } |
Oops, something went wrong.