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-09-02 20:01:29 -04:00
parent b5d572cbfb
commit 133b30f0e7
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/controllers/algo/accel_enrichment.cpp
View File

@ -153,7 +153,7 @@ static void setDecelMult(float value) {
static void setTpsAccelLen(int len) {
if (len < 1) {
scheduleMsg(logger, "Length shoold be positive");
scheduleMsg(logger, "Length should be positive");
return;
}
engine->tpsAccelEnrichment.cb.setSize(len);
@ -162,7 +162,7 @@ static void setTpsAccelLen(int len) {
static void setMapAccelLen(int len) {
if (len < 1) {
scheduleMsg(logger, "Length shoold be positive");
scheduleMsg(logger, "Length should be positive");
return;
}
engine->mapAccelEnrichment.cb.setSize(len);

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

@ -4,8 +4,8 @@ import com.rusefi.FileLog;
import com.rusefi.core.Sensor;
import com.rusefi.ui.storage.Node;
import com.rusefi.ui.util.UiUtils;
import com.rusefi.ui.widgets.AnyCommand;
import com.rusefi.ui.widgets.PopupMenuButton;
import com.rusefi.ui.widgets.SensorGauge;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
@ -63,6 +63,9 @@ public class GaugesPanel {
private boolean showRpmPanel = true;
private boolean showMessagesPanel = true;
private final JPanel lowerRpmPanel = new JPanel(new FlowLayout(FlowLayout.CENTER, 0, 0));
/**
* this panel is displayed on the right
*/
private final JPanel messagesPanel = new JPanel(new BorderLayout());
private final JSplitPane middleSplitPanel;
@ -71,7 +74,7 @@ public class GaugesPanel {
showRpmPanel = config.getBoolProperty(SHOW_RPM, true);
showMessagesPanel = config.getBoolProperty(SHOW_MESSAGES, true);
prepareMessagesPanel(config);
prepareMessagesPanel();
lowerRpmPanel.add(new RpmLabel(15).getContent());
@ -176,8 +179,8 @@ public class GaugesPanel {
return menu;
}
private void prepareMessagesPanel(Node config) {
MessagesPanel mp = new MessagesPanel(config, false);
private void prepareMessagesPanel() {
MessagesPanel mp = new MessagesPanel(null);
messagesPanel.add(BorderLayout.NORTH, mp.getButtonPanel());
messagesPanel.add(BorderLayout.CENTER, mp.getMessagesScroll());
}
@ -187,6 +190,8 @@ public class GaugesPanel {
JPanel leftUpperPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 5, 0));
leftUpperPanel.add(createSaveImageButton());
leftUpperPanel.add(new RpmLabel(2).getContent());
AnyCommand command = new AnyCommand(config, false, false);
leftUpperPanel.add(command.getContent());
return leftUpperPanel;
}

4
java_console/ui/src/com/rusefi/ui/MessagesPane.java
View File

@ -5,6 +5,7 @@ import com.rusefi.Launcher;
import com.rusefi.ui.engine.EngineSnifferPanel;
import com.rusefi.ui.storage.Node;
import com.rusefi.ui.util.URLLabel;
import com.rusefi.ui.widgets.AnyCommand;
import com.rusefi.ui.widgets.IdleLabel;
import javax.swing.*;
@ -27,7 +28,8 @@ public class MessagesPane {
public MessagesPane(final Node config) {
JPanel topPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 5, 0));
final MessagesPanel upperPanel = new MessagesPanel(config, true);
AnyCommand command = new AnyCommand(config, true, false);
final MessagesPanel upperPanel = new MessagesPanel(command.getContent());
upperPanel.loadFont(config);
JPanel middlePanel = new JPanel(new BorderLayout());

7
java_console/ui/src/com/rusefi/ui/MessagesPanel.java
View File

@ -25,12 +25,11 @@ public class MessagesPanel {
private static final String FONT_SIZE = "font_size";
private static final String FONT_NAME = "font_name";
private final AnyCommand anyCommand;
private final MessagesView messagesView = new MessagesView();
private final JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.CENTER, 5, 0));
public MessagesPanel(Node config, boolean listenToCommands) {
public MessagesPanel(JComponent extraButton) {
JPanel middlePanel = new JPanel(new BorderLayout());
middlePanel.add(messagesView.messagesScroll, BorderLayout.CENTER);
// buttonPanel.setBorder(BorderFactory.createLineBorder(Color.cyan));
@ -56,8 +55,8 @@ public class MessagesPanel {
buttonPanel.add(resetButton);
buttonPanel.add(pauseButton);
anyCommand = new AnyCommand(config, listenToCommands, false);
buttonPanel.add(anyCommand.getContent());
if (extraButton != null)
buttonPanel.add(extraButton);
}
public JPanel getButtonPanel() {