From 3165a744c919605822c363e7d927f238b2492f3b Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 19 Nov 2016 12:02:47 -0500 Subject: [PATCH] auto-sync --- .../logging/src/com/rusefi/FileLog.java | 2 +- java_console/ui/src/com/rusefi/Launcher.java | 2 +- .../ui/src/com/rusefi/SensorSnifferPane.java | 18 ++++++----- .../ui/src/com/rusefi/ui/MessagesPanel.java | 30 +++++++++--------- .../rusefi/ui/engine/EngineSnifferPanel.java | 31 ++++++++++--------- .../ui/src/com/rusefi/ui/util/UiUtils.java | 8 +++++ 6 files changed, 53 insertions(+), 38 deletions(-) diff --git a/java_console/logging/src/com/rusefi/FileLog.java b/java_console/logging/src/com/rusefi/FileLog.java index e8ac34d209..3a0f35e159 100644 --- a/java_console/logging/src/com/rusefi/FileLog.java +++ b/java_console/logging/src/com/rusefi/FileLog.java @@ -68,7 +68,7 @@ public enum FileLog { } public static String getDate() { - return new SimpleDateFormat("yyyy-MM-dd_HH_mm").format(new Date()); + return new SimpleDateFormat("yyyy-MM-dd_HH_mm_ss").format(new Date()); } public synchronized void logLine(String fullLine) { diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index 3c57297eeb..25923c3560 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -38,7 +38,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; * @see EngineSnifferPanel */ public class Launcher { - public static final int CONSOLE_VERSION = 20161107; + public static final int CONSOLE_VERSION = 20161119; public static final boolean SHOW_STIMULATOR = false; private static final String TAB_INDEX = "main_tab"; protected static final String PORT_KEY = "port"; diff --git a/java_console/ui/src/com/rusefi/SensorSnifferPane.java b/java_console/ui/src/com/rusefi/SensorSnifferPane.java index 75e3f8f597..c50e8bb0c2 100644 --- a/java_console/ui/src/com/rusefi/SensorSnifferPane.java +++ b/java_console/ui/src/com/rusefi/SensorSnifferPane.java @@ -18,8 +18,6 @@ import java.awt.event.ActionListener; import java.util.*; import java.util.List; -import static com.rusefi.ui.util.LocalizedMessages.CLEAR; - /** * Date: 12/21/13 * Andrey Belomutskiy (c) 2012-2013 @@ -58,14 +56,15 @@ public class SensorSnifferPane { }); final JPanel upperPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 5, 0)); + final JButton pauseButton = UiUtils.createPauseButton(); - JButton clearButton = new JButton(CLEAR.getMessage()); - clearButton.setMnemonic('c'); + JButton clearButton = UiUtils.createClearButton(); clearButton.addActionListener(new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { clear(); UiUtils.trueRepaint(canvas); + setPaused(pauseButton, false); } }); upperPanel.add(clearButton); @@ -76,14 +75,13 @@ public class SensorSnifferPane { @Override public void actionPerformed(ActionEvent e) { int rpm = RpmModel.getInstance().getValue(); - String fileName = FileLog.getDate() + "rpm_" + rpm + "_sensor" + ".png"; + String fileName = FileLog.getDate() + "_rpm_" + rpm + "_sensor" + ".png"; UiUtils.saveImageWithPrompt(fileName, upperPanel, canvas); } } ); - final JButton pauseButton = UiUtils.createPauseButton(); upperPanel.add(pauseButton); upperPanel.add(new RpmLabel(2).getContent()); @@ -94,8 +92,7 @@ public class SensorSnifferPane { ActionListener() { @Override public void actionPerformed(ActionEvent e) { - paused = !paused; - UiUtils.setPauseButtonText(pauseButton, paused); + setPaused(pauseButton, !paused); } } ); @@ -113,6 +110,11 @@ public class SensorSnifferPane { lowerPanel.add(new ConfigField(Fields.SENSORCHARTFREQUENCY, "Every XXX engine cycles").getContent()); } + private void setPaused(JButton pauseButton, boolean isPaused) { + paused = isPaused; + UiUtils.setPauseButtonText(pauseButton, paused); + } + private void clear() { minX = maxX = minY = maxY = 0; values.clear(); diff --git a/java_console/ui/src/com/rusefi/ui/MessagesPanel.java b/java_console/ui/src/com/rusefi/ui/MessagesPanel.java index da53a7963f..718f739d49 100644 --- a/java_console/ui/src/com/rusefi/ui/MessagesPanel.java +++ b/java_console/ui/src/com/rusefi/ui/MessagesPanel.java @@ -9,8 +9,6 @@ import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import static com.rusefi.ui.util.LocalizedMessages.CLEAR; - /** * This panel displays plain-text 'msg' plain-text debug messages *

@@ -33,30 +31,34 @@ public class MessagesPanel { middlePanel.add(messagesView.messagesScroll, BorderLayout.CENTER); // buttonPanel.setBorder(BorderFactory.createLineBorder(Color.cyan)); - JButton resetButton = new JButton(CLEAR.getMessage()); - resetButton.setMnemonic('c'); - resetButton.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent event) { - messagesView.clear(); - } - }); - final JButton pauseButton = UiUtils.createPauseButton(); pauseButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - messagesView.isPaused = !messagesView.isPaused; - UiUtils.setPauseButtonText(pauseButton, messagesView.isPaused); + setPaused(pauseButton, !messagesView.isPaused); } }); - buttonPanel.add(resetButton); + JButton clearButton = UiUtils.createClearButton(); + clearButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent event) { + messagesView.clear(); + setPaused(pauseButton, false); + } + }); + + buttonPanel.add(clearButton); buttonPanel.add(pauseButton); if (extraButton != null) buttonPanel.add(extraButton); } + private void setPaused(JButton pauseButton, boolean isPaused) { + messagesView.isPaused = isPaused; + UiUtils.setPauseButtonText(pauseButton, messagesView.isPaused); + } + public JPanel getButtonPanel() { return buttonPanel; } diff --git a/java_console/ui/src/com/rusefi/ui/engine/EngineSnifferPanel.java b/java_console/ui/src/com/rusefi/ui/engine/EngineSnifferPanel.java index 94627f21d3..8e0d9e4350 100644 --- a/java_console/ui/src/com/rusefi/ui/engine/EngineSnifferPanel.java +++ b/java_console/ui/src/com/rusefi/ui/engine/EngineSnifferPanel.java @@ -10,13 +10,13 @@ import com.rusefi.ui.*; import com.rusefi.ui.config.BitConfigField; import com.rusefi.ui.config.ConfigField; import com.rusefi.ui.storage.Node; +import com.rusefi.ui.util.URLLabel; import com.rusefi.ui.util.UiUtils; import com.rusefi.ui.widgets.AnyCommand; -import com.rusefi.ui.util.URLLabel; import com.rusefi.waves.EngineChart; +import com.rusefi.waves.EngineChartParser; import com.rusefi.waves.EngineReport; import com.rusefi.waves.RevolutionLog; -import com.rusefi.waves.EngineChartParser; import javax.swing.*; import java.awt.*; @@ -25,8 +25,6 @@ import java.awt.event.ActionListener; import java.util.*; import java.util.List; -import static com.rusefi.ui.util.LocalizedMessages.CLEAR; - /** * Engine Sniffer control consists of a set of {@link UpDownImage} *

@@ -79,13 +77,21 @@ public class EngineSnifferPanel { statusPanel.setTimeAxisTranslator(crank.createTranslator()); - JButton clearButton = new JButton(CLEAR.getMessage()); - clearButton.setMnemonic('c'); + final JButton pauseButton = UiUtils.createPauseButton(); + pauseButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + setPaused(pauseButton, !isPaused); + } + }); + + JButton clearButton = UiUtils.createClearButton(); clearButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { for (UpDownImage image : images.values()) image.setWaveReport(EngineReport.MOCK, null); + setPaused(pauseButton, false); } }); @@ -97,14 +103,6 @@ public class EngineSnifferPanel { } }); - final JButton pauseButton = UiUtils.createPauseButton(); - pauseButton.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - isPaused = !isPaused; - UiUtils.setPauseButtonText(pauseButton, isPaused); - } - }); JPanel upperPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 5, 0)); upperPanel.add(clearButton); @@ -180,6 +178,11 @@ public class EngineSnifferPanel { // displayChart("wave_chart,crank2!down!192811978!crank2!up!192813389!crank2!down!192813749!crank2!up!192815156!crank2!down!192815512!crank!up!192820764!crank2!up!192825818!crank2!down!192826182!crank2!up!192827610!crank2!down!192827975!crank2!up!192829399!crank2!down!192829757!crank2!up!192831154!crank2!down!192831507!r!187!192834224!crank!down!192834224!crank2!up!192836757!crank2!down!192841994!crank2!up!192843561!crank2!down!192843925!crank2!up!192845334!crank2!down!192845693!crank2!up!192847086!crank2!down!192847439!crank!up!192853135!crank2!up!192857701!crank2!down!192858065!crank2!up!192859491!crank2!down!192859858!crank2!up!192861269!crank2!down!192861626!crank2!up!192863025!crank2!down!192863382!crank2!up!192868647!crank!down!192871268!crank2!down!192872804!crank2!up!192872804!crank!down!192872804!crank!up!192872804!crank2!down!192873898!crank2!up!192875508!crank2!down!192875887!crank2!up!192877357!crank2!down!192877732!crank2!up!192879192!crank2!down!192879565!crank!up!192886293!r!0!194982088!crank!down!194982088!crank2!up!194984699!crank2!down!194990112!crank2!up!194991715!crank2!down!194992085!crank2!up!194993530!crank2!down!194993884!crank2!up!194995292!crank2!down!194995645!crank!up!195001475!crank2!up!195006153!crank2!down!195006515!crank2!up!195007968!crank2!down!195008325!crank2!up!195009773!crank2!down!195010134!crank2!up!195011549!crank2!down!195011901!crank2!up!195017256!crank!down!195019915!crank2!down!195022597!crank2!up!195024189!crank2!down!195024554!crank2!up!195025980!crank2!down!195026329!crank2!up!195027744!crank2!down!195028103!crank!up!195033418!crank2!up!195038542!crank2!down!195038911!crank2!up!195040351!crank2!down!195040722!crank2!up!195042167!crank2!down!195042529!crank2!up!195043934!crank2!down!195044294!r!187!195047060!crank!down!195047060!crank2!up!195049619!crank2!down!195054954!crank2!up!195056549!crank2!down!195056920!crank2!up!195058345!crank2!down!195058703!crank2!up!195060114!crank2!down!195060464!crank!up!195066245!crank2!up!195070882!crank2!down!195071250!crank2!up!195072689!crank2!down!195073054!crank2!up!195074479!,"); } + private void setPaused(JButton pauseButton, boolean isPaused) { + this.isPaused = isPaused; + UiUtils.setPauseButtonText(pauseButton, this.isPaused); + } + public void setOutpinListener(EngineState engineState) { engineState.registerStringValueAction(EngineState.OUTPIN_TAG, new EngineState.ValueCallback() { @Override diff --git a/java_console/ui/src/com/rusefi/ui/util/UiUtils.java b/java_console/ui/src/com/rusefi/ui/util/UiUtils.java index 293bbbeb97..892714d8a5 100644 --- a/java_console/ui/src/com/rusefi/ui/util/UiUtils.java +++ b/java_console/ui/src/com/rusefi/ui/util/UiUtils.java @@ -14,6 +14,7 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.net.URL; +import static com.rusefi.ui.util.LocalizedMessages.CLEAR; import static com.rusefi.ui.util.LocalizedMessages.PAUSE; import static com.rusefi.ui.util.LocalizedMessages.RESUME; @@ -140,4 +141,11 @@ public class UiUtils { pauseButton.setMnemonic('p'); return pauseButton; } + + @NotNull + public static JButton createClearButton() { + JButton clearButton = new JButton(CLEAR.getMessage()); + clearButton.setMnemonic('c'); + return clearButton; + } }