From 7307c3769d5251206aeeb8829dbc26b59f8b0ea7 Mon Sep 17 00:00:00 2001 From: ST-TEN12 Date: Mon, 10 Feb 2025 16:03:11 +0100 Subject: [PATCH] stten12 ok --- src/components/archive_synchronizer.py | 2 +- src/components/component.py | 2 +- src/components/hikrobot_sc/hikrobot_sc.py | 2 +- src/ui/test_vision/test_vision.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/archive_synchronizer.py b/src/components/archive_synchronizer.py index 28a0343..5c87fb3 100644 --- a/src/components/archive_synchronizer.py +++ b/src/components/archive_synchronizer.py @@ -273,7 +273,7 @@ class ArchiveSynchronizer(Component): self.log.error(f"id {record.id}: {path_in}: file not found.") return False except Forbidden as e: - if re.match("^Object '.*?' is subject to bucket's retention policy and cannot be deleted, overwritten or archived until .*?$", e._response.json()["error"]["message"]) is not None: + if re.match("^Object '.*?' is subject .*?$", e._response.json()["error"]["message"]) is not None: self.log.info(f"id {record.id}: {path_in}: already stored.") else: self.log.warning(f"id: {record.id}: failed to store remotely: {str(e)}: {e._response.json()}") diff --git a/src/components/component.py b/src/components/component.py index 81c3680..9fd0990 100644 --- a/src/components/component.py +++ b/src/components/component.py @@ -174,7 +174,7 @@ class Component(QObject): self._lock.release() return running - def wait_completion(self, timeout=5): + def wait_completion(self, timeout=10): """ waits until the requested action has been completed by the component this will return immediately if threaded=False was passed at component initialization diff --git a/src/components/hikrobot_sc/hikrobot_sc.py b/src/components/hikrobot_sc/hikrobot_sc.py index 1b643e0..27edd3b 100644 --- a/src/components/hikrobot_sc/hikrobot_sc.py +++ b/src/components/hikrobot_sc/hikrobot_sc.py @@ -14,7 +14,7 @@ from .hikrobot_dll import * class HikrobotSmartCamera(Component): - def __init__(self, config=None, name=None, period=0.5, lazy=True, paused=False, threaded=True): + def __init__(self, config=None, name=None, period=0.2, lazy=True, paused=False, threaded=True): super().__init__(config=config, name=name, period=period, lazy=lazy, paused=paused, threaded=threaded) self.simulate = "--sim-camera" in sys.argv self.num_cameras=1 diff --git a/src/ui/test_vision/test_vision.py b/src/ui/test_vision/test_vision.py index ef1104c..9d55bbc 100644 --- a/src/ui/test_vision/test_vision.py +++ b/src/ui/test_vision/test_vision.py @@ -15,7 +15,7 @@ class Test_Vision(Test_Test): def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, reset_on_start=True, enable_override=True): super().__init__(components=components, recipe=recipe, step=step, pieces=pieces, run_once=run_once, reset_on_start=reset_on_start, enable_override=enable_override) if "--sim-camera" not in sys.argv: - self.ok_counter_limit = 2 + self.ok_counter_limit = 3 else: self.ok_counter_limit = 1 # DETECTIONS TABLE