rusefi
/
RomRaider
mirror of https://github.com/rusefi/RomRaider.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated dash panel 

git-svn-id: https://svn2.assembla.com/svn/romraider/trunk@88 38686702-15cf-42e4-a595-3071df8bf5ea
This commit is contained in:
kascade 2008-05-31 09:40:31 +00:00
parent 2c651f20fc
commit 1b374a36fe
6 changed files with 84 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/romraider/logger/ecu/ui/handler/dash/DashboardUpdateHandler.java
View File

@ -41,9 +41,9 @@ public final class DashboardUpdateHandler implements DataUpdateHandler, Converto
this.dashboardPanel = dashboardPanel;
}
public synchronized void registerData(LoggerData loggerData) {
Gauge gauge = new PlainGauge(loggerData);
// Gauge gauge = new SmallGauge(loggerData);
public synchronized void registerData(final LoggerData loggerData) {
Gauge gauge = new Gauge(new PlainGauge(loggerData));
// final Gauge gauge = new Gauge(new SmallGauge(loggerData));
gauges.put(loggerData, gauge);
dashboardPanel.add(gauge);
repaintDashboardPanel();

32
src/com/romraider/logger/ecu/ui/handler/dash/Gauge.java
View File

@ -22,13 +22,37 @@
package com.romraider.logger.ecu.ui.handler.dash;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;
public abstract class Gauge extends JPanel {
public final class Gauge extends JPanel {
private GaugeStyle style;
public abstract void refreshTitle();
public Gauge(GaugeStyle style) {
super();
setGaugeStyle(style);
}
public abstract void updateValue(double value);
public void refreshTitle() {
style.refreshTitle();
}
public abstract void resetValue();
public void updateValue(double value) {
style.updateValue(value);
}
public void resetValue() {
style.resetValue();
}
public void setGaugeStyle(final GaugeStyle style) {
this.style = style;
SwingUtilities.invokeLater(new Runnable() {
public void run() {
removeAll();
style.apply(Gauge.this);
}
});
}
}

7
src/com/romraider/logger/ecu/ui/handler/dash/GaugeStyle.java Normal file
View File

@ -0,0 +1,7 @@
package com.romraider.logger.ecu.ui.handler.dash;
import javax.swing.JPanel;
public interface GaugeStyle extends GaugeUpdateListener {
void apply(JPanel panel);
}

9
src/com/romraider/logger/ecu/ui/handler/dash/GaugeUpdateListener.java Normal file
View File

@ -0,0 +1,9 @@
package com.romraider.logger.ecu.ui.handler.dash;
public interface GaugeUpdateListener {
void refreshTitle();
public void updateValue(double value);
public void resetValue();
}

47
src/com/romraider/logger/ecu/ui/handler/dash/PlainGauge.java
View File

@ -46,7 +46,7 @@ import static java.awt.Font.PLAIN;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
public class PlainGauge extends Gauge implements ActionListener {
public class PlainGauge implements GaugeStyle, ActionListener {
private static final String BLANK = "";
private static final String ABOVE = "above";
private static final String BELOW = "below";
@ -68,12 +68,12 @@ public class PlainGauge extends Gauge implements ActionListener {
private final LoggerData loggerData;
private double max = Double.MIN_VALUE;
private double min = Double.MAX_VALUE;
private JPanel panel = new JPanel();
public PlainGauge(LoggerData loggerData) {
checkNotNull(loggerData, "loggerData");
this.loggerData = loggerData;
zeroText = format(0.0);
initGaugeLayout();
zeroText = format(loggerData, 0.0);
}
public void refreshTitle() {
@ -110,22 +110,27 @@ public class PlainGauge extends Gauge implements ActionListener {
}
}
protected void initGaugeLayout() {
public void apply(JPanel panel) {
this.panel = panel;
doApply(panel);
}
protected void doApply(JPanel panel) {
refreshTitle();
resetValue();
setPreferredSize(new Dimension(236, 144));
setBackground(LIGHT_GREY);
setLayout(new BorderLayout(3, 0));
panel.setPreferredSize(new Dimension(236, 144));
panel.setBackground(LIGHT_GREY);
panel.setLayout(new BorderLayout(3, 0));
// title
title.setFont(getFont().deriveFont(BOLD, 12F));
title.setFont(panel.getFont().deriveFont(BOLD, 12F));
title.setForeground(WHITE);
add(title, NORTH);
panel.add(title, NORTH);
// data panel
JPanel data = new JPanel(new FlowLayout(FlowLayout.CENTER, 3, 1));
data.setBackground(BLACK);
liveValueLabel.setFont(getFont().deriveFont(PLAIN, 40F));
liveValueLabel.setFont(panel.getFont().deriveFont(PLAIN, 40F));
liveValueLabel.setForeground(WHITE);
liveValuePanel.setBackground(LIGHT_GREY);
liveValuePanel.setPreferredSize(new Dimension(140, 80));
@ -156,13 +161,13 @@ public class PlainGauge extends Gauge implements ActionListener {
warnFormPanel.setPreferredSize(new Dimension(226, 34));
warnFormPanel.setBackground(BLACK);
warnFormPanel.setBorder(createLineBorder(LIGHT_GREY, 1));
warnCheckBox.setFont(getFont().deriveFont(PLAIN, 10F));
warnCheckBox.setFont(panel.getFont().deriveFont(PLAIN, 10F));
warnCheckBox.setBackground(BLACK);
warnCheckBox.setForeground(LIGHTER_GREY);
warnCheckBox.setSelected(false);
warnCheckBox.addActionListener(this);
warnType.setPreferredSize(new Dimension(60, 20));
warnType.setFont(getFont().deriveFont(PLAIN, 10F));
warnType.setFont(panel.getFont().deriveFont(PLAIN, 10F));
warnType.setBackground(BLACK);
warnType.setForeground(LIGHTER_GREY);
warnTextField.setColumns(4);
@ -175,18 +180,18 @@ public class PlainGauge extends Gauge implements ActionListener {
warnPanel.add(warnFormPanel);
// add panels
add(data, CENTER);
add(warnPanel, SOUTH);
panel.add(data, CENTER);
panel.add(warnPanel, SOUTH);
}
private JPanel buildMaxMinPanel(String title, JLabel label) {
label.setFont(getFont().deriveFont(PLAIN, 12F));
label.setForeground(WHITE);
JPanel panel = new JPanel(new BorderLayout(1, 1));
label.setFont(panel.getFont().deriveFont(PLAIN, 12F));
label.setForeground(WHITE);
panel.setPreferredSize(new Dimension(60, 38));
panel.setBackground(LIGHT_GREY);
JLabel titleLabel = new JLabel(title, JLabel.CENTER);
titleLabel.setFont(getFont().deriveFont(BOLD, 12F));
titleLabel.setFont(panel.getFont().deriveFont(BOLD, 12F));
titleLabel.setForeground(WHITE);
JPanel dataPanel = new JPanel(new BorderLayout());
dataPanel.setBackground(DARK_GREY);
@ -197,7 +202,7 @@ public class PlainGauge extends Gauge implements ActionListener {
}
private void refreshValue(final double value) {
final String text = format(value);
final String text = format(loggerData, value);
final int scaledValue = scaleForProgressBar(value);
SwingUtilities.invokeLater(new Runnable() {
public void run() {
@ -234,12 +239,12 @@ public class PlainGauge extends Gauge implements ActionListener {
SwingUtilities.invokeLater(new Runnable() {
public void run() {
if (enabled) {
setBackground(RED);
panel.setBackground(RED);
liveValuePanel.setBackground(RED);
progressBar.setForeground(RED);
Speaker.say("Warning!");
} else {
setBackground(LIGHT_GREY);
panel.setBackground(LIGHT_GREY);
liveValuePanel.setBackground(LIGHT_GREY);
progressBar.setForeground(GREEN);
}
@ -247,7 +252,7 @@ public class PlainGauge extends Gauge implements ActionListener {
});
}
private String format(double value) {
private String format(LoggerData loggerData, double value) {
return loggerData.getSelectedConvertor().format(value);
}

22
src/com/romraider/logger/ecu/ui/handler/dash/SmallGauge.java
View File

@ -18,22 +18,22 @@ public final class SmallGauge extends PlainGauge {
super(loggerData);
}
protected void initGaugeLayout() {
protected void doApply(JPanel panel) {
refreshTitle();
resetValue();
setPreferredSize(new Dimension(150, 78));
setBackground(LIGHT_GREY);
setLayout(new BorderLayout(1, 0));
panel.setPreferredSize(new Dimension(150, 78));
panel.setBackground(LIGHT_GREY);
panel.setLayout(new BorderLayout(1, 0));
// title
title.setFont(getFont().deriveFont(PLAIN, 10F));
title.setFont(panel.getFont().deriveFont(PLAIN, 10F));
title.setForeground(WHITE);
add(title, NORTH);
panel.add(title, NORTH);
// data panel
JPanel data = new JPanel(new FlowLayout(FlowLayout.CENTER, 2, 1));
data.setBackground(BLACK);
liveValueLabel.setFont(getFont().deriveFont(PLAIN, 20F));
liveValueLabel.setFont(panel.getFont().deriveFont(PLAIN, 20F));
liveValueLabel.setForeground(WHITE);
liveValuePanel.setBackground(LIGHT_GREY);
liveValuePanel.setPreferredSize(new Dimension(85, 60));
@ -58,17 +58,17 @@ public final class SmallGauge extends PlainGauge {
data.add(progressBar);
// add panels
add(data, CENTER);
panel.add(data, CENTER);
}
private JPanel buildMaxMinPanel(String title, JLabel label) {
label.setFont(getFont().deriveFont(PLAIN, 10F));
label.setForeground(WHITE);
JPanel panel = new JPanel(new BorderLayout(1, 1));
label.setFont(panel.getFont().deriveFont(PLAIN, 10F));
label.setForeground(WHITE);
panel.setPreferredSize(new Dimension(45, 28));
panel.setBackground(LIGHT_GREY);
JLabel titleLabel = new JLabel(title, JLabel.CENTER);
titleLabel.setFont(getFont().deriveFont(PLAIN, 10F));
titleLabel.setFont(panel.getFont().deriveFont(PLAIN, 10F));
titleLabel.setForeground(WHITE);
JPanel dataPanel = new JPanel(new BorderLayout());
dataPanel.setBackground(DARK_GREY);