Fixed running tranmitter linked to the viewport

Author: Alex-Bolinger

src/main/java/org/emrick/project/FootballFieldListener.java

@@ -3,9 +3,10 @@
 /**
  * Listen to important events whose source comes from FootballFieldPanel. For example, when a performer is selected.
  */
-public interface FootballFieldListener {
+public interface FootballFieldListener extends RFSignalListener {
     void onPerformerSelect();
     void onPerformerDeselect();
     void onResizeBackground();
     void onFinishRepaint();
+    double getFrameRate();
 }

src/main/java/org/emrick/project/FootballFieldPanel.java

@@ -2,14 +2,18 @@
 
 import org.emrick.project.effect.Effect;
 import org.emrick.project.effect.EffectManager;
+import org.emrick.project.effect.RFTrigger;
 
 import javax.swing.*;
 import javax.swing.event.MouseInputListener;
 import java.awt.*;
 import java.awt.event.MouseEvent;
 import java.awt.geom.Point2D;
 import java.awt.image.BufferedImage;
+import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashMap;
+import java.util.Iterator;
 
 public class FootballFieldPanel extends JPanel implements RepaintListener {
     public Drill drill;
@@ -34,19 +38,19 @@ public class FootballFieldPanel extends JPanel implements RepaintListener {
     public long currentMS = 0;
     private int currentCount = 0;
     private int currentSetStartCount = 0;
-    private SerialTransmitter serialTransmitter;
 
     // Effects utility
     private final FootballFieldListener footballFieldListener;
     private EffectManager effectManager;
     private int effectTransparency = 255;
     private boolean useFps;
+    private HashMap<Integer, RFTrigger> count2RFTrigger;
 
     public void setUseFps(boolean useFps) {
         this.useFps = useFps;
     }
 
-    public FootballFieldPanel(FootballFieldListener footballFieldListener) {
+    public FootballFieldPanel(FootballFieldListener footballFieldListener, HashMap<Integer, RFTrigger> count2RFTrigger) {
 //        setPreferredSize(new Dimension(fieldWidth + 2*margin, fieldHeight + 2*margin)); // Set preferred size for the drawing area
         setMinimumSize(new Dimension(1042, 548));
         drill = new Drill();
@@ -55,10 +59,11 @@ public FootballFieldPanel(FootballFieldListener footballFieldListener) {
         this.addMouseListener(new MouseInput(this));
         colorChosen = Color.BLACK;
         this.footballFieldListener = footballFieldListener;
+        this.count2RFTrigger = count2RFTrigger;
     }
 
     public FootballFieldPanel(Color colorChosen, FootballFieldListener footballFieldListener) {
-        this(footballFieldListener);
+        this.footballFieldListener = footballFieldListener;
         this.colorChosen = colorChosen;
     }
 
@@ -75,12 +80,17 @@ public void setEffectTransparency(int effectTransparency) {
         this.effectTransparency = effectTransparency;
     }
 
+    public HashMap<Integer, RFTrigger> getCount2RFTrigger() {
+        return count2RFTrigger;
+    }
+
+    public void setCount2RFTrigger(HashMap<Integer, RFTrigger> count2RFTrigger) {
+        this.count2RFTrigger = count2RFTrigger;
+    }
+
     public void addSetToField(Set set) {
         currentSet = set;
         if (!set.equals("0")) {
-            if (serialTransmitter != null) {
-                serialTransmitter.writeSet(set.index);
-            }
             for (Performer p : drill.performers) {
                 for (Coordinate c : p.getCoordinates()) {
                     if (c.set.equals(set)) {
@@ -97,14 +107,6 @@ public void addSetToField(Set set) {
         repaint();
     }
 
-    public SerialTransmitter getSerialTransmitter() {
-        return serialTransmitter;
-    }
-
-    public void setSerialTransmitter(SerialTransmitter serialTransmitter) {
-        this.serialTransmitter = serialTransmitter;
-    }
-
     public int getCurrentCount() {
         return currentCount;
     }
@@ -232,6 +234,23 @@ protected void paintComponent(Graphics g) {
         }
         // Case: User is not using FPS playback mode
         if (!useFps) currentSetRatio = 1;
+        if (count2RFTrigger != null) {
+            Iterator<RFTrigger> iterator = count2RFTrigger.values().iterator();
+            ArrayList<RFTrigger> triggers = new ArrayList<>();
+            while (iterator.hasNext()) {
+                triggers.add(iterator.next());
+            }
+            triggers.sort(Comparator.comparingInt(RFTrigger::getCount));
+            for (int i = 0; i < triggers.size(); i++) {
+                RFTrigger trigger = triggers.get(i);
+                long start = trigger.getTimestampMillis();
+                long nextFrameMS = start + (long) (1.0 / footballFieldListener.getFrameRate() * 1000);
+                if (currMS >= start && currMS < nextFrameMS) {
+                    footballFieldListener.onRFSignal(i);
+                    break;
+                }
+            }
+        }
 
         // Draw performers with their colors
         for (Performer p : drill.performers) {

src/main/java/org/emrick/project/MediaEditorGUI.java

@@ -91,6 +91,7 @@ public class MediaEditorGUI extends Component implements ImportListener, ScrubBa
     // RF Trigger
     private RFTriggerGUI rfTriggerGUI;
     private HashMap<Integer, RFTrigger> count2RFTrigger;
+    private boolean runningShow;
 
     private FlowViewGUI flowViewGUI;
 
@@ -201,7 +202,7 @@ public MediaEditorGUI(String file) {
         UIManager.put("RadioButtonMenuItem.font", f);
 
         // Field
-        footballFieldPanel = new FootballFieldPanel(this);
+        footballFieldPanel = new FootballFieldPanel(this, null);
         footballFieldPanel.setOpaque(false);
         //footballFieldPanel.setBackground(Color.lightGray); // temp. Visual indicator for unfilled space
         JScrollPane fieldScrollPane = new JScrollPane(footballFieldPanel);
@@ -220,6 +221,7 @@ public MediaEditorGUI(String file) {
 
         // Scrub bar cursor starts on first count of drill by default
         useStartDelay = true;
+        runningShow = false;
 
         if (!file.equals("")) {
             if (file.endsWith(".emrick")) {
@@ -623,7 +625,6 @@ public void createAndShowGUI() {
                 mainContentPanel.revalidate();
                 mainContentPanel.repaint();
             }
-            footballFieldPanel.setSerialTransmitter(null);
             serialTransmitter = null;
             stopShowItem.setEnabled(false);
             runShowItem.setEnabled(true);
@@ -673,7 +674,6 @@ public void createAndShowGUI() {
                 return;
             }
 
-            footballFieldPanel.setSerialTransmitter(serialTransmitter);
             footballFieldPanel.addSetToField(footballFieldPanel.drill.sets.get(0));
             runShowItem.setEnabled(false);
             flowViewerItem.setEnabled(false);
@@ -976,6 +976,7 @@ public void loadProject(File path) {
                 scrubBarGUI.setTimeSync(timeSync);
                 startDelay = pf.startDelay;
                 count2RFTrigger = pf.count2RFTrigger;
+                footballFieldPanel.setCount2RFTrigger(count2RFTrigger);
                 setupEffectView(pf.ids);
                 updateTimelinePanel();
                 updateEffectViewPanel(selectedEffectType);
@@ -1463,6 +1464,7 @@ public void onDrillImport(String drill) {
         footballFieldPanel.drill = DrillParser.parseWholeDrill(text);
         footballFieldPanel.addSetToField(footballFieldPanel.drill.sets.get(0));
         count2RFTrigger = new HashMap<>();
+        footballFieldPanel.setCount2RFTrigger(count2RFTrigger);
         updateEffectViewPanel(selectedEffectType);
         updateTimelinePanel();
         rebuildPageTabCounts();
@@ -1494,6 +1496,7 @@ public void onSync(ArrayList<SyncTimeGUI.Pair> times, float startDelay) {
 
         scrubBarGUI.setTimeSync(timeSync);
         count2RFTrigger = new HashMap<>();
+        footballFieldPanel.setCount2RFTrigger(count2RFTrigger);
 
         setupEffectView(null);
     }
@@ -1703,13 +1706,15 @@ public void onCreateRFTrigger(RFTrigger rfTrigger) {
             return;
         }
         count2RFTrigger.put(footballFieldPanel.getCurrentCount(), rfTrigger);
+        footballFieldPanel.setCount2RFTrigger(count2RFTrigger);
         updateRFTriggerButton();
         updateTimelinePanel();
     }
 
     @Override
     public void onDeleteRFTrigger(int count) {
         count2RFTrigger.remove(count);
+        footballFieldPanel.setCount2RFTrigger(count2RFTrigger);
         updateRFTriggerButton();
         updateTimelinePanel();
     }
@@ -1746,6 +1751,11 @@ public void onFinishRepaint() {
         }
     }
 
+    @Override
+    public double getFrameRate() {
+        return scrubBarGUI.getFps();
+    }
+
     private void updateEffectViewPanel(int effectType) {
 
         // No point in updating effect view if can't use effects
@@ -2128,7 +2138,9 @@ public void actionPerformed(ActionEvent e) {
 
     @Override
     public void onRFSignal(int i) {
-        serialTransmitter.writeSet(i);
+        if (serialTransmitter != null && scrubBarGUI.isPlaying()) {
+            serialTransmitter.writeSet(i);
+        }
     }
 
     /*