Update app.py

app.py

@@ -324,7 +324,6 @@ class DicomAnalyzer:
     def add_formulas_to_template(self, ws, row_pair, col_group, red_font):
         """
         Inserts SNR (first row) and CNR (second row) formulas with IFERROR.
-        (Same approach: col_group[-1] is the last column, so the formula goes in the next col.)
         """
         try:
             base_col = col_group[1]  # Mean column
@@ -332,20 +331,21 @@ class DicomAnalyzer:
             
             row1, row2 = row_pair
             
-            # SNR formula in row1
             formula_col = get_column_letter(column_index_from_string(col_group[-1]) + 1)
-            formula1 = f"=IFERROR({base_col}{row1}/{std_col}{row1},\"\")"
-            cell1 = ws[f"{formula_col}{row1}"]
-            cell1.value = formula1
-            cell1.font = red_font
-            cell1.alignment = openpyxl.styles.Alignment(horizontal='center')
             
-            # CNR formula in row2
-            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')
+            # SNR formula -> row1
+            formula_snr = f"=IFERROR({base_col}{row1}/{std_col}{row1},\"\")"
+            cell_snr = ws[f"{formula_col}{row1}"]
+            cell_snr.value = formula_snr
+            cell_snr.font = red_font
+            cell_snr.alignment = openpyxl.styles.Alignment(horizontal='center')
+            
+            # CNR formula -> row2
+            formula_cnr = f"=IFERROR(({base_col}{row1}-{base_col}{row2})/{std_col}{row2},\"\")"
+            cell_cnr = ws[f"{formula_col}{row2}"]
+            cell_cnr.value = formula_cnr
+            cell_cnr.font = red_font
+            cell_cnr.alignment = openpyxl.styles.Alignment(horizontal='center')
             
             logger.debug(f"Added formulas for rows {row1},{row2} in column {formula_col}")
         except Exception as e:
@@ -359,7 +359,7 @@ class DicomAnalyzer:
             wb = openpyxl.Workbook()
             ws = wb.active
             red_font = openpyxl.styles.Font(color="FF0000")
-            center_alignment = openpyxl.styles.Alignment(horizontal='center')
+            center_alignment = openpyxl.styles.Alignment(horizontal='center', vertical='center')
             
             headers = ['Area', 'Mean', 'StdDev', 'Min', 'Max']
 
@@ -372,15 +372,14 @@ class DicomAnalyzer:
                 ('BJ', 'BK', 'BL', 'BM', 'BN'), ('BP', 'BQ', 'BR', 'BS', 'BT'),
                 ('BV', 'BW', 'BX', 'BY', 'BZ')
             ]
-
-            # Write headers in row1 for each column group
+            
+            # Write the headers in row1 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
 
-            # row pairs for 10 phantoms, each has row1 and row2
             row_pairs = [
                 (2, 3), (5, 6), (8, 9), (11, 12), (14, 15),
                 (17, 18), (20, 21), (23, 24), (26, 27), (29, 30)
@@ -391,13 +390,13 @@ class DicomAnalyzer:
                 '(4.5mm)', '(4mm)', '(3.5mm)', '(3mm)', '(2.5mm)'
             ]
             
-            # Put phantom sizes in column A (above row1 for each pair)
+            # Put phantom size labels in column A above each row pair.
             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 data from self.results in these row_pairs/column_groups
+            # Write the results in the row pairs, add SNR/CNR formulas.
             result_idx = 0
             current_col_group = 0
             current_row_pair = 0
@@ -407,29 +406,26 @@ class DicomAnalyzer:
                     break
                     
                 cols = column_groups[current_col_group]
-                rows = row_pairs[current_row_pair]
+                row1, row2 = row_pairs[current_row_pair]
                 
-                # first measurement -> row1
                 if result_idx < len(self.results):
                     result = self.results[result_idx]
-                    self._write_result_to_cells(ws, result, cols, rows[0])
+                    self._write_result_to_cells(ws, result, cols, row1)
                     result_idx += 1
                 
-                # second measurement -> row2
                 if result_idx < len(self.results):
                     result = self.results[result_idx]
-                    self._write_result_to_cells(ws, result, cols, rows[1])
+                    self._write_result_to_cells(ws, result, cols, row2)
                     result_idx += 1
                 
-                # Insert SNR/CNR formulas in these 2 rows (mean, std dev columns to formula col)
-                self.add_formulas_to_template(ws, rows, cols, red_font)
+                self.add_formulas_to_template(ws, (row1,row2), cols, red_font)
                 
                 current_col_group += 1
                 if current_col_group >= len(column_groups):
                     current_col_group = 0
                     current_row_pair += 1
 
-            # center alignment for existing cells (2..30 in all column groups)
+            # Center-align the raw data rows (2..30) in all column groups.
             for cols in column_groups:
                 for col in cols:
                     for row in range(2, 31):
@@ -437,128 +433,129 @@ class DicomAnalyzer:
                         if cell.value is not None:
                             cell.alignment = center_alignment
 
-            # Now do the 3 sections: StdDev Averages, Mean Averages, CNR Averages
+            #########################################################
+            #  تصميم "1-AVG" في الصف 35 (مدمج D35:E35, F35:G35, H35:I35)
+            #########################################################
+            start_row = 35
+            ws['C35'] = "1-AVG"
+            ws['C35'].alignment = center_alignment
+
+            ws.merge_cells('D35:E35')
+            ws.merge_cells('F35:G35')
+            ws.merge_cells('H35:I35')
+
+            headers_avg = {
+                'D35': 'AVG MEAN',
+                'F35': 'AVG STDDEV',
+                'H35': 'AVG CNR'
+            }
+            for c_ref, text_val in headers_avg.items():
+                ws[c_ref] = text_val
+                ws[c_ref].font = red_font
+                ws[c_ref].alignment = center_alignment
+
+            # We'll keep the same 10 phantom sizes, to fill rows 36..45.
+            phantom_sizes2 = [
+                '(7.0mm)', '(6.5mm)', '(6.0mm)', '(5.5mm)', '(5.0mm)',
+                '(4.5mm)', '(4.0mm)', '(3.5mm)', '(3.0mm)', '(2.5mm)'
+            ]
 
-            ##################
-            # 1) 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]  # 'D','J','P'.. etc.
-                    cell_value = ws[f"{stddev_col}{row_number}"].value
-                    if cell_value not in [0, None, '']:
-                        stddev_values.append(float(cell_value))
-                
-                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
-
-            ##################
-            # 2) 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_label in enumerate(phantom_sizes2):
+                row = start_row + i + 1  # 36..45
+
+                # merge cells for each row (D-E, F-G, H-I)
+                ws.merge_cells(f'D{row}:E{row}')
+                ws.merge_cells(f'F{row}:G{row}')
+                ws.merge_cells(f'H{row}:I{row}')
+
+                c_cell = ws[f'C{row}']
+                c_cell.value = size_label
+                c_cell.font = red_font
+                c_cell.alignment = center_alignment
+
+                # We'll read from row_pairs[i]: row1->(2,5,8..), row2->(3,6,9..)
+                if i >= len(row_pairs):
+                    continue
+                (raw_row1, raw_row2) = row_pairs[i]
 
-            for i, size in enumerate(phantom_sizes):
-                row_number = row_pairs[i][0]  # we take the first row only (object)
                 mean_values = []
-                
-                for cols in column_groups:
-                    mean_col = cols[1]  # 'C','I','O'.. etc.
-                    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
-
-            ##################
-            # 3) CNR Averages (the snippet approach: build `=AVERAGE(...)` referencing each phantom's CNR cell)
-            ##################
-            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]  # second row for each phantom
-                cnr_cells = []
-
-                # We'll collect references to the formula column for each column group and row2.
-                for cols in column_groups:
-                    # formula col is after the last col in group (like 'F' -> 'G')
-                    formula_col = get_column_letter(column_index_from_string(cols[-1]) + 1)
-                    cnr_cell_ref = f"{formula_col}{row_number}"
-
-                    # we also check if mean1,mean2,std2 are zero => skip or not. This is from the snippet logic.
-                    mean_col = cols[1]
-                    std_col  = cols[2]
-                    
-                    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
+                stddev_values = []
+                cnr_cells = []  # We'll collect references to the formula column for row2.
 
+                # for each column group, read Mean (row1), StdDev (row1) if you want to average them.
+                # plus the CNR formula in row2.
+                for group in column_groups:
+                    mean_col = group[1]  # e.g. 'C'
+                    std_col  = group[2]  # e.g. 'D'
+                    
+                    m1_val = ws[f"{mean_col}{raw_row1}"].value
+                    if m1_val not in [None,'']:
+                        try:
+                            mean_values.append(float(m1_val))
+                        except:
+                            pass
+
+                    std1_val = ws[f"{std_col}{raw_row1}"].value
+                    if std1_val not in [None,'']:
+                        try:
+                            stddev_values.append(float(std1_val))
+                        except:
+                            pass
+
+                    # The formula col is after group[-1]
+                    formula_col = get_column_letter(column_index_from_string(group[-1]) + 1)
+                    cnr_cell_ref = f"{formula_col}{raw_row2}"
+
+                    # Check if row2 is not zero => basically the snippet's logic:
                     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
+                        mean2_val = ws[f"{mean_col}{raw_row2}"].value
+                        std2_val  = ws[f"{std_col}{raw_row2}"].value
+
+                        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
+                        mean2_val, std2_val = 0,0
 
-                    if not (mean1_val == 0 and mean2_val == 0 and std2_val == 0):
-                        # i.e. valid ROI data => we add the formula cell reference to average later.
+                    if not (mean2_val == 0 and std2_val == 0):
+                        # i.e. there's valid data => we use that formula cell.
                         cnr_cells.append(cnr_cell_ref)
-                
-                size_cell = ws.cell(row=current_row, column=1, value=size)
-                size_cell.alignment = center_alignment
 
-                if cnr_cells:
-                    # create a new formula to average those 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
-                
-                current_row += 1
+                # Compute average MEAN, STDDEV in python from row1 if you want.
+                final_mean = sum(mean_values)/len(mean_values) if mean_values else None
+                final_std  = sum(stddev_values)/len(stddev_values) if stddev_values else None
 
-            # Finally, center-align from row 32.. up to current_row in columns 1..2
-            for row in range(32, current_row):
-                for col in range(1, 3):
-                    cell = ws.cell(row=row, column=col)
-                    cell.alignment = center_alignment
+                # For CNR, we build a formula =AVERAGE(...) referencing all the row2 formula cells.
+                # But we'll do it as an Excel formula:
+                # e.g. =IFERROR(AVERAGE(G3, G6, ...),"")
+
+                if final_mean is not None:
+                    ws[f'D{row}'].value = final_mean
+                    ws[f'D{row}'].alignment = center_alignment
+                    ws[f'D{row}'].number_format = '0.0000'
+
+                if final_std is not None:
+                    ws[f'F{row}'].value = final_std
+                    ws[f'F{row}'].alignment = center_alignment
+                    ws[f'F{row}'].number_format = '0.0000'
+
+                if cnr_cells:
+                    # create a formula for average of those CNR references.
+                    formula_avg_cnr = f"=IFERROR(AVERAGE({','.join(cnr_cells)}),\"\")"
+                    ws[f'H{row}'].value = formula_avg_cnr
+                    ws[f'H{row}'].alignment = center_alignment
+                    ws[f'H{row}'].number_format = '0.0000'
+
+            # Add thin border around the region C35..I45.
+            thin_side = openpyxl.styles.Side(style='thin')
+            border = openpyxl.styles.Border(
+                left=thin_side, right=thin_side, top=thin_side, bottom=thin_side
+            )
+            for r in range(35, 46):
+                for col in ['C','D','E','F','G','H','I']:
+                    ws[f"{col}{r}"].border = border
 
-            # Save workbook to disk
             wb.save(output_path)
             return output_path, f"Results saved successfully ({len(self.results)} measurements)"
-
         except Exception as e:
             logger.error(f"Error saving formatted results: {str(e)}")
             return None, f"Error saving results: {str(e)}"
@@ -612,12 +609,11 @@ class DicomAnalyzer:
         return image, self.format_results()
 
     def undo_last(self, image):
-        if not self.results:  # لو مفيش نتائج أصلاً
+        if not self.results:  # لا توجد نتائج
             return self.update_display(), self.format_results()
             
         last_result = self.results[-1]
-        is_measurement = last_result['Point'] != '(0, 0)'
-        
+        is_measurement = (last_result['Point'] != '(0, 0)')
         self.results.pop()
         
         if is_measurement and self.marks:
@@ -675,7 +671,7 @@ def create_interface():
         - Use Zoom In/Out buttons or Reset View to adjust zoom level.
         - Use Reset All to clear all measurements.
         - "Save Results": basic Excel with raw data.
-        - "Save Formatted Results": Excel with advanced formatting & formulas (including average CNR).
+        - "Save Formatted Results": Excel with advanced formatting & formulas.
         """)
 
         def update_diameter(x):
@@ -763,6 +759,7 @@ def create_interface():
             outputs=[file_output, results_display]
         )
 
+        # JavaScript to capture arrow keys and pass to Gradio.
         js = """
         <script>
         document.addEventListener('keydown', function(e) {