Fixing serious bug from previous commits

HenriquesLab · Oct 9, 2018 · f5c6fbc · f5c6fbc
1 parent 9497f5d
commit f5c6fbc
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 3 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
@@ -40,7 +40,7 @@ private SequenceManager() { }
     public void run(){
         while (alive) {
             if (started) {
-                for (currentStep = startStep; currentStep < endStep+1; currentStep++) {
+                for (currentStep = startStep; currentStep < endStep; currentStep++) {
                     if (!started) break;
 
                     Step step = sequence.get(currentStep);
@@ -105,14 +105,16 @@ else if (timeToGo >= 60) setWaitingMessage("Withdrawal step. Waiting for: "
 
                     // If this isn't the last step, then set the "syringe ready" status to false. This makes
                     // the sequence wait until the user has confirmed the syringe exchange.
-                    if (currentStep != endStep) setMonkeyReady(false);
+                    if (currentStep < endStep) setMonkeyReady(false);
                         // If it IS the last step, then we can stop now.
                     else {
                         stop();
+                        setWaitingMessage("Sequence finished.");
                         break;
                     }
 
-                    syringeExchangeNeeded = sequence.get(currentStep+1).isSyringeExchangeRequired();
+                    if (currentStep < endStep-1)
+                        syringeExchangeNeeded = sequence.get(currentStep+1).isSyringeExchangeRequired();
 
                     setChanged();
                     notifyObservers(SYRINGE_STATUS_CHANGED);
@@ -146,6 +148,8 @@ else if (timeToGo >= 60) setWaitingMessage("Step: " + step.getNumber() + ", "
                     }
                 }
                 currentStep = -1;
+                endStep = 0;
+                started = false;
                 setChanged();
                 notifyObservers(SEQUENCE_FINISHED);
             }