Merge branch '1075-multiposition-time-lapse-out-of-order' of https://github.com/TheDeanLab/navigate into 1075-multiposition-time-lapse-out-of-order

Author: AdvancedImagingUTSW

src/navigate/controller/sub_controllers/acquire_bar.py

@@ -160,9 +160,10 @@ def progress_bar(
         if microscope_state["is_multiposition"] is False:
             number_of_positions = 1
         else:
+            # The first row is a header that describes stage axis designation.
             number_of_positions = len(
                 self.parent_controller.configuration["multi_positions"]
-            )
+            ) - 1
 
         if mode == "single":
             number_of_slices = 1

src/navigate/model/model.py

@@ -371,12 +371,12 @@ def __init__(
             ],
             "z-stack": [
                 (
+                    {"name": ZStackAcquisition},
+                    {"name": StackPause},
                     {
                         "name": LoopByCount,
                         "args": ("experiment.MicroscopeState.timepoints",),
                     },
-                    {"name": ZStackAcquisition},
-                    {"name": StackPause},
                 )
             ],
             "customized": [],