From 3d351dc6917070c2fdbe345adf1a2d7f99d94d8c Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 8 Apr 2019 14:09:00 -0400 Subject: [PATCH] reducing Formula confusion --- java_console/ui/src/com/rusefi/Launcher.java | 2 +- .../ui/src/com/rusefi/ui/FormulasPane.java | 22 +++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index 7bb05f1354..64f0d24712 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -45,7 +45,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; * @see EngineSnifferPanel */ public class Launcher { - public static final int CONSOLE_VERSION = 20190407; + public static final int CONSOLE_VERSION = 20190408; 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/ui/FormulasPane.java b/java_console/ui/src/com/rusefi/ui/FormulasPane.java index 2e2aae5821..27c7fbccf1 100644 --- a/java_console/ui/src/com/rusefi/ui/FormulasPane.java +++ b/java_console/ui/src/com/rusefi/ui/FormulasPane.java @@ -56,10 +56,10 @@ public class FormulasPane { UiUtils.setPauseButtonText(pauseButton, isPaused); } }); - JPanel top = new JPanel(new FlowLayout()); - top.add(saveImage); - top.add(pauseButton); - content.add(top, BorderLayout.NORTH); + JPanel topButtonsPanel = new JPanel(new FlowLayout()); + topButtonsPanel.add(saveImage); + topButtonsPanel.add(pauseButton); + content.add(topButtonsPanel, BorderLayout.NORTH); JPanel bottomPanel = new JPanel(new FlowLayout()); bottomPanel.add(new IntGaugeLabel("count", Sensor.errorCodeCounter)); @@ -133,16 +133,20 @@ public class FormulasPane { TeXFormula formula = new TeXFormula("\r\n" + algo.title + NL3 + page + ""); - TeXIcon icon = formula.createTeXIcon(TeXConstants.STYLE_DISPLAY, 20); + TeXIcon formulasTeX = formula.createTeXIcon(TeXConstants.STYLE_DISPLAY, 20); - BufferedImage image = new BufferedImage(icon.getIconWidth(), icon.getIconHeight(), BufferedImage.TYPE_INT_ARGB); + BufferedImage image = new BufferedImage(formulasTeX.getIconWidth(), formulasTeX.getIconHeight(), BufferedImage.TYPE_INT_ARGB); Graphics2D g2 = image.createGraphics(); g2.setColor(Color.white); - g2.fillRect(0, 0, icon.getIconWidth(), icon.getIconHeight()); - JLabel label = new JLabel(icon); + g2.fillRect(0, 0, formulasTeX.getIconWidth(), formulasTeX.getIconHeight()); + JLabel formulaLabel = new JLabel(formulasTeX); centerProxy.removeAll(); - centerProxy.add(label, BorderLayout.CENTER); + + JLabel warning = new JLabel("These values are for reference only and do not always reflect ECU logic completely. During cranking different logic is applied."); + warning.setForeground(Color.red); + centerProxy.add(warning, BorderLayout.NORTH); + centerProxy.add(formulaLabel, BorderLayout.CENTER); } @NotNull