Update app.py

app.py

@@ -139,9 +139,6 @@ class DicomAnalyzer:
             print(f"Handling key press: {key}")
             pan_amount = int(5 * self.zoom_factor)
             
-            original_pan_x = self.pan_x
-            original_pan_y = self.pan_y
-            
             if key == 'ArrowLeft':
                 self.pan_x = max(0, self.pan_x - pan_amount)
             elif key == 'ArrowRight':
@@ -155,7 +152,6 @@ class DicomAnalyzer:
         except Exception as e:
             print(f"Error handling keyboard input: {str(e)}")
             return self.display_image
-
     def analyze_roi(self, evt: gr.SelectData):
         try:
             if self.current_image is None:
@@ -174,7 +170,6 @@ class DicomAnalyzer:
             y = int(round(y))
             
             height, width = self.original_image.shape[:2]
-            
             Y, X = np.ogrid[:height, :width]
             radius = self.circle_diameter / 2.0
             r_squared = radius * radius
@@ -224,6 +219,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 update_display(self):
         try:
             if self.original_display is None:
@@ -279,22 +275,55 @@ class DicomAnalyzer:
             print(f"Error updating display: {str(e)}")
             return self.original_display
 
+    def save_results(self):
+        """
+        Basic save function for raw results with improved error handling and logging
+        """
+        try:
+            if not self.results:
+                logger.warning("Attempted to save with no results")
+                return None, "No results to save"
+
+            df = pd.DataFrame(self.results)
+            columns_order = ['Area (mm²)', 'Mean', 'StdDev', 'Min', 'Max', 'Point']
+            df = df[columns_order]
+
+            timestamp = time.strftime("%Y%m%d_%H%M%S")
+            output_file = f"analysis_results_{timestamp}.xlsx"
+
+            with pd.ExcelWriter(output_file, engine='openpyxl') as writer:
+                df.to_excel(writer, index=False, sheet_name='Results')
+                
+                worksheet = writer.sheets['Results']
+                for idx, col in enumerate(df.columns):
+                    max_length = max(
+                        df[col].astype(str).apply(len).max(),
+                        len(str(col))
+                    ) + 2
+                    worksheet.column_dimensions[get_column_letter(idx + 1)].width = max_length
+
+            logger.info(f"Results saved successfully to {output_file}")
+            return output_file, f"Results saved successfully to {output_file}"
+
+        except Exception as e:
+            error_msg = f"Error saving results: {str(e)}"
+            logger.error(error_msg)
+            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:
-            base_col = col_group[1]  # Mean column
-            std_col = col_group[2]   # StdDev column
+            base_col = col_group[1]
+            std_col = col_group[2]
             
             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}"]
             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}"]
             cell2.value = formula2
@@ -311,40 +340,26 @@ class DicomAnalyzer:
 
             wb = openpyxl.Workbook()
             ws = wb.active
-
             red_font = openpyxl.styles.Font(color="FF0000")
 
             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
+                ('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')
             ]
 
             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
+                (2, 3), (5, 6), (8, 9), (11, 12), (14, 15),
+                (17, 18), (20, 21), (23, 24), (26, 27), (29, 30)
             ]
 
             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
@@ -385,7 +400,6 @@ class DicomAnalyzer:
             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"""
         ws[f"{cols[0]}{row}"] = float(result['Area (mm²)'])
         ws[f"{cols[1]}{row}"] = float(result['Mean'])
         ws[f"{cols[2]}{row}"] = float(result['StdDev'])
@@ -401,7 +415,6 @@ class DicomAnalyzer:
         return df.to_string(index=False)
 
     def add_blank_row(self, image):
-        """Add a blank row to the results"""
         self.results.append({
             'Area (mm²)': '',
             'Mean': '',
@@ -413,7 +426,6 @@ class DicomAnalyzer:
         return image, self.format_results()
 
     def add_zero_row(self, image):
-        """Add a row of zeros to the results"""
         self.results.append({
             'Area (mm²)': '0.000',
             'Mean': '0.000',
@@ -425,12 +437,13 @@ class DicomAnalyzer:
         return image, self.format_results()
 
     def undo_last(self, image):
-        """Remove the last measurement"""
         if self.results:
             self.results.pop()
         if self.marks:
             self.marks.pop()
         return self.update_display(), self.format_results()
+
+# Interface creation and main execution will be in the next part...
 def create_interface():
     print("Creating interface...")
     analyzer = DicomAnalyzer()