Update app.py

app.py

@@ -203,266 +203,267 @@ 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:
-                        return None
-        
-                    height, width = self.original_display.shape[:2]
-                    new_height = int(height * self.zoom_factor)
-                    new_width = int(width * self.zoom_factor)
-        
-                    # Create zoomed image
-                    zoomed = cv2.resize(self.original_display, (new_width, new_height), 
-                                      interpolation=cv2.INTER_CUBIC)
-        
-                    # Convert to BGR for drawing
-                    zoomed_bgr = cv2.cvtColor(zoomed, cv2.COLOR_RGB2BGR)
+
+    def update_display(self):
+        try:
+            if self.original_display is None:
+                return None
+
+            height, width = self.original_display.shape[:2]
+            new_height = int(height * self.zoom_factor)
+            new_width = int(width * self.zoom_factor)
+
+            # Create zoomed image
+            zoomed = cv2.resize(self.original_display, (new_width, new_height), 
+                              interpolation=cv2.INTER_CUBIC)
+
+            # Convert to BGR for drawing
+            zoomed_bgr = cv2.cvtColor(zoomed, cv2.COLOR_RGB2BGR)
+
+            # Draw marks
+            for x, y, diameter in self.marks:
+                zoomed_x = int(x * self.zoom_factor)
+                zoomed_y = int(y * self.zoom_factor)
+                zoomed_diameter = int(diameter * self.zoom_factor)
+                
+                # Draw main circle in BGR color space
+                cv2.circle(zoomed_bgr,
+                          (zoomed_x, zoomed_y),
+                          zoomed_diameter // 2,
+                          (0, 255, 255),  # BGR: Yellow
+                          1,
+                          lineType=cv2.LINE_AA)
+                
+                # Draw dots on circle
+                num_points = 8
+                for i in range(num_points):
+                    angle = 2 * np.pi * i / num_points
+                    point_x = int(zoomed_x + (zoomed_diameter/2) * np.cos(angle))
+                    point_y = int(zoomed_y + (zoomed_diameter/2) * np.sin(angle))
+                    cv2.circle(zoomed_bgr,
+                              (point_x, point_y),
+                              1,
+                              (0, 255, 255),  # BGR: Yellow
+                              -1,
+                              lineType=cv2.LINE_AA)
+
+            # Convert back to RGB for display
+            zoomed = cv2.cvtColor(zoomed_bgr, cv2.COLOR_BGR2RGB)
+
+            # Calculate pan limits
+            self.max_pan_x = max(0, new_width - width)
+            self.max_pan_y = max(0, new_height - height)
+            
+            # Ensure pan values are within bounds
+            self.pan_x = min(max(0, self.pan_x), self.max_pan_x)
+            self.pan_y = min(max(0, self.pan_y), self.max_pan_y)
+            
+            # Extract visible portion
+            visible = zoomed[
+                int(self.pan_y):int(self.pan_y + height),
+                int(self.pan_x):int(self.pan_x + width)
+            ]
+
+            return visible
+        except Exception as e:
+            print(f"Error updating display: {str(e)}")
+            return self.original_display
+
+    def format_results(self):
+        if not self.results:
+            return "No measurements yet"
+        df = pd.DataFrame(self.results)
+        columns_order = ['Area (mm²)', 'Mean', 'StdDev', 'Min', 'Max', 'Point']
+        df = df[columns_order]
+        return df.to_string(index=False)
+
+    def add_blank_row(self, image):
+        self.results.append({
+            'Area (mm²)': '',
+            'Mean': '',
+            'StdDev': '',
+            'Min': '',
+            'Max': '',
+            'Point': ''
+        })
+        return image, self.format_results()
+
+    def add_zero_row(self, image):
+        self.results.append({
+            'Area (mm²)': '0.000',
+            'Mean': '0.000',
+            'StdDev': '0.000',
+            'Min': '0.000',
+            'Max': '0.000',
+            'Point': '(0, 0)'
+        })
+        return image, self.format_results()
+
+    def undo_last(self, image):
+        if self.results:
+            self.results.pop()
+        if self.marks:
+            self.marks.pop()
+        return self.update_display(), self.format_results()
+
+    def save_results(self):
+        try:
+            if not self.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]
+            
+            temp_file = "analysis_results.xlsx"
+            df.to_excel(temp_file, index=False)
+            
+            return temp_file, "Results saved successfully"
+        except Exception as e:
+            return None, f"Error saving results: {str(e)}"
+
+def create_interface():
+    print("Creating interface...")
+    analyzer = DicomAnalyzer()
+    
+    with gr.Blocks(css="#image_display { outline: none; }") as interface:
+        gr.Markdown("# DICOM Image Analyzer")
         
-                    # Draw marks
-                    for x, y, diameter in self.marks:
-                        zoomed_x = int(x * self.zoom_factor)
-                        zoomed_y = int(y * self.zoom_factor)
-                        zoomed_diameter = int(diameter * self.zoom_factor)
-                        
-                        # Draw main circle in BGR color space
-                        cv2.circle(zoomed_bgr,
-                                  (zoomed_x, zoomed_y),
-                                  zoomed_diameter // 2,
-                                  (0, 255, 255),  # BGR: Yellow
-                                  1,
-                                  lineType=cv2.LINE_AA)
-                        
-                        # Draw dots on circle
-                        num_points = 8
-                        for i in range(num_points):
-                            angle = 2 * np.pi * i / num_points
-                            point_x = int(zoomed_x + (zoomed_diameter/2) * np.cos(angle))
-                            point_y = int(zoomed_y + (zoomed_diameter/2) * np.sin(angle))
-                            cv2.circle(zoomed_bgr,
-                                      (point_x, point_y),
-                                      1,
-                                      (0, 255, 255),  # BGR: Yellow
-                                      -1,
-                                      lineType=cv2.LINE_AA)
+        with gr.Row():
+            with gr.Column():
+                file_input = gr.File(label="Upload DICOM file")
+                diameter_slider = gr.Slider(
+                    minimum=1,
+                    maximum=20,
+                    value=9,
+                    step=1,
+                    label="ROI Diameter (pixels)"
+                )
+                
+                with gr.Row():
+                    zoom_in_btn = gr.Button("Zoom In (+)")
+                    zoom_out_btn = gr.Button("Zoom Out (-)")
+                    reset_btn = gr.Button("Reset View")
+                
+            with gr.Column():
+                image_display = gr.Image(label="DICOM Image", interactive=True, elem_id="image_display")
+                
+        with gr.Row():
+            blank_btn = gr.Button("Add Blank Row")
+            zero_btn = gr.Button("Add Zero Row")
+            undo_btn = gr.Button("Undo Last")
+            save_btn = gr.Button("Save Results")
+            
+        results_display = gr.Textbox(label="Results", interactive=False)
+        file_output = gr.File(label="Download Results")
+        key_press = gr.Textbox(visible=False, elem_id="key_press")
         
-                    # Convert back to RGB for display
-                    zoomed = cv2.cvtColor(zoomed_bgr, cv2.COLOR_BGR2RGB)
+        gr.Markdown("""
+        ### Controls:
+        - Use arrow keys to pan when zoomed in
+        - Click points to measure
+        - Use Zoom In/Out buttons or Reset View to adjust zoom level
+        """)
         
-                    # Calculate pan limits
-                    self.max_pan_x = max(0, new_width - width)
-                    self.max_pan_y = max(0, new_height - height)
-                    
-                    # Ensure pan values are within bounds
-                    self.pan_x = min(max(0, self.pan_x), self.max_pan_x)
-                    self.pan_y = min(max(0, self.pan_y), self.max_pan_y)
-                    
-                    # Extract visible portion
-                    visible = zoomed[
-                        int(self.pan_y):int(self.pan_y + height),
-                        int(self.pan_x):int(self.pan_x + width)
-                    ]
+        def update_diameter(x):
+            analyzer.circle_diameter = x
+            print(f"Diameter updated to: {x}")
+            return f"Diameter set to {x} pixels"
+
+        # Event handlers
+        file_input.change(
+            fn=analyzer.load_dicom,
+            inputs=file_input,
+            outputs=[image_display, results_display]
+        )
         
-                    return visible
-                except Exception as e:
-                    print(f"Error updating display: {str(e)}")
-                    return self.original_display
+        image_display.select(
+            fn=analyzer.analyze_roi,
+            outputs=[image_display, results_display]
+        )
         
-            def format_results(self):
-                if not self.results:
-                    return "No measurements yet"
-                df = pd.DataFrame(self.results)
-                columns_order = ['Area (mm²)', 'Mean', 'StdDev', 'Min', 'Max', 'Point']
-                df = df[columns_order]
-                return df.to_string(index=False)
+        diameter_slider.change(
+            fn=update_diameter,
+            inputs=diameter_slider,
+            outputs=gr.Textbox(label="Status")
+        )
         
-            def add_blank_row(self, image):
-                self.results.append({
-                    'Area (mm²)': '',
-                    'Mean': '',
-                    'StdDev': '',
-                    'Min': '',
-                    'Max': '',
-                    'Point': ''
-                })
-                return image, self.format_results()
+        zoom_in_btn.click(
+            fn=analyzer.zoom_in,
+            inputs=image_display,
+            outputs=image_display
+        )
         
-            def add_zero_row(self, image):
-                self.results.append({
-                    'Area (mm²)': '0.000',
-                    'Mean': '0.000',
-                    'StdDev': '0.000',
-                    'Min': '0.000',
-                    'Max': '0.000',
-                    'Point': '(0, 0)'
-                })
-                return image, self.format_results()
+        zoom_out_btn.click(
+            fn=analyzer.zoom_out,
+            inputs=image_display,
+            outputs=image_display
+        )
         
-            def undo_last(self, image):
-                if self.results:
-                    self.results.pop()
-                if self.marks:
-                    self.marks.pop()
-                return self.update_display(), self.format_results()
+        reset_btn.click(
+            fn=analyzer.reset_view,
+            outputs=image_display
+        )
         
-            def save_results(self):
-                try:
-                    if not self.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]
-                    
-                    temp_file = "analysis_results.xlsx"
-                    df.to_excel(temp_file, index=False)
-                    
-                    return temp_file, "Results saved successfully"
-                except Exception as e:
-                    return None, f"Error saving results: {str(e)}"
+        key_press.change(
+            fn=analyzer.handle_keyboard,
+            inputs=key_press,
+            outputs=image_display
+        )
         
-        def create_interface():
-            print("Creating interface...")
-            analyzer = DicomAnalyzer()
-            
-            with gr.Blocks(css="#image_display { outline: none; }") as interface:
-                gr.Markdown("# DICOM Image Analyzer")
-                
-                with gr.Row():
-                    with gr.Column():
-                        file_input = gr.File(label="Upload DICOM file")
-                        diameter_slider = gr.Slider(
-                            minimum=1,
-                            maximum=20,
-                            value=9,
-                            step=1,
-                            label="ROI Diameter (pixels)"
-                        )
-                        
-                        with gr.Row():
-                            zoom_in_btn = gr.Button("Zoom In (+)")
-                            zoom_out_btn = gr.Button("Zoom Out (-)")
-                            reset_btn = gr.Button("Reset View")
-                        
-                    with gr.Column():
-                        image_display = gr.Image(label="DICOM Image", interactive=True, elem_id="image_display")
-                        
-                with gr.Row():
-                    blank_btn = gr.Button("Add Blank Row")
-                    zero_btn = gr.Button("Add Zero Row")
-                    undo_btn = gr.Button("Undo Last")
-                    save_btn = gr.Button("Save Results")
-                    
-                results_display = gr.Textbox(label="Results", interactive=False)
-                file_output = gr.File(label="Download Results")
-                key_press = gr.Textbox(visible=False, elem_id="key_press")
-                
-                gr.Markdown("""
-                ### Controls:
-                - Use arrow keys to pan when zoomed in
-                - Click points to measure
-                - Use Zoom In/Out buttons or Reset View to adjust zoom level
-                """)
-                
-                def update_diameter(x):
-                    analyzer.circle_diameter = x
-                    print(f"Diameter updated to: {x}")
-                    return f"Diameter set to {x} pixels"
+        blank_btn.click(
+            fn=analyzer.add_blank_row,
+            inputs=image_display,
+            outputs=[image_display, results_display]
+        )
         
-                # Event handlers
-                file_input.change(
-                    fn=analyzer.load_dicom,
-                    inputs=file_input,
-                    outputs=[image_display, results_display]
-                )
-                
-                image_display.select(
-                    fn=analyzer.analyze_roi,
-                    outputs=[image_display, results_display]
-                )
-                
-                diameter_slider.change(
-                    fn=update_diameter,
-                    inputs=diameter_slider,
-                    outputs=gr.Textbox(label="Status")
-                )
-                
-                zoom_in_btn.click(
-                    fn=analyzer.zoom_in,
-                    inputs=image_display,
-                    outputs=image_display
-                )
-                
-                zoom_out_btn.click(
-                    fn=analyzer.zoom_out,
-                    inputs=image_display,
-                    outputs=image_display
-                )
-                
-                reset_btn.click(
-                    fn=analyzer.reset_view,
-                    outputs=image_display
-                )
-                
-                key_press.change(
-                    fn=analyzer.handle_keyboard,
-                    inputs=key_press,
-                    outputs=image_display
-                )
-                
-                blank_btn.click(
-                    fn=analyzer.add_blank_row,
-                    inputs=image_display,
-                    outputs=[image_display, results_display]
-                )
-                
-                zero_btn.click(
-                    fn=analyzer.add_zero_row,
-                    inputs=image_display,
-                    outputs=[image_display, results_display]
-                )
-                
-                undo_btn.click(
-                    fn=analyzer.undo_last,
-                    inputs=image_display,
-                    outputs=[image_display, results_display]
-                )
-                
-                save_btn.click(
-                    fn=analyzer.save_results,
-                    outputs=[file_output, results_display]
-                )
+        zero_btn.click(
+            fn=analyzer.add_zero_row,
+            inputs=image_display,
+            outputs=[image_display, results_display]
+        )
         
-                js = """
-                <script>
-                document.addEventListener('keydown', function(e) {
-                    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'));
-                        }
-                    }
-                });
-                </script>
-                """
-                gr.HTML(js)
-            
-            print("Interface created successfully")
-            return interface
+        undo_btn.click(
+            fn=analyzer.undo_last,
+            inputs=image_display,
+            outputs=[image_display, results_display]
+        )
         
-        if __name__ == "__main__":
-            try:
-                print("Starting application...")
-                interface = create_interface()
-                print("Launching interface...")
-                interface.launch(
-                    server_name="0.0.0.0",
-                    server_port=7860,
-                    share=True,
-                    debug=True
-                )
-            except Exception as e:
-                print(f"Error launching application: {str(e)}")
-                raise e
+        save_btn.click(
+            fn=analyzer.save_results,
+            outputs=[file_output, results_display]
+        )
+
+        js = """
+        <script>
+        document.addEventListener('keydown', function(e) {
+            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'));
+                }
+            }
+        });
+        </script>
+        """
+        gr.HTML(js)
+    
+    print("Interface created successfully")
+    return interface
+
+if __name__ == "__main__":
+    try:
+        print("Starting application...")
+        interface = create_interface()
+        print("Launching interface...")
+        interface.launch(
+            server_name="0.0.0.0",
+            server_port=7860,
+            share=True,
+            debug=True
+        )
+    except Exception as e:
+        print(f"Error launching application: {str(e)}")
+        raise e