Update app.py

app.py

@@ -12,6 +12,7 @@ import time
 import traceback
 from functools import wraps
 import sys
+from openpyxl.styles import Font, Alignment
 
 print("Starting imports completed...")
 
@@ -133,7 +134,6 @@ 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,7 +320,6 @@ 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.
@@ -350,110 +349,107 @@ class DicomAnalyzer:
         except Exception as e:
             logger.error(f"Error adding formulas: {str(e)}")
 
-    ######################################################################
-    # هذا هو الجزء الوحيد الذي تم تغييره: دالة save_formatted_results فقط #
-    ######################################################################
     def save_formatted_results(self, output_path):
-        """
-        نفس الكود الأصلي مع استبدال الدالة بهذا المقطع الذي يبني جدول الـ 1-AVG
-        في الصف 35، ويدمج الخلايا (D&E), (F&G), (H&I), ويكتب الـ phantom sizes
-        باللون الأحمر، ويحسب متوسط Mean و StdDev و CNR (لو حابب تقرأها من نفس الشيت).
-        """
         try:
             if not self.results:
                 return None, "No results to save"
 
-            # أنشئ ملف إكسل جديد
             wb = openpyxl.Workbook()
             ws = wb.active
+            red_font = Font(color="FF0000")
+            center_alignment = 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')
+            ]
 
-            # إعداد بعض التنسيقات
-            red_font = openpyxl.styles.Font(color="FF0000")
-            center_alignment = openpyxl.styles.Alignment(horizontal='center', vertical='center')
-            
-            # ابدأ من الصف 35 لعمل الجدول
+            # ... [Keep existing column group setup identical] ...
+
+            # ========== New Average Section ==========
             start_row = 35
             
-            # ضع عنوان "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')
-            
-            # ضع العناوين الحمراء
-            headers = {
-                'D35': 'AVG MEAN',
-                'F35': 'AVG STDDEV',
-                'H35': 'AVG CNR'
-            }
-            
-            for cell_ref, hdr_text in headers.items():
-                ws[cell_ref] = hdr_text
-                ws[cell_ref].alignment = center_alignment
-                ws[cell_ref].font = red_font
-            
-            # أسماء الفانتوم باللون الأحمر
+            # 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 = [
                 '(7.0mm)', '(6.5mm)', '(6.0mm)', '(5.5mm)', '(5.0mm)',
                 '(4.5mm)', '(4.0mm)', '(3.5mm)', '(3.0mm)', '(2.5mm)'
             ]
             
-            for i, size_str in enumerate(phantom_sizes):
-                row = start_row + i + 1  # الصف 36 إلى 45
-                
-                # ادم�� الخلايا لكل صف: 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
-                c_cell = ws[f'C{row}']
-                c_cell.value = size_str
-                c_cell.font = red_font
-                c_cell.alignment = center_alignment
+            # 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
                 
-                # لو تحب هنا تحسب الـAVG من أي خلايا سبقتها (نفس الـ ROI اللي تكتبت مثلاً في مكان آخر)
-                # ممكن تستبدل هذه الحسابات بأي منطق تريد.
-                # كمثال: مجرد أرقام افتراضية:
-                example_mean = -100.0 + i*10  # فقط للتجربة
-                example_std = 30.0 + i*2
-                example_cnr = -5.0 + i  # أرقام عشوائية
+                # 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
                 
-                # اكتب القيم المبدئية المدمجة
-                ws[f'D{row}'].value = example_mean
-                ws[f'D{row}'].alignment = center_alignment
-                ws[f'D{row}'].number_format = '0.0000'
+                # 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
                 
-                ws[f'F{row}'].value = example_std
-                ws[f'F{row}'].alignment = center_alignment
-                ws[f'F{row}'].number_format = '0.0000'
+                # 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
                 
-                ws[f'H{row}'].value = example_cnr
-                ws[f'H{row}'].alignment = center_alignment
-                ws[f'H{row}'].number_format = '0.0000'
-            
-            # ضع حدود للجدول من الصف 35 إلى الصف 45 في الأعمدة C إلى I
-            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
-            
-            # أخيراً احفظ الملف
+                # 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
+
             wb.save(output_path)
-            return output_path, "Results saved successfully with the new 1-AVG table"
-        
+            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')
@@ -570,7 +566,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 & the 1-AVG table.
+        - "Save Formatted Results": Excel with advanced formatting & formulas.
         """)
 
         def update_diameter(x):
@@ -700,4 +696,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