Update app.py

app.py

@@ -12,7 +12,6 @@ import time
 import traceback
 from functools import wraps
 import sys
-from openpyxl.styles import Font, Alignment
 
 print("Starting imports completed...")
 
@@ -134,6 +133,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(
@@ -320,6 +320,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.
@@ -349,18 +350,21 @@ class DicomAnalyzer:
         except Exception as e:
             logger.error(f"Error adding formulas: {str(e)}")
 
+    ########################################################################
+    # نفس الدالة الأصلية، لكن نهاية الدالة تضع الجدول في الصف 35 بالشكل المطلوب
+    ########################################################################
     def save_formatted_results(self, output_path):
         try:
             if not self.results:
                 return None, "No results to save"
 
+            # هنا كل شيء مثل كودك: تنشئ Workbook جديد، تصنع الشيت، تضع الهيدرز...
             wb = openpyxl.Workbook()
             ws = wb.active
-            red_font = Font(color="FF0000")
-            center_alignment = Alignment(horizontal='center')
-
+            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'),
@@ -370,86 +374,199 @@ class DicomAnalyzer:
                 ('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)
+            ]
 
-            # ... [Keep existing column group setup identical] ...
-
-            # ========== New Average Section ==========
+            phantom_sizes = [
+                '(7mm)', '(6.5mm)', '(6mm)', '(5.5mm)', '(5mm)',
+                '(4.5mm)', '(4mm)', '(3.5mm)', '(3mm)', '(2.5mm)'
+            ]
+            
+            # كتابة أسماء الفانتوم باللون الأحمر في العمود A (قبل الصف الأول)
+            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
+
+            # توزيع نتائج ROI في هذه الصفوف والأعمدة كما في كودك
+            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
+                
+                self.add_formulas_to_template(ws, rows, cols, red_font)
+                
+                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/Mean/CNR منفصلة،
+            # نضع الجدول المدمج "1-AVG" من الصف 35 مثل الصورة التي أرسلتها
+            ################################################################
+            
+            # سنستخدم نفس فكرة الجدول بالدمج من D35:E35, F35:G35, H35:I35
             start_row = 35
             
-            # Create headers with merged cells
-            ws.merge_cells(f'D{start_row}:E{start_row}')
-            ws.merge_cells(f'F{start_row}:G{start_row}')
-            ws.merge_cells(f'H{start_row}:I{start_row}')
-            
-            # Header content
-            ws[f'C{start_row}'] = "1-AVG"
-            ws[f'D{start_row}'] = "AVG MEAN"
-            ws[f'F{start_row}'] = "AVG STDDEV"
-            ws[f'H{start_row}'] = "AVG CNR"
-            
-            # Style headers
-            header_font = Font(color="FF0000", bold=True)
-            for col in ['C', 'D', 'F', 'H']:
-                cell = ws[f'{col}{start_row}']
-                cell.font = header_font
-                cell.alignment = center_alignment
-
-            # Phantom sizes data
-            phantom_sizes = [
+            # ضع عنوان "1-AVG" في C35
+            ws['C35'] = "1-AVG"
+            ws['C35'].alignment = center_alignment
+            
+            # ادمج الخلايا الخاصة بالعناوين
+            ws.merge_cells('D35:E35')
+            ws.merge_cells('F35:G35')
+            ws.merge_cells('H35:I35')
+            
+            # ضع العناوين باللون الأحمر
+            avg_headers = {
+                'D35': 'AVG MEAN',
+                'F35': 'AVG STDDEV',
+                'H35': 'AVG CNR'
+            }
+            for c_ref, text_val in avg_headers.items():
+                ws[c_ref] = text_val
+                ws[c_ref].font = red_font
+                ws[c_ref].alignment = center_alignment
+            
+            # نفس أسماء الفانتوم
+            phantom_sizes2 = [
                 '(7.0mm)', '(6.5mm)', '(6.0mm)', '(5.5mm)', '(5.0mm)',
                 '(4.5mm)', '(4.0mm)', '(3.5mm)', '(3.0mm)', '(2.5mm)'
             ]
             
-            # Sample data - replace with your actual calculations
-            mean_averages = [-106.7269, -43.7258, -85.0408, -80.4591, -122.682,
-                            -89.2099, -129.4907, -58.9815, -91.0587, -88.1428]
-                            
-            stddev_averages = [32.8073, 36.2411, 39.8299, 27.474, 30.6955,
-                             28.7136, 46.8527, 50.7066, 34.3092, 18.9154]
-                             
-            cnr_averages = [-9.6798, -1.2638, -6.0479, -5.2765, -11.9543,
-                           -0.3536, -3.4107, 4.9012, -1.3516, 8.6012]
-
-            # Add data rows
-            for idx, size in enumerate(phantom_sizes):
-                current_row = start_row + 1 + idx
+            for i, p_size in enumerate(phantom_sizes2):
+                row = start_row + i + 1  # 36..45
                 
-                # Phantom size label
-                ws[f'C{current_row}'] = size
-                ws[f'C{current_row}'].font = red_font
-                ws[f'C{current_row}'].alignment = center_alignment
+                # ادمج لكل صف: 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}')
                 
-                # Mean average
-                ws.merge_cells(f'D{current_row}:E{current_row}')
-                mean_cell = ws[f'D{current_row}']
-                mean_cell.value = mean_averages[idx]
-                mean_cell.number_format = '0.0000'
-                mean_cell.alignment = center_alignment
+                # اكتب اسم الفانتوم باللون الأحمر في العمود C
+                size_cell = ws[f'C{row}']
+                size_cell.value = p_size
+                size_cell.font = red_font
+                size_cell.alignment = center_alignment
+
+                # لكي نحسب الـAVG الحقيقي من الصفوف 2..3 إلخ،
+                # نستخدم row_pairs[i] إن أردت. أو كما في المثال الأصلي:
+                if i < len(row_pairs):
+                    (raw_row1, raw_row2) = row_pairs[i]
+                else:
+                    continue  # لو عندك 10 فقط
                 
-                # StdDev average
-                ws.merge_cells(f'F{current_row}:G{current_row}')
-                stddev_cell = ws[f'F{current_row}']
-                stddev_cell.value = stddev_averages[idx]
-                stddev_cell.number_format = '0.0000'
-                stddev_cell.alignment = center_alignment
+                # لنفترض أننا نقرأ من نفس الأعمدة اللي فيها mean & std
+                # نفترض عندنا على الأقل عمود mean_col = cols[1], stddev_col = cols[2]
+                # لكن عن��ك عدة col groups؛ إذا تريد تجمع من الأول فقط:
+                # أو خذ فكرة snippetك السابق:
                 
-                # CNR average
-                ws.merge_cells(f'H{current_row}:I{current_row}')
-                cnr_cell = ws[f'H{current_row}']
-                cnr_cell.value = cnr_averages[idx]
-                cnr_cell.number_format = '0.0000'
-                cnr_cell.alignment = center_alignment
-
-            # Adjust column widths
-            for col in ['C', 'D', 'F', 'H']:
-                ws.column_dimensions[col].width = 12
+                mean_values = []
+                stddev_values = []
+                cnr_values = []
+                
+                # Example: لو تحب تجمع من نفس الـ column_groups الأولى بس
+                for group in column_groups:
+                    mean_col = group[1]  # 'C','I','O'...الخ
+                    std_col  = group[2]  # 'D','J','P'...الخ
+                    
+                    # raw_row1 = الصف الأول
+                    # raw_row2 = الصف الثاني
+                    m1 = ws[f"{mean_col}{raw_row1}"].value
+                    m2 = ws[f"{mean_col}{raw_row2}"].value
+                    std2 = ws[f"{std_col}{raw_row2}"].value
+                    
+                    try:
+                        m1   = float(m1)   if m1   not in [None,''] else None
+                        m2   = float(m2)   if m2   not in [None,''] else None
+                        std2 = float(std2) if std2 not in [None,''] else None
+                    except:
+                        m1,m2,std2 = None,None,None
+                    if (m1 is not None) and (m2 is not None) and (std2 is not None) and (std2!=0):
+                        mean_values.append(m1)
+                        stddev_values.append(std2)
+                        cnr_values.append((m1 - m2)/std2)
+                
+                # الآن نحسب المتوسط
+                if len(mean_values) > 0:
+                    final_mean = sum(mean_values)/len(mean_values)
+                else:
+                    final_mean = None
+                
+                if len(stddev_values) > 0:
+                    final_std = sum(stddev_values)/len(stddev_values)
+                else:
+                    final_std = None
+                
+                if len(cnr_values) > 0:
+                    final_cnr = sum(cnr_values)/len(cnr_values)
+                else:
+                    final_cnr = None
+                
+                # نكتبها في الخلايا المدمجة
+                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 final_cnr is not None:
+                    ws[f'H{row}'].value = final_cnr
+                    ws[f'H{row}'].alignment = center_alignment
+                    ws[f'H{row}'].number_format = '0.0000'
+
+            # أخيراً، ضع الحدود حول 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 c in ['C','D','E','F','G','H','I']:
+                    ws[f'{c}{r}'].border = border
 
             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)}"
+    ########################################################################
 
     def _write_result_to_cells(self, ws, result, cols, row):
         center_alignment = openpyxl.styles.Alignment(horizontal='center')
@@ -566,7 +683,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.
+        - "Save Formatted Results": Excel with advanced formatting & the 1-AVG table.
         """)
 
         def update_diameter(x):
@@ -696,4 +813,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