Update app.py

app.py

@@ -312,83 +312,89 @@ class DicomAnalyzer:
             print(f"Error saving results: {str(e)}")
             return None, f"Error saving results: {str(e)}"
 
-def save_results_to_template(self, template_path, output_path):
-    try:
-        if not self.results:
-            return None, "No results to save"
-
-        # Load the template while preserving formulas
-        wb = openpyxl.load_workbook(template_path, data_only=False)
-        ws = wb.active
-
-        # Define the column groups for horizontal saving
-        column_groups = [
-            ('B', 'C', 'D', 'E', 'F'),  # First group
-            ('H', 'I', 'J', 'K', 'L'),  # Second group
-            ('N', 'O', 'P', 'Q', 'R'),  # Third group
-            ('T', 'U', 'V', 'W', 'X'),  # Fourth group
-            # Add more groups as needed
-        ]
-
-        # Define row pairs
-        row_pairs = [
-            (41, 42),    # 7mm
-            (67, 68),    # 6.5mm
-            (93, 94),    # 6mm
-            (119, 120),  # 5.5mm
-            (145, 146),  # 5mm
-            (171, 172),  # 4.5mm
-            (197, 198),  # 4mm
-            (223, 224),  # 3.5mm
-            (249, 250),  # 3mm
-            (275, 276)   # 2.5mm
-        ]
-
-        # Process results in pairs
-        result_idx = 0
-        metrics = ['Area (mm²)', 'Mean', 'StdDev', 'Min', 'Max']
-
-        for row_pair in row_pairs:
-            col_group_idx = 0
-            for i in range(0, min(len(self.results), 2), 2):
-                if result_idx >= len(self.results):
-                    break
-                
-                if col_group_idx >= len(column_groups):
-                    break
+    def save_results_to_template(self, template_path, output_path):
+        try:
+            if not self.results:
+                return None, "No results to save"
+
+            # Load the template while preserving formulas
+            wb = openpyxl.load_workbook(template_path, data_only=False)
+            ws = wb.active
+
+            # Define the column groups for horizontal saving
+            column_groups = [
+                ('B', 'C', 'D', 'E', 'F'),    # First group
+                ('H', 'I', 'J', 'K', 'L'),    # Second group
+                ('N', 'O', 'P', 'Q', 'R'),    # Third group
+                ('T', 'U', 'V', 'W', 'X'),    # Fourth group
+                ('Z', 'AA', 'AB', 'AC', 'AD'),  # Fifth group
+                ('AF', 'AG', 'AH', 'AI', 'AJ'), # Sixth group
+                ('AL', 'AM', 'AN', 'AO', 'AP'), # Seventh group
+                ('AR', 'AS', 'AT', 'AU', 'AV'), # Eighth group
+                ('AX', 'AY', 'AZ', 'BA', 'BB'), # Ninth group
+                ('BD', 'BE', 'BF', 'BG', 'BH'), # Tenth group
+                ('BJ', 'BK', 'BL', 'BM', 'BN'), # Eleventh group
+                ('BP', 'BQ', 'BR', 'BS', 'BT'), # Twelfth group
+                ('BV', 'BW', 'BX', 'BY', 'BZ')  # Thirteenth group
+            ]
+
+            # Define row pairs
+            row_pairs = [
+                (41, 42),    # 7mm
+                (67, 68),    # 6.5mm
+                (93, 94),    # 6mm
+                (119, 120),  # 5.5mm
+                (145, 146),  # 5mm
+                (171, 172),  # 4.5mm
+                (197, 198),  # 4mm
+                (223, 224),  # 3.5mm
+                (249, 250),  # 3mm
+                (275, 276)   # 2.5mm
+            ]
 
-                # Get current column group
-                cols = column_groups[col_group_idx]
+            # Process results in pairs
+            result_idx = 0
+            metrics = ['Area (mm²)', 'Mean', 'StdDev', 'Min', 'Max']
 
-                # Process pair of results
-                for row_idx, row in enumerate(row_pair):
-                    if result_idx + row_idx >= len(self.results):
+            for row_pair in row_pairs:
+                col_group_idx = 0
+                while result_idx < len(self.results):
+                    if col_group_idx >= len(column_groups):
                         break
 
-                    result = self.results[result_idx + row_idx]
-                    
-                    # Write each metric to corresponding column
-                    for metric_idx, metric in enumerate(metrics):
-                        cell = f"{cols[metric_idx]}{row}"
-                        value = result.get(metric, '')
-                        if value:
-                            cell_obj = ws[cell]
-                            if not (isinstance(cell_obj.value, str) and cell_obj.value.startswith('=')):
-                                try:
-                                    ws[cell] = float(value)
-                                except ValueError:
-                                    ws[cell] = value
-
-                col_group_idx += 1
-                result_idx += 2
-
-        # Save while preserving formulas
-        wb.save(output_path)
-        return output_path, "Results saved successfully in template format"
+                    # Get current column group
+                    cols = column_groups[col_group_idx]
 
-    except Exception as e:
-        print(f"Error saving results to template: {str(e)}")
-        return None, f"Error saving results to template: {str(e)}"
+                    # Process pair of results
+                    for row_idx, row in enumerate(row_pair):
+                        if result_idx >= len(self.results):
+                            break
+
+                        result = self.results[result_idx]
+                        
+                        # Write each metric to corresponding column
+                        for metric_idx, metric in enumerate(metrics):
+                            cell = f"{cols[metric_idx]}{row}"
+                            value = result.get(metric, '')
+                            if value:
+                                cell_obj = ws[cell]
+                                if not (isinstance(cell_obj.value, str) and cell_obj.value.startswith('=')):
+                                    try:
+                                        ws[cell] = float(value)
+                                    except ValueError:
+                                        ws[cell] = value
+
+                        result_idx += 1
+
+                    col_group_idx += 1
+
+            # Save while preserving formulas
+            wb.save(output_path)
+            return output_path, "Results saved successfully in template format"
+
+        except Exception as e:
+            print(f"Error saving results to template: {str(e)}")
+            return None, f"Error saving results to template: {str(e)}"
 
     def add_blank_row(self, image):
         self.results.append({
@@ -418,7 +424,6 @@ def save_results_to_template(self, template_path, output_path):
         if self.marks:
             self.marks.pop()
         return self.update_display(), self.format_results()
-
 def create_interface():
     print("Creating interface...")
     analyzer = DicomAnalyzer()