From 19a39d8b3ef00a232511b7ca48857540f9128dbc Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Wed, 2 Dec 2020 21:02:54 -0500
Subject: [PATCH] all triggers should be documented way nicer #2001

---
 .../main/java/com/rusefi/TriggerImage.java    | 23 ++++-------
 .../java/com/rusefi/TriggerWheelInfo.java     | 39 +++++++++++++++++++
 2 files changed, 46 insertions(+), 16 deletions(-)
 create mode 100644 java_console/ui/src/main/java/com/rusefi/TriggerWheelInfo.java

diff --git a/java_console/ui/src/main/java/com/rusefi/TriggerImage.java b/java_console/ui/src/main/java/com/rusefi/TriggerImage.java
index 795782b2db..2d121c6b40 100644
--- a/java_console/ui/src/main/java/com/rusefi/TriggerImage.java
+++ b/java_console/ui/src/main/java/com/rusefi/TriggerImage.java
@@ -83,21 +83,12 @@ public class TriggerImage {
     }
 
     private static void readTrigger(BufferedReader reader, String line, TriggerPanel triggerPanel) throws IOException {
-        String[] tokens = line.split(" ");
-        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);
-
+        TriggerWheelInfo triggerWheelInfo = TriggerWheelInfo.readTriggerWheelInfo(line, reader);
 //        if (id != 20)
 //            return;
 
-        System.out.println("id=" + id + ", count=" + eventCount + ", name=" + triggerName);
-
-        List<WaveState> waves = readTrigger(reader, eventCount);
+        triggerPanel.tdcPosition = triggerWheelInfo.tdcPosition;
+        List<WaveState> waves = triggerWheelInfo.waves;
 
         EngineReport re0 = new EngineReport(waves.get(0).list, 720, 720 * (1 + EXTRA_COUNT));
         System.out.println(re0);
@@ -134,17 +125,17 @@ public class TriggerImage {
         if (isThirdVisible)
             triggerPanel.add(upDownImage2);
 
-        triggerPanel.name = triggerName;
-        triggerPanel.id = id;
+        triggerPanel.name = triggerWheelInfo.triggerName;
+        triggerPanel.id = triggerWheelInfo.id;
 
         UiUtils.trueLayout(triggerPanel);
         UiUtils.trueRepaint(triggerPanel);
         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
-    private static List<WaveState> readTrigger(BufferedReader reader, int count) throws IOException {
+    static List<WaveState> readTrigger(BufferedReader reader, int count) throws IOException {
         String line;
         String[] tokens;
         List<Signal> signals = new ArrayList<>();
diff --git a/java_console/ui/src/main/java/com/rusefi/TriggerWheelInfo.java b/java_console/ui/src/main/java/com/rusefi/TriggerWheelInfo.java
new file mode 100644
index 0000000000..51e77c584f
--- /dev/null
+++ b/java_console/ui/src/main/java/com/rusefi/TriggerWheelInfo.java
@@ -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);
+    }
+}