Feature/updates for 3.3.0 wrapper types

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
@@ -323,7 +325,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 +535,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

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

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
 

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, \
@@ -18,7 +20,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 +32,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 +200,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 +208,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)

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

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

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

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

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

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
@@ -77,14 +79,18 @@ class SensorInfo(object):
     temperature: int
     gain: float
     readout_time: datetime.datetime
+    width: int
+    height: int
 
     @classmethod
     def _from_internal(cls, info):
         return cls(averages=info.averages,
                    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)
 
 
 

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):