mirror of https://github.com/rusefi/RomRaider.git
Added a startup status progress bar to the Logger.
git-svn-id: https://svn2.assembla.com/svn/romraider/trunk@357 38686702-15cf-42e4-a595-3071df8bf5ea
This commit is contained in:
parent
db5be77439
commit
48ec4df524
|
@ -58,6 +58,7 @@ 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;
|
||||||
|
@ -85,12 +86,14 @@ 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;
|
||||||
import javax.swing.JMenuItem;
|
import javax.swing.JMenuItem;
|
||||||
import javax.swing.JPanel;
|
import javax.swing.JPanel;
|
||||||
import javax.swing.JPopupMenu;
|
import javax.swing.JPopupMenu;
|
||||||
|
import javax.swing.JProgressBar;
|
||||||
import javax.swing.JScrollPane;
|
import javax.swing.JScrollPane;
|
||||||
import javax.swing.JSeparator;
|
import javax.swing.JSeparator;
|
||||||
import javax.swing.JSplitPane;
|
import javax.swing.JSplitPane;
|
||||||
|
@ -255,6 +258,8 @@ 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 JLabel startText = new JLabel(" Initializing Logger...");
|
||||||
|
|
||||||
public EcuLogger(Settings settings) {
|
public EcuLogger(Settings settings) {
|
||||||
super(ECU_LOGGER_TITLE);
|
super(ECU_LOGGER_TITLE);
|
||||||
|
@ -270,13 +275,26 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
|
||||||
private void construct(Settings settings) {
|
private void construct(Settings settings) {
|
||||||
checkNotNull(settings);
|
checkNotNull(settings);
|
||||||
this.settings = settings;
|
this.settings = settings;
|
||||||
|
JProgressBar progressBar = startbar();
|
||||||
Logger.getRootLogger().setLevel((Level) Level.toLevel(settings.getLoggerDebuggingLevel()));
|
Logger.getRootLogger().setLevel((Level) Level.toLevel(settings.getLoggerDebuggingLevel()));
|
||||||
bootstrap();
|
bootstrap();
|
||||||
|
progressBar.setValue(20);
|
||||||
|
startText.setText(" Loading ECU Defs...");
|
||||||
loadEcuDefs();
|
loadEcuDefs();
|
||||||
|
progressBar.setValue(40);
|
||||||
|
startText.setText(" Loading Plugins...");
|
||||||
|
progressBar.setIndeterminate(true);
|
||||||
loadLoggerPlugins();
|
loadLoggerPlugins();
|
||||||
|
progressBar.setIndeterminate(false);
|
||||||
|
progressBar.setValue(60);
|
||||||
|
startText.setText(" Loading ECU Parameters...");
|
||||||
loadLoggerParams();
|
loadLoggerParams();
|
||||||
|
progressBar.setValue(80);
|
||||||
|
startText.setText(" Starting Logger...");
|
||||||
initControllerListeners();
|
initControllerListeners();
|
||||||
|
progressBar.setValue(100);
|
||||||
initUserInterface();
|
initUserInterface();
|
||||||
|
startStatus.dispose();
|
||||||
initDataUpdateHandlers();
|
initDataUpdateHandlers();
|
||||||
startPortRefresherThread();
|
startPortRefresherThread();
|
||||||
if (!isLogging()) startLogging();
|
if (!isLogging()) startLogging();
|
||||||
|
@ -1371,7 +1389,31 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//**********************************************************************
|
public void setRefreshMode(boolean refreshMode) {
|
||||||
|
settings.setRefreshMode(refreshMode);
|
||||||
|
refresher.setRefreshMode(refreshMode);
|
||||||
|
}
|
||||||
|
|
||||||
|
private JProgressBar startbar() {
|
||||||
|
startStatus = new JDialog();
|
||||||
|
startStatus.setAlwaysOnTop(true);
|
||||||
|
startStatus.setUndecorated(true);
|
||||||
|
startStatus.setLocation((int)(settings.getLoggerWindowSize().getWidth()/2 + settings.getLoggerWindowLocation().getX()),
|
||||||
|
(int)(settings.getLoggerWindowSize().getHeight()/2 + settings.getLoggerWindowLocation().getY()));
|
||||||
|
JProgressBar progressBar = new JProgressBar(0, 100);
|
||||||
|
progressBar.setValue(0);
|
||||||
|
progressBar.setIndeterminate(false);
|
||||||
|
progressBar.setOpaque(true);
|
||||||
|
startText.setOpaque(true);
|
||||||
|
startStatus.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
|
||||||
|
startStatus.getContentPane().add(progressBar, BorderLayout.CENTER);
|
||||||
|
startStatus.getContentPane().add(startText, BorderLayout.SOUTH);
|
||||||
|
startStatus.pack();
|
||||||
|
startStatus.setVisible(true);
|
||||||
|
return progressBar;
|
||||||
|
}
|
||||||
|
|
||||||
|
//**********************************************************************
|
||||||
|
|
||||||
|
|
||||||
public static void startLogger(int defaultCloseOperation, ECUEditor ecuEditor) {
|
public static void startLogger(int defaultCloseOperation, ECUEditor ecuEditor) {
|
||||||
|
@ -1445,9 +1487,4 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRefreshMode(boolean refreshMode) {
|
|
||||||
settings.setRefreshMode(refreshMode);
|
|
||||||
refresher.setRefreshMode(refreshMode);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -69,8 +69,8 @@ public enum SensorConversionsOther implements ExternalSensorConversions {
|
||||||
MAF_GS ("g/sec", "x", "0.00", new GaugeMinMax(0,400,50)),
|
MAF_GS ("g/sec", "x", "0.00", new GaugeMinMax(0,400,50)),
|
||||||
MAF_GS2LB ("lb/min", "x/7.54", "0.00", new GaugeMinMax(0,50,5)),
|
MAF_GS2LB ("lb/min", "x/7.54", "0.00", new GaugeMinMax(0,50,5)),
|
||||||
PERCENT ("%", "x", "0.0", new GaugeMinMax(0,100,10)),
|
PERCENT ("%", "x", "0.0", new GaugeMinMax(0,100,10)),
|
||||||
VOLTS_5DC("vdc", "x", "0.0", new GaugeMinMax(0,5,0.5)),
|
VOLTS_5DC("VDC", "x", "0.0", new GaugeMinMax(0,5,0.5)),
|
||||||
VOLTS_12DC("vdc", "x", "0.0", new GaugeMinMax(0,15,1.5));
|
VOLTS_12DC("VDC", "x", "0.0", new GaugeMinMax(0,15,1.5));
|
||||||
|
|
||||||
|
|
||||||
private final String units;
|
private final String units;
|
||||||
|
|
Loading…
Reference in New Issue