From 9049ab453d25767dcdd062d9c1d1efe71cca8d12 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Tue, 26 May 2020 01:51:50 -0400
Subject: [PATCH] refactoring

---
 .../models/src/com/rusefi/waves/EngineReport.java     | 11 +++++++----
 .../com/rusefi/waves/test/EngineChartParserTest.java  |  4 ++--
 .../ui/src/com/rusefi/ui/engine/UpDownImage.java      |  8 ++++----
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/java_console/models/src/com/rusefi/waves/EngineReport.java b/java_console/models/src/com/rusefi/waves/EngineReport.java
index 4c64ce16c0..b557641bfb 100644
--- a/java_console/models/src/com/rusefi/waves/EngineReport.java
+++ b/java_console/models/src/com/rusefi/waves/EngineReport.java
@@ -159,15 +159,18 @@ public class EngineReport {
     public static class UpDown {
         // times in sys ticks
         public final int upTime;
-        public final int upIndex;
+        /**
+         * Only trigger channels have these
+         */
+        public final int upTriggerCycleIndex;
         public final int downTime;
-        public final int downIndex;
+        public final int downTriggerCycleIndex;
 
         public UpDown(int upTime, int upIndex, int downTime, int downIndex) {
             this.upTime = upTime;
-            this.upIndex = upIndex;
+            this.upTriggerCycleIndex = upIndex;
             this.downTime = downTime;
-            this.downIndex = downIndex;
+            this.downTriggerCycleIndex = downIndex;
         }
 
         public int getDuration() {
diff --git a/java_console/models/src/com/rusefi/waves/test/EngineChartParserTest.java b/java_console/models/src/com/rusefi/waves/test/EngineChartParserTest.java
index 1f59ebd3bb..f72cf1c658 100644
--- a/java_console/models/src/com/rusefi/waves/test/EngineChartParserTest.java
+++ b/java_console/models/src/com/rusefi/waves/test/EngineChartParserTest.java
@@ -32,10 +32,10 @@ public class EngineChartParserTest {
 
         EngineReport.UpDown upDown = list.get(0);
         assertEquals(24, upDown.upTime);
-        assertEquals(156, upDown.upIndex);
+        assertEquals(156, upDown.upTriggerCycleIndex);
 
         assertEquals(39, upDown.downTime);
-        assertEquals(157, upDown.downIndex);
+        assertEquals(157, upDown.downTriggerCycleIndex);
     }
 
     @Test
diff --git a/java_console/ui/src/com/rusefi/ui/engine/UpDownImage.java b/java_console/ui/src/com/rusefi/ui/engine/UpDownImage.java
index 37f8a9e9c3..5a00ed35fc 100644
--- a/java_console/ui/src/com/rusefi/ui/engine/UpDownImage.java
+++ b/java_console/ui/src/com/rusefi/ui/engine/UpDownImage.java
@@ -282,12 +282,12 @@ public class UpDownImage extends JPanel {
             String fromAngleStr = RevolutionLog.angle2string(fromAngle);
 
             g.setColor(Color.darkGray);
-            if (upDown.upIndex != -1) {
-                g.drawString("" + upDown.upIndex, x1, (int) (0.25 * d.height));
+            if (upDown.upTriggerCycleIndex != -1) {
+                g.drawString("" + upDown.upTriggerCycleIndex, x1, (int) (0.25 * d.height));
 //            System.out.println("digital_event," + upDown.upIndex + "," + fromAngleStr);
             }
-            if (upDown.downIndex != -1) {
-                g.drawString("" + upDown.downIndex, x2, (int) (0.25 * d.height));
+            if (upDown.downTriggerCycleIndex != -1) {
+                g.drawString("" + upDown.downTriggerCycleIndex, x2, (int) (0.25 * d.height));
 //            System.out.println("digital_event," + upDown.downIndex + "," + toAngleStr);
             }