Skip to content

Fix handling of worker result return values #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
birkholz-cubert merged 1 commit into from
May 6, 2025
Merged

Fix handling of worker result return values #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cuvis/Viewer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def __init__(self, settings: Union[int, ViewerSettings]):
self._handle = None
if isinstance(settings, int):
self._handle = settings
if isinstance(settings, ViewerSettings):
elif isinstance(settings, ViewerSettings):
_ptr = cuvis_il.new_p_int()
if cuvis_il.status_ok != cuvis_il.cuvis_viewer_create(
_ptr, settings._get_internal()):
Expand Down
21 changes: 10 additions & 11 deletions cuvis/Worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,38 +129,37 @@ def has_next_result(self) -> bool:

@copydoc(cuvis_il.cuvis_worker_get_next_result)
def get_next_result(self, timeout) -> WorkerResult:
this_mesu = cuvis_il.new_p_int()
this_viewer = cuvis_il.new_p_int()
ptr_mesu = cuvis_il.new_p_int()
ptr_view = cuvis_il.new_p_int()
if cuvis_il.status_ok != cuvis_il.cuvis_worker_get_next_result(
self._handle, this_mesu, this_viewer, timeout):
self._handle, ptr_mesu, ptr_view, timeout):
raise SDKException()
mesu = Measurement(cuvis_il.p_int_value(this_mesu))
mesu = Measurement(cuvis_il.p_int_value(ptr_mesu))
if self._viewer_set:
view = Viewer(cuvis_il.p_int_value(this_viewer)).apply(this_mesu)
view = Viewer._create_view_data(None, cuvis_il.p_int_value(ptr_view))
else:
view = None
return WorkerResult(mesu, view)
# return mesu

async def get_next_result_async(self, timeout: int) -> WorkerResult:
poll_intervall = 100
this_mesu = cuvis_il.new_p_int()
this_viewer = cuvis_il.new_p_int()
ptr_mesu = cuvis_il.new_p_int()
ptr_view = cuvis_il.new_p_int()

tries = 0
while tries * poll_intervall < timeout:
if self.has_next_result():
await a.sleep(0)
if cuvis_il.status_ok != cuvis_il.cuvis_worker_get_next_result(
self._handle, this_mesu, this_viewer, 100):
self._handle, ptr_mesu, ptr_view, 100):
raise SDKException()
break
else:
tries += 1
await a.sleep(poll_intervall / 1000)
mesu = Measurement(cuvis_il.p_int_value(this_mesu))
mesu = Measurement(cuvis_il.p_int_value(ptr_mesu))
if self._viewer_set:
view = Viewer(cuvis_il.p_int_value(this_viewer)).apply(this_mesu)
view = Viewer._create_view_data(None, cuvis_il.p_int_value(ptr_view))
else:
view = None
return WorkerResult(mesu, view)
Expand Down