From 1ca14ca33e0795b9110b01d5b78531e30ab0f111 Mon Sep 17 00:00:00 2001 From: misyaguziya <53165965+misyaguziya@users.noreply.github.com> Date: Tue, 18 Feb 2025 15:30:48 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9B[bugfix]=20model=20:=20overlay?= =?UTF-8?q?=E5=8B=95=E4=BD=9C=E6=99=82=E3=81=ABoverlay=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E3=83=87=E3=83=90=E3=82=A4=E3=82=B9=E3=81=8C=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E3=81=97=E3=81=AA=E3=81=84=E5=A0=B4=E5=90=88=E3=81=AB=E3=82=A8?= =?UTF-8?q?=E3=83=A9=E3=83=BC=E3=81=8C=E7=99=BA=E7=94=9F=E3=81=99=E3=82=8B?= =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit デバイスの存在チェックを追加 --- src-python/models/overlay/overlay.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src-python/models/overlay/overlay.py b/src-python/models/overlay/overlay.py index 71df4c98..a3abfdec 100644 --- a/src-python/models/overlay/overlay.py +++ b/src-python/models/overlay/overlay.py @@ -198,11 +198,12 @@ class Overlay: transform = utils.transform_matrix(base_matrix, translation, rotation) transform = mat34Id(transform) - self.overlay.setOverlayTransformTrackedDeviceRelative( - self.handle[size], - trackerIndex, - transform - ) + if bool(self.overlay_system.isTrackedDeviceConnected(trackerIndex)) is True: + self.overlay.setOverlayTransformTrackedDeviceRelative( + self.handle[size], + trackerIndex, + transform + ) def updateDisplayDuration(self, display_duration, size): self.settings[size]["display_duration"] = display_duration From 6fe403315a5170284c88b657de4f322dfdb60827 Mon Sep 17 00:00:00 2001 From: misyaguziya <53165965+misyaguziya@users.noreply.github.com> Date: Tue, 18 Feb 2025 15:33:45 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=90=9B[bugfix]=20model=20:=20overlay?= =?UTF-8?q?=20200=E5=9B=9E=E8=A1=A8=E7=A4=BA=E5=BE=8C=E3=81=AE=E3=83=AA?= =?UTF-8?q?=E3=82=BB=E3=83=83=E3=83=88=E5=87=A6=E7=90=86=E3=81=A7=E3=82=A8?= =?UTF-8?q?=E3=83=A9=E3=83=BC=E3=81=8C=E7=99=BA=E7=94=9F=E3=81=97=E3=81=9F?= =?UTF-8?q?=E5=A0=B4=E5=90=88=E3=81=AE=E3=81=BF=E3=82=A8=E3=83=A9=E3=83=BC?= =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=82=92=E4=BF=9D=E5=AD=98=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-python/models/overlay/overlay.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src-python/models/overlay/overlay.py b/src-python/models/overlay/overlay.py index a3abfdec..92c24ab9 100644 --- a/src-python/models/overlay/overlay.py +++ b/src-python/models/overlay/overlay.py @@ -128,11 +128,14 @@ class Overlay: try: self.overlay.setOverlayRaw(self.handle[size], img, width, height, 4) except Exception: - errorLogging() self.reStartOverlay() while self.initialized is False: time.sleep(0.1) - self.overlay.setOverlayRaw(self.handle[size], img, width, height, 4) + try: + self.overlay.setOverlayRaw(self.handle[size], img, width, height, 4) + except Exception: + errorLogging() + self.updateOpacity(self.settings[size]["opacity"], size) self.lastUpdate[size] = time.monotonic()