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

added small gauge 

git-svn-id: https://svn2.assembla.com/svn/romraider/trunk@103 38686702-15cf-42e4-a595-3071df8bf5ea
This commit is contained in:
kascade 2008-06-06 08:36:53 +00:00
parent d9e6dfe42c
commit 8a6d6697e4
3 changed files with 131 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ import java.util.HashMap;
import java.util.Map;
public final class DashboardUpdateHandler implements DataUpdateHandler, ConvertorUpdateListener {
private static final Class[] STYLES = {PlainGaugeStyle.class, SmallGaugeStyle.class, NoFrillsGaugeStyle.class, DialGaugeStyle.class};
private static final Class[] STYLES = {PlainGaugeStyle.class, SmallGaugeStyle.class, NoFrillsGaugeStyle.class, DialGaugeStyle.class, SmallDialGaugeStyle.class};
private final Map<LoggerData, Gauge> gauges = synchronizedMap(new HashMap<LoggerData, Gauge>());
private final JPanel dashboardPanel;
private int styleIndex;

20
src/com/romraider/logger/ecu/ui/handler/dash/DialGaugeStyle.java
View File

@ -36,12 +36,12 @@ import static java.lang.Double.MAX_VALUE;
import static java.lang.Double.MIN_VALUE;
import java.text.DecimalFormat;
public final class DialGaugeStyle implements GaugeStyle {
private final DefaultValueDataset current = new DefaultValueDataset(0.0);
private final DefaultValueDataset max = new DefaultValueDataset(0.0);
private final DefaultValueDataset min = new DefaultValueDataset(0.0);
private final DialTextAnnotation unitsLabel = new DialTextAnnotation("");
private final LoggerData loggerData;
public class DialGaugeStyle implements GaugeStyle {
protected final DefaultValueDataset current = new DefaultValueDataset(0.0);
protected final DefaultValueDataset max = new DefaultValueDataset(0.0);
protected final DefaultValueDataset min = new DefaultValueDataset(0.0);
protected final DialTextAnnotation unitsLabel = new DialTextAnnotation("");
protected final LoggerData loggerData;
private double maxValue = MIN_VALUE;
private double minValue = MAX_VALUE;
private JPanel panel;
@ -62,7 +62,7 @@ public final class DialGaugeStyle implements GaugeStyle {
public void run() {
JFreeChart chart = buildChart();
ChartPanel chartPanel = new ChartPanel(chart);
chartPanel.setPreferredSize(new Dimension(250, 270));
chartPanel.setPreferredSize(getChartSize());
panel.removeAll();
panel.add(chartPanel);
panel.revalidate();
@ -116,7 +116,11 @@ public final class DialGaugeStyle implements GaugeStyle {
});
}
private JFreeChart buildChart() {
protected Dimension getChartSize() {
return new Dimension(250, 270);
}
protected JFreeChart buildChart() {
DialPlot plot = new DialPlot();
plot.setView(0.0, 0.0, 1.0, 1.0);
plot.setDataset(0, current);

118
src/com/romraider/logger/ecu/ui/handler/dash/SmallDialGaugeStyle.java Normal file
View File

@ -0,0 +1,118 @@
package com.romraider.logger.ecu.ui.handler.dash;
import com.romraider.logger.ecu.definition.EcuDataConvertor;
import com.romraider.logger.ecu.definition.LoggerData;
import org.jfree.chart.JFreeChart;
import org.jfree.chart.plot.dial.DialBackground;
import org.jfree.chart.plot.dial.DialCap;
import org.jfree.chart.plot.dial.DialFrame;
import org.jfree.chart.plot.dial.DialPlot;
import org.jfree.chart.plot.dial.DialPointer;
import org.jfree.chart.plot.dial.DialValueIndicator;
import org.jfree.chart.plot.dial.StandardDialFrame;
import org.jfree.chart.plot.dial.StandardDialRange;
import org.jfree.chart.plot.dial.StandardDialScale;
import static org.jfree.ui.GradientPaintTransformType.VERTICAL;
import org.jfree.ui.StandardGradientPaintTransformer;
import java.awt.BasicStroke;
import java.awt.Color;
import static java.awt.Color.BLUE;
import static java.awt.Color.GREEN;
import static java.awt.Color.ORANGE;
import static java.awt.Color.RED;
import java.awt.Dimension;
import java.awt.Font;
import static java.awt.Font.BOLD;
import static java.awt.Font.PLAIN;
import java.awt.GradientPaint;
import java.awt.Point;
import java.text.DecimalFormat;
public final class SmallDialGaugeStyle extends DialGaugeStyle {
public SmallDialGaugeStyle(LoggerData loggerData) {
super(loggerData);
}
protected Dimension getChartSize() {
return new Dimension(170, 190);
}
protected JFreeChart buildChart() {
DialPlot plot = new DialPlot();
plot.setView(0.0, 0.0, 1.0, 1.0);
plot.setDataset(0, current);
plot.setDataset(1, max);
plot.setDataset(2, min);
DialFrame dialFrame = new StandardDialFrame();
plot.setDialFrame(dialFrame);
GradientPaint gp = new GradientPaint(new Point(),
new Color(255, 255, 255), new Point(),
new Color(170, 170, 220));
DialBackground db = new DialBackground(gp);
db.setGradientPaintTransformer(new StandardGradientPaintTransformer(VERTICAL));
plot.setBackground(db);
unitsLabel.setFont(new Font("Dialog", BOLD, 14));
unitsLabel.setRadius(0.7);
unitsLabel.setLabel(loggerData.getSelectedConvertor().getUnits());
plot.addLayer(unitsLabel);
DialValueIndicator dvi = new DialValueIndicator(0);
plot.addLayer(dvi);
EcuDataConvertor convertor = loggerData.getSelectedConvertor();
GaugeMinMax minMax = convertor.getGaugeMinMax();
StandardDialScale scale = new StandardDialScale(minMax.min, minMax.max, 225.0, -270.0, minMax.step, 5);
scale.setTickRadius(0.88);
scale.setTickLabelOffset(0.15);
scale.setTickLabelFont(new Font("Dialog", PLAIN, 12));
scale.setTickLabelFormatter(new DecimalFormat("0.0"));
plot.addScale(0, scale);
plot.addScale(1, scale);
plot.addScale(2, scale);
StandardDialRange range = new StandardDialRange(rangeLimit(minMax, 0.75), minMax.max, RED);
range.setInnerRadius(0.52);
range.setOuterRadius(0.55);
plot.addLayer(range);
StandardDialRange range2 = new StandardDialRange(rangeLimit(minMax, 0.5), rangeLimit(minMax, 0.75), ORANGE);
range2.setInnerRadius(0.52);
range2.setOuterRadius(0.55);
plot.addLayer(range2);
StandardDialRange range3 = new StandardDialRange(minMax.min, rangeLimit(minMax, 0.5), GREEN);
range3.setInnerRadius(0.52);
range3.setOuterRadius(0.55);
plot.addLayer(range3);
DialPointer needleCurrent = new DialPointer.Pointer(0);
plot.addLayer(needleCurrent);
DialPointer needleMax = new DialPointer.Pin(1);
needleMax.setRadius(0.84);
((DialPointer.Pin) needleMax).setPaint(RED);
((DialPointer.Pin) needleMax).setStroke(new BasicStroke(1.5F));
plot.addLayer(needleMax);
DialPointer needleMin = new DialPointer.Pin(2);
needleMin.setRadius(0.84);
((DialPointer.Pin) needleMin).setPaint(BLUE);
((DialPointer.Pin) needleMin).setStroke(new BasicStroke(1.5F));
plot.addLayer(needleMin);
DialCap cap = new DialCap();
cap.setRadius(0.10);
plot.setCap(cap);
JFreeChart chart = new JFreeChart(plot);
chart.setTitle(loggerData.getName());
return chart;
}
private double rangeLimit(GaugeMinMax minMax, double fraction) {
return minMax.min + (minMax.max - minMax.min) * fraction;
}
}