Update app.py

app.py

@@ -295,97 +295,98 @@ class DicomAnalyzer:
         df = df[columns_order]
         return df.to_string(index=False)
 
-    def save_results(self):
-        try:
-            if not self.results:
-                return None, "No results to save"
+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
+        ]
+
+        # Define row pairs
+        row_pairs = [
+            (2, 3),      # 7mm
+            (5, 6),      # 6.5mm
+            (8, 9),      # 6mm
+            (11, 12),    # 5.5mm
+            (14, 15),    # 5mm
+            (17, 18),    # 4.5mm
+            (20, 21),    # 4mm
+            (23, 24),    # 3.5mm
+            (26, 27),    # 3mm
+            (29, 30)     # 2.5mm
+        ]
+
+        # Process results
+        result_idx = 0
+        current_col_group = 0
+        current_row_pair = 0
+        
+        while result_idx < len(self.results):
+            if current_col_group >= len(column_groups) or current_row_pair >= len(row_pairs):
+                break
+                
+            # Get current positions
+            cols = column_groups[current_col_group]
+            rows = row_pairs[current_row_pair]
             
-            df = pd.DataFrame(self.results)
-            columns_order = ['Area (mm²)', 'Mean', 'StdDev', 'Min', 'Max', 'Point']
-            df = df[columns_order]
+            # Write first row if available
+            if result_idx < len(self.results):
+                result = self.results[result_idx]
+                # Write Area
+                ws[f"{cols[0]}{rows[0]}"] = float(result['Area (mm²)'])
+                # Write Mean
+                ws[f"{cols[1]}{rows[0]}"] = float(result['Mean'])
+                # Write StdDev
+                ws[f"{cols[2]}{rows[0]}"] = float(result['StdDev'])
+                # Write Min
+                ws[f"{cols[3]}{rows[0]}"] = float(result['Min'])
+                # Write Max
+                ws[f"{cols[4]}{rows[0]}"] = float(result['Max'])
+                result_idx += 1
             
-            temp_file = "analysis_results.xlsx"
-            df.to_excel(temp_file, index=False)
+            # Write second row if available
+            if result_idx < len(self.results):
+                result = self.results[result_idx]
+                # Write Area
+                ws[f"{cols[0]}{rows[1]}"] = float(result['Area (mm²)'])
+                # Write Mean
+                ws[f"{cols[1]}{rows[1]}"] = float(result['Mean'])
+                # Write StdDev
+                ws[f"{cols[2]}{rows[1]}"] = float(result['StdDev'])
+                # Write Min
+                ws[f"{cols[3]}{rows[1]}"] = float(result['Min'])
+                # Write Max
+                ws[f"{cols[4]}{rows[1]}"] = float(result['Max'])
+                result_idx += 1
             
-            return temp_file, "Results saved successfully"
-        except Exception as e:
-            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
-            ]
-
-            # Define row pairs
-            row_pairs = [
-                (2, 3),    # 7mm
-                (5, 6),    # 6.5mm
-                (8, 9),    # 6mm
-                (11, 12),  # 5.5mm
-                (14, 15),  # 5mm
-                (17, 18),  # 4.5mm
-                (20, 21),  # 4mm
-                (23, 24),  # 3.5mm
-                (26, 27),  # 3mm
-                (29, 30)   # 2.5mm
-            ]
+            # Move to next column group if we've written both rows
+            current_col_group += 1
+            
+            # If we've used all column groups, move to next row pair
+            if current_col_group >= len(column_groups):
+                current_col_group = 0
+                current_row_pair += 1
 
-            # Process results in pairs
-            result_idx = 0
-            metrics = ['Area (mm²)', 'Mean', 'StdDev', 'Min', 'Max']
-
-            for row_pair in row_pairs:
-                col_group_idx = 0
-                while result_idx < len(self.results):
-                    if col_group_idx >= len(column_groups):
-                        break
-
-                    # Get current column group
-                    cols = column_groups[col_group_idx]
-
-                    # 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"
+        # Save while preserving formulas
+        wb.save(output_path)
+        print(f"Saved {result_idx} results to template")
+        return output_path, f"Results saved successfully in template format ({result_idx} measurements)"
 
-        except Exception as e:
-            print(f"Error saving results to template: {str(e)}")
-            return None, f"Error saving results to template: {str(e)}"
+    except Exception as e:
+        print(f"Error saving results to template: {str(e)}")
+        logger.error(f"Error saving results to template: {str(e)}")
+        logger.error(traceback.format_exc())
+        return None, f"Error saving results to template: {str(e)}"
 
     def add_blank_row(self, image):
         self.results.append({