From 169942040f1192436320d8b66948e79797372130 Mon Sep 17 00:00:00 2001 From: Simon Birkholz Date: Wed, 10 Apr 2024 16:04:33 +0200 Subject: [PATCH 1/3] updated some wrapper types for the new 3.3 version --- cuvis/AcquisitionContext.py | 4 ++-- cuvis/FileWriteSettings.py | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/cuvis/AcquisitionContext.py b/cuvis/AcquisitionContext.py index c27d7a5..b6c29c2 100644 --- a/cuvis/AcquisitionContext.py +++ b/cuvis/AcquisitionContext.py @@ -323,7 +323,7 @@ def _get_hardware_queue_size(self, idref: int) -> int: return cuvis_il.p_int_value(val) @copydoc(cuvis_il.cuvis_comp_temperature_get) - def _get_temperature(self, idref: int) -> int: + def _get_temperature(self, idref: int) -> float: val = cuvis_il.new_p_int() if cuvis_il.status_ok != cuvis_il.cuvis_comp_temperature_get( self._handle, idref, val): @@ -533,7 +533,7 @@ def online(self) -> bool: @property @copydoc(cuvis_il.cuvis_comp_temperature_get) - def temperature(self) -> int: + def temperature(self) -> float: return self._acq._get_temperature(self._idx) @property diff --git a/cuvis/FileWriteSettings.py b/cuvis/FileWriteSettings.py index 30bb2a6..a823744 100644 --- a/cuvis/FileWriteSettings.py +++ b/cuvis/FileWriteSettings.py @@ -18,7 +18,7 @@ class GeneralExportSettings(object): export_dir: str = '.' channel_selection: str = 'all' - spectra_multiplier: float = 1.0 + spectra_multiplier: int = 1 pan_scale: float = 0.0 pan_sharpening_interpolation_type: PanSharpeningInterpolationType = PanSharpeningInterpolationType.Linear pan_sharpening_algorithm: PanSharpeningAlgorithm = PanSharpeningAlgorithm.CubertMacroPixel @@ -30,7 +30,7 @@ def _get_internal(self): ge = cuvis_il.cuvis_export_general_settings_t() ge.export_dir = self.export_dir ge.channel_selection = self.channel_selection - ge.spectra_multiplier = float(self.spectra_multiplier) + ge.spectra_multiplier = int(self.spectra_multiplier) ge.pan_scale = float(self.pan_scale) ge.pan_interpolation_type = internal.__CuvisPanSharpeningInterpolationType__[ self.pan_sharpening_interpolation_type] @@ -198,7 +198,6 @@ def _from_internal(cls, pa): class WorkerSettings(object): worker_count: int = 0 poll_intervall: int = 10 - keep_out_of_sequence: bool = False hard_limit: int = 10 soft_limit: int = 10 can_drop: bool = True @@ -207,7 +206,6 @@ def _get_internal(self): wa = cuvis_il.cuvis_worker_settings_t() wa.worker_count = int(self.worker_count) wa.poll_interval = int(self.poll_intervall) - wa.keep_out_of_sequence = int(self.keep_out_of_sequence) wa.worker_queue_hard_limit = int(self.hard_limit) wa.worker_queue_soft_limit = int(self.soft_limit) wa.can_drop = int(self.can_drop) From cb9f2f49eca114ce66d089356fc0b602b7d818e9 Mon Sep 17 00:00:00 2001 From: Simon Birkholz Date: Wed, 10 Apr 2024 16:06:54 +0200 Subject: [PATCH 2/3] added width and height to SensorInfo --- cuvis/cuvis_aux.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cuvis/cuvis_aux.py b/cuvis/cuvis_aux.py index dbdf194..55d40d2 100644 --- a/cuvis/cuvis_aux.py +++ b/cuvis/cuvis_aux.py @@ -77,6 +77,8 @@ class SensorInfo(object): temperature: int gain: float readout_time: datetime.datetime + width: int + height: int @classmethod def _from_internal(cls, info): @@ -84,7 +86,9 @@ def _from_internal(cls, info): temperature=info.temperature, gain=info.gain, readout_time= base_datetime + datetime.timedelta( - milliseconds=info.readout_time)) + milliseconds=info.readout_time), + width=info.width, + height=info.height) From 13270ce9e8c3f50ebef6fd4e7fb6325c8631bc48 Mon Sep 17 00:00:00 2001 From: Simon Birkholz Date: Wed, 10 Apr 2024 16:41:29 +0200 Subject: [PATCH 3/3] do not supress dll load errors --- cuvis/AcquisitionContext.py | 4 +++- cuvis/Calibration.py | 4 +++- cuvis/Export.py | 4 +++- cuvis/FileWriteSettings.py | 4 +++- cuvis/General.py | 4 +++- cuvis/Measurement.py | 4 +++- cuvis/ProcessingContext.py | 4 +++- cuvis/SessionFile.py | 4 +++- cuvis/Viewer.py | 4 +++- cuvis/cuvis_aux.py | 4 +++- cuvis/cuvis_types.py | 4 +++- 11 files changed, 33 insertions(+), 11 deletions(-) diff --git a/cuvis/AcquisitionContext.py b/cuvis/AcquisitionContext.py index b6c29c2..2bb8e4e 100644 --- a/cuvis/AcquisitionContext.py +++ b/cuvis/AcquisitionContext.py @@ -1,6 +1,8 @@ try: from cuvis_il import cuvis_il -except: +except ImportError as e: + if e.msg.startswith('DLL'): + raise import cuvis_il from .Async import Async, AsyncMesu from .Calibration import Calibration diff --git a/cuvis/Calibration.py b/cuvis/Calibration.py index 8057c54..2a3ca62 100644 --- a/cuvis/Calibration.py +++ b/cuvis/Calibration.py @@ -3,7 +3,9 @@ try: from cuvis_il import cuvis_il -except: +except ImportError as e: + if e.msg.startswith('DLL'): + raise import cuvis_il from .SessionFile import SessionFile from .cuvis_aux import SDKException, Capabilities diff --git a/cuvis/Export.py b/cuvis/Export.py index d63f2e0..3ffabf3 100644 --- a/cuvis/Export.py +++ b/cuvis/Export.py @@ -1,6 +1,8 @@ try: from cuvis_il import cuvis_il -except: +except ImportError as e: + if e.msg.startswith('DLL'): + raise import cuvis_il from .cuvis_aux import SDKException diff --git a/cuvis/FileWriteSettings.py b/cuvis/FileWriteSettings.py index a823744..18dbe34 100644 --- a/cuvis/FileWriteSettings.py +++ b/cuvis/FileWriteSettings.py @@ -1,6 +1,8 @@ try: from cuvis_il import cuvis_il -except: +except ImportError as e: + if e.msg.startswith('DLL'): + raise import cuvis_il from .cuvis_aux import SDKException from .cuvis_types import PanSharpeningInterpolationType, \ diff --git a/cuvis/General.py b/cuvis/General.py index 9a6f873..6520477 100644 --- a/cuvis/General.py +++ b/cuvis/General.py @@ -4,7 +4,9 @@ try: from cuvis_il import cuvis_il -except: +except ImportError as e: + if e.msg.startswith('DLL'): + raise import cuvis_il from .cuvis_aux import SDKException from .cuvis_types import ComponentType diff --git a/cuvis/Measurement.py b/cuvis/Measurement.py index f142c10..ac4d018 100644 --- a/cuvis/Measurement.py +++ b/cuvis/Measurement.py @@ -3,7 +3,9 @@ try: from cuvis_il import cuvis_il -except: +except ImportError as e: + if e.msg.startswith('DLL'): + raise import cuvis_il from .cuvis_aux import SDKException, SessionData, Capabilities, MeasurementFlags, SensorInfo, GPSData from .cuvis_types import DataFormat, ProcessingMode, ReferenceType diff --git a/cuvis/ProcessingContext.py b/cuvis/ProcessingContext.py index f87296b..600732e 100644 --- a/cuvis/ProcessingContext.py +++ b/cuvis/ProcessingContext.py @@ -1,6 +1,8 @@ try: from cuvis_il import cuvis_il -except: +except ImportError as e: + if e.msg.startswith('DLL'): + raise import cuvis_il from .Calibration import Calibration from .FileWriteSettings import ProcessingArgs diff --git a/cuvis/SessionFile.py b/cuvis/SessionFile.py index f99974e..1e890bb 100644 --- a/cuvis/SessionFile.py +++ b/cuvis/SessionFile.py @@ -3,7 +3,9 @@ try: from cuvis_il import cuvis_il -except: +except ImportError as e: + if e.msg.startswith('DLL'): + raise import cuvis_il from .Measurement import Measurement from .cuvis_aux import SDKException diff --git a/cuvis/Viewer.py b/cuvis/Viewer.py index 25b0ef6..d3a5f74 100644 --- a/cuvis/Viewer.py +++ b/cuvis/Viewer.py @@ -1,6 +1,8 @@ try: from cuvis_il import cuvis_il -except: +except ImportError as e: + if e.msg.startswith('DLL'): + raise import cuvis_il from .Measurement import ImageData, Measurement from .cuvis_aux import SDKException diff --git a/cuvis/cuvis_aux.py b/cuvis/cuvis_aux.py index 55d40d2..e0f6f46 100644 --- a/cuvis/cuvis_aux.py +++ b/cuvis/cuvis_aux.py @@ -5,7 +5,9 @@ try: from cuvis_il import cuvis_il -except: +except ImportError as e: + if e.msg.startswith('DLL'): + raise import cuvis_il from typing import List, Union diff --git a/cuvis/cuvis_types.py b/cuvis/cuvis_types.py index 28e1b27..1d10fe4 100644 --- a/cuvis/cuvis_types.py +++ b/cuvis/cuvis_types.py @@ -3,7 +3,9 @@ try: from cuvis_il import cuvis_il -except: +except ImportError as e: + if e.msg.startswith('DLL'): + raise import cuvis_il def __generateTranslationDict(enum_cls):