rusefi
/
rusefi
mirror of https://github.com/rusefi/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactoring

This commit is contained in:
rusefillc 2023-01-06 11:56:25 -05:00
parent 12102d5bf3
commit 9ba21589f8
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java_console/ui/src/main/java/com/rusefi/SensorSnifferPane.java
View File

@ -5,7 +5,7 @@ import com.rusefi.config.generated.Fields;
import com.rusefi.ui.RpmLabel;
import com.rusefi.ui.RpmModel;
import com.rusefi.ui.UIContext;
import com.rusefi.ui.config.ConfigField;
import com.rusefi.ui.config.ConfigUiField;
import com.rusefi.ui.config.EnumConfigField;
import com.rusefi.ui.engine.EngineSnifferPanel;
import com.rusefi.core.preferences.storage.Node;
@ -114,7 +114,7 @@ public class SensorSnifferPane {
content.add(lowerPanel, BorderLayout.SOUTH);
lowerPanel.add(new EnumConfigField(uiContext, Fields.SENSORCHARTMODE, "Mode").getContent());
lowerPanel.add(new ConfigField(uiContext, Fields.SENSORSNIFFERRPMTHRESHOLD, "RPM threshold").getContent());
lowerPanel.add(new ConfigUiField(uiContext, Fields.SENSORSNIFFERRPMTHRESHOLD, "RPM threshold").getContent());
}
private void setPaused(JButton pauseButton, boolean isPaused) {

4
java_console/ui/src/main/java/com/rusefi/sensor_logs/PlainTextSensorLog.java
View File

@ -9,7 +9,7 @@ import com.rusefi.config.generated.Fields;
import com.rusefi.core.Sensor;
import com.rusefi.core.SensorCentral;
import com.rusefi.ui.UIContext;
import com.rusefi.ui.config.ConfigField;
import com.rusefi.ui.config.ConfigUiField;
import java.io.FileWriter;
import java.io.IOException;
@ -55,7 +55,7 @@ public class PlainTextSensorLog implements SensorLog {
if (bp != null) {
ConfigurationImage ci = bp.getControllerConfiguration();
if (ci != null) {
debugMode = ConfigField.getIntValue(ci, Fields.DEBUGMODE);
debugMode = ConfigUiField.getIntValue(ci, Fields.DEBUGMODE);
}
}
// todo: kill debug mode!

6
java_console/ui/src/main/java/com/rusefi/ui/config/ConfigField.java → java_console/ui/src/main/java/com/rusefi/ui/config/ConfigUiField.java
View File

@ -14,11 +14,11 @@ import java.awt.event.KeyEvent;
import java.text.DecimalFormat;
import java.text.ParseException;
public class ConfigField extends BaseConfigField {
public class ConfigUiField extends BaseConfigField {
private final JTextField view = new JTextFieldWithWidth(200);
private final static DecimalFormat df = new DecimalFormat("0.0000");
public ConfigField(UIContext uiContext, final Field field, String topLabel) {
public ConfigUiField(UIContext uiContext, final Field field, String topLabel) {
super(uiContext, field);
createUi(topLabel, view);
requestInitialValue(field); // this is not in base constructor so that view is created by the time we invoke it
@ -40,7 +40,7 @@ public class ConfigField extends BaseConfigField {
@Override
public void keyPressed(KeyEvent e) {
if (e.getKeyCode() == KeyEvent.VK_ENTER) {
sendValue(field, ConfigField.this.view.getText());
sendValue(field, ConfigUiField.this.view.getText());
}
}
});

2
java_console/ui/src/main/java/com/rusefi/ui/console/SettingsTab.java
View File

@ -153,7 +153,7 @@ public class SettingsTab {
} else if (field.getOptions() != null) {
control = new EnumConfigField(uiContext, field, f.getUiName()).getContent();
} else {
control = new ConfigField(uiContext, field, f.getUiName()).getContent();
control = new ConfigUiField(uiContext, field, f.getUiName()).getContent();
}
dialogBody.add(control);

8
java_console/ui/src/main/java/com/rusefi/ui/engine/EngineSnifferPanel.java
View File

@ -8,7 +8,7 @@ import com.rusefi.core.Sensor;
import com.rusefi.core.SensorCentral;
import com.rusefi.ui.*;
import com.rusefi.ui.config.BitConfigField;
import com.rusefi.ui.config.ConfigField;
import com.rusefi.ui.config.ConfigUiField;
import com.rusefi.core.preferences.storage.Node;
import com.rusefi.ui.util.URLLabel;
import com.rusefi.ui.util.UiUtils;
@ -126,12 +126,12 @@ public class EngineSnifferPanel {
if (!uiContext.getLinkManager().isLogViewer()) {
JPanel lowerButtons = new JPanel(new FlowLayout(FlowLayout.RIGHT, 5, 0));
lowerButtons.add(new ConfigField(uiContext, Fields.GLOBALTRIGGERANGLEOFFSET, "Trigger Offset").getContent());
lowerButtons.add(new ConfigUiField(uiContext, Fields.GLOBALTRIGGERANGLEOFFSET, "Trigger Offset").getContent());
lowerButtons.add(new BitConfigField(uiContext, Fields.VERBOSETRIGGERSYNCHDETAILS, "Verbose trigger Sync").getContent());
lowerButtons.add(new BitConfigField(uiContext, Fields.VERBOSEVVTDECODING, "Verbose VVT Sync").getContent());
lowerButtons.add(new BitConfigField(uiContext, Fields.ENGINESNIFFERFOCUSONINPUTS, "Focus On Inputs").getContent());
lowerButtons.add(new ConfigField(uiContext, Fields.ENGINECHARTSIZE, "Engine Sniffer size").getContent());
lowerButtons.add(new ConfigField(uiContext, Fields.ENGINESNIFFERRPMTHRESHOLD, "RPM threshold").getContent());
lowerButtons.add(new ConfigUiField(uiContext, Fields.ENGINECHARTSIZE, "Engine Sniffer size").getContent());
lowerButtons.add(new ConfigUiField(uiContext, Fields.ENGINESNIFFERRPMTHRESHOLD, "RPM threshold").getContent());
lowerButtons.add(new BitConfigField(uiContext, Fields.INVERTPRIMARYTRIGGERSIGNAL, "Invert Primary Input").getContent());
bottomPanel.add(lowerButtons, BorderLayout.NORTH);
}

8
java_console/ui/src/main/java/com/rusefi/ui/etb/EtbCommandsPanel.java
View File

@ -4,7 +4,7 @@ import com.rusefi.config.generated.Fields;
import com.rusefi.core.Sensor;
import com.rusefi.ui.UIContext;
import com.rusefi.ui.config.BitConfigField;
import com.rusefi.ui.config.ConfigField;
import com.rusefi.ui.config.ConfigUiField;
import com.rusefi.ui.config.EnumConfigField;
import com.rusefi.core.preferences.storage.Node;
import com.rusefi.ui.util.UiUtils;
@ -43,9 +43,9 @@ public class EtbCommandsPanel {
testParameters.add(new JLabel("set etb_p 1.1"));
testParameters.add(new BitConfigField(uiContext, Fields.PAUSEETBCONTROL, "Pause").getContent());
testParameters.add(new ConfigField(uiContext, Fields.ETB_PFACTOR, "pFactor").getContent());
testParameters.add(new ConfigField(uiContext, Fields.ETB_IFACTOR, "iFactor").getContent());
testParameters.add(new ConfigField(uiContext, Fields.ETB_DFACTOR, "dFactor").getContent());
testParameters.add(new ConfigUiField(uiContext, Fields.ETB_PFACTOR, "pFactor").getContent());
testParameters.add(new ConfigUiField(uiContext, Fields.ETB_IFACTOR, "iFactor").getContent());
testParameters.add(new ConfigUiField(uiContext, Fields.ETB_DFACTOR, "dFactor").getContent());
content.setBorder(BorderFactory.createTitledBorder("Commands"));