diff --git a/EX05_recordSingleImages.py b/EX05_recordSingleImages.py index 5ad2c90..c9fdfd1 100644 --- a/EX05_recordSingleImages.py +++ b/EX05_recordSingleImages.py @@ -8,18 +8,25 @@ def run_example_recordSingleImage( - userSettingsDir, - factoryDir, - recDir, - exposure, - nrImgs): + userSettingsDir: str, + factoryDir: Path, + recDir: str, + exposure: int, + nrImgs: int): print("loading user settings...") cuvis.init(userSettingsDir) cuvis.set_log_level("info") print( "loading calibration, processing and acquisition context (factory)...") - calibration = cuvis.Calibration(factoryDir) + if (factoryDir.is_dir()): + calibration = cuvis.Calibration(factoryDir) + elif (factoryDir.suffix == '.cu3c'): + print("using .cu3c file as calibration instead of factory dir...") + calibFile = cuvis.SessionFile(factoryDir) + calibration = cuvis.Calibration(calibFile) + else: + raise ValueError('Unrecognized file format') processingContext = cuvis.ProcessingContext(calibration) acquisitionContext = cuvis.AcquisitionContext(calibration) @@ -85,7 +92,8 @@ def run_example_recordSingleImage( if userSettingsDir.strip().lower() in ["", "default"]: userSettingsDir = loc_settings - factoryDir = input("Factory directory (default: {}): ".format(loc_factory)) + factoryDir = input( + "Factory directory (default: {}) or .cu3c file: ".format(loc_factory)) if factoryDir.strip().lower() in ["", "default"]: factoryDir = loc_factory @@ -105,5 +113,5 @@ def run_example_recordSingleImage( nrImgs = loc_nimgs nrImgs = int(nrImgs) - run_example_recordSingleImage(str(userSettingsDir), str(factoryDir), str(recDir), exposure, + run_example_recordSingleImage(str(userSettingsDir), Path(factoryDir), str(recDir), exposure, nrImgs) diff --git a/EX05_recordSingleImages_async.py b/EX05_recordSingleImages_async.py index b7af5c9..25786b4 100644 --- a/EX05_recordSingleImages_async.py +++ b/EX05_recordSingleImages_async.py @@ -10,18 +10,25 @@ async def run_example_recordSingleImage( - userSettingsDir, - factoryDir, - recDir, - exposure, - nrImgs): + userSettingsDir: str, + factoryDir: Path, + recDir: str, + exposure: int, + nrImgs: int): print("loading user settings...") cuvis.init(userSettingsDir) cuvis.set_log_level("info") print( "loading calibration, processing and acquisition context (factory)...") - calibration = cuvis.Calibration(factoryDir) + if (factoryDir.is_dir()): + calibration = cuvis.Calibration(factoryDir) + elif (factoryDir.suffix == '.cu3c'): + print("using .cu3c file as calibration instead of factory dir...") + calibFile = cuvis.SessionFile(factoryDir) + calibration = cuvis.Calibration(calibFile) + else: + raise ValueError('Unrecognized file format') processingContext = cuvis.ProcessingContext(calibration) acquisitionContext = cuvis.AcquisitionContext(calibration) @@ -84,7 +91,8 @@ async def run_example_recordSingleImage( if userSettingsDir.strip().lower() in ["", "default"]: userSettingsDir = loc_settings - factoryDir = input("Factory directory (default: {}): ".format(loc_factory)) + factoryDir = input( + "Factory directory (default: {}) or .cu3c file: ".format(loc_factory)) if factoryDir.strip().lower() in ["", "default"]: factoryDir = loc_factory @@ -104,5 +112,5 @@ async def run_example_recordSingleImage( nrImgs = loc_nimgs nrImgs = int(nrImgs) - a.run(run_example_recordSingleImage(str(userSettingsDir), str(factoryDir), str(recDir), exposure, + a.run(run_example_recordSingleImage(str(userSettingsDir), Path(factoryDir), str(recDir), exposure, nrImgs)) diff --git a/EX06_recordVideo.py b/EX06_recordVideo.py index 1822fd6..1a84390 100644 --- a/EX06_recordVideo.py +++ b/EX06_recordVideo.py @@ -7,18 +7,25 @@ import cuvis -def run_example_recordVideo(userSettingsDir, - factoryDir, - recDir, - exposure, - autoExp, - fps): +def run_example_recordVideo(userSettingsDir: str, + factoryDir: Path, + recDir: str, + exposure: int, + autoExp: bool, + fps: float): print("loading user settings...") cuvis.init(userSettingsDir) cuvis.set_log_level("info") print("loading calibration (factory)...") - calibration = cuvis.Calibration(factoryDir) + if (factoryDir.is_dir()): + calibration = cuvis.Calibration(factoryDir) + elif (factoryDir.suffix == '.cu3c'): + print("using .cu3c file as calibration instead of factory dir...") + calibFile = cuvis.SessionFile(factoryDir) + calibration = cuvis.Calibration(calibFile) + else: + raise ValueError('Unrecognized file format') print("loading acquisition context...") acquisitionContext = cuvis.AcquisitionContext(calibration) @@ -131,7 +138,8 @@ def run_example_recordVideo(userSettingsDir, if userSettingsDir.strip().lower() in ["", "default"]: userSettingsDir = loc_settings - factoryDir = input("Factory directory (default: {}): ".format(loc_factory)) + factoryDir = input( + "Factory directory (default: {}) or .cu3c file: ".format(loc_factory)) if factoryDir.strip().lower() in ["", "default"]: factoryDir = loc_factory @@ -156,7 +164,7 @@ def run_example_recordVideo(userSettingsDir, "Target frames per second (fps) (default: {}): ".format(loc_fps)) if fps.strip().lower() in ["", "default"]: fps = loc_fps - fps = int(fps) + fps = float(fps) - run_example_recordVideo(str(userSettingsDir), str(factoryDir), str(recDir), exposure, + run_example_recordVideo(str(userSettingsDir), Path(factoryDir), str(recDir), exposure, autoExp, fps) diff --git a/EX06_recordVideo_async.py b/EX06_recordVideo_async.py index c16b824..5da3399 100644 --- a/EX06_recordVideo_async.py +++ b/EX06_recordVideo_async.py @@ -18,18 +18,25 @@ async def worker_collect_mesu_task(workerContainer: cuvis.WorkerResult): workerContainer.mesu.session_info.sequence_number)) -async def run_example_recordVideo(userSettingsDir, - factoryDir, - recDir, - exposure, - autoExp, - fps): +async def run_example_recordVideo(userSettingsDir: str, + factoryDir: Path, + recDir: str, + exposure: int, + autoExp: bool, + fps: float): print("loading user settings...") cuvis.init(userSettingsDir) cuvis.set_log_level("info") print("loading calibration (factory)...") - calibration = cuvis.Calibration(factoryDir) + if (factoryDir.is_dir()): + calibration = cuvis.Calibration(factoryDir) + elif (factoryDir.suffix == '.cu3c'): + print("using .cu3c file as calibration instead of factory dir...") + calibFile = cuvis.SessionFile(factoryDir) + calibration = cuvis.Calibration(calibFile) + else: + raise ValueError('Unrecognized file format') print("loading acquisition context...") acquisitionContext = cuvis.AcquisitionContext(calibration) @@ -127,7 +134,8 @@ async def run_example_recordVideo(userSettingsDir, if userSettingsDir.strip().lower() in ["", "default"]: userSettingsDir = loc_settings - factoryDir = input("Factory directory (default: {}): ".format(loc_factory)) + factoryDir = input( + "Factory directory (default: {}) or .cu3c file: ".format(loc_factory)) if factoryDir.strip().lower() in ["", "default"]: factoryDir = loc_factory @@ -152,7 +160,7 @@ async def run_example_recordVideo(userSettingsDir, "Target frames per second (fps) (default: {}): ".format(loc_fps)) if fps.strip().lower() in ["", "default"]: fps = loc_fps - fps = int(fps) + fps = float(fps) - a.run(run_example_recordVideo(str(userSettingsDir), str(factoryDir), str(recDir), exposure, + a.run(run_example_recordVideo(str(userSettingsDir), Path(factoryDir), str(recDir), exposure, autoExp, fps))