Skip to content

Commit f26e8ba

Browse files
committed
ENH: Better generalize the queue expectations
1 parent 339b0ee commit f26e8ba

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

itkwidgets/viewer.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,9 @@ def loop(self):
173173

174174
async def run_queued_requests(self):
175175
def _run_queued_requests(queue):
176-
method_name, args = queue.get().values()
176+
method_name, args, kwargs = queue.get()
177177
fn = getattr(self.viewer_rpc.itk_viewer, method_name)
178-
self.loop.call_soon_threadsafe(asyncio.ensure_future, fn(*args))
178+
self.loop.call_soon_threadsafe(asyncio.ensure_future, fn(*args, **kwargs))
179179

180180
# Wait for the viewer to be created
181181
self.viewer_rpc.viewer_event.wait()
@@ -192,14 +192,14 @@ def queue_worker(self):
192192
task = loop.create_task(self.run_queued_requests())
193193
loop.run_until_complete(task)
194194

195-
def queue_request(self, method, *args):
195+
def queue_request(self, method, *args, **kwargs):
196196
if hasattr(self.viewer_rpc, 'itk_viewer'):
197197
fn = getattr(self.viewer_rpc.itk_viewer, method)
198-
fn(*args)
198+
fn(*args, **kwargs)
199199
elif method in deferred_methods():
200-
self.deferred_queue.put({'method': method, 'arg': args})
200+
self.deferred_queue.put((method, args, kwargs))
201201
else:
202-
self.queue.put({'method': method, 'arg': args})
202+
self.queue.put((method, args, kwargs))
203203

204204
def set_annotations_enabled(self, enabled: bool):
205205
self.queue_request('setAnnotationsEnabled', enabled)

0 commit comments

Comments
 (0)