mirror of https://github.com/rusefi/RomRaider.git
Minor changes to startup status window and MTS port selection dialog.
git-svn-id: https://svn2.assembla.com/svn/romraider/trunk@363 38686702-15cf-42e4-a595-3071df8bf5ea
This commit is contained in:
parent
4c7e7ca553
commit
3007ee63dc
|
@ -81,14 +81,16 @@ This is the first beta release of the upcoming official 0.5.4b release.
|
||||||
- Moved the COM port Auto Refresh checkbox to the Settings menu.
|
- Moved the COM port Auto Refresh checkbox to the Settings menu.
|
||||||
- Added a Logger startup Progress Bar as loading plugins sometimes takes time.
|
- Added a Logger startup Progress Bar as loading plugins sometimes takes time.
|
||||||
- Added colour to "Log to File" button. Red when recording and green when not.
|
- Added colour to "Log to File" button. Red when recording and green when not.
|
||||||
* Button colours may not appear correctly as this is platform dependent.
|
* Button colours may not appear correctly as this is platform dependent. Colour
|
||||||
|
may show as a border rather than a fill.
|
||||||
Also changed the colours used for the connection state:
|
Also changed the colours used for the connection state:
|
||||||
* Red = recording to file (used to be green)
|
* Red = recording to file (used to be green)
|
||||||
* Green = connected and ready to record (used to blue)
|
* Green = connected and ready to record (used to blue)
|
||||||
* Blue = connection to ECU in progress (used to be red)
|
* Blue = connection to ECU in progress (used to be red)
|
||||||
* Red with X = disconnected (used to be red)
|
* Red with X = disconnected (used to be red)
|
||||||
- Added colour to "Un-select ALL" button. Yellow so it stands out.
|
- Added colour to "Un-select ALL" button. Yellow so it stands out.
|
||||||
* Button colours may not appear correctly as this is platform dependent.
|
* Button colours may not appear correctly as this is platform dependent. Colour
|
||||||
|
may show as a border rather than a fill.
|
||||||
--- Editor ---
|
--- Editor ---
|
||||||
- Set JInternalFrame.isPalette in TableFarme.java so table titles are visible on
|
- Set JInternalFrame.isPalette in TableFarme.java so table titles are visible on
|
||||||
Mac OS.
|
Mac OS.
|
||||||
|
|
|
@ -36,7 +36,9 @@ import static java.awt.BorderLayout.NORTH;
|
||||||
import static java.awt.BorderLayout.SOUTH;
|
import static java.awt.BorderLayout.SOUTH;
|
||||||
import static java.awt.BorderLayout.WEST;
|
import static java.awt.BorderLayout.WEST;
|
||||||
import static java.awt.Color.BLACK;
|
import static java.awt.Color.BLACK;
|
||||||
|
import static java.awt.Color.GREEN;
|
||||||
import static java.awt.Color.RED;
|
import static java.awt.Color.RED;
|
||||||
|
import static java.awt.Color.YELLOW;
|
||||||
import static java.lang.System.currentTimeMillis;
|
import static java.lang.System.currentTimeMillis;
|
||||||
import static java.util.Collections.sort;
|
import static java.util.Collections.sort;
|
||||||
import static javax.swing.BorderFactory.createLoweredBevelBorder;
|
import static javax.swing.BorderFactory.createLoweredBevelBorder;
|
||||||
|
@ -58,7 +60,6 @@ import static javax.swing.SwingUtilities.invokeLater;
|
||||||
|
|
||||||
import java.awt.AWTException;
|
import java.awt.AWTException;
|
||||||
import java.awt.BorderLayout;
|
import java.awt.BorderLayout;
|
||||||
import java.awt.Color;
|
|
||||||
import java.awt.Component;
|
import java.awt.Component;
|
||||||
import java.awt.Dimension;
|
import java.awt.Dimension;
|
||||||
import java.awt.FlowLayout;
|
import java.awt.FlowLayout;
|
||||||
|
@ -82,11 +83,11 @@ import java.util.Map;
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
|
|
||||||
import javax.swing.AbstractAction;
|
import javax.swing.AbstractAction;
|
||||||
|
import javax.swing.BorderFactory;
|
||||||
import javax.swing.ImageIcon;
|
import javax.swing.ImageIcon;
|
||||||
import javax.swing.JButton;
|
import javax.swing.JButton;
|
||||||
import javax.swing.JCheckBox;
|
import javax.swing.JCheckBox;
|
||||||
import javax.swing.JComponent;
|
import javax.swing.JComponent;
|
||||||
import javax.swing.JDialog;
|
|
||||||
import javax.swing.JFrame;
|
import javax.swing.JFrame;
|
||||||
import javax.swing.JLabel;
|
import javax.swing.JLabel;
|
||||||
import javax.swing.JMenuBar;
|
import javax.swing.JMenuBar;
|
||||||
|
@ -101,6 +102,8 @@ import javax.swing.JTabbedPane;
|
||||||
import javax.swing.JTable;
|
import javax.swing.JTable;
|
||||||
import javax.swing.JTextField;
|
import javax.swing.JTextField;
|
||||||
import javax.swing.JToggleButton;
|
import javax.swing.JToggleButton;
|
||||||
|
import javax.swing.JWindow;
|
||||||
|
import javax.swing.border.Border;
|
||||||
import javax.swing.table.TableColumn;
|
import javax.swing.table.TableColumn;
|
||||||
|
|
||||||
import org.apache.log4j.Level;
|
import org.apache.log4j.Level;
|
||||||
|
@ -258,7 +261,7 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
|
||||||
private List<ExternalDataSource> externalDataSources;
|
private List<ExternalDataSource> externalDataSources;
|
||||||
private List<EcuParameter> ecuParams;
|
private List<EcuParameter> ecuParams;
|
||||||
private SerialPortRefresher refresher;
|
private SerialPortRefresher refresher;
|
||||||
private JDialog startStatus;
|
private JWindow startStatus;
|
||||||
private JLabel startText = new JLabel(" Initializing Logger...");
|
private JLabel startText = new JLabel(" Initializing Logger...");
|
||||||
|
|
||||||
public EcuLogger(Settings settings) {
|
public EcuLogger(Settings settings) {
|
||||||
|
@ -820,7 +823,7 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
|
||||||
|
|
||||||
private JButton buildUnselectAllButton() {
|
private JButton buildUnselectAllButton() {
|
||||||
final JButton button = new JButton();
|
final JButton button = new JButton();
|
||||||
button.setBackground(Color.YELLOW);
|
button.setBackground(YELLOW);
|
||||||
VerticalTextIcon textIcon = new VerticalTextIcon(button, "Un-select ALL", ROTATE_LEFT);
|
VerticalTextIcon textIcon = new VerticalTextIcon(button, "Un-select ALL", ROTATE_LEFT);
|
||||||
button.setToolTipText(UNSELECT_ALL_TT_TEXT);
|
button.setToolTipText(UNSELECT_ALL_TT_TEXT);
|
||||||
button.setIcon(textIcon);
|
button.setIcon(textIcon);
|
||||||
|
@ -1074,16 +1077,16 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
|
||||||
logToFileButton = new JToggleButton("Log to file", new ImageIcon("./graphics/logger_log_to_file.png"));
|
logToFileButton = new JToggleButton("Log to file", new ImageIcon("./graphics/logger_log_to_file.png"));
|
||||||
logToFileButton.setToolTipText("Start/stop file logging (F1)");
|
logToFileButton.setToolTipText("Start/stop file logging (F1)");
|
||||||
//logToFileButton.setPreferredSize(new Dimension(100, 25));
|
//logToFileButton.setPreferredSize(new Dimension(100, 25));
|
||||||
logToFileButton.setBackground(Color.GREEN);
|
logToFileButton.setBackground(GREEN);
|
||||||
logToFileButton.setOpaque(true);
|
logToFileButton.setOpaque(true);
|
||||||
logToFileButton.addActionListener(new ActionListener() {
|
logToFileButton.addActionListener(new ActionListener() {
|
||||||
public void actionPerformed(ActionEvent actionEvent) {
|
public void actionPerformed(ActionEvent actionEvent) {
|
||||||
if (logToFileButton.isSelected()) {
|
if (logToFileButton.isSelected()) {
|
||||||
fileUpdateHandler.start();
|
fileUpdateHandler.start();
|
||||||
logToFileButton.setBackground(Color.RED);
|
logToFileButton.setBackground(RED);
|
||||||
} else {
|
} else {
|
||||||
fileUpdateHandler.stop();
|
fileUpdateHandler.stop();
|
||||||
logToFileButton.setBackground(Color.GREEN);
|
logToFileButton.setBackground(GREEN);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -1418,9 +1421,8 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
|
||||||
}
|
}
|
||||||
|
|
||||||
private JProgressBar startbar() {
|
private JProgressBar startbar() {
|
||||||
startStatus = new JDialog();
|
startStatus = new JWindow();
|
||||||
startStatus.setAlwaysOnTop(true);
|
startStatus.setAlwaysOnTop(true);
|
||||||
startStatus.setUndecorated(true);
|
|
||||||
startStatus.setLocation((int)(settings.getLoggerWindowSize().getWidth()/2 + settings.getLoggerWindowLocation().getX()),
|
startStatus.setLocation((int)(settings.getLoggerWindowSize().getWidth()/2 + settings.getLoggerWindowLocation().getX()),
|
||||||
(int)(settings.getLoggerWindowSize().getHeight()/2 + settings.getLoggerWindowLocation().getY()));
|
(int)(settings.getLoggerWindowSize().getHeight()/2 + settings.getLoggerWindowLocation().getY()));
|
||||||
JProgressBar progressBar = new JProgressBar(0, 100);
|
JProgressBar progressBar = new JProgressBar(0, 100);
|
||||||
|
@ -1428,9 +1430,13 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
|
||||||
progressBar.setIndeterminate(false);
|
progressBar.setIndeterminate(false);
|
||||||
progressBar.setOpaque(true);
|
progressBar.setOpaque(true);
|
||||||
startText.setOpaque(true);
|
startText.setOpaque(true);
|
||||||
startStatus.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
|
Border etchedBdr = BorderFactory.createEtchedBorder();
|
||||||
startStatus.getContentPane().add(progressBar, BorderLayout.CENTER);
|
JPanel panel = new JPanel();
|
||||||
startStatus.getContentPane().add(startText, BorderLayout.SOUTH);
|
panel.setLayout(new BorderLayout());
|
||||||
|
panel.setBorder(etchedBdr);
|
||||||
|
panel.add(progressBar, BorderLayout.CENTER);
|
||||||
|
panel.add(startText, BorderLayout.SOUTH);
|
||||||
|
startStatus.getContentPane().add(panel);
|
||||||
startStatus.pack();
|
startStatus.pack();
|
||||||
startStatus.setVisible(true);
|
startStatus.setVisible(true);
|
||||||
return progressBar;
|
return progressBar;
|
||||||
|
|
|
@ -53,12 +53,13 @@ public final class Lm2MtsPluginMenuAction extends AbstractAction {
|
||||||
}
|
}
|
||||||
|
|
||||||
private String[] getPorts() {
|
private String[] getPorts() {
|
||||||
MTS mts = createMTS();
|
String[] results;
|
||||||
mts.disconnect();
|
MTS mts = createMTS();
|
||||||
try {
|
try {
|
||||||
int portCount = mts.portCount();
|
mts.disconnect();
|
||||||
String[] results = new String[portCount];
|
int portCount = mts.portCount();
|
||||||
results[0] = "-1 - [ no ports found ]";
|
results = new String[portCount];
|
||||||
|
results[0] = "-1 - [ no ports found ]";
|
||||||
for (int i = 0; i < portCount; i++) {
|
for (int i = 0; i < portCount; i++) {
|
||||||
mts.currentPort(i);
|
mts.currentPort(i);
|
||||||
String name = mts.portName();
|
String name = mts.portName();
|
||||||
|
@ -70,9 +71,9 @@ public final class Lm2MtsPluginMenuAction extends AbstractAction {
|
||||||
results[i] = result;
|
results[i] = result;
|
||||||
mts.disconnect();
|
mts.disconnect();
|
||||||
}
|
}
|
||||||
return results;
|
|
||||||
} finally {
|
} finally {
|
||||||
mts.dispose();
|
mts.dispose();
|
||||||
}
|
}
|
||||||
|
return results;
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue