rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hiding weird panes

This commit is contained in:
rusefi 2019-07-14 11:09:51 -04:00
parent b24b1b4619
commit 23c1243dbf
4 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,6 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
*/
public class Launcher {
public static final int CONSOLE_VERSION = 20190714;
public static final boolean SHOW_STIMULATOR = false;
public static final String INPUT_FILES_PATH = "..";
private static final String TAB_INDEX = "main_tab";
protected static final String PORT_KEY = "port";
@ -98,6 +97,7 @@ public class Launcher {
private final SettingsTab settingsTab = new SettingsTab();
private final LogDownloader logsManager = new LogDownloader();
private final FuelTunePane fuelTunePane;
private final PaneSettings paneSettings;
/**
* @see StartupFrame
@ -141,6 +141,8 @@ public class Launcher {
}
});
paneSettings = new PaneSettings(getConfig().getRoot().getChild("panes"));
engineSnifferPanel = new EngineSnifferPanel(getConfig().getRoot().getChild("digital_sniffer"));
if (!LinkManager.isLogViewerMode(port))
engineSnifferPanel.setOutpinListener(LinkManager.engineState);
@ -154,7 +156,7 @@ public class Launcher {
GaugesPanel.DetachedRepository.INSTANCE.init(getConfig().getRoot().getChild("detached"));
GaugesPanel.DetachedRepository.INSTANCE.load();
if (!LinkManager.isLogViewer())
tabbedPane.addTab("Gauges", new GaugesPanel(getConfig().getRoot().getChild("gauges")).getContent());
tabbedPane.addTab("Gauges", new GaugesPanel(getConfig().getRoot().getChild("gauges"), paneSettings).getContent());
if (!LinkManager.isLogViewer()) {
MessagesPane messagesPane = new MessagesPane(getConfig().getRoot().getChild("messages"));
@ -162,7 +164,8 @@ public class Launcher {
}
if (!LinkManager.isLogViewer()) {
tabbedPane.add("Bench Test", new BenchTestPane().getContent());
tabbedPane.add("ETB", new ETBPane().getContent());
if (paneSettings.showEtbPane)
tabbedPane.add("ETB", new ETBPane().getContent());
tabbedPane.add("Presets", new PresetsPane().getContent());
}
@ -176,7 +179,7 @@ public class Launcher {
// tabbedPane.addTab("LE controls", new FlexibleControls().getPanel());
// tabbedPane.addTab("ADC", new AdcPanel(new BooleanInputsModel()).createAdcPanel());
if (SHOW_STIMULATOR && !LinkManager.isSimulationMode && !LinkManager.isLogViewerMode(port)) {
if (paneSettings.showStimulatorPane && !LinkManager.isSimulationMode && !LinkManager.isLogViewerMode(port)) {
// todo: rethink this UI? special command line key to enable it?
EcuStimulator stimulator = EcuStimulator.getInstance();
tabbedPane.add("ECU stimulation", stimulator.getPanel());
@ -193,12 +196,14 @@ public class Launcher {
if (!LinkManager.isLogViewer() && false) // todo: fix it & better name?
tabbedPane.add("Logs Manager", logsManager.getContent());
fuelTunePane = new FuelTunePane(getConfig().getRoot().getChild("fueltune"));
if (true)
if (paneSettings.showFuelTunePane)
tabbedPane.add("Fuel Tune", fuelTunePane.getContent());
if (!LinkManager.isLogViewer())
tabbedPane.add("Trigger Shape", new AverageAnglePanel().getPanel());
if (!LinkManager.isLogViewer()) {
if (paneSettings.showTriggerShapePane)
tabbedPane.add("Trigger Shape", new AverageAnglePanel().getPanel());
}
if (!LinkManager.isLogViewerMode(port)) {
int selectedIndex = getConfig().getRoot().getIntProperty(TAB_INDEX, 2);

18
java_console/ui/src/com/rusefi/PaneSettings.java Normal file
View File

@ -0,0 +1,18 @@
package com.rusefi;
import com.rusefi.ui.storage.Node;
public class PaneSettings {
private static final String SHOW_ETB = "show_etb_pane";
private static final String SHOW_FUEL_TUNE = "show_fuel_tune_pane";
public boolean showEtbPane;
public boolean showFuelTunePane;
public boolean showTriggerShapePane;
public boolean showStimulatorPane;
public PaneSettings(Node config) {
showEtbPane = config.getBoolProperty(SHOW_ETB, false);
showFuelTunePane = config.getBoolProperty(SHOW_FUEL_TUNE, false);
}
}

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

@ -39,8 +39,7 @@ public class StimulationInputs {
content.add(UiUtils.wrap(elResistance2));
JButton button = ecuStimulator.createButton();
if (Launcher.SHOW_STIMULATOR)
content.add(UiUtils.wrap(button));
content.add(UiUtils.wrap(button));
}
public double getEngineLoadMin() {

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

@ -1,6 +1,7 @@
package com.rusefi.ui;
import com.rusefi.FileLog;
import com.rusefi.PaneSettings;
import com.rusefi.core.Sensor;
import com.rusefi.ui.storage.Node;
import com.rusefi.ui.util.UiUtils;
@ -74,7 +75,7 @@ public class GaugesPanel {
private final JPanel messagesPanel = new JPanel(new BorderLayout());
private final JSplitPane middleSplitPanel;
public GaugesPanel(final Node config) {
public GaugesPanel(final Node config, PaneSettings paneSettings) {
gauges = new GaugesGrid(3, 5);
this.config = config;
showRpmPanel = config.getBoolProperty(SHOW_RPM, true);