Update app.py

app.py

@@ -338,118 +338,118 @@ class DicomAnalyzer:
             logger.error(traceback.format_exc())
             return None, error_msg
 
-    def add_formulas_to_template(self, ws, row_pair, col_group, red_font):
-        """Add formulas for each row pair and column group"""
-        try:
-            # Get base column for formulas
-            base_col = col_group[1]  # Mean column
-            std_col = col_group[2]   # StdDev column
+def add_formulas_to_template(self, ws, row_pair, col_group, red_font):
+    """Add formulas for each row pair and column group"""
+    try:
+        # Get base column for formulas
+        base_col = col_group[1]  # Mean column
+        std_col = col_group[2]   # StdDev column
+        
+        row1, row2 = row_pair
+        
+        # Formula for first row: =Mean/StdDev
+        formula1 = f"={base_col}{row1}/{std_col}{row1}"
+        formula_col = get_column_letter(column_index_from_string(col_group[-1]) + 1)
+        cell1 = ws[f"{formula_col}{row1}"]  # Get cell reference first
+        cell1.value = formula1
+        cell1.font = red_font
+        
+        # Formula for second row: =(Mean1-Mean2)/StdDev2
+        formula2 = f"=({base_col}{row1}-{base_col}{row2})/{std_col}{row2}"
+        cell2 = ws[f"{formula_col}{row2}"]  # Get cell reference first
+        cell2.value = formula2
+        cell2.font = red_font
+        
+        logger.debug(f"Added formulas for rows {row1},{row2} in column {formula_col}")
+    except Exception as e:
+        logger.error(f"Error adding formulas: {str(e)}")
+
+def save_formatted_results(self, output_path):
+    try:
+        if not self.results:
+            return None, "No results to save"
+
+        # Create new workbook
+        wb = openpyxl.Workbook()
+        ws = wb.active
+
+        # Create font styles
+        red_font = openpyxl.styles.Font(color="FF0000")  # Red color in RGB
+
+        # Define column groups and row pairs
+        column_groups = [
+            ('B', 'C', 'D', 'E', 'F'),      # First group
+            ('H', 'I', 'J', 'K', 'L'),      # Second group
+            ('N', 'O', 'P', 'Q', 'R'),      # Third group
+            ('T', 'U', 'V', 'W', 'X'),      # Fourth group
+            ('Z', 'AA', 'AB', 'AC', 'AD'),  # Fifth group
+            ('AF', 'AG', 'AH', 'AI', 'AJ'), # Sixth group
+            ('AL', 'AM', 'AN', 'AO', 'AP'), # Seventh group
+            ('AR', 'AS', 'AT', 'AU', 'AV'), # Eighth group
+            ('AX', 'AY', 'AZ', 'BA', 'BB'), # Ninth group
+            ('BD', 'BE', 'BF', 'BG', 'BH'), # Tenth group
+            ('BJ', 'BK', 'BL', 'BM', 'BN'), # Eleventh group
+            ('BP', 'BQ', 'BR', 'BS', 'BT'), # Twelfth group
+            ('BV', 'BW', 'BX', 'BY', 'BZ')  # Thirteenth group
+        ]
+
+        row_pairs = [
+            (2, 3),      # 7mm
+            (5, 6),      # 6.5mm
+            (8, 9),      # 6mm
+            (11, 12),    # 5.5mm
+            (14, 15),    # 5mm
+            (17, 18),    # 4.5mm
+            (20, 21),    # 4mm
+            (23, 24),    # 3.5mm
+            (26, 27),    # 3mm
+            (29, 30)     # 2.5mm
+        ]
+
+        # Add headers with red font
+        phantom_sizes = ['(7mm)', '(6.5mm)', '(6mm)', '(5.5mm)', '(5mm)', 
+                       '(4.5mm)', '(4mm)', '(3.5mm)', '(3mm)', '(2.5mm)']
+        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
+
+        # Process results
+        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]
             
-            row1, row2 = row_pair
+            # Write data and add formulas
+            if result_idx < len(self.results):
+                result = self.results[result_idx]
+                self._write_result_to_cells(ws, result, cols, rows[0])
+                result_idx += 1
             
-            # Formula for first row: =Mean/StdDev
-            formula1 = f"={base_col}{row1}/{std_col}{row1}"
-            formula_col = get_column_letter(column_index_from_string(col_group[-1]) + 1)
-            ws[f"{formula_col}{row1}"] = formula1
-            cell1.value = formula1
-            cell1.font = red_font
+            if result_idx < len(self.results):
+                result = self.results[result_idx]
+                self._write_result_to_cells(ws, result, cols, rows[1])
+                result_idx += 1
             
-            # Formula for second row: =(Mean1-Mean2)/StdDev2
-            formula2 = f"=({base_col}{row1}-{base_col}{row2})/{std_col}{row2}"
-            ws[f"{formula_col}{row2}"] = formula2
-            cell2.value = formula2
-            cell2.font = red_font
+            # Add formulas for this group
+            self.add_formulas_to_template(ws, rows, cols, red_font)
             
-            logger.debug(f"Added formulas for rows {row1},{row2} in column {formula_col}")
-        except Exception as e:
-            logger.error(f"Error adding formulas: {str(e)}")
+            current_col_group += 1
+            if current_col_group >= len(column_groups):
+                current_col_group = 0
+                current_row_pair += 1
 
-    def save_formatted_results(self, output_path):
-        try:
-            if not self.results:
-                return None, "No results to save"
-
-            # Create new workbook
-            wb = openpyxl.Workbook()
-            ws = wb.active
-
-            # Create red font style
-            red_font = openpyxl.styles.Font(color="FF0000")  # Red color in RGB
-
-            # Define column groups and row pairs
-            column_groups = [
-                ('B', 'C', 'D', 'E', 'F'),      # First group
-                ('H', 'I', 'J', 'K', 'L'),      # Second group
-                ('N', 'O', 'P', 'Q', 'R'),      # Third group
-                ('T', 'U', 'V', 'W', 'X'),      # Fourth group
-                ('Z', 'AA', 'AB', 'AC', 'AD'),  # Fifth group
-                ('AF', 'AG', 'AH', 'AI', 'AJ'), # Sixth group
-                ('AL', 'AM', 'AN', 'AO', 'AP'), # Seventh group
-                ('AR', 'AS', 'AT', 'AU', 'AV'), # Eighth group
-                ('AX', 'AY', 'AZ', 'BA', 'BB'), # Ninth group
-                ('BD', 'BE', 'BF', 'BG', 'BH'), # Tenth group
-                ('BJ', 'BK', 'BL', 'BM', 'BN'), # Eleventh group
-                ('BP', 'BQ', 'BR', 'BS', 'BT'), # Twelfth group
-                ('BV', 'BW', 'BX', 'BY', 'BZ')  # Thirteenth group
-            ]
-
-            row_pairs = [
-                (2, 3),      # 7mm
-                (5, 6),      # 6.5mm
-                (8, 9),      # 6mm
-                (11, 12),    # 5.5mm
-                (14, 15),    # 5mm
-                (17, 18),    # 4.5mm
-                (20, 21),    # 4mm
-                (23, 24),    # 3.5mm
-                (26, 27),    # 3mm
-                (29, 30)     # 2.5mm
-            ]
-
-            # Add headers
-            phantom_sizes = ['(7mm)', '(6.5mm)', '(6mm)', '(5.5mm)', '(5mm)', 
-                           '(4.5mm)', '(4mm)', '(3.5mm)', '(3mm)', '(2.5mm)']
-            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
-
-            # Process results
-            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]
-                
-                # Write data and add formulas
-                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
-                
-                # Add formulas for this group
-                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
+        wb.save(output_path)
+        return output_path, f"Results saved successfully ({result_idx} measurements)"
 
-            wb.save(output_path)
-            return output_path, f"Results saved successfully ({result_idx} measurements)"
-
-        except Exception as e:
-            logger.error(f"Error saving formatted results: {str(e)}")
-            return None, f"Error saving results: {str(e)}"
+    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):
         """Helper method to write a single result to worksheet cells"""