Fixing time display for withdrawal times.

HenriquesLab · Dec 7, 2018 · cb14f92 · cb14f92
1 parent 4c2e7dd
commit cb14f92
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 6 deletions.
diff --git a/NanoJ-Fluidics.jar b/NanoJ-Fluidics.jar
diff --git a/NanoJ-Fluidics_IJ.jar b/NanoJ-Fluidics_IJ.jar
diff --git a/NanoJ-Fluidics_MM.jar b/NanoJ-Fluidics_MM.jar
diff --git a/PackagedBinaries/NanoJ-Fluidics.zip b/PackagedBinaries/NanoJ-Fluidics.zip
diff --git a/PackagedBinaries/NanoJ-Fluidics_IJ.zip b/PackagedBinaries/NanoJ-Fluidics_IJ.zip
diff --git a/PackagedBinaries/NanoJ-Fluidics_MM.zip b/PackagedBinaries/NanoJ-Fluidics_MM.zip
diff --git a/src/nanoj/pumpControl/java/sequentialProtocol/SequenceManager.java b/src/nanoj/pumpControl/java/sequentialProtocol/SequenceManager.java
@@ -70,17 +70,25 @@ public void run(){
                         }
                     } else suckDuration = 0;
 
-                    long startTime = System.currentTimeMillis() / 1000;
+                    suckDuration *= 1000;
 
-                    while ((System.currentTimeMillis() / 1000 - startTime) < suckDuration) {
+                    long startTime = System.currentTimeMillis();
+
+                    while ((System.currentTimeMillis() - startTime) < suckDuration) {
                         //Stop sequence if the "Stop" button was pressed.
                         if (!started) break;
 
                         //Calculate how much time there is still to go in seconds.
-                        float timeToGo = (suckDuration - (float) (System.currentTimeMillis() / 1000 - startTime));
-                        if (timeToGo < 60) setWaitingMessage("Withdrawal step. Waiting for: " + timeToGo + " seconds.");
-                        else if (timeToGo >= 60) setWaitingMessage("Withdrawal step. Waiting for: "
-                                + timeToGo / 60 + " more minutes.");
+                        float timeToGo = (suckDuration - (float) (System.currentTimeMillis() - startTime));
+
+                        String formattedTime = format.format(new Date((long) timeToGo));
+
+                        if (timeToGo > 60000)
+                            setWaitingMessage("Withdrawal step. Waiting for: " + formattedTime);
+                        else
+                            setWaitingMessage("Withdrawal step. Waiting for: " +
+                                    Math.round(timeToGo/1000) + " seconds");
+
                         try {
                             Thread.sleep(300);
                         } catch (InterruptedException e) {