Merge pull request #31 from andreped/render-fix

Improved renderer speed by only using a single AnnotatedImage

.gitignore

@@ -11,3 +11,5 @@ venv/
 *.onnx
 *.xml
 *.obj
+*.zip
+*.txt

demo/src/gui.py

@@ -20,7 +20,7 @@ def __init__(
         self.pred_images = []
 
         # @TODO: This should be dynamically set based on chosen volume size
-        self.nb_slider_items = 415
+        self.nb_slider_items = 820
 
         self.model_name = model_name
         self.cwd = cwd
@@ -39,8 +39,8 @@ def __init__(
 
         # define widgets not to be rendered immediantly, but later on
         self.slider = gr.Slider(
-            1,
-            self.nb_slider_items,
+            minimum=1,
+            maximum=self.nb_slider_items,
             value=1,
             step=1,
             label="Which 2D slice to show",
@@ -74,14 +74,19 @@ def process(self, mesh_file_name):
 
         self.images = load_ct_to_numpy(path)
         self.pred_images = load_pred_volume_to_numpy("./prediction.nii.gz")
+
         return "./prediction.obj"
 
     def get_img_pred_pair(self, k):
-        k = int(k) - 1
-        out = [gr.AnnotatedImage.update(visible=False)] * self.nb_slider_items
-        out[k] = gr.AnnotatedImage.update(
+        k = int(k)
+        out = gr.AnnotatedImage(
             self.combine_ct_and_seg(self.images[k], self.pred_images[k]),
             visible=True,
+            elem_id="model-2d",
+        ).style(
+            color_map={self.class_name: "#ffae00"},
+            height=512,
+            width=512,
         )
         return out
 
@@ -139,20 +144,19 @@ def run(self):
             with gr.Row():
                 with gr.Box():
                     with gr.Column():
-                        image_boxes = []
-                        for i in range(self.nb_slider_items):
-                            visibility = True if i == 1 else False
-                            t = gr.AnnotatedImage(
-                                visible=visibility, elem_id="model-2d"
-                            ).style(
-                                color_map={self.class_name: "#ffae00"},
-                                height=512,
-                                width=512,
-                            )
-                            image_boxes.append(t)
+                        # create dummy image to be replaced by loaded images
+                        t = gr.AnnotatedImage(
+                            visible=True, elem_id="model-2d"
+                        ).style(
+                            color_map={self.class_name: "#ffae00"},
+                            height=512,
+                            width=512,
+                        )
 
                         self.slider.input(
-                            self.get_img_pred_pair, self.slider, image_boxes
+                            self.get_img_pred_pair,
+                            self.slider,
+                            t,
                         )
 
                         self.slider.render()

demo/src/utils.py

@@ -5,7 +5,7 @@
 
 
 def load_ct_to_numpy(data_path):
-    if type(data_path) != str:
+    if not isinstance(data_path, str):
         data_path = data_path.name
 
     image = nib.load(data_path)
@@ -25,7 +25,7 @@ def load_ct_to_numpy(data_path):
 
 
 def load_pred_volume_to_numpy(data_path):
-    if type(data_path) != str:
+    if not isinstance(data_path, str):
         data_path = data_path.name
 
     image = nib.load(data_path)