From efa40993e08416cd678bb75687c3ac6c42f2d02b Mon Sep 17 00:00:00 2001 From: evonneng Date: Mon, 11 Jul 2022 16:07:52 -0700 Subject: [PATCH] small fix silencing exception on camera change (#112) --- pyrad/viewer/server/viewer_utils.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pyrad/viewer/server/viewer_utils.py b/pyrad/viewer/server/viewer_utils.py index 342a0feef..056857787 100644 --- a/pyrad/viewer/server/viewer_utils.py +++ b/pyrad/viewer/server/viewer_utils.py @@ -141,19 +141,11 @@ class VisualizerState: self.check_interrupt_vis = True time.sleep(0.001) - def _interruptable_get_outputs_for_camera_ray_bundle(self, graph: Graph, camera_ray_bundle: RayBundle) -> None: - """wrapper around graph function, terminating when interrupting""" - try: - outputs = graph.get_outputs_for_camera_ray_bundle(camera_ray_bundle) - return outputs - except CameraChangeException: - return None - @torch.no_grad() def _async_get_visualizer_outputs(self, graph: Graph, camera_ray_bundle: RayBundle) -> None: """async getter function for visualizer without returning""" with SetTrace(self._check_interrupt): - self._interruptable_get_outputs_for_camera_ray_bundle(graph, camera_ray_bundle) + interruptable_get_outputs_for_camera_ray_bundle(graph, camera_ray_bundle) self.check_done_render = True self.check_interrupt_vis = False @@ -207,6 +199,18 @@ class VisualizerState: self.vis["/Cameras/Main Camera"].set_image(image) +def interruptable_get_outputs_for_camera_ray_bundle(graph: Graph, camera_ray_bundle: RayBundle) -> None: + """wrapper around graph function, terminating when interrupting""" + try: + outputs = graph.get_outputs_for_camera_ray_bundle(camera_ray_bundle) + return outputs + except CameraChangeException: + return None + finally: + # TODO(): find out better way to do interrupts for camera change + return None # pylint: disable=lost-exception + + def get_default_vis() -> Viewer: """Returns the default Visualizer.""" zmq_url = "tcp://0.0.0.0:6000"