Update app.py

app.py

@@ -152,6 +152,7 @@ class DicomAnalyzer:
         except Exception as e:
             print(f"Error handling keyboard input: {str(e)}")
             return self.display_image
+
     def analyze_roi(self, evt: gr.SelectData):
         try:
             if self.current_image is None:
@@ -274,7 +275,6 @@ class DicomAnalyzer:
         except Exception as e:
             print(f"Error updating display: {str(e)}")
             return self.original_display
-
     def save_results(self):
         """
         Basic save function for raw results with improved error handling and logging
@@ -323,11 +323,13 @@ class DicomAnalyzer:
             cell1 = ws[f"{formula_col}{row1}"]
             cell1.value = formula1
             cell1.font = red_font
+            cell1.alignment = openpyxl.styles.Alignment(horizontal='center')
             
             formula2 = f"=({base_col}{row1}-{base_col}{row2})/{std_col}{row2}"
             cell2 = ws[f"{formula_col}{row2}"]
             cell2.value = formula2
             cell2.font = red_font
+            cell2.alignment = openpyxl.styles.Alignment(horizontal='center')
             
             logger.debug(f"Added formulas for rows {row1},{row2} in column {formula_col}")
         except Exception as e:
@@ -343,9 +345,8 @@ class DicomAnalyzer:
             red_font = openpyxl.styles.Font(color="FF0000")
             center_alignment = openpyxl.styles.Alignment(horizontal='center')
             
-            #Define headers
+            # Define headers
             headers = ['Area', 'Mean', 'StdDev', 'Min', 'Max']
-            
 
             column_groups = [
                 ('B', 'C', 'D', 'E', 'F'), ('H', 'I', 'J', 'K', 'L'),
@@ -356,14 +357,14 @@ class DicomAnalyzer:
                 ('BJ', 'BK', 'BL', 'BM', 'BN'), ('BP', 'BQ', 'BR', 'BS', 'BT'),
                 ('BV', 'BW', 'BX', 'BY', 'BZ')
             ]
+
             # Add headers for each column group
             for cols in column_groups:
                 for i, header in enumerate(headers):
                     cell = ws[f"{cols[i]}1"]
                     cell.value = header
-                    cell.alignment = center_alignment  # Center align the headers
+                    cell.alignment = center_alignment
 
-            
             row_pairs = [
                 (2, 3), (5, 6), (8, 9), (11, 12), (14, 15),
                 (17, 18), (20, 21), (23, 24), (26, 27), (29, 30)
@@ -375,8 +376,8 @@ class DicomAnalyzer:
             for i, size in enumerate(phantom_sizes):
                 header_cell = ws.cell(row=row_pairs[i][0]-1, column=1, value=size)
                 header_cell.font = red_font
-                header_cell.alignment = center_alignment  # Center align the phantom sizes
-                 
+                header_cell.alignment = center_alignment
+
             result_idx = 0
             current_col_group = 0
             current_row_pair = 0
@@ -405,12 +406,13 @@ class DicomAnalyzer:
                     current_col_group = 0
                     current_row_pair += 1
 
-                 # Center align all data cells
+            # Center align all data cells
             for cols in column_groups:
                 for col in cols:
-                    for row in range(2, 31):  # Adjust range based on your data
+                    for row in range(2, 31):
                         cell = ws[f"{col}{row}"]
-                        cell.alignment = center_alignment
+                        if cell.value is not None:
+                            cell.alignment = center_alignment
 
             wb.save(output_path)
             return output_path, f"Results saved successfully ({result_idx} measurements)"
@@ -422,16 +424,20 @@ class DicomAnalyzer:
     def _write_result_to_cells(self, ws, result, cols, row):
         """Helper method to write a single result to worksheet cells"""
         center_alignment = openpyxl.styles.Alignment(horizontal='center')
-        ws[f"{cols[0]}{row}"] = float(result['Area (mm²)'])
-        ws[f"{cols[1]}{row}"] = float(result['Mean'])
-        ws[f"{cols[2]}{row}"] = float(result['StdDev'])
-        ws[f"{cols[3]}{row}"] = float(result['Min'])
-        ws[f"{cols[4]}{row}"] = float(result['Max'])
-
-        for i, value in enumerate(['Area (mm²)', 'Mean', 'StdDev', 'Min', 'Max']):
-        cell = ws[f"{cols[i]}{row}"]
-        cell.value = float(result[value])
-        cell.alignment = center_alignment
+        
+        # Map the headers to the result keys
+        value_mapping = {
+            'Area': 'Area (mm²)',
+            'Mean': 'Mean',
+            'StdDev': 'StdDev',
+            'Min': 'Min',
+            'Max': 'Max'
+        }
+        
+        for i, (header, key) in enumerate(value_mapping.items()):
+            cell = ws[f"{cols[i]}{row}"]
+            cell.value = float(result[key])
+            cell.alignment = center_alignment
 
     def format_results(self):
         if not self.results:
@@ -470,7 +476,6 @@ class DicomAnalyzer:
             self.marks.pop()
         return self.update_display(), self.format_results()
 
-# Interface creation and main execution will be in the next part...
 def create_interface():
     print("Creating interface...")
     analyzer = DicomAnalyzer()