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-10 17:10:17 -05:00
parent dcef30d374
commit c0438be970
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,13 +150,13 @@ public class TriggerImage {
topPanel.removeAll(); topPanel.removeAll();
JPanel firstWheelControl = createWheelPanel(triggerWheelInfo.getFirstWheeTriggerSignals()); JPanel firstWheelControl = createWheelPanel(triggerWheelInfo.getFirstWheeTriggerSignals(), true);
topPanel.add(firstWheelControl); topPanel.add(firstWheelControl);
topPanel.add(StartupFrame.createLogoLabel()); topPanel.add(StartupFrame.createLogoLabel());
if (!triggerWheelInfo.waves.get(1).list.isEmpty()) { if (!triggerWheelInfo.waves.get(1).list.isEmpty()) {
JPanel secondWheelControl = createWheelPanel(triggerWheelInfo.getSecondWheeTriggerSignals()); JPanel secondWheelControl = createWheelPanel(triggerWheelInfo.getSecondWheeTriggerSignals(), false);
topPanel.add(secondWheelControl); topPanel.add(secondWheelControl);
} }
@ -212,7 +212,7 @@ public class TriggerImage {
} }
@NotNull @NotNull
private static JPanel createWheelPanel(List<TriggerSignal> wheel) { private static JPanel createWheelPanel(List<TriggerSignal> wheel, boolean showTdc) {
JPanel clock = new JPanel() { JPanel clock = new JPanel() {
@Override @Override
public void paint(Graphics g) { public void paint(Graphics g) {
@ -223,14 +223,24 @@ public class TriggerImage {
TriggerSignal current = wheel.get(i); TriggerSignal current = wheel.get(i);
drawRadialLine(g, current.angle); drawRadialLine(g, current.angle);
/**
* java arc API is
* * Angles are interpreted such that 0&nbsp;degrees
* * is at the 3'clock position.
* * A positive value indicates a counter-clockwise rotation
* * while a negative value indicates a clockwise rotation.
*
* we want zero to be at 12'clock position and clockwise rotation
*/
double nextAngle = i == wheel.size() - 1 ? 360 + wheel.get(0).angle : wheel.get(i + 1).angle; double nextAngle = i == wheel.size() - 1 ? 360 + wheel.get(0).angle : wheel.get(i + 1).angle;
int arcDuration = (int) (nextAngle - current.angle); int arcDuration = (int) (nextAngle - current.angle);
int arcStart = (int) arcToRusEFI(nextAngle);
if (current.state == 1) { if (current.state == 1) {
g.drawArc(WHEEL_BORDER, WHEEL_BORDER, WHEEL_DIAMETER, WHEEL_DIAMETER, (int) current.angle, arcDuration); g.drawArc(WHEEL_BORDER, WHEEL_BORDER, WHEEL_DIAMETER, WHEEL_DIAMETER, arcStart, arcDuration);
} else { } else {
int corner = WHEEL_BORDER + (WHEEL_DIAMETER - SMALL_DIAMETER) / 2; int corner = WHEEL_BORDER + (WHEEL_DIAMETER - SMALL_DIAMETER) / 2;
g.drawArc(corner, corner, SMALL_DIAMETER, SMALL_DIAMETER, (int) current.angle, arcDuration); g.drawArc(corner, corner, SMALL_DIAMETER, SMALL_DIAMETER, arcStart, arcDuration);
} }
} }
} }
@ -244,17 +254,19 @@ public class TriggerImage {
return clock; return clock;
} }
private static double arcToRusEFI(double angle) {
return (90 - angle);
}
private static void drawRadialLine(Graphics g, double angle) { private static void drawRadialLine(Graphics g, double angle) {
int center = WHEEL_BORDER + WHEEL_DIAMETER / 2; int center = WHEEL_BORDER + WHEEL_DIAMETER / 2;
// converting to 'drawArc' angle convention
angle = 90 + angle;
double radianAngle = Math.toRadians(angle); double radianAngle = Math.toRadians(angle);
int smallX = (int) (SMALL_DIAMETER / 2 * Math.sin(radianAngle)); int smallX = (int) (SMALL_DIAMETER / 2 * Math.sin(radianAngle));
int smallY = (int) (SMALL_DIAMETER / 2 * Math.cos(radianAngle)); int smallY =- (int) (SMALL_DIAMETER / 2 * Math.cos(radianAngle));
int largeX = (int) (WHEEL_DIAMETER / 2 * Math.sin(radianAngle)); int largeX = (int) (WHEEL_DIAMETER / 2 * Math.sin(radianAngle));
int largeY = (int) (WHEEL_DIAMETER / 2 * Math.cos(radianAngle)); int largeY = -(int) (WHEEL_DIAMETER / 2 * Math.cos(radianAngle));
g.drawLine(center + smallX, center + smallY, center + largeX, center + largeY); g.drawLine(center + smallX, center + smallY, center + largeX, center + largeY);
} }