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

auto-sync

This commit is contained in:
rusEfi 2015-08-31 13:02:28 -04:00
parent 94f41b669f
commit 2879e12039
8 changed files with 129 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java_console/ui/src/com/rusefi/Launcher.java
View File

@ -32,7 +32,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
* @see com.rusefi.StartupFrame
*/
public class Launcher {
public static final int CONSOLE_VERSION = 20150830;
public static final int CONSOLE_VERSION = 20150831;
public static final boolean SHOW_STIMULATOR = false;
private static final String TAB_INDEX = "main_tab";
protected static final String PORT_KEY = "port";

2
java_console/ui/src/com/rusefi/StartupFrame.java
View File

@ -132,7 +132,7 @@ public class StartupFrame {
for (final String port : ports)
comboPorts.addItem(port);
panel.add(comboPorts);
String defaultPort = getConfig().getRoot().getProperty(Launcher.PORT_KEY, "");
String defaultPort = getConfig().getRoot().getProperty(Launcher.PORT_KEY);
comboPorts.setSelectedItem(defaultPort);
final JComboBox<String> comboSpeeds = createSpeedCombo();

3
java_console/ui/src/com/rusefi/ui/GaugesGridElement.java
View File

@ -11,6 +11,8 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
/**
* This panel contains either a {@link SensorGauge} or {@link SensorLiveGraph}
*
* (c) Andrey Belomutskiy
* 8/21/2015.
*/
@ -79,5 +81,4 @@ public class GaugesGridElement {
Sensor sensor = Sensor.lookup(gaugeName, defaultSensor);
return new GaugesGridElement(config).createGauge(sensor);
}
}

2
java_console/ui/src/com/rusefi/ui/GaugesPanel.java
View File

@ -18,7 +18,7 @@ import java.beans.PropertyChangeListener;
/**
* Date: 2/5/13
* (c) Andrey Belomutskiy
* @see SensorGauge
* @see GaugesGridElement
*/
public class GaugesPanel {
private static final Sensor[] DEFAULT_LAYOUT = {

134
java_console/ui/src/com/rusefi/ui/SensorLiveGraph.java
View File

@ -20,11 +20,16 @@ import java.util.LinkedList;
public class SensorLiveGraph extends JPanel {
private static final int COUNT = 30;
private static final String SENSOR_TYPE = "sensor";
private static final String PERIOD = "period";
private static final String USE_AUTO_SCALE = "auto_scale";
private final LinkedList<Double> values = new LinkedList<>();
private final Node config;
private final JMenuItem extraItem;
@NotNull
private ChangePeriod period = ChangePeriod._100;
private Sensor sensor;
private boolean autoScale;
public SensorLiveGraph(Node config, final Sensor defaultSensor, JMenuItem extraItem) {
this.config = config;
@ -35,6 +40,8 @@ public class SensorLiveGraph extends JPanel {
Thread thread = new Thread(createRunnable());
thread.setDaemon(true);
thread.start();
period = ChangePeriod.lookup(config.getProperty(PERIOD));
autoScale = config.getBoolProperty(USE_AUTO_SCALE);
MouseListener mouseListener = new MouseAdapter() {
@Override
@ -59,7 +66,7 @@ public class SensorLiveGraph extends JPanel {
public void run() {
while (true) {
try {
Thread.sleep(100);
Thread.sleep(period.getMs());
} catch (InterruptedException e) {
throw new IllegalStateException(e);
}
@ -79,6 +86,74 @@ public class SensorLiveGraph extends JPanel {
private void showPopupMenu(MouseEvent e) {
JPopupMenu pm = new JPopupMenu();
addChangeSensorItems(pm);
pm.add(new JSeparator());
addChangePeriodItems(pm);
final JCheckBoxMenuItem as = new JCheckBoxMenuItem("Auto scale");
as.setSelected(autoScale);
as.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
autoScale = as.isSelected();
config.setBoolProperty(USE_AUTO_SCALE, autoScale);
}
});
pm.add(as);
pm.add(extraItem);
pm.show(e.getComponent(), e.getX(), e.getY());
}
enum ChangePeriod {
_3000(3000, "3 seconds"),
_1000(1000, "1 second"),
_200(200, "second / 5"),
_100(100, "second / 10"),
_50(50, "second / 20"),;
private final int ms;
private final String text;
ChangePeriod(int ms, String text) {
this.ms = ms;
this.text = text;
}
public int getMs() {
return ms;
}
public String getText() {
return text;
}
public static ChangePeriod lookup(String value) {
for (ChangePeriod cp : ChangePeriod.values()) {
if ((cp.getMs() + "").equals(value))
return cp;
}
return ChangePeriod._200;
}
}
private void addChangePeriodItems(JPopupMenu pm) {
JMenuItem mi = new JMenu("Refresh period");
pm.add(mi);
for (final ChangePeriod cp : ChangePeriod.values()) {
JCheckBoxMenuItem i = new JCheckBoxMenuItem(cp.getText());
i.setSelected(cp == period);
i.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
period = cp;
config.setProperty(PERIOD, period.getMs());
}
});
mi.add(i);
}
}
private void addChangeSensorItems(JPopupMenu pm) {
for (final SensorCategory sc : SensorCategory.values()) {
JMenuItem cmi = new JMenu(sc.getName());
pm.add(cmi);
@ -94,8 +169,6 @@ public class SensorLiveGraph extends JPanel {
cmi.add(mi);
}
}
pm.add(extraItem);
pm.show(e.getComponent(), e.getX(), e.getY());
}
private synchronized void setSensor(Sensor sensor) {
@ -119,21 +192,15 @@ public class SensorLiveGraph extends JPanel {
return; // it's hopeless
g.setColor(Color.black);
double minValue = Double.MAX_VALUE;
double maxValue = -Double.MAX_VALUE;
for (double value : values) {
minValue = Math.min(minValue, value);
maxValue = Math.max(maxValue, value);
}
if (minValue == maxValue) { // double equals should work here, should it?
minValue = 0.9 * maxValue - 1;
maxValue = 1.1 * maxValue + 1;
double minValue;
double maxValue;
if (autoScale) {
VisibleRange getVisibleRange = new VisibleRange().invoke();
minValue = getVisibleRange.getMinValue();
maxValue = getVisibleRange.getMaxValue();
} else {
// expand the range just a bit for borders
double diff = maxValue - minValue;
minValue -= 0.05 * diff;
maxValue += 0.05 * diff;
minValue = sensor.getMinValue();
maxValue = sensor.getMaxValue();
}
int index = 0;
@ -167,4 +234,37 @@ public class SensorLiveGraph extends JPanel {
int nameWidth = g.getFontMetrics().stringWidth(sensorName);
g.drawString(sensorName, d.width - nameWidth, g.getFont().getSize());
}
private class VisibleRange {
private double minValue;
private double maxValue;
public double getMinValue() {
return minValue;
}
public double getMaxValue() {
return maxValue;
}
public VisibleRange invoke() {
minValue = Double.MAX_VALUE;
maxValue = -Double.MAX_VALUE;
for (double value : values) {
minValue = Math.min(minValue, value);
maxValue = Math.max(maxValue, value);
}
if (minValue == maxValue) { // double equals should work here, should it?
minValue = 0.9 * maxValue - 1;
maxValue = 1.1 * maxValue + 1;
} else {
// expand the range just a bit for borders
double diff = maxValue - minValue;
minValue -= 0.05 * diff;
maxValue += 0.05 * diff;
}
return this;
}
}
}

4
java_console/ui/src/com/rusefi/ui/storage/Node.java
View File

@ -72,6 +72,10 @@ public class Node {
return value == null ? defaultValue : value;
}
public String getProperty(String key) {
return getProperty(key, "");
}
public String getPrefix() {
return prefix;
}

2
java_console/ui/src/com/rusefi/ui/widgets/AnyCommand.java
View File

@ -32,7 +32,7 @@ public class AnyCommand {
private int index;
public AnyCommand(final Node config, boolean listenToCommands, boolean withCommandCaption) {
this(config, config.getProperty(KEY, ""), listenToCommands, withCommandCaption);
this(config, config.getProperty(KEY), listenToCommands, withCommandCaption);
}
public AnyCommand(final Node config, String defaultCommand, final boolean listenToCommands, boolean withCommandCaption) {

2
java_console/ui/src/com/rusefi/ui/widgets/SensorGauge.java
View File

@ -13,6 +13,8 @@ import java.awt.*;
import java.awt.event.*;
/**
* Round gauge
*
* Date: 7/9/14
* (c) Andrey Belomutskiy 2012-2014
* @see GaugesPanel