mirror of https://github.com/rusefi/rusefi.git
auto-sync
This commit is contained in:
parent
22f3114f05
commit
c43fe5f6e1
|
@ -54,7 +54,8 @@ public class AnalogChartPanel extends JPanel {
|
||||||
|
|
||||||
JPanel upperPanel = new JPanel(new FlowLayout(FlowLayout.CENTER, 5, 0));
|
JPanel upperPanel = new JPanel(new FlowLayout(FlowLayout.CENTER, 5, 0));
|
||||||
|
|
||||||
JButton imageButton = new JButton("save image");
|
JButton imageButton = new JButton(WavePanel.SAVE_IMAGE);
|
||||||
|
imageButton.setMnemonic('s');
|
||||||
upperPanel.add(imageButton);
|
upperPanel.add(imageButton);
|
||||||
imageButton.addActionListener(new
|
imageButton.addActionListener(new
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,8 @@ public class ChartHelper {
|
||||||
jsp.getSurface().setYLabel("MAF voltage");
|
jsp.getSurface().setYLabel("MAF voltage");
|
||||||
result.add(BorderLayout.CENTER, jsp);
|
result.add(BorderLayout.CENTER, jsp);
|
||||||
|
|
||||||
JButton saveImageButton = new JButton("save image");
|
JButton saveImageButton = new JButton(WavePanel.SAVE_IMAGE);
|
||||||
|
saveImageButton.setMnemonic('s');
|
||||||
saveImageButton.addActionListener(new ActionListener() {
|
saveImageButton.addActionListener(new ActionListener() {
|
||||||
@Override
|
@Override
|
||||||
public void actionPerformed(ActionEvent e) {
|
public void actionPerformed(ActionEvent e) {
|
||||||
|
|
|
@ -1,12 +1,13 @@
|
||||||
package com.rusefi.ui;
|
package com.rusefi.ui;
|
||||||
|
|
||||||
import com.irnems.core.MessagesCentral;
|
import com.irnems.core.MessagesCentral;
|
||||||
|
import com.rusefi.io.CommandQueue;
|
||||||
|
import com.rusefi.io.serial.PortHolder;
|
||||||
import com.rusefi.ui.widgets.AnyCommand;
|
import com.rusefi.ui.widgets.AnyCommand;
|
||||||
import com.rusefi.ui.widgets.IdleLabel;
|
import com.rusefi.ui.widgets.IdleLabel;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import javax.swing.text.BadLocationException;
|
import javax.swing.text.*;
|
||||||
import javax.swing.text.Document;
|
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
import java.awt.event.ActionEvent;
|
import java.awt.event.ActionEvent;
|
||||||
import java.awt.event.ActionListener;
|
import java.awt.event.ActionListener;
|
||||||
|
@ -28,6 +29,8 @@ public class MsgPanel {
|
||||||
|
|
||||||
private final JTextPane msg = new JTextPane();
|
private final JTextPane msg = new JTextPane();
|
||||||
private boolean isPaused;
|
private boolean isPaused;
|
||||||
|
private final Style bold;
|
||||||
|
private final Style italic;
|
||||||
private final JPanel content = new JPanel(new BorderLayout()) {
|
private final JPanel content = new JPanel(new BorderLayout()) {
|
||||||
@Override
|
@Override
|
||||||
public Dimension getPreferredSize() {
|
public Dimension getPreferredSize() {
|
||||||
|
@ -46,17 +49,25 @@ public class MsgPanel {
|
||||||
middlePanel.add(new RecentCommands().getContent(), BorderLayout.EAST);
|
middlePanel.add(new RecentCommands().getContent(), BorderLayout.EAST);
|
||||||
|
|
||||||
|
|
||||||
|
StyledDocument d = (StyledDocument) msg.getDocument();
|
||||||
|
bold = d.addStyle("StyleName", null);
|
||||||
|
bold.addAttribute(StyleConstants.CharacterConstants.Bold, Boolean.TRUE);
|
||||||
|
|
||||||
|
italic = d.addStyle("StyleName", null);
|
||||||
|
italic.addAttribute(StyleConstants.CharacterConstants.Italic, Boolean.TRUE);
|
||||||
|
|
||||||
content.add(middlePanel, BorderLayout.CENTER);
|
content.add(middlePanel, BorderLayout.CENTER);
|
||||||
MessagesCentral.getInstance().addListener(new MessagesCentral.MessageListener() {
|
MessagesCentral.getInstance().addListener(new MessagesCentral.MessageListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onMessage(Class clazz, String message) {
|
public void onMessage(Class clazz, String message) {
|
||||||
final String date = DATE_FORMAT.format(new Date());
|
final String date = DATE_FORMAT.format(new Date());
|
||||||
if (!isPaused)
|
if (!isPaused)
|
||||||
append(date + ": " + clazz.getSimpleName() + ": " + message);
|
append(date + ": " + clazz.getSimpleName() + ": " + message, clazz);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
JButton resetButton = new JButton("clear");
|
JButton resetButton = new JButton("clear");
|
||||||
|
resetButton.setMnemonic('c');
|
||||||
resetButton.addActionListener(new ActionListener() {
|
resetButton.addActionListener(new ActionListener() {
|
||||||
@Override
|
@Override
|
||||||
public void actionPerformed(ActionEvent event) {
|
public void actionPerformed(ActionEvent event) {
|
||||||
|
@ -66,6 +77,7 @@ public class MsgPanel {
|
||||||
});
|
});
|
||||||
|
|
||||||
final JButton pauseButton = new JButton("pause");
|
final JButton pauseButton = new JButton("pause");
|
||||||
|
pauseButton.setMnemonic('p');
|
||||||
pauseButton.addActionListener(new ActionListener() {
|
pauseButton.addActionListener(new ActionListener() {
|
||||||
@Override
|
@Override
|
||||||
public void actionPerformed(ActionEvent e) {
|
public void actionPerformed(ActionEvent e) {
|
||||||
|
@ -103,15 +115,26 @@ public class MsgPanel {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void append(String line) {
|
private void append(String line, Class clazz) {
|
||||||
Document d = msg.getDocument();
|
Document d = msg.getDocument();
|
||||||
if (d.getLength() > MAX_SIZE)
|
if (d.getLength() > MAX_SIZE)
|
||||||
clearMessages(d);
|
clearMessages(d);
|
||||||
try {
|
try {
|
||||||
d.insertString(d.getLength(), line + "\r\n", null);
|
d.insertString(d.getLength(), line + "\r\n", getStyle(clazz));
|
||||||
msg.select(d.getLength(), d.getLength());
|
msg.select(d.getLength(), d.getLength());
|
||||||
} catch (BadLocationException e) {
|
} catch (BadLocationException e) {
|
||||||
throw new IllegalStateException(e);
|
throw new IllegalStateException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private AttributeSet getStyle(Class clazz) {
|
||||||
|
/**
|
||||||
|
* this is ugly as hell, but that's so much better then nothing...
|
||||||
|
*/
|
||||||
|
if (clazz == CommandQueue.class)
|
||||||
|
return bold;
|
||||||
|
if (clazz == PortHolder.class)
|
||||||
|
return italic;
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,6 +36,7 @@ public class WavePanel {
|
||||||
public static final Comparator<String> INSTANCE = new ImageOrderComparator();
|
public static final Comparator<String> INSTANCE = new ImageOrderComparator();
|
||||||
private static final String HELP_URL = "http://rusefi.com/wiki/index.php?title=Manual:DevConsole#Digital_Chart";
|
private static final String HELP_URL = "http://rusefi.com/wiki/index.php?title=Manual:DevConsole#Digital_Chart";
|
||||||
public static final String HELP_TEXT = "Click here for online help";
|
public static final String HELP_TEXT = "Click here for online help";
|
||||||
|
public static final String SAVE_IMAGE = "save image";
|
||||||
|
|
||||||
private final JPanel chartPanel = new JPanel(new BorderLayout());
|
private final JPanel chartPanel = new JPanel(new BorderLayout());
|
||||||
private final JPanel panel = new JPanel(new BorderLayout());
|
private final JPanel panel = new JPanel(new BorderLayout());
|
||||||
|
@ -87,8 +88,9 @@ public class WavePanel {
|
||||||
|
|
||||||
statusPanel.setWaveReport(crank.createTranslator());
|
statusPanel.setWaveReport(crank.createTranslator());
|
||||||
|
|
||||||
JButton resetButton = new JButton("reset");
|
JButton clearButton = new JButton("clear");
|
||||||
resetButton.addActionListener(new ActionListener() {
|
clearButton.setMnemonic('c');
|
||||||
|
clearButton.addActionListener(new ActionListener() {
|
||||||
@Override
|
@Override
|
||||||
public void actionPerformed(ActionEvent e) {
|
public void actionPerformed(ActionEvent e) {
|
||||||
for (UpDownImage image : images.values())
|
for (UpDownImage image : images.values())
|
||||||
|
@ -96,7 +98,8 @@ public class WavePanel {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
JButton saveImageButton = new JButton("save image");
|
JButton saveImageButton = new JButton(SAVE_IMAGE);
|
||||||
|
saveImageButton.setMnemonic('s');
|
||||||
saveImageButton.addActionListener(new ActionListener() {
|
saveImageButton.addActionListener(new ActionListener() {
|
||||||
@Override
|
@Override
|
||||||
public void actionPerformed(ActionEvent e) {
|
public void actionPerformed(ActionEvent e) {
|
||||||
|
@ -105,6 +108,7 @@ public class WavePanel {
|
||||||
});
|
});
|
||||||
|
|
||||||
final JButton pauseButton = new JButton("pause");
|
final JButton pauseButton = new JButton("pause");
|
||||||
|
pauseButton.setMnemonic('p');
|
||||||
pauseButton.addActionListener(new ActionListener() {
|
pauseButton.addActionListener(new ActionListener() {
|
||||||
@Override
|
@Override
|
||||||
public void actionPerformed(ActionEvent e) {
|
public void actionPerformed(ActionEvent e) {
|
||||||
|
@ -114,7 +118,7 @@ public class WavePanel {
|
||||||
});
|
});
|
||||||
|
|
||||||
JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 5, 0));
|
JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 5, 0));
|
||||||
buttonPanel.add(resetButton);
|
buttonPanel.add(clearButton);
|
||||||
buttonPanel.add(saveImageButton);
|
buttonPanel.add(saveImageButton);
|
||||||
buttonPanel.add(pauseButton);
|
buttonPanel.add(pauseButton);
|
||||||
buttonPanel.add(new RpmControl().setSize(2).getContent());
|
buttonPanel.add(new RpmControl().setSize(2).getContent());
|
||||||
|
|
Loading…
Reference in New Issue