Update app.py

app.py

@@ -115,7 +115,6 @@ class DicomAnalyzer:
         except Exception as e:
             print(f"Error normalizing image: {str(e)}")
             return None
-
     def reset_view(self):
         self.zoom_factor = 1.0
         self.pan_x = 0
@@ -230,11 +229,8 @@ class DicomAnalyzer:
             new_height = int(height * self.zoom_factor)
             new_width = int(width * self.zoom_factor)
 
-            zoomed = cv2.resize(
-                self.original_display,
-                (new_width, new_height),
-                interpolation=cv2.INTER_CUBIC
-            )
+            zoomed = cv2.resize(self.original_display, (new_width, new_height), 
+                              interpolation=cv2.INTER_CUBIC)
 
             zoomed_bgr = cv2.cvtColor(zoomed, cv2.COLOR_RGB2BGR)
 
@@ -243,28 +239,24 @@ class DicomAnalyzer:
                 zoomed_y = int(y * self.zoom_factor)
                 zoomed_radius = int((diameter/2.0) * self.zoom_factor)
                 
-                cv2.circle(
-                    zoomed_bgr,
-                    (zoomed_x, zoomed_y),
-                    zoomed_radius,
-                    self.CIRCLE_COLOR,
-                    1,
-                    lineType=cv2.LINE_AA
-                )
+                cv2.circle(zoomed_bgr,
+                          (zoomed_x, zoomed_y),
+                          zoomed_radius,
+                          self.CIRCLE_COLOR,
+                          1,
+                          lineType=cv2.LINE_AA)
                 
                 num_points = 8
                 for i in range(num_points):
                     angle = 2 * np.pi * i / num_points
                     point_x = int(zoomed_x + zoomed_radius * np.cos(angle))
                     point_y = int(zoomed_y + zoomed_radius * np.sin(angle))
-                    cv2.circle(
-                        zoomed_bgr,
-                        (point_x, point_y),
-                        1,
-                        self.CIRCLE_COLOR,
-                        -1,
-                        lineType=cv2.LINE_AA
-                    )
+                    cv2.circle(zoomed_bgr,
+                              (point_x, point_y),
+                              1,
+                              self.CIRCLE_COLOR,
+                              -1,
+                              lineType=cv2.LINE_AA)
 
             zoomed = cv2.cvtColor(zoomed_bgr, cv2.COLOR_BGR2RGB)
 
@@ -318,7 +310,6 @@ class DicomAnalyzer:
             logger.error(error_msg)
             logger.error(traceback.format_exc())
             return None, error_msg
-
     def add_formulas_to_template(self, ws, row_pair, col_group, red_font):
         try:
             base_col = col_group[1]  # Mean column
@@ -335,10 +326,7 @@ class DicomAnalyzer:
             cell1.alignment = openpyxl.styles.Alignment(horizontal='center')
             
             # CNR Formula for second row
-            formula2 = (
-                f"=IF(OR({std_col}{row2}=0,{base_col}{row1}=0,{base_col}{row2}=0),"
-                f"0,({base_col}{row1}-{base_col}{row2})/{std_col}{row2})"
-            )
+            formula2 = f"=IF(OR({std_col}{row2}=0,{base_col}{row1}=0,{base_col}{row2}=0),0,({base_col}{row1}-{base_col}{row2})/{std_col}{row2})"
             cell2 = ws[f"{formula_col}{row2}"]
             cell2.value = formula2
             cell2.font = red_font
@@ -383,10 +371,8 @@ class DicomAnalyzer:
                 (17, 18), (20, 21), (23, 24), (26, 27), (29, 30)
             ]
 
-            phantom_sizes = [
-                '(7mm)', '(6.5mm)', '(6mm)', '(5.5mm)', '(5mm)',
-                '(4.5mm)', '(4mm)', '(3.5mm)', '(3mm)', '(2.5mm)'
-            ]
+            phantom_sizes = ['(7mm)', '(6.5mm)', '(6mm)', '(5.5mm)', '(5mm)', 
+                           '(4.5mm)', '(4mm)', '(3.5mm)', '(3mm)', '(2.5mm)']
             
             for i, size in enumerate(phantom_sizes):
                 header_cell = ws.cell(row=row_pairs[i][0]-1, column=1, value=size)
@@ -438,15 +424,15 @@ class DicomAnalyzer:
             stddev_header.alignment = center_alignment
             current_row += 1
             
-            # Calculate StdDev averages for each row pair (first row only)
+            # Calculate StdDev averages for each row pair
             for i, size in enumerate(phantom_sizes):
-                row_number = row_pairs[i][0]  # First row
+                row_number = row_pairs[i][0]  # First row only
                 stddev_values = []
                 
                 for cols in column_groups:
                     stddev_col = cols[2]  # StdDev column
                     cell_value = ws[f"{stddev_col}{row_number}"].value
-                    if cell_value not in [0, None, '']:  # Ignore zeros and empty
+                    if cell_value not in [0, None, '']:  # Ignore zeros and empty values
                         stddev_values.append(float(cell_value))
                 
                 if stddev_values:
@@ -467,7 +453,7 @@ class DicomAnalyzer:
             cnr_header.alignment = center_alignment
             current_row += 1
             
-            # Calculate CNR averages for each row pair (second row)
+            # Calculate CNR averages for each row pair
             for i, size in enumerate(phantom_sizes):
                 row_number = row_pairs[i][1]  # Second row for CNR
                 cnr_references = []
@@ -515,6 +501,7 @@ class DicomAnalyzer:
             logger.error(f"Error saving formatted results: {str(e)}")
             return None, f"Error saving results: {str(e)}"
 
+
     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')
@@ -570,7 +557,6 @@ class DicomAnalyzer:
             self.marks.pop()
         return self.update_display(), self.format_results()
 
-# Interface Creation and Main Execution
 def create_interface():
     print("Creating interface...")
     analyzer = DicomAnalyzer()
@@ -621,7 +607,7 @@ def create_interface():
         - Use Reset All to clear all measurements
         - Save Formatted Results will create Excel file with formulas
         """)
-
+        
         def update_diameter(x):
             analyzer.circle_diameter = float(x)
             print(f"Diameter updated to: {x}")
@@ -630,7 +616,7 @@ def create_interface():
         def save_formatted():
             output_path = "analysis_results_formatted.xlsx"
             return analyzer.save_formatted_results(output_path)
-        
+
         # Event handlers
         file_input.change(
             fn=analyzer.load_dicom,
@@ -745,4 +731,4 @@ if __name__ == "__main__":
         print(f"Error launching application: {str(e)}")
         logger.error(f"Error launching application: {str(e)}")
         logger.error(traceback.format_exc())
-        raise e
+        raise e