Show resolution level and metric in the registration progress bar

CBCT_CT_HeadNeck/Model.py

@@ -164,10 +164,29 @@ class ElastixEngine:
             # chained parameter maps), so the bar spans the whole chain of registration stages.
             progress = tqdm.tqdm(total=self._iterations or None, desc="Registration", ncols=0, leave=True)
             assert proc.stdout is not None
+            resolution = 0
             for line in proc.stdout:
                 captured.append(line)
-                if iteration_line.match(line):
+                stripped = line.strip()
+                if stripped.startswith("Resolution:"):
+                    try:
+                        resolution = int(stripped.split(":", 1)[1])
+                    except ValueError:
+                        pass
+                elif iteration_line.match(line):
                     progress.update(1)
+                    # Mirror KonfAI's informative bars (which surface runtime state in the description):
+                    # show the elastix resolution level and the similarity metric being optimised so the
+                    # bar conveys convergence, not a bare iteration count. Column 2 of the iteration table
+                    # is the metric (header: "1:ItNr 2:Metric ...").
+                    columns = line.split()
+                    if len(columns) > 1:
+                        try:
+                            progress.set_description(
+                                f"Registration : res {resolution} | metric {float(columns[1]):.4f}"
+                            )
+                        except ValueError:
+                            pass
             progress.close()
             returncode = proc.wait()
             if returncode != 0:

CBCT_CT_MRSeg/Model.py

@@ -164,10 +164,29 @@ class ElastixEngine:
             # chained parameter maps), so the bar spans the whole chain of registration stages.
             progress = tqdm.tqdm(total=self._iterations or None, desc="Registration", ncols=0, leave=True)
             assert proc.stdout is not None
+            resolution = 0
             for line in proc.stdout:
                 captured.append(line)
-                if iteration_line.match(line):
+                stripped = line.strip()
+                if stripped.startswith("Resolution:"):
+                    try:
+                        resolution = int(stripped.split(":", 1)[1])
+                    except ValueError:
+                        pass
+                elif iteration_line.match(line):
                     progress.update(1)
+                    # Mirror KonfAI's informative bars (which surface runtime state in the description):
+                    # show the elastix resolution level and the similarity metric being optimised so the
+                    # bar conveys convergence, not a bare iteration count. Column 2 of the iteration table
+                    # is the metric (header: "1:ItNr 2:Metric ...").
+                    columns = line.split()
+                    if len(columns) > 1:
+                        try:
+                            progress.set_description(
+                                f"Registration : res {resolution} | metric {float(columns[1]):.4f}"
+                            )
+                        except ValueError:
+                            pass
             progress.close()
             returncode = proc.wait()
             if returncode != 0:

CBCT_CT_TS/Model.py

@@ -164,10 +164,29 @@ class ElastixEngine:
             # chained parameter maps), so the bar spans the whole chain of registration stages.
             progress = tqdm.tqdm(total=self._iterations or None, desc="Registration", ncols=0, leave=True)
             assert proc.stdout is not None
+            resolution = 0
             for line in proc.stdout:
                 captured.append(line)
-                if iteration_line.match(line):
+                stripped = line.strip()
+                if stripped.startswith("Resolution:"):
+                    try:
+                        resolution = int(stripped.split(":", 1)[1])
+                    except ValueError:
+                        pass
+                elif iteration_line.match(line):
                     progress.update(1)
+                    # Mirror KonfAI's informative bars (which surface runtime state in the description):
+                    # show the elastix resolution level and the similarity metric being optimised so the
+                    # bar conveys convergence, not a bare iteration count. Column 2 of the iteration table
+                    # is the metric (header: "1:ItNr 2:Metric ...").
+                    columns = line.split()
+                    if len(columns) > 1:
+                        try:
+                            progress.set_description(
+                                f"Registration : res {resolution} | metric {float(columns[1]):.4f}"
+                            )
+                        except ValueError:
+                            pass
             progress.close()
             returncode = proc.wait()
             if returncode != 0:

Generic_Rigid/Model.py

@@ -164,10 +164,29 @@ class ElastixEngine:
             # chained parameter maps), so the bar spans the whole chain of registration stages.
             progress = tqdm.tqdm(total=self._iterations or None, desc="Registration", ncols=0, leave=True)
             assert proc.stdout is not None
+            resolution = 0
             for line in proc.stdout:
                 captured.append(line)
-                if iteration_line.match(line):
+                stripped = line.strip()
+                if stripped.startswith("Resolution:"):
+                    try:
+                        resolution = int(stripped.split(":", 1)[1])
+                    except ValueError:
+                        pass
+                elif iteration_line.match(line):
                     progress.update(1)
+                    # Mirror KonfAI's informative bars (which surface runtime state in the description):
+                    # show the elastix resolution level and the similarity metric being optimised so the
+                    # bar conveys convergence, not a bare iteration count. Column 2 of the iteration table
+                    # is the metric (header: "1:ItNr 2:Metric ...").
+                    columns = line.split()
+                    if len(columns) > 1:
+                        try:
+                            progress.set_description(
+                                f"Registration : res {resolution} | metric {float(columns[1]):.4f}"
+                            )
+                        except ValueError:
+                            pass
             progress.close()
             returncode = proc.wait()
             if returncode != 0:

Generic_Rigid_BSpline/Model.py

@@ -164,10 +164,29 @@ class ElastixEngine:
             # chained parameter maps), so the bar spans the whole chain of registration stages.
             progress = tqdm.tqdm(total=self._iterations or None, desc="Registration", ncols=0, leave=True)
             assert proc.stdout is not None
+            resolution = 0
             for line in proc.stdout:
                 captured.append(line)
-                if iteration_line.match(line):
+                stripped = line.strip()
+                if stripped.startswith("Resolution:"):
+                    try:
+                        resolution = int(stripped.split(":", 1)[1])
+                    except ValueError:
+                        pass
+                elif iteration_line.match(line):
                     progress.update(1)
+                    # Mirror KonfAI's informative bars (which surface runtime state in the description):
+                    # show the elastix resolution level and the similarity metric being optimised so the
+                    # bar conveys convergence, not a bare iteration count. Column 2 of the iteration table
+                    # is the metric (header: "1:ItNr 2:Metric ...").
+                    columns = line.split()
+                    if len(columns) > 1:
+                        try:
+                            progress.set_description(
+                                f"Registration : res {resolution} | metric {float(columns[1]):.4f}"
+                            )
+                        except ValueError:
+                            pass
             progress.close()
             returncode = proc.wait()
             if returncode != 0:

MR_CT_HeadNeck/Model.py

@@ -164,10 +164,29 @@ class ElastixEngine:
             # chained parameter maps), so the bar spans the whole chain of registration stages.
             progress = tqdm.tqdm(total=self._iterations or None, desc="Registration", ncols=0, leave=True)
             assert proc.stdout is not None
+            resolution = 0
             for line in proc.stdout:
                 captured.append(line)
-                if iteration_line.match(line):
+                stripped = line.strip()
+                if stripped.startswith("Resolution:"):
+                    try:
+                        resolution = int(stripped.split(":", 1)[1])
+                    except ValueError:
+                        pass
+                elif iteration_line.match(line):
                     progress.update(1)
+                    # Mirror KonfAI's informative bars (which surface runtime state in the description):
+                    # show the elastix resolution level and the similarity metric being optimised so the
+                    # bar conveys convergence, not a bare iteration count. Column 2 of the iteration table
+                    # is the metric (header: "1:ItNr 2:Metric ...").
+                    columns = line.split()
+                    if len(columns) > 1:
+                        try:
+                            progress.set_description(
+                                f"Registration : res {resolution} | metric {float(columns[1]):.4f}"
+                            )
+                        except ValueError:
+                            pass
             progress.close()
             returncode = proc.wait()
             if returncode != 0:

MR_CT_MRSeg/Model.py

@@ -164,10 +164,29 @@ class ElastixEngine:
             # chained parameter maps), so the bar spans the whole chain of registration stages.
             progress = tqdm.tqdm(total=self._iterations or None, desc="Registration", ncols=0, leave=True)
             assert proc.stdout is not None
+            resolution = 0
             for line in proc.stdout:
                 captured.append(line)
-                if iteration_line.match(line):
+                stripped = line.strip()
+                if stripped.startswith("Resolution:"):
+                    try:
+                        resolution = int(stripped.split(":", 1)[1])
+                    except ValueError:
+                        pass
+                elif iteration_line.match(line):
                     progress.update(1)
+                    # Mirror KonfAI's informative bars (which surface runtime state in the description):
+                    # show the elastix resolution level and the similarity metric being optimised so the
+                    # bar conveys convergence, not a bare iteration count. Column 2 of the iteration table
+                    # is the metric (header: "1:ItNr 2:Metric ...").
+                    columns = line.split()
+                    if len(columns) > 1:
+                        try:
+                            progress.set_description(
+                                f"Registration : res {resolution} | metric {float(columns[1]):.4f}"
+                            )
+                        except ValueError:
+                            pass
             progress.close()
             returncode = proc.wait()
             if returncode != 0:

MR_CT_TS/Model.py

@@ -164,10 +164,29 @@ class ElastixEngine:
             # chained parameter maps), so the bar spans the whole chain of registration stages.
             progress = tqdm.tqdm(total=self._iterations or None, desc="Registration", ncols=0, leave=True)
             assert proc.stdout is not None
+            resolution = 0
             for line in proc.stdout:
                 captured.append(line)
-                if iteration_line.match(line):
+                stripped = line.strip()
+                if stripped.startswith("Resolution:"):
+                    try:
+                        resolution = int(stripped.split(":", 1)[1])
+                    except ValueError:
+                        pass
+                elif iteration_line.match(line):
                     progress.update(1)
+                    # Mirror KonfAI's informative bars (which surface runtime state in the description):
+                    # show the elastix resolution level and the similarity metric being optimised so the
+                    # bar conveys convergence, not a bare iteration count. Column 2 of the iteration table
+                    # is the metric (header: "1:ItNr 2:Metric ...").
+                    columns = line.split()
+                    if len(columns) > 1:
+                        try:
+                            progress.set_description(
+                                f"Registration : res {resolution} | metric {float(columns[1]):.4f}"
+                            )
+                        except ValueError:
+                            pass
             progress.close()
             returncode = proc.wait()
             if returncode != 0: