Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions cuvis/Measurement.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from typing import Union, List
from .FileWriteSettings import SaveArgs
import datetime
import os

Expand All @@ -8,8 +10,6 @@
import cuvis.cuvis_types as internal
base_datetime = datetime.datetime(1970, 1, 1)

from .FileWriteSettings import SaveArgs
from typing import Union, List

class Measurement(object):
capture_time: datetime.datetime
Expand All @@ -19,14 +19,16 @@ class Measurement(object):
factory_calibration: datetime.datetime
assembly: str
integration_time: int
averages: int
distance: float
serial_number: str
product_name: str
processing_mode: ProcessingMode
name: str
session_info: SessionData
frame_id: int

def __init__(self, base: Union[int,str]):
def __init__(self, base: Union[int, str]):
self._handle = None

if isinstance(base, int):
Expand All @@ -44,9 +46,8 @@ def __init__(self, base: Union[int,str]):
self.refresh()
pass


def _refresh_metadata(self):
_metaData = cuvis_il.cuvis_mesu_metadata_allocate()
_metaData = cuvis_il.cuvis_mesu_metadata_allocate()
if cuvis_il.status_ok != cuvis_il.cuvis_measurement_get_metadata(
self._handle, _metaData):
raise SDKException
Expand All @@ -60,14 +61,16 @@ def _refresh_metadata(self):
milliseconds=_metaData.factory_calibration)
self.assembly = _metaData.assembly
self.averages = _metaData.averages
self.distance = _metaData.distance
self.integration_time = _metaData.integration_time
self.serial_number = _metaData.serial_number
self.product_name = _metaData.product_name
self.processing_mode = internal.__ProcessingMode__[_metaData.processing_mode]
self.processing_mode = internal.__ProcessingMode__[
_metaData.processing_mode]
self.name = _metaData.name
self.session_info = SessionData(_metaData.session_info_name,
_metaData.session_info_session_no,
_metaData.session_info_sequence_no)
_metaData.session_info_session_no,
_metaData.session_info_sequence_no)
self.frame_id = _metaData.measurement_frame_id
cuvis_il.cuvis_mesu_metadata_free(_metaData)

Expand Down Expand Up @@ -176,15 +179,14 @@ def clear_implicit_reference(self, ref_type: ReferenceType) -> None:
self._handle, internal.__CuvisReferenceType__[ref_type]):
raise SDKException()


def deepcopy(self):
_ptr = cuvis_il.new_p_int()
if cuvis_il.status_ok != cuvis_il.cuvis_measurement_deep_copy(
self._handle, _ptr):
raise SDKException()
copy = Measurement(cuvis_il.p_int_value(_ptr))
return copy

def __del__(self):
_ptr = cuvis_il.new_p_int()
self.clear_cube()
Expand All @@ -193,6 +195,7 @@ def __del__(self):
self._handle = cuvis_il.p_int_value(_ptr)
pass


class ImageData(object):
def __init__(self, img_buf=None, dformat=None):

Expand Down Expand Up @@ -236,4 +239,3 @@ def __init__(self, img_buf=None, dformat=None):
else:
raise TypeError(
"Wrong data type for image buffer: {}".format(type(img_buf)))