Changes to period calc ui

Author: azaat

app/src/main/java/com/googleresearch/capturesync/MainActivity.java

@@ -393,6 +393,36 @@ public void onTimestampNs(long timestampNs) {
 
     /* Set up UI controls and listeners based on if device is currently a leader of client. */
     private void setLeaderClientControls(boolean isLeader) {
+        getPeriodButton.setOnClickListener(
+                view -> {
+                    Log.d(TAG, "Calculating frames period.");
+
+                    FutureTask<Integer> periodTask = new FutureTask<Integer>(
+                            () -> {
+                                try {
+                                    long periodNs = periodCalculator.getPeriodNs();
+                                    Log.d(TAG, "Calculated period: " + periodNs);
+                                    if (latestToast != null) {
+                                        latestToast.cancel();
+                                    }
+                                    latestToast =
+                                            Toast.makeText(
+                                                    this,
+                                                    "Calculated period: " + periodNs,
+                                                    Toast.LENGTH_LONG);
+                                    latestToast.show();
+                                    phaseAlignController.setPeriodNs(periodNs);
+                                } catch (InterruptedException e) {
+                                    Log.d(TAG, "Failed calculating period");
+                                    e.printStackTrace();
+                                }
+                                return 0;
+                            }
+                    );
+                    periodTask.run();
+                }
+        );
+
         if (isLeader) {
             // Leader, all controls visible and set.
             captureStillButton.setVisibility(View.VISIBLE);
@@ -444,36 +474,6 @@ private void setLeaderClientControls(boolean isLeader) {
                     String.valueOf(futureTimestamp));*/
                     });
 
-            getPeriodButton.setOnClickListener(
-                    view -> {
-                        Log.d(TAG, "Calculating frames period.");
-
-                        FutureTask<Integer> periodTask = new FutureTask<Integer>(
-                                () -> {
-                                    try {
-                                        long periodNs = periodCalculator.getPeriodNs();
-                                        Log.d(TAG, "Calculated period: " + periodNs);
-                                        if (latestToast != null) {
-                                            latestToast.cancel();
-                                        }
-                                        latestToast =
-                                                Toast.makeText(
-                                                        this,
-                                                        "Calculated period: " + periodNs,
-                                                        Toast.LENGTH_LONG);
-                                        latestToast.show();
-                                        phaseAlignController.setPeriodNs(periodNs);
-                                    } catch (InterruptedException e) {
-                                        Log.d(TAG, "Failed calculating period");
-                                        e.printStackTrace();
-                                    }
-                                    return 0;
-                                }
-                        );
-                        periodTask.run();
-                    }
-            );
-
             phaseAlignButton.setOnClickListener(
                     view -> {
                         Log.d(TAG, "Broadcasting phase alignment request.");
@@ -544,7 +544,7 @@ public void onStopTrackingTouch(SeekBar seekBar) {
             // Client. All controls invisible.
             captureStillButton.setVisibility(View.INVISIBLE);
             phaseAlignButton.setVisibility(View.INVISIBLE);
-            getPeriodButton.setVisibility(View.INVISIBLE);
+            getPeriodButton.setVisibility(View.VISIBLE);
             exposureSeekBar.setVisibility(View.INVISIBLE);
             sensitivitySeekBar.setVisibility(View.INVISIBLE);
 

app/src/main/java/com/googleresearch/capturesync/softwaresync/phasealign/PeriodCalculator.java

@@ -7,7 +7,7 @@
 import java.util.stream.Collectors;
 
 public class PeriodCalculator {
-    private final static long CALC_DURATION_MS = 5000;
+    private final static long CALC_DURATION_MS = 10000;
     private volatile boolean shouldRegister;
     private ArrayList<Long> registeredTimestamps;
 
@@ -23,7 +23,6 @@ public long getPeriodNs() throws InterruptedException {
         Thread.sleep(CALC_DURATION_MS);
         // Stop recording timestamps and calculate period
         shouldRegister = false;
-        // TODO: switch to clusters!
         return calcPeriodNsClusters(getDiff(registeredTimestamps));
     }