From 386795a320f8c007186c41b0d10a4f4281a9c28c Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 23 Jan 2023 13:52:08 +0100 Subject: video/opencv, tracker/nn: add exposure presets --- tracker-neuralnet/ftnoir_tracker_neuralnet.cpp | 16 ++++++++ tracker-neuralnet/ftnoir_tracker_neuralnet.h | 3 ++ tracker-neuralnet/lang/nl_NL.ts | 4 ++ tracker-neuralnet/lang/ru_RU.ts | 4 ++ tracker-neuralnet/lang/stub.ts | 4 ++ tracker-neuralnet/lang/zh_CN.ts | 4 ++ tracker-neuralnet/neuralnet-trackercontrols.ui | 52 +++++++++++++++++++++----- 7 files changed, 77 insertions(+), 10 deletions(-) (limited to 'tracker-neuralnet') diff --git a/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp b/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp index d8077326..cbfb3496 100644 --- a/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp +++ b/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp @@ -750,6 +750,22 @@ NeuralNetDialog::NeuralNetDialog() : tie_setting(settings_.force_fps, ui_.cameraFPS); #endif + { + const struct { + QString label; + exposure_preset preset; + } presets[] = { + { QStringLiteral("Near (1-4ft)"), exposure_preset::near }, + { QStringLiteral("Far (4-8ft)"), exposure_preset::far }, + { QStringLiteral("Custom"), exposure_preset::ignored }, + }; + + for (const auto& [label, preset] : presets) + ui_.exposure_preset->addItem(label, int(preset)); + + tie_setting(cs_.exposure_preset, ui_.exposure_preset); + } + connect(ui_.buttonBox, SIGNAL(accepted()), this, SLOT(doOK())); connect(ui_.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel())); connect(ui_.camera_settings, SIGNAL(clicked()), this, SLOT(camera_settings())); diff --git a/tracker-neuralnet/ftnoir_tracker_neuralnet.h b/tracker-neuralnet/ftnoir_tracker_neuralnet.h index df71a7a8..d44a9953 100644 --- a/tracker-neuralnet/ftnoir_tracker_neuralnet.h +++ b/tracker-neuralnet/ftnoir_tracker_neuralnet.h @@ -20,6 +20,7 @@ #include "compat/timer.hpp" #include "video/camera.hpp" #include "cv/affine.hpp" +#include "video-opencv/settings.hpp" #include #include @@ -176,6 +177,8 @@ private: Ui::Form ui_; Settings settings_; + dshow_camera_settings cs_; + // Calibration code mostly taken from point tracker QTimer calib_timer_; TranslationCalibrator trans_calib_; diff --git a/tracker-neuralnet/lang/nl_NL.ts b/tracker-neuralnet/lang/nl_NL.ts index 25742b8f..09a2ebd7 100644 --- a/tracker-neuralnet/lang/nl_NL.ts +++ b/tracker-neuralnet/lang/nl_NL.ts @@ -40,6 +40,10 @@ Don't roll or change position. Up + + Exposure preset + + neuralnet_tracker_ns::NeuralNetDialog diff --git a/tracker-neuralnet/lang/ru_RU.ts b/tracker-neuralnet/lang/ru_RU.ts index 5b311a19..3b1bb257 100644 --- a/tracker-neuralnet/lang/ru_RU.ts +++ b/tracker-neuralnet/lang/ru_RU.ts @@ -40,6 +40,10 @@ Don't roll or change position. Up + + Exposure preset + + neuralnet_tracker_ns::NeuralNetDialog diff --git a/tracker-neuralnet/lang/stub.ts b/tracker-neuralnet/lang/stub.ts index 62ce527b..8461ce0f 100644 --- a/tracker-neuralnet/lang/stub.ts +++ b/tracker-neuralnet/lang/stub.ts @@ -40,6 +40,10 @@ Don't roll or change position. Up + + Exposure preset + + neuralnet_tracker_ns::NeuralNetDialog diff --git a/tracker-neuralnet/lang/zh_CN.ts b/tracker-neuralnet/lang/zh_CN.ts index 39a6c0e2..4b24f3db 100644 --- a/tracker-neuralnet/lang/zh_CN.ts +++ b/tracker-neuralnet/lang/zh_CN.ts @@ -40,6 +40,10 @@ Don't roll or change position. Up + + Exposure preset + + neuralnet_tracker_ns::NeuralNetDialog diff --git a/tracker-neuralnet/neuralnet-trackercontrols.ui b/tracker-neuralnet/neuralnet-trackercontrols.ui index 01fdd4bd..c03f866c 100644 --- a/tracker-neuralnet/neuralnet-trackercontrols.ui +++ b/tracker-neuralnet/neuralnet-trackercontrols.ui @@ -10,21 +10,14 @@ 0 0 445 - 226 + 355 Tracker settings - - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - + true @@ -260,7 +253,7 @@ Don't roll or change position. - + @@ -273,6 +266,45 @@ Don't roll or change position. + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + Camera settings + + + + + + + 1 + 0 + + + + Exposure preset + + + + + + + + 0 + 0 + + + + + + + -- cgit v1.2.3