Upload 4 files

README.md

@@ -31,16 +31,20 @@ square, two taps per corner via the zoom).
 ### fast_counting
 
 1. Upload all four squares at once.
-2. Tap the centre of the 4×4 block in each of row 2. One tap places all four
+2. Tap the centre of the 4×4 block in each image. One tap places all four
    corners of that square.
 3. Press **Run**.
 
 The layout is deliberately spare, because the point is speed:
 
-1. the four raw frames
-2. the four squares — tap the block centre; tap again to re-place
-3. per-square counts: total, live, dead, viability
-4. the means, and the time taken — then the live-cell concentration
+1. the four squares, **two per row** so each is large enough to aim at —
+   tap the block centre; tap again to re-place
+2. per-square counts: total, live, dead, viability
+3. the means, and the time taken — then the live-cell concentration
+
+There is no separate row of raw frames: until you tap it, each image *is* the
+raw frame, so a second copy only cost the screen space that made the tap target
+too small to judge.
 
 No settings are exposed here. It uses the same defaults the comprehensive tab
 ships with (automatic minimum cell size, 1%/1% stereological exclusion,
@@ -67,7 +71,7 @@ instead of 1–5 sits on real printed lines just as well, so every
 line-agreement metric scores it perfectly. Nothing downstream can flag it.
 
 The tap fixes it because it puts the seed inside the intended block, which is
-the half-cell window the phase fit needs. **Still look at row 2 before running** —
+the half-cell window the phase fit needs. **Still look at each proposed square before running** —
 the tap makes the common case right, it does not make the check unnecessary.
 
 ### comprehensive_counting

app.py

@@ -1876,7 +1876,7 @@ with gr.Blocks(title="CellposeCellCounter", theme=gr.themes.Soft()) as demo:
         gr.Markdown(
             "### Fast counting\n"
             "Upload all four squares, tap the centre of the 4×4 block in each "
-            "of row 2, then press **Run**.\n\n"
+            "image, then press **Run**.\n\n"
             "The tap is what tells the detector which block you mean. It is not "
             "optional: the centre of the frame is often not inside the intended "
             "square, and a block placed one row off still sits on real rulings, "
@@ -1888,18 +1888,19 @@ with gr.Blocks(title="CellposeCellCounter", theme=gr.themes.Soft()) as demo:
                             height=95)
         f_status = gr.Markdown("*Waiting for images.*")
 
-        with gr.Row():          # row 1 -- raw frames
-            f_raw = [gr.Image(type="pil", label="Square %d" % (i + 1),
-                              height=140, interactive=False,
-                              show_download_button=False)
-                     for i in range(4)]
-
-        with gr.Row():          # row 2 -- detected square, tap centre to redo
-            f_sel = [gr.Image(type="pil",
-                              label="Square %d — tap the block centre" % (i + 1),
-                              height=165, interactive=True, format="jpeg",
-                              show_download_button=False)
-                     for i in range(4)]
+        # Two squares per row: at four across the disc renders too small to
+        # see where the block centre is, which is the one thing the user has to
+        # judge. There is no separate row of raw frames -- until it is tapped
+        # each of these IS the raw frame, so a second copy only cost space.
+        f_sel = []
+        for _pair in range(2):
+            with gr.Row():
+                for _k in (2 * _pair, 2 * _pair + 1):
+                    f_sel.append(gr.Image(
+                        type="pil",
+                        label="Square %d — tap the block centre" % (_k + 1),
+                        height=460, interactive=True, format="jpeg",
+                        show_download_button=False))
 
         with gr.Row():
             f_clear = gr.Button("✕ Clear squares", size="sm")
@@ -1956,11 +1957,11 @@ with gr.Blocks(title="CellposeCellCounter", theme=gr.themes.Soft()) as demo:
             return [(int(x), int(y)) for x, y in res["corners"]], res
 
         def f_on_upload(files):
-            raws, sels = [None] * 4, [None] * 4
+            sels = [None] * 4
             fulls, prevs = [None] * 4, [None] * 4
             scs, ptss = [1.0] * 4, [None] * 4
             if not files:
-                return (*raws, *sels, *fulls, *prevs, *scs, *ptss,
+                return (*sels, *fulls, *prevs, *scs, *ptss,
                         "*Waiting for images.*")
             paths = sorted((str(getattr(f, "name", f)) for f in files),
                            key=lambda p: os.path.basename(p).lower())
@@ -1973,22 +1974,21 @@ with gr.Blocks(title="CellposeCellCounter", theme=gr.themes.Soft()) as demo:
                 except Exception:
                     notes.append("%s unreadable" % os.path.basename(p))
                     continue
-                fulls[i] = raws[i] = im
+                fulls[i] = im
                 prevs[i], scs[i] = make_preview(im)
                 sels[i] = prevs[i]        # awaiting the user's tap
                 found += 1
             msg = "**%d image%s loaded.** Now tap the centre of the 4×4 block " \
-                  "in each of row 2." % (found, "" if found == 1 else "s")
+                  "in each image below." % (found, "" if found == 1 else "s")
             if notes:
                 msg += "  \n⚠️ " + "; ".join(notes)
             if len(paths) > 4:
                 msg += "  \n*Ignored %d extra file(s).*" % (len(paths) - 4)
-            return (*raws, *sels, *fulls, *prevs, *scs, *ptss, msg)
+            return (*sels, *fulls, *prevs, *scs, *ptss, msg)
 
         f_upload.change(
             fn=f_on_upload, inputs=[f_upload],
-            outputs=[*f_raw, *f_sel, *f_full, *f_prev, *f_scale, *f_pts,
-                     f_status])
+            outputs=[*f_sel, *f_full, *f_prev, *f_scale, *f_pts, f_status])
 
         def _f_mk_reseed(idx):
             def h(full, prev, scale, evt: gr.SelectData):