Update app.py

app.py

@@ -434,7 +434,7 @@ class DicomAnalyzer:
                             cell.alignment = center_alignment
 
             #########################################################
-            #  تصميم "1-AVG" في الصف 35 (مدمج D35:E35, F35:G35, H35:I35)
+            # تصميم "1-AVG" في الصف 35، مع تجاهل الأصفار في الحساب
             #########################################################
             start_row = 35
             ws['C35'] = "1-AVG"
@@ -463,7 +463,6 @@ class DicomAnalyzer:
             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}')
@@ -473,73 +472,89 @@ class DicomAnalyzer:
                 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]
 
                 mean_values = []
                 stddev_values = []
-                cnr_cells = []  # We'll collect references to the formula column for row2.
+                cnr_cells = []  # We'll store references to the row2 formula for CNR
 
-                # for each column group, read Mean (row1), StdDev (row1) if you want to average them.
-                # plus the CNR formula in row2.
+                # Loop over column_groups to gather Mean (row1), StdDev (row1), and CNR references (row2).
                 for group in column_groups:
                     mean_col = group[1]  # e.g. 'C'
                     std_col  = group[2]  # e.g. 'D'
                     
+                    # Read mean from row1 => if 0 => skip.
                     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]
+                    try:
+                        m1_val = float(m1_val) if m1_val not in [None,''] else None
+                    except:
+                        m1_val = None
+                    # تجاهل أي خلية = 0
+                    if m1_val == 0:
+                        m1_val = None
+                    
+                    if m1_val is not None:
+                        mean_values.append(m1_val)
+
+                    # Read std from row1 => if 0 => skip.
+                    s1_val = ws[f"{std_col}{raw_row1}"].value
+                    try:
+                        s1_val = float(s1_val) if s1_val not in [None,''] else None
+                    except:
+                        s1_val = None
+                    if s1_val == 0:
+                        s1_val = None
+
+                    if s1_val is not None:
+                        stddev_values.append(s1_val)
+
+                    # For CNR, we have formula in the column after group[-1], row2.
                     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:
+                    # حتى لا نُدخل خلية الـCNR في الحساب إن كانت قيم الصف الثاني = 0
+                    # مثلاً mean2=0 أو std2=0 => نعتبرها غير صالحة.
+                    mean2_val = ws[f"{mean_col}{raw_row2}"].value
+                    std2_val  = ws[f"{std_col}{raw_row2}"].value
                     try:
-                        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
+                        mean2_val = float(mean2_val) if mean2_val not in [None,''] else None
+                        std2_val  = float(std2_val)  if std2_val  not in [None,''] else None
                     except:
-                        mean2_val, std2_val = 0,0
-
-                    if not (mean2_val == 0 and std2_val == 0):
-                        # i.e. there's valid data => we use that formula cell.
+                        mean2_val, std2_val = None, None
+
+                    if mean2_val == 0:
+                        mean2_val = None
+                    if std2_val == 0:
+                        std2_val = None
+
+                    # لو عندك منطق إضافي: التحقق أن Mean1 !=0 أيضاً (m1_val) 
+                    # إذا أردت تجاهل الخلية إن كان m1_val=0...الخ.
+                    # لكن عادة, تحسب CNR من Mean1,Mean2,Std2 => if any=0 => skip.
+                    # نحسب Mean1 من نفس row1_col.
+                    # m1_val = read it above, but we didn't store it if zero => might do it again.
+                    
+                    # Decide if we require m1_val !=0 too? If so:
+                    if (m1_val is not None) and (mean2_val is not None) and (std2_val is not None):
                         cnr_cells.append(cnr_cell_ref)
 
-                # 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
-
-                # 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'
 
+                # حساب متوسط stddev
+                final_std = sum(stddev_values)/len(stddev_values) if stddev_values else None
                 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'
 
+                # أما الـCNR, فننشئ صيغة AVERAGE(...) لو عندنا cnr_cells.
                 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
@@ -763,15 +778,15 @@ def create_interface():
         js = """
         <script>
         document.addEventListener('keydown', function(e) {
-            if (['ArrowUp', 'ArrowDown', 'ArrowLeft', 'ArrowRight'].includes(e.key)) {
+            if (['ArrowUp','ArrowDown','ArrowLeft','ArrowRight'].includes(e.key)) {
                 e.preventDefault();
-                const keyPressElement = document.querySelector('#key_press textarea');
-                if (keyPressElement) {
-                    keyPressElement.value = e.key;
-                    keyPressElement.dispatchEvent(new Event('input'));
+                const el = document.querySelector('#key_press textarea');
+                if (el) {
+                    el.value = e.key;
+                    el.dispatchEvent(new Event('input'));
                     setTimeout(() => {
-                      keyPressElement.value = '';
-                      keyPressElement.dispatchEvent(new Event('input'));
+                      el.value = '';
+                      el.dispatchEvent(new Event('input'));
                     }, 100);
                 }
             }