Update app.py

app.py

@@ -455,7 +455,6 @@ class DicomAnalyzer:
                             cell.alignment = center_alignment
 
             # ---- Create tables for StdDev Averages and CNR Averages ----
-
             current_row = 32
 
             # 1) StdDev Averages
@@ -492,41 +491,43 @@ class DicomAnalyzer:
             cnr_header.alignment = center_alignment
             current_row += 1
             
+            # حساب متوسط CNR للصف الثاني في كل pair:
             for i, size in enumerate(phantom_sizes):
-                row_number = row_pairs[i][1]  # second row for CNR
-                valid_cnr_refs = []
+                # الصف الثاني هو row_pairs[i][1]
+                row_number = row_pairs[i][1]
+                cnr_cells = []
                 
-                # We'll check each column group to see if there's a (Mean1, Mean2, Std2) not all zero
+                # نجمع كل الخلايا التي فيها الصيغة CNR (وهي العمود بعد آخر عمود في المجموعة)
                 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}"
+
+                    # تحقق من قيم (Mean1,Mean2,Std2) للفلترة
                     mean_col = cols[1]
-                    std_col = cols[2]
+                    std_col  = cols[2]
                     
-                    mean1 = ws[f"{mean_col}{row_pairs[i][0]}"].value
-                    mean2 = ws[f"{mean_col}{row_pairs[i][1]}"].value
-                    std2 = ws[f"{std_col}{row_pairs[i][1]}"].value
-                    
-                    # Convert potential string values to float
+                    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 = float(mean1) if mean1 not in [None, ''] else 0
-                        mean2 = float(mean2) if mean2 not in [None, ''] else 0
-                        std2 = float(std2) if std2 not in [None, ''] else 0
-                    except (ValueError, TypeError):
-                        continue
-                    
-                    # If not all zero => there's something measured
-                    if not (mean1 == 0 and mean2 == 0 and std2 == 0):
-                        cell_ref = f"{formula_col}{row_number}"
-                        valid_cnr_refs.append(cell_ref)
+                        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)
                 
                 size_cell = ws.cell(row=current_row, column=1, value=size)
                 size_cell.alignment = center_alignment
-                
-                if valid_cnr_refs:
-                    # Use AVERAGEIF to ignore zero or empty cells
-                    # Must wrap references like (A1,A2,A3) not A1,A2,A3 alone
-                    formula_range = f"({','.join(valid_cnr_refs)})"
-                    cnr_formula = f'=IFERROR(AVERAGEIF({formula_range}, "<>0"), "")'
+
+                if cnr_cells:
+                    # نبني صيغة AverageIF تتجاهل الخلايا = 0
+                    cnr_range = f"({','.join(cnr_cells)})"
+                    cnr_formula = f'=IFERROR(AVERAGEIF({cnr_range}, "<>0"), "")'
                     
                     avg_cell = ws.cell(row=current_row, column=2)
                     avg_cell.value = cnr_formula
@@ -535,7 +536,7 @@ class DicomAnalyzer:
                 
                 current_row += 1
 
-            # Final alignment in the last table
+            # تنسيق العناوين الأخيرة
             for row in range(32, current_row):
                 for col in range(1, 3):
                     cell = ws.cell(row=row, column=col)