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

average angles panel to console

This commit is contained in:
rusefi 2017-05-21 18:09:57 -04:00
parent 18a88495d2
commit a7b9956b7f
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java_console/models/src/com/rusefi/AverageAngles.java
View File

@ -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<AngleEvent> 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");

4
java_console/ui/src/com/rusefi/Launcher.java
View File

@ -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())