Skip to content

Feature/updates 3.3.0 #11

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

Merged
birkholz-cubert merged 2 commits into from
Jan 22, 2024
Merged

Feature/updates 3.3.0 #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
257f58a
removed keep_out_of_sequence
arndcubert Jan 3, 2024
fc24d33
updating types to newest cuvis.h version
arndcubert Jan 4, 2024
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
42 changes: 17 additions & 25 deletions interface/cuvis.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ namespace cuvis
*
* @copydoc cuvis_export_general_settings_t.spectra_multiplier
* */
double spectra_multiplier;
uint8_t spectra_multiplier;

/** @brief amount of pan-sharpening (default: 0)
*
Expand Down Expand Up @@ -496,11 +496,6 @@ namespace cuvis
*/
std::chrono::milliseconds poll_interval;

/**
* @copydoc cuvis_worker_settings_t.keep_out_of_sequence
*/
bool keep_out_of_sequence;

/**
* @copydoc cuvis_worker_settings_t.worker_queue_size
*/
Expand Down Expand Up @@ -636,7 +631,7 @@ namespace cuvis
/** number of averages used*/
uint32_t averages;
/** the sensors's temperature while readout (0 if not applicable) */
int32_t temperature;
double temperature;
/** gain value while recording */
double gain;
/** the timestamp (UTC) of the image readout (senor's hardware clock )*/
Expand Down Expand Up @@ -1143,7 +1138,7 @@ namespace cuvis
type_wrapped get_##funname(size_t id) const \
{ \
type_ifcae res; \
chk(sdkname##_get(*_acqCont, id, &res)); \
chk(sdkname##_get(*_acqCont, static_cast<int32_t>(id), &res)); \
return static_cast<type_wrapped>(res); \
}

Expand All @@ -1157,15 +1152,15 @@ namespace cuvis
ACQ_STUB_1a(hardware_queue_size, cuvis_comp_hardware_queue_size, int_t, size_t);
ACQ_STUB_1a(hardware_queue_used, cuvis_comp_hardware_queue_used, int_t, size_t);

ACQ_STUB_1a(temperature, cuvis_comp_temperature, int_t, int);
ACQ_STUB_1a(temperature, cuvis_comp_temperature, double, double);

#undef ACQ_STUB_1a

#define ACQ_STUB_1b(funname, sdkname, type_ifcae, type_wrapped) \
Async set_##funname(size_t id, type_wrapped value) const \
{ \
CUVIS_ASYNC_CALL_RESULT async_handle; \
chk(sdkname##_set_async(*_acqCont, id, &async_handle, static_cast<type_ifcae>(value))); \
chk(sdkname##_set_async(*_acqCont, static_cast<int32_t>(id), &async_handle, static_cast<type_ifcae>(value))); \
Async async; \
async._async = std::shared_ptr<CUVIS_ASYNC_CALL_RESULT>(new CUVIS_ASYNC_CALL_RESULT{async_handle}, [](CUVIS_ASYNC_CALL_RESULT* handle) { \
cuvis_async_call_free(handle); \
Expand Down Expand Up @@ -1741,7 +1736,6 @@ namespace cuvis
CUVIS_WORKER this_worker = *_worker;

auto wait_on_session_done = [this_worker]() {
const int poll_time_ms = 10;
CUVIS_INT session_total;
CUVIS_INT session_current;
CUVIS_INT status;
Expand Down Expand Up @@ -1865,7 +1859,7 @@ namespace cuvis
chk(code);
//transforms into exception
}
catch (cuvis::cuvis_sdk_exception const& ex)
catch (cuvis::cuvis_sdk_exception const&)
{
except = std::current_exception();
}
Expand Down Expand Up @@ -2408,7 +2402,7 @@ namespace cuvis
inline std::optional<Measurement> SessionFile::get_mesu(int_t frameNo, cuvis_session_item_type_t type) const
{
CUVIS_MESU mesu;
const auto ret = cuvis_session_file_get_mesu(*_session, frameNo, type, &mesu);
cuvis_session_file_get_mesu(*_session, frameNo, type, &mesu);

if (CUVIS_HANDLE_NULL == mesu)
{
Expand All @@ -2421,7 +2415,7 @@ namespace cuvis
inline std::optional<Measurement> SessionFile::get_ref(int_t refNo, cuvis_reference_type_t type) const
{
CUVIS_MESU mesu;
const auto ret = cuvis_session_file_get_reference_mesu(*_session, refNo, type, &mesu);
cuvis_session_file_get_reference_mesu(*_session, refNo, type, &mesu);

if (CUVIS_HANDLE_NULL == mesu)
{
Expand Down Expand Up @@ -2475,7 +2469,7 @@ namespace cuvis
inline GeneralExportArgs::GeneralExportArgs()
: export_dir("."),
channel_selection("all"),
spectra_multiplier(1.0),
spectra_multiplier(1),
pan_scale(0.0),
pan_interpolation_type(pan_sharpening_interpolation_type_Linear),
pan_algorithm(pan_sharpening_algorithm_CubertMacroPixel),
Expand Down Expand Up @@ -2517,16 +2511,16 @@ namespace cuvis
inline SaveArgs::operator cuvis_save_args_t() const
{
cuvis_save_args_t save_args;
save_args.allow_fragmentation = static_cast<int_t>(allow_fragmentation);
save_args.allow_overwrite = static_cast<int_t>(allow_overwrite);
save_args.allow_drop = static_cast<int_t>(allow_drop);
save_args.allow_session_file = static_cast<int_t>(allow_session_file);
save_args.allow_info_file = static_cast<int_t>(allow_info_file);
save_args.allow_fragmentation = static_cast<int32_t>(allow_fragmentation);
save_args.allow_overwrite = static_cast<int32_t>(allow_overwrite);
save_args.allow_drop = static_cast<int32_t>(allow_drop);
save_args.allow_session_file = static_cast<int32_t>(allow_session_file);
save_args.allow_info_file = static_cast<int32_t>(allow_info_file);
save_args.operation_mode = operation_mode;
save_args.fps = fps;
save_args.soft_limit = soft_limit;
save_args.hard_limit = hard_limit;
save_args.max_buftime = max_buftime.count();
save_args.soft_limit = static_cast<int32_t>(soft_limit);
save_args.hard_limit = static_cast<int32_t>(hard_limit);
save_args.max_buftime = static_cast<int32_t>(max_buftime.count());
return save_args;
}

Expand Down Expand Up @@ -2574,7 +2568,6 @@ namespace cuvis
inline WorkerArgs::WorkerArgs()
: worker_count(std::thread::hardware_concurrency()),
poll_interval(std::chrono::milliseconds(5)),
keep_out_of_sequence(false),
worker_queue_hard_limit(100),
worker_queue_soft_limit(90),
can_drop(false)
Expand All @@ -2586,7 +2579,6 @@ namespace cuvis

args.worker_count = worker_count;
args.poll_interval = (std::int32_t)(poll_interval.count());
args.keep_out_of_sequence = (int)keep_out_of_sequence;
args.worker_queue_hard_limit = worker_queue_hard_limit;
args.worker_queue_soft_limit = worker_queue_soft_limit;
args.can_drop = can_drop;
Expand Down