diff options
| -rw-r--r-- | tracker-neuralnet/ftnoir_tracker_neuralnet.cpp | 7 | ||||
| -rw-r--r-- | video-opencv/impl-camera.cpp | 3 | ||||
| -rw-r--r-- | video-opencv/settings.hpp | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp b/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp index 797febd8..34368478 100644 --- a/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp +++ b/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp @@ -774,9 +774,10 @@ NeuralNetDialog::NeuralNetDialog() : 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 }, + { QStringLiteral("Near (1-3ft)"), exposure_preset::near }, + { QStringLiteral("Medium (3-6ft)"), exposure_preset::medium }, + { QStringLiteral("Far (6+ft)"), exposure_preset::far }, + { QStringLiteral("Custom"), exposure_preset::ignored }, }; for (const auto& [label, preset] : presets) diff --git a/video-opencv/impl-camera.cpp b/video-opencv/impl-camera.cpp index 855f3345..5c7f736d 100644 --- a/video-opencv/impl-camera.cpp +++ b/video-opencv/impl-camera.cpp @@ -37,7 +37,8 @@ void cam::set_exposure(bool write) if (e != exposure) switch (e) { - case exposure_preset::near: cap->set(cv::CAP_PROP_EXPOSURE, -5); qDebug() << "near"; break; + case exposure_preset::near: cap->set(cv::CAP_PROP_EXPOSURE, -6); qDebug() << "near"; break; + case exposure_preset::medium: cap->set(cv::CAP_PROP_EXPOSURE, -5); qDebug() << "medium"; break; case exposure_preset::far: cap->set(cv::CAP_PROP_EXPOSURE, -4); qDebug() << "far"; break; default: break; } diff --git a/video-opencv/settings.hpp b/video-opencv/settings.hpp index a4f70c25..09d4507e 100644 --- a/video-opencv/settings.hpp +++ b/video-opencv/settings.hpp @@ -3,11 +3,11 @@ using namespace options; enum class exposure_preset : int { - near, far, ignored, - DEFAULT = near, + near, far, ignored, medium, + DEFAULT = medium, }; struct dshow_camera_settings final { bundle b = make_bundle("video-camera"); - value<exposure_preset> exposure{b, "exposure-preset", exposure_preset::near}; + value<exposure_preset> exposure{b, "exposure-preset", exposure_preset::DEFAULT}; }; |