From 4020e59030d388c233b1a2bd90543501f96703ee Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Sat, 5 Dec 2020 21:10:19 -0500
Subject: [PATCH] time and TDC stroke should be less full, also time and scale
 should be painted before/under engine events

---
 .../main/java/com/rusefi/rusEFIVersion.java   |  2 +-
 .../com/rusefi/ui/engine/UpDownImage.java     | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/java_console/models/src/main/java/com/rusefi/rusEFIVersion.java b/java_console/models/src/main/java/com/rusefi/rusEFIVersion.java
index a38cd56a36..4f4fadc13a 100644
--- a/java_console/models/src/main/java/com/rusefi/rusEFIVersion.java
+++ b/java_console/models/src/main/java/com/rusefi/rusEFIVersion.java
@@ -6,7 +6,7 @@ import java.net.URL;
 import java.util.concurrent.atomic.AtomicReference;
 
 public class rusEFIVersion {
-    public static final int CONSOLE_VERSION = 20201006;
+    public static final int CONSOLE_VERSION = 20201205;
     public static AtomicReference<String> firmwareVersion = new AtomicReference<>("N/A");
 
     public static long classBuildTimeMillis() {
diff --git a/java_console/ui/src/main/java/com/rusefi/ui/engine/UpDownImage.java b/java_console/ui/src/main/java/com/rusefi/ui/engine/UpDownImage.java
index 6c127cb5a6..f41dc3504b 100644
--- a/java_console/ui/src/main/java/com/rusefi/ui/engine/UpDownImage.java
+++ b/java_console/ui/src/main/java/com/rusefi/ui/engine/UpDownImage.java
@@ -34,6 +34,10 @@ public class UpDownImage extends JPanel {
     private static final int LINE_SIZE = 20;
     public static final Color TIME_SCALE_COLOR = Color.red;
     public static final Color ENGINE_CYCLE_COLOR = Color.green;
+    private static final BasicStroke TIME_SCALE_STROKE = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 10.0f,
+            new float[]{7.0f, 21.0f}, 0.0f);
+    private static final BasicStroke ENGINE_CYCLE_STROKE = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 10.0f,
+            new float[]{21.0f, 7.0f}, 0.0f);
 
     private long lastUpdateTime;
     private EngineReport engineReport;
@@ -167,11 +171,14 @@ public class UpDownImage extends JPanel {
         g.setColor(getBackground());
         g.fillRect(0, 0, d.width, d.height);
 
+        if (showMouseOverText)
+            paintScaleLines(g2, d);
+
+        drawStartOfRevolution(g2, d);
+
         for (EngineReport.UpDown upDown : engineReport.getList())
             paintUpDown(d, upDown, g);
 
-        if (showMouseOverText)
-            paintScaleLines(g2, d);
 
         g2.setColor(Color.black);
 
@@ -201,7 +208,6 @@ public class UpDownImage extends JPanel {
             g.drawString(FORMAT.format(new Date(lastUpdateTime)), 5, ++line * LINE_SIZE);
         }
 
-        drawStartOfRevolution(g2, d);
     }
 
     private void drawStartOfRevolution(Graphics2D g2, Dimension d) {
@@ -210,7 +216,7 @@ public class UpDownImage extends JPanel {
 
         RevolutionLog time2rpm = RevolutionLog.parseRevolutions(revolutions);
 
-        g2.setStroke(new BasicStroke());
+        g2.setStroke(ENGINE_CYCLE_STROKE);
         for (int time : time2rpm.keySet()) {
             int x = translator.timeToScreen(time, d.width);
             g2.setColor(ENGINE_CYCLE_COLOR);
@@ -228,15 +234,12 @@ public class UpDownImage extends JPanel {
         return false;
     }
 
-    private static final BasicStroke LONG_STROKE = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 10.0f,
-            new float[]{21.0f, 7.0f}, 0.0f);
-
     /**
      * This method draws a vertical line every 100 milliseconds
      */
     private void paintScaleLines(Graphics2D g2, Dimension d) {
         int fromMs = translator.getMinTime() / TIMESCALE_MULT;
-        g2.setStroke(LONG_STROKE);
+        g2.setStroke(TIME_SCALE_STROKE);
         g2.setColor(TIME_SCALE_COLOR);
 
         int toMs = translator.getMaxTime() / TIMESCALE_MULT;