Update app.py

app.py

@@ -65,6 +65,14 @@ class DicomAnalyzer:
         self.SMALL_CIRCLES_COLOR = (255, 255, 255)  # BGR white
         print("DicomAnalyzer initialized...")
 
+        # If you rely on self.column_groups in your new snippet, define it here:
+        # Adjust the column letters to match how your raw (Mean, StdDev) data are actually laid out.
+        self.column_groups = [
+            # Example: (AreaCol, MeanCol, StdDevCol) if you store area in B, mean in C, std in D, etc.
+            # If you only store mean & std, just treat the first col as a placeholder. 
+            ('B','C','D'),
+        ]
+
     def save_results(self):
         try:
             if not self.results:
@@ -133,6 +141,7 @@ class DicomAnalyzer:
         except Exception as e:
             print(f"Error loading DICOM file: {str(e)}")
             return None, f"Error loading DICOM file: {str(e)}"
+
     def normalize_image(self, image):
         try:
             normalized = cv2.normalize(
@@ -319,6 +328,11 @@ class DicomAnalyzer:
         except Exception as e:
             print(f"Error analyzing ROI: {str(e)}")
             return self.display_image, f"Error analyzing ROI: {str(e)}"
+
+    # -------------------------------------------------------------------
+    # The following two helper methods were in your original code. 
+    # We keep them, in case you still need them. Adjust or remove if needed.
+    # -------------------------------------------------------------------
     def add_formulas_to_template(self, ws, row_pair, col_group, red_font):
         """
         Inserts SNR (first row) and CNR (second row) formulas with IFERROR.
@@ -348,6 +362,27 @@ class DicomAnalyzer:
         except Exception as e:
             logger.error(f"Error adding formulas: {str(e)}")
 
+    def _write_result_to_cells(self, ws, result, cols, row):
+        center_alignment = openpyxl.styles.Alignment(horizontal='center')
+        
+        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}"]
+            val = result[key]
+            cell.value = float(val) if val not in ['', None] else ''
+            cell.alignment = center_alignment
+
+
+    # -------------------------------------------------------------------
+    # REPLACEMENT SAVE_FORMATTED_RESULTS (Your updated snippet):
+    # -------------------------------------------------------------------
     def save_formatted_results(self, output_path):
         try:
             if not self.results:
@@ -355,203 +390,117 @@ class DicomAnalyzer:
 
             wb = openpyxl.Workbook()
             ws = wb.active
+            
+            # Define styles
             red_font = openpyxl.styles.Font(color="FF0000")
-            center_alignment = openpyxl.styles.Alignment(horizontal='center')
-            
-            headers = ['Area', 'Mean', 'StdDev', 'Min', 'Max']
-
-            column_groups = [
-                ('B', 'C', 'D', 'E', 'F'), ('H', 'I', 'J', 'K', 'L'),
-                ('N', 'O', 'P', 'Q', 'R'), ('T', 'U', 'V', 'W', 'X'),
-                ('Z', 'AA', 'AB', 'AC', 'AD'), ('AF', 'AG', 'AH', 'AI', 'AJ'),
-                ('AL', 'AM', 'AN', 'AO', 'AP'), ('AR', 'AS', 'AT', 'AU', 'AV'),
-                ('AX', 'AY', 'AZ', 'BA', 'BB'), ('BD', 'BE', 'BF', 'BG', 'BH'),
-                ('BJ', 'BK', 'BL', 'BM', 'BN'), ('BP', 'BQ', 'BR', 'BS', 'BT'),
-                ('BV', 'BW', 'BX', 'BY', 'BZ')
-            ]
-
-            for cols in column_groups:
-                for i, header in enumerate(headers):
-                    cell = ws[f"{cols[i]}1"]
-                    cell.value = header
-                    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)
-            ]
-
+            center_alignment = openpyxl.styles.Alignment(horizontal='center', vertical='center')
+            
+            # Start creating the averages table at row 35
+            start_row = 35
+            
+            # Write the "1-AVG" header
+            ws['C35'] = "1-AVG"
+            ws['C35'].alignment = center_alignment
+            
+            # Merge cells for headers and add titles
+            ws.merge_cells('D35:E35')
+            ws.merge_cells('F35:G35')
+            ws.merge_cells('H35:I35')
+            
+            headers = {
+                'D35': 'AVG MEAN',
+                'F35': 'AVG STDDEV',
+                'H35': 'AVG CNR'
+            }
+            
+            for cell, value in headers.items():
+                ws[cell] = value
+                ws[cell].alignment = center_alignment
+                ws[cell].font = red_font
+            
+            # Add phantom sizes in red
             phantom_sizes = [
-                '(7mm)', '(6.5mm)', '(6mm)', '(5.5mm)', '(5mm)',
-                '(4.5mm)', '(4mm)', '(3.5mm)', '(3mm)', '(2.5mm)'
+                '(7.0mm)', '(6.5mm)', '(6.0mm)', '(5.5mm)', '(5.0mm)',
+                '(4.5mm)', '(4.0mm)', '(3.5mm)', '(3.0mm)', '(2.5mm)'
             ]
             
             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
-
-            result_idx = 0
-            current_col_group = 0
-            current_row_pair = 0
-            
-            while result_idx < len(self.results):
-                if current_row_pair >= len(row_pairs):
-                    break
-                    
-                cols = column_groups[current_col_group]
-                rows = row_pairs[current_row_pair]
-                
-                if result_idx < len(self.results):
-                    result = self.results[result_idx]
-                    self._write_result_to_cells(ws, result, cols, rows[0])
-                    result_idx += 1
-                
-                if result_idx < len(self.results):
-                    result = self.results[result_idx]
-                    self._write_result_to_cells(ws, result, cols, rows[1])
-                    result_idx += 1
+                row = start_row + i + 1  # Start from row 36
                 
-                self.add_formulas_to_template(ws, rows, cols, red_font)
+                # Merge cells for each row
+                ws.merge_cells(f'D{row}:E{row}')
+                ws.merge_cells(f'F{row}:G{row}')
+                ws.merge_cells(f'H{row}:I{row}')
                 
-                current_col_group += 1
-                if current_col_group >= len(column_groups):
-                    current_col_group = 0
-                    current_row_pair += 1
-
-            for cols in column_groups:
-                for col in cols:
-                    for row in range(2, 31):
-                        cell = ws[f"{col}{row}"]
-                        if cell.value is not None:
-                            cell.alignment = center_alignment
-            # StdDev Averages
-            current_row = 32
-            stddev_header = ws.cell(row=current_row, column=1, value="StdDev Averages")
-            stddev_header.font = red_font
-            stddev_header.alignment = center_alignment
-            current_row += 1
-            
-            for i, size in enumerate(phantom_sizes):
-                row_number = row_pairs[i][0]
-                stddev_values = []
-                
-                for cols in column_groups:
-                    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))
+                cell = ws[f'C{row}"]
+                cell.value = size
+                cell.font = red_font
+                cell.alignment = center_alignment
                 
-                size_cell = ws.cell(row=current_row, column=1, value=size)
-                size_cell.alignment = center_alignment
-
-                if stddev_values:
-                    avg_stddev = sum(stddev_values) / len(stddev_values)
-                    avg_cell = ws.cell(row=current_row, column=2, value=avg_stddev)
-                    avg_cell.number_format = '0.000'
-                    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
-
-            for i, size in enumerate(phantom_sizes):
-                row_number = row_pairs[i][0]  # نأخذ الصف الأول فقط
+                # Calculate averages as before
                 mean_values = []
+                stddev_values = []
+                cnr_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))
+                # For example, row_pair = (2 + i*3, 3 + i*3).
+                row_pair = (2 + i * 3, 3 + i * 3)
                 
-                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
-            current_row += 1
-            
-            for i, size in enumerate(phantom_sizes):
-                row_number = row_pairs[i][1]
-                cnr_cells = []
-
-                for cols in column_groups:
-                    formula_col = get_column_letter(column_index_from_string(cols[-1]) + 1)
-                    cnr_cell_ref = f"{formula_col}{row_number}"
-
+                for cols in self.column_groups:
                     mean_col = cols[1]
-                    std_col  = cols[2]
+                    stddev_col = cols[2]
+                    
+                    mean1_val = ws[f"{mean_col}{row_pair[0]}"].value
+                    mean2_val = ws[f"{mean_col}{row_pair[1]}"].value
+                    stddev2_val = ws[f"{stddev_col}{row_pair[1]}"].value
                     
-                    mean1_val = ws[f"{mean_col}{row_pairs[i][0]}"].value
-                    mean2_val = ws[f"{mean_col}{row_pairs[i][1]}"].value
-                    std2_val  = ws[f"{std_col}{row_pairs[i][1]}"].value
-
                     try:
-                        mean1_val = float(mean1_val) if mean1_val not in [None, ''] else 0
-                        mean2_val = float(mean2_val) if mean2_val not in [None, ''] else 0
-                        std2_val  = float(std2_val)  if std2_val  not in [None, ''] else 0
-                    except:
-                        mean1_val, mean2_val, std2_val = 0, 0, 0
-
-                    if not (mean1_val == 0 and mean2_val == 0 and std2_val == 0):
-                        cnr_cells.append(cnr_cell_ref)
+                        mean1_val = float(mean1_val) if mean1_val not in [None, ''] else None
+                        mean2_val = float(mean2_val) if mean2_val not in [None, ''] else None
+                        stddev2_val = float(stddev2_val) if stddev2_val not in [None, ''] else None
+                        
+                        if all(v is not None for v in [mean1_val, mean2_val, stddev2_val]):
+                            mean_values.append(mean1_val)
+                            stddev_values.append(stddev2_val)
+                            cnr_values.append((mean1_val - mean2_val) / stddev2_val)
+                    except (ValueError, TypeError):
+                        continue
                 
-                size_cell = ws.cell(row=current_row, column=1, value=size)
-                size_cell.alignment = center_alignment
-
-                if cnr_cells:
-                    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'
-                    avg_cell.alignment = center_alignment
+                # Write averages to merged cells
+                if mean_values:
+                    ws[f'D{row}'].value = sum(mean_values) / len(mean_values)
+                    ws[f'D{row}'].alignment = center_alignment
+                    ws[f'D{row}'].number_format = '0.0000'
                 
-                current_row += 1
-
-            for row in range(32, current_row):
-                for col in range(1, 3):
-                    cell = ws.cell(row=row, column=col)
-                    cell.alignment = center_alignment
-
+                if stddev_values:
+                    ws[f'F{row}'].value = sum(stddev_values) / len(stddev_values)
+                    ws[f'F{row}'].alignment = center_alignment
+                    ws[f'F{row}'].number_format = '0.0000'
+                
+                if cnr_values:
+                    ws[f'H{row}'].value = sum(cnr_values) / len(cnr_values)
+                    ws[f'H{row}'].alignment = center_alignment
+                    ws[f'H{row}'].number_format = '0.0000'
+            
+            # Add borders to the table including merged cells
+            border = openpyxl.styles.Border(
+                left=openpyxl.styles.Side(style='thin'),
+                right=openpyxl.styles.Side(style='thin'),
+                top=openpyxl.styles.Side(style='thin'),
+                bottom=openpyxl.styles.Side(style='thin')
+            )
+            
+            for row in range(35, 46):  # From row 35 to 45
+                for col in ['C', 'D', 'E', 'F', 'G', 'H', 'I']:
+                    ws[f'{col}{row}'].border = border
+            
+            # Save the workbook
             wb.save(output_path)
-            return output_path, f"Results saved successfully ({len(self.results)} measurements)"
-
+            return output_path, "Results saved successfully with formatted averages table"
+            
         except Exception as e:
             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):
-        center_alignment = openpyxl.styles.Alignment(horizontal='center')
-        
-        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}"]
-            val = result[key]
-            cell.value = float(val) if val not in ['', None] else ''
-            cell.alignment = center_alignment
 
     def format_results(self):
         if not self.results:
@@ -781,4 +730,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