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

all triggers should be documented way nicer #2001

This commit is contained in:
rusefillc 2020-12-02 21:02:54 -05:00
parent b662b977fa
commit 19a39d8b3e
2 changed files with 46 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
java_console/ui/src/main/java/com/rusefi/TriggerImage.java
View File

@ -83,21 +83,12 @@ public class TriggerImage {
} }
private static void readTrigger(BufferedReader reader, String line, TriggerPanel triggerPanel) throws IOException { private static void readTrigger(BufferedReader reader, String line, TriggerPanel triggerPanel) throws IOException {
String[] tokens = line.split(" "); TriggerWheelInfo triggerWheelInfo = TriggerWheelInfo.readTriggerWheelInfo(line, reader);
String idStr = tokens[1];
String eventCountStr = tokens[2];
String triggerName = tokens[3];
System.out.println("Processing " + line + " " + idStr);
triggerPanel.tdcPosition = Double.parseDouble(tokens[4]);
int eventCount = Integer.parseInt(eventCountStr);
int id = Integer.parseInt(idStr);
// if (id != 20) // if (id != 20)
// return; // return;
System.out.println("id=" + id + ", count=" + eventCount + ", name=" + triggerName); triggerPanel.tdcPosition = triggerWheelInfo.tdcPosition;
List<WaveState> waves = triggerWheelInfo.waves;
List<WaveState> waves = readTrigger(reader, eventCount);
EngineReport re0 = new EngineReport(waves.get(0).list, 720, 720 * (1 + EXTRA_COUNT)); EngineReport re0 = new EngineReport(waves.get(0).list, 720, 720 * (1 + EXTRA_COUNT));
System.out.println(re0); System.out.println(re0);
@ -134,17 +125,17 @@ public class TriggerImage {
if (isThirdVisible) if (isThirdVisible)
triggerPanel.add(upDownImage2); triggerPanel.add(upDownImage2);
triggerPanel.name = triggerName; triggerPanel.name = triggerWheelInfo.triggerName;
triggerPanel.id = id; triggerPanel.id = triggerWheelInfo.id;
UiUtils.trueLayout(triggerPanel); UiUtils.trueLayout(triggerPanel);
UiUtils.trueRepaint(triggerPanel); UiUtils.trueRepaint(triggerPanel);
new File(OUTPUT_FOLDER).mkdir(); new File(OUTPUT_FOLDER).mkdir();
UiUtils.saveImage(OUTPUT_FOLDER + File.separator + "trigger_" + id + ".png", triggerPanel); UiUtils.saveImage(OUTPUT_FOLDER + File.separator + "trigger_" + triggerWheelInfo.id + ".png", triggerPanel);
} }
@NotNull @NotNull
private static List<WaveState> readTrigger(BufferedReader reader, int count) throws IOException { static List<WaveState> readTrigger(BufferedReader reader, int count) throws IOException {
String line; String line;
String[] tokens; String[] tokens;
List<Signal> signals = new ArrayList<>(); List<Signal> signals = new ArrayList<>();

39
java_console/ui/src/main/java/com/rusefi/TriggerWheelInfo.java Normal file
View File

@ -0,0 +1,39 @@
package com.rusefi;
import com.rusefi.trigger.WaveState;
import java.io.BufferedReader;
import java.io.IOException;
import java.util.List;
class TriggerWheelInfo {
final int id;
final double tdcPosition;
final String triggerName;
final List<WaveState> waves;
public TriggerWheelInfo(int id, double tdcPosition, String triggerName, List<WaveState> waves) {
this.id = id;
this.tdcPosition = tdcPosition;
this.triggerName = triggerName;
this.waves = waves;
}
static TriggerWheelInfo readTriggerWheelInfo(String line, BufferedReader reader) throws IOException {
String[] tokens = line.split(" ");
String idStr = tokens[1];
int eventCount = Integer.parseInt(tokens[2]);
String triggerName = tokens[3];
System.out.println("Processing " + line + " " + idStr);
int id = Integer.parseInt(idStr);
double tdcPosition = Double.parseDouble(tokens[4]);
System.out.println("id=" + id + ", count=" + eventCount + ", name=" + triggerName);
List<WaveState> waves = TriggerImage.readTrigger(reader, eventCount);
return new TriggerWheelInfo(id, tdcPosition, triggerName, waves);
}
}