From a7b9956b7fc5ef9a569a02ef1fd3aa9572d69f0f Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 21 May 2017 18:09:57 -0400 Subject: [PATCH] average angles panel to console --- java_console/models/src/com/rusefi/AverageAngles.java | 5 ++++- java_console/ui/src/com/rusefi/Launcher.java | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/java_console/models/src/com/rusefi/AverageAngles.java b/java_console/models/src/com/rusefi/AverageAngles.java index 2c9a180058..90dce67ed2 100644 --- a/java_console/models/src/com/rusefi/AverageAngles.java +++ b/java_console/models/src/com/rusefi/AverageAngles.java @@ -18,6 +18,7 @@ public class AverageAngles { static String PRIMARY = "T_PRIMARY"; static String SECONDARY = "T_SECONDARY"; static String T_CHANNEL_3 = "T_CHANNEL_3"; + private int count; enum trigger_event_e { SHAFT_PRIMARY_FALLING(PRIMARY), @@ -55,6 +56,7 @@ public class AverageAngles { public void clear() { rpmAtPrevChart = -1; angleData.clear(); + count = 0; } public void add(int rpm, String line) { @@ -63,6 +65,7 @@ public class AverageAngles { rpmAtPrevChart = rpm; return; } + count ++; rpmAtPrevChart = rpm; String v[] = line.split("\\|"); @@ -93,7 +96,7 @@ public class AverageAngles { public void printReport(Appendable stream) throws IOException { List angles = new ArrayList<>(); - stream.append("Based on " + angleData.size() + " charts\r\n"); + stream.append("Based on " + count + " charts\r\n"); stream.append("index,average,stdev,diff\r\n"); diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index 11613c063d..f8b61813b9 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -187,6 +187,10 @@ public class Launcher { if (true) tabbedPane.add("Fuel Tune", fuelTunePane.getContent()); + + if (!LinkManager.isLogViewer()) + tabbedPane.add("Trigger Shape", new AverageAnglePanel().getPanel()); + if (!LinkManager.isLogViewerMode(port)) { int selectedIndex = getConfig().getRoot().getIntProperty(TAB_INDEX, 2); if (selectedIndex < tabbedPane.getTabCount())