Update app.py

app.py

@@ -61,16 +61,11 @@ class DicomAnalyzer:
         self.pan_y = 0
         self.max_pan_x = 0
         self.max_pan_y = 0
-        # Main circle color remains yellow:
         self.CIRCLE_COLOR = (0, 255, 255)  # BGR format
-        # Small circles inside the main circle will be white:
         self.SMALL_CIRCLES_COLOR = (255, 255, 255)  # BGR white
         print("DicomAnalyzer initialized...")
 
     def save_results(self):
-        """
-        Basic save function for raw results with improved error handling and logging
-        """
         try:
             if not self.results:
                 logger.warning("Attempted to save with no results")
@@ -175,12 +170,8 @@ class DicomAnalyzer:
         return self.update_display()
 
     def handle_keyboard(self, key):
-        """
-        Handle arrow keys. Pan movement is increased to be more noticeable.
-        """
         try:
             print(f"Handling key press: {key}")
-            # Increase pan step for bigger movement:
             pan_amount = int(10 * self.zoom_factor)
             
             if key == 'ArrowLeft':
@@ -196,12 +187,7 @@ class DicomAnalyzer:
         except Exception as e:
             print(f"Error handling keyboard input: {str(e)}")
             return self.display_image
-
     def update_display(self):
-        """
-        Updates the displayed image according to the current zoom/pan and draws the circles.
-        The big circle is in CIRCLE_COLOR, and the small circles inside are in SMALL_CIRCLES_COLOR.
-        """
         try:
             if self.original_display is None:
                 return None
@@ -266,9 +252,6 @@ class DicomAnalyzer:
             return self.original_display
 
     def analyze_roi(self, evt: gr.SelectData):
-        """
-        Called when user clicks on the displayed image to measure an ROI.
-        """
         try:
             if self.current_image is None:
                 return None, "No image loaded"
@@ -276,11 +259,9 @@ class DicomAnalyzer:
             clicked_x = evt.index[0]
             clicked_y = evt.index[1]
             
-            # Adjust by pan
             x = clicked_x + self.pan_x
             y = clicked_y + self.pan_y
 
-            # Adjust by zoom
             if self.zoom_factor != 1.0:
                 x = x / self.zoom_factor
                 y = y / self.zoom_factor
@@ -338,41 +319,7 @@ class DicomAnalyzer:
         except Exception as e:
             print(f"Error analyzing ROI: {str(e)}")
             return self.display_image, f"Error analyzing ROI: {str(e)}"
-
-    def add_formulas_to_template(self, ws, row_pair, col_group, red_font):
-        """
-        Inserts SNR (first row) and CNR (second row) formulas with IFERROR.
-        """
-        try:
-            base_col = col_group[1]  # Mean column
-            std_col = col_group[2]   # StdDev column
-            
-            row1, row2 = row_pair
-            
-            # SNR formula
-            formula1 = f"=IFERROR({base_col}{row1}/{std_col}{row1},\"\")"
-            formula_col = get_column_letter(column_index_from_string(col_group[-1]) + 1)
-            cell1 = ws[f"{formula_col}{row1}"]
-            cell1.value = formula1
-            cell1.font = red_font
-            cell1.alignment = openpyxl.styles.Alignment(horizontal='center')
-            
-            # CNR formula
-            formula2 = f"=IFERROR(({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:
-            logger.error(f"Error adding formulas: {str(e)}")
-
     def save_formatted_results(self, output_path):
-        """
-        Creates an Excel file with results in a formatted table,
-        including SNR/CNR formulas and average calculations.
-        """
         try:
             if not self.results:
                 return None, "No results to save"
@@ -382,7 +329,6 @@ class DicomAnalyzer:
             red_font = openpyxl.styles.Font(color="FF0000")
             center_alignment = openpyxl.styles.Alignment(horizontal='center')
             
-            # Column group headers
             headers = ['Area', 'Mean', 'StdDev', 'Min', 'Max']
 
             column_groups = [
@@ -411,13 +357,11 @@ class DicomAnalyzer:
                 '(4.5mm)', '(4mm)', '(3.5mm)', '(3mm)', '(2.5mm)'
             ]
             
-            # Set the phantom size row labels
             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
 
-            # Fill the data from self.results
             result_idx = 0
             current_col_group = 0
             current_row_pair = 0
@@ -429,19 +373,16 @@ class DicomAnalyzer:
                 cols = column_groups[current_col_group]
                 rows = row_pairs[current_row_pair]
                 
-                # First row
                 if result_idx < len(self.results):
                     result = self.results[result_idx]
                     self._write_result_to_cells(ws, result, cols, rows[0])
                     result_idx += 1
                 
-                # Second row
                 if result_idx < len(self.results):
                     result = self.results[result_idx]
                     self._write_result_to_cells(ws, result, cols, rows[1])
                     result_idx += 1
                 
-                # Add SNR/CNR formulas
                 self.add_formulas_to_template(ws, rows, cols, red_font)
                 
                 current_col_group += 1
@@ -449,7 +390,6 @@ class DicomAnalyzer:
                     current_col_group = 0
                     current_row_pair += 1
 
-            # Center align all data cells
             for cols in column_groups:
                 for col in cols:
                     for row in range(2, 31):
@@ -457,10 +397,8 @@ class DicomAnalyzer:
                         if cell.value is not None:
                             cell.alignment = center_alignment
 
-            # Additional tables: StdDev Averages and CNR Averages
+            # StdDev Averages
             current_row = 32
-
-            # StdDev
             stddev_header = ws.cell(row=current_row, column=1, value="StdDev Averages")
             stddev_header.font = red_font
             stddev_header.alignment = center_alignment
@@ -471,7 +409,7 @@ class DicomAnalyzer:
                 stddev_values = []
                 
                 for cols in column_groups:
-                    stddev_col = cols[2]  # The StdDev column
+                    stddev_col = cols[2]
                     cell_value = ws[f"{stddev_col}{row_number}"].value
                     if cell_value not in [0, None, '']:
                         stddev_values.append(float(cell_value))
@@ -486,9 +424,36 @@ class DicomAnalyzer:
                     avg_cell.alignment = center_alignment
                 current_row += 1
 
+            # Mean Averages
             current_row += 2
+            mean_header = ws.cell(row=current_row, column=1, value="Mean Averages")
+            mean_header.font = red_font
+            mean_header.alignment = center_alignment
+            current_row += 1
 
-            # CNR
+            for i, size in enumerate(phantom_sizes):
+                row_number = row_pairs[i][0]  # نأخذ الصف الأول فقط
+                mean_values = []
+                
+                for cols in column_groups:
+                    mean_col = cols[1]  # The Mean column
+                    cell_value = ws[f"{mean_col}{row_number}"].value
+                    if cell_value not in [0, None, '']:
+                        mean_values.append(float(cell_value))
+                
+                size_cell = ws.cell(row=current_row, column=1, value=size)
+                size_cell.alignment = center_alignment
+
+                if mean_values:
+                    avg_mean = sum(mean_values) / len(mean_values)
+                    avg_cell = ws.cell(row=current_row, column=2, value=avg_mean)
+                    avg_cell.number_format = '0.000'
+                    avg_cell.alignment = center_alignment
+                current_row += 1
+
+            current_row += 2
+
+            # CNR Averages
             cnr_header = ws.cell(row=current_row, column=1, value="CNR Averages")
             cnr_header.font = red_font
             cnr_header.alignment = center_alignment
@@ -502,7 +467,6 @@ class DicomAnalyzer:
                     formula_col = get_column_letter(column_index_from_string(cols[-1]) + 1)
                     cnr_cell_ref = f"{formula_col}{row_number}"
 
-                    # Read Mean1, Mean2, Std2 to skip zeros
                     mean_col = cols[1]
                     std_col  = cols[2]
                     
@@ -517,7 +481,6 @@ class DicomAnalyzer:
                     except:
                         mean1_val, mean2_val, std2_val = 0, 0, 0
 
-                    # If not all zero, add the cell reference
                     if not (mean1_val == 0 and mean2_val == 0 and std2_val == 0):
                         cnr_cells.append(cnr_cell_ref)
                 
@@ -525,9 +488,7 @@ class DicomAnalyzer:
                 size_cell.alignment = center_alignment
 
                 if cnr_cells:
-                    # Using AVERAGE(...) instead of AVERAGEIF
                     average_formula = f'=IFERROR(AVERAGE({",".join(cnr_cells)}), "")'
-                    
                     avg_cell = ws.cell(row=current_row, column=2)
                     avg_cell.value = average_formula
                     avg_cell.number_format = '0.000'
@@ -535,7 +496,6 @@ class DicomAnalyzer:
                 
                 current_row += 1
 
-            # Align the extra rows
             for row in range(32, current_row):
                 for col in range(1, 3):
                     cell = ws.cell(row=row, column=col)
@@ -549,7 +509,6 @@ class DicomAnalyzer:
             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')
         
         value_mapping = {
@@ -567,7 +526,6 @@ class DicomAnalyzer:
             cell.alignment = center_alignment
 
     def format_results(self):
-        """Returns a string representation of self.results for display."""
         if not self.results:
             return "No measurements yet"
         df = pd.DataFrame(self.results)
@@ -576,9 +534,6 @@ class DicomAnalyzer:
         return df.to_string(index=False)
 
     def add_zero_row(self, image):
-        """
-        Adds one row with zero-values.
-        """
         self.results.append({
             'Area (mm²)': '0.000',
             'Mean': '0.000',
@@ -590,9 +545,6 @@ class DicomAnalyzer:
         return image, self.format_results()
 
     def add_two_zero_rows(self, image):
-        """
-        Adds two consecutive rows with zero-values.
-        """
         for _ in range(2):
             self.results.append({
                 'Area (mm²)': '0.000',
@@ -605,10 +557,20 @@ class DicomAnalyzer:
         return image, self.format_results()
 
     def undo_last(self, image):
-        if self.results:
-            self.results.pop()
-        if self.marks:
+        if not self.results:  # لو مفيش نتائج أصلاً
+            return self.update_display(), self.format_results()
+            
+        last_result = self.results[-1]
+        # نتحقق إذا كان آخر إجراء قياس حقيقي أم صف صفري
+        is_measurement = last_result['Point'] != '(0, 0)'
+        
+        # نمسح آخر نتيجة
+        self.results.pop()
+        
+        # لو كان قياس حقيقي، نمسح العلامة المقابلة له
+        if is_measurement and self.marks:
             self.marks.pop()
+            
         return self.update_display(), self.format_results()
 
 
@@ -643,7 +605,6 @@ def create_interface():
                     elem_id="image_display"
                 )
                 
-        # Removed the "Add Blank Row" button
         with gr.Row():
             zero_btn = gr.Button("Add Zero Row")
             zero2_btn = gr.Button("Add Two Zero Rows")
@@ -674,7 +635,6 @@ def create_interface():
             output_path = "analysis_results_formatted.xlsx"
             return analyzer.save_formatted_results(output_path)
 
-        # Handlers
         file_input.change(
             fn=analyzer.load_dicom,
             inputs=file_input,
@@ -723,7 +683,6 @@ def create_interface():
             outputs=image_display
         )
         
-        # Removed blank_btn
         zero_btn.click(
             fn=analyzer.add_zero_row,
             inputs=image_display,
@@ -752,7 +711,6 @@ def create_interface():
             outputs=[file_output, results_display]
         )
 
-        # JavaScript snippet to allow multiple arrow key presses
         js = """
         <script>
         document.addEventListener('keydown', function(e) {