Update app.py

app.py

@@ -76,12 +76,13 @@ def detect_objects(image_path):
 def draw_bounding_boxes(img, results, dicom_meta):
     dets = []
     for (x1, y1, x2, y2), conf, cls in results:
-        x1, y1, x2, y2, cls = map(int, [x1, y1, x2, y2, cls])
+        zc = dicom_meta.loc[dicom_meta.Key == 'Instance Number', 'Value'].iloc[0]
+        x1, y1, x2, y2, zc, cls = map(int, [x1, y1, x2, y2, zc, cls])
         xc = x1+(x2-x1)/2
         yc = y1+(y2-y1)/2
         conf = round(conf.detach().item(), 4)
         #print("results in draw_bounding box:",[(x1, y1, x2, y2), conf, cls])
-        zc = dicom_meta.loc[dicom_meta.Key == 'Instance Number', 'Value'].iloc[0]
+
         #dets.append([(x1, y1, x2, y2), conf, cls])
         dets.append([(xc, yc, zc), conf, cls])
         cv2.rectangle(img, (x1, y1), (x2, y2), (255, 0, 0), 2)
@@ -120,11 +121,7 @@ def read_and_preprocess_dicom(file_path: str):
     
     image = image_pil.convert('RGB')
 
-    #print("In preprocess dicom:", image.size)
     image = np.array(image)[:,:,::-1].copy()
- 
-    #  shape
-    #print("In preprocess dicom-image.shape2:",image.shape)
 
     # Collect metadata in dictionary format and convert to DataFrame
     metadata_dict = {elem.name: str(elem.value) for elem in dicom_data.iterall() if elem.name != 'Pixel Data'}
@@ -138,7 +135,6 @@ def read_and_preprocess_dicom(file_path: str):
 
 # Define Gradio components
 input_component = gr.File(label="Input DICOM Data")
-#output_component = gr.components.Image(type="numpy", label="Output Image")
 dicom_image = gr.Image(type="numpy", label="Output Image")
 dicom_meta = gr.Dataframe(headers=None, label="Metadata")
 dets_res = gr.Text(label="Detections")
@@ -156,52 +152,3 @@ interface = gr.Interface(
 )
 
 interface.launch()
-
-'''
-def build_interface():
-    """
-    Function to build the Gradio interface
-    """
-    theme = gr.themes.Soft(
-        primary_hue=gr.themes.colors.emerald,
-        secondary_hue=gr.themes.colors.emerald
-    )
-
-    with gr.Blocks(title='DICOM Viewer', theme=theme) as demo:
-        gr.Markdown(
-            """
-            # DICOM Viewer
-            This app reads a DICOM file and displays the image and metadata.
-            """
-        )
-        with gr.Column():
-            file_path = gr.File(label="Input DICOM Data")
-
-            with gr.Row():
-                dicom_image = gr.Image(type="numpy", label="Output Image")
-                #dicom_image = gr.Image(type="pil", label="DICOM Image")
-                dicom_meta = gr.Dataframe(headers=None, label="Metadata")
-
-            inputs = [file_path]
-            outputs = [dicom_image, dicom_meta]
-            file_path.upload(fn=read_and_preprocess_dicom, inputs=inputs, outputs=outputs)
-
-            clear_button = gr.ClearButton(components=inputs + outputs, )
-
-            example = gr.Examples(
-                ['samples/81_80.dcm','samples/110_109.dcm','samples/189_188.dcm'],
-                inputs=inputs,
-                outputs=outputs,
-                #outputs=dicom_image,
-                #fn=read_and_preprocess_dicom,
-                fn=show_preds_image,
-                cache_examples=True
-            )
-
-    return demo
-
-
-if __name__ == '__main__':
-    demo = build_interface()
-    demo.launch
- '''