Skip to content

Use VmbFeatureEnumIsAvailable when reporting possible enum values #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adam-urbanczyk wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Use VmbFeatureEnumIsAvailable when reporting possible enum values #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7acf8a3
Merge pull request #1 from morefigs/master
adam-urbanczyk Oct 19, 2019
c995d62
Implemented VmbFeatureEnumIsAvailable check when reporting possible e…
adam-urbanczyk Oct 19, 2019
fc09867
Wrapped more functions related to features
adam-urbanczyk Oct 19, 2019
5ced680
Exposed more vimba functions in the feature class
adam-urbanczyk Oct 20, 2019
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
133 changes: 129 additions & 4 deletions pymba/feature.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,27 @@ def range(self) -> Union[None, Tuple[int, int], Tuple[float, float], Tuple[str,
_FEATURE_DATA_ENUM):
return self._access_func('range', self.info.featureDataType)()
return None


@property
def increment(self) -> Union[None, int, float]:
# only some types actually have an increment
if self.info.featureDataType in (_FEATURE_DATA_INT,
_FEATURE_DATA_FLOAT):
return self._access_func('increment', self.info.featureDataType)()
return None

@property
def affected(self) -> List[str]:
return self._affected_query()

@property
def selected(self) -> List[str]:
return self._selected_query()

@property
def access(self) -> Tuple[bool,bool]:
return self._access_query()

def __init__(self, name, handle):
self._name = name.encode()
self._handle = handle
Expand All @@ -64,10 +84,12 @@ def _access_func(self, func_type: str, data_type: int) -> Callable:
_FEATURE_DATA_UNKNOWN: (),
_FEATURE_DATA_INT: (self._get_int,
self._set_int,
self._range_query_int),
self._range_query_int,
self._increment_query_int),
_FEATURE_DATA_FLOAT: (self._get_float,
self._set_float,
self._range_query_float),
self._range_query_float,
self._increment_query_float),
_FEATURE_DATA_ENUM: (self._get_enum,
self._set_enum,
self._range_query_enum),
Expand All @@ -84,6 +106,7 @@ def _access_func(self, func_type: str, data_type: int) -> Callable:
'get': 0,
'set': 1,
'range': 2,
'increment' : 3
}

# doesn't make sense to get / set a command data type
Expand Down Expand Up @@ -241,5 +264,107 @@ def _range_query_enum(self) -> List[str]:
byref(num_found))
if error:
raise VimbaException(error)

# check which enum names are actually allowed for the given camera
rv = []
found = c_bool(False)
for enum_name in enum_names:
error = vimba_c.vmb_feature_enum_is_available(self._handle,
self._name,
enum_name,
byref(found))
if error:
raise VimbaException(error)
elif found:
rv.append(enum_name.decode())

return rv

def _increment_query_int(self) -> int:
increment = c_int64()
error = vimba_c.vmb_feature_int_increment_query(self._handle,
self._name,
byref(increment))
if error:
raise VimbaException(error)

return int(increment.value)

def _increment_query_float(self) -> Tuple[bool,float]:
increment = c_double(-1)
has_increment = c_bool(True)
error = vimba_c.vmb_feature_float_increment_query(self._handle,
self._name,
byref(has_increment),
byref(increment))
if error:
raise VimbaException(error)

return has_increment.value,float(increment.value)

def _affected_query(self) -> List[str]:
# call once to get number of available features
vmb_feature_info = vimba_c.VmbFeatureInfo()
num_found = c_uint32(-1)
error = vimba_c.vmb_feature_list_affected(self._handle,
self._name,
None,
0,
byref(num_found),
sizeof(vmb_feature_info))
if error:
raise VimbaException(error)

# call again to get the features
num_features = num_found.value
vmb_feature_infos = (vimba_c.VmbFeatureInfo * num_features)()
error = vimba_c.vmb_feature_list_affected(self._handle,
self._name,
vmb_feature_infos,
num_features,
byref(num_found),
sizeof(vmb_feature_info))
if error:
raise VimbaException(error)

return list(vmb_feature_info.name.decode() for vmb_feature_info in vmb_feature_infos)

def _selected_query(self) -> List[str]:
# call once to get number of available features
vmb_feature_info = vimba_c.VmbFeatureInfo()
num_found = c_uint32(-1)
error = vimba_c.vmb_feature_list_selected(self._handle,
self._name,
None,
0,
byref(num_found),
sizeof(vmb_feature_info))
if error:
raise VimbaException(error)

# call again to get the features
num_features = num_found.value
vmb_feature_infos = (vimba_c.VmbFeatureInfo * num_features)()
error = vimba_c.vmb_feature_list_selected(self._handle,
self._name,
vmb_feature_infos,
num_features,
byref(num_found),
sizeof(vmb_feature_info))
if error:
raise VimbaException(error)

return list(vmb_feature_info.name.decode() for vmb_feature_info in vmb_feature_infos)


def _access_query(self) -> Tuple[bool,bool]:
readable = c_bool()
writable = c_bool()
error = vimba_c.vmb_feature_access_query(self._handle,
self._name,
byref(readable),
byref(writable))
if error:
raise VimbaException(error)

return list(enum_name.decode() for enum_name in enum_names)
return readable.value,writable.value
49 changes: 43 additions & 6 deletions pymba/vimba_c.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,9 +259,31 @@ class VmbFrame(Structure):
POINTER(VmbFeatureInfo),
c_uint32)

# todo VmbFeatureListAffected
# todo VmbFeatureListSelected
# todo VmbFeatureAccessQuery

vmb_feature_list_affected = _vimba_lib.VmbFeatureListAffected
vmb_feature_list_affected.restype = c_int32
vmb_feature_list_affected.argtypes = (c_void_p,
c_char_p,
POINTER(VmbFeatureInfo),
c_uint32,
POINTER(c_uint32),
c_uint32)

vmb_feature_list_selected = _vimba_lib.VmbFeatureListSelected
vmb_feature_list_selected.restype = c_int32
vmb_feature_list_selected.argtypes = (c_void_p,
c_char_p,
POINTER(VmbFeatureInfo),
c_uint32,
POINTER(c_uint32),
c_uint32)

vmb_feature_access_query = _vimba_lib.VmbFeatureAccessQuery
vmb_feature_access_query.restype = c_int32
vmb_feature_access_query.argtypes = (c_void_p,
c_char_p,
POINTER(c_bool),
POINTER(c_bool))

vmb_feature_int_get = _vimba_lib.VmbFeatureIntGet
vmb_feature_int_get.restype = c_int32
Expand All @@ -282,7 +304,11 @@ class VmbFrame(Structure):
POINTER(c_int64),
POINTER(c_int64))

# todo VmbFeatureIntIncrementQuery
vmb_feature_int_increment_query = _vimba_lib.VmbFeatureIntIncrementQuery
vmb_feature_int_increment_query.restype = c_int32
vmb_feature_int_increment_query.argtypes = (c_void_p,
c_char_p,
POINTER(c_int64))

vmb_feature_float_get = _vimba_lib.VmbFeatureFloatGet
vmb_feature_float_get.restype = c_int32
Expand All @@ -303,7 +329,12 @@ class VmbFrame(Structure):
POINTER(c_double),
POINTER(c_double))

# todo VmbFeatureFloatIncrementQuery
vmb_feature_float_increment_query = _vimba_lib.VmbFeatureFloatIncrementQuery
vmb_feature_float_increment_query.restype = c_int32
vmb_feature_float_increment_query.argtypes = (c_void_p,
c_char_p,
POINTER(c_bool),
POINTER(c_double))

vmb_feature_enum_get = _vimba_lib.VmbFeatureEnumGet
vmb_feature_enum_get.restype = c_int32
Expand All @@ -325,7 +356,13 @@ class VmbFrame(Structure):
c_uint32,
POINTER(c_uint32))

# todo VmbFeatureEnumIsAvailable
vmb_feature_enum_is_available = _vimba_lib.VmbFeatureEnumIsAvailable
vmb_feature_enum_is_available.restype = c_int32
vmb_feature_enum_is_available.argtypes = (c_void_p,
c_char_p,
c_char_p,
POINTER(c_bool))

# todo VmbFeatureEnumAsInt
# todo VmbFeatureEnumAsString
# todo VmbFeatureEnumEntryGet
Expand Down