From cec57b98cb03159863b3af9c7ab9103cd4d4b63c Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 27 Feb 2023 16:08:16 +0100 Subject: tracker/nn: actually remove most options --- tracker-neuralnet/ftnoir_tracker_neuralnet.cpp | 22 +- tracker-neuralnet/lang/nl_NL.ts | 36 +- tracker-neuralnet/lang/ru_RU.ts | 36 +- tracker-neuralnet/lang/stub.ts | 36 +- tracker-neuralnet/lang/zh_CN.ts | 36 +- tracker-neuralnet/neuralnet-trackercontrols.ui | 845 +++++++++++-------------- 6 files changed, 401 insertions(+), 610 deletions(-) (limited to 'tracker-neuralnet') diff --git a/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp b/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp index f23356d5..797febd8 100644 --- a/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp +++ b/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp @@ -503,9 +503,17 @@ bool NeuralNetTracker::load_and_initialize_model() bool NeuralNetTracker::open_camera() { +#if 0 int rint = std::clamp(*settings_.resolution, 0, (int)std::size(resolution_choices)-1); resolution_tuple res = resolution_choices[rint]; int fps = enum_to_fps(settings_.force_fps); +#endif + + video::impl::camera::info args {}; + args.width = 640; + args.height = 480; + args.fps = 60; + args.use_mjpeg = true; QMutexLocker l(&camera_mtx_); @@ -515,16 +523,8 @@ bool NeuralNetTracker::open_camera() if (name.isEmpty() || name == "TrackHat sensor") { camera_ = video::make_camera_("TrackHat sensor"); - if (camera_) - { - video::impl::camera::info args {}; - args.width = 640; - args.height = 480; - args.fps = 60; - args.use_mjpeg = true; - if (camera_->start(args)) - return true; - } + if (camera_ && camera_->start(args)) + return true; if (!name.isEmpty()) return false; } @@ -534,6 +534,7 @@ bool NeuralNetTracker::open_camera() if (!camera_) return false; +#if 0 video::impl::camera::info args {}; if (res.width) @@ -545,6 +546,7 @@ bool NeuralNetTracker::open_camera() args.fps = fps; args.use_mjpeg = settings_.use_mjpeg; +#endif if (!camera_->start(args)) { diff --git a/tracker-neuralnet/lang/nl_NL.ts b/tracker-neuralnet/lang/nl_NL.ts index b1e03913..52a7c174 100644 --- a/tracker-neuralnet/lang/nl_NL.ts +++ b/tracker-neuralnet/lang/nl_NL.ts @@ -48,38 +48,6 @@ Don't roll or change position. Camera Configuration - - Camera name - - - - The requested resolution for cases where the camera delivers maximum frame rate only for a particular resolution. The image may still be downscaled to the internal resolution. - - - - Field of view. Needed to transform the pose to world coordinates. - - - - Diagonal FOV - - - - Resolution - - - - Requested video frame rate. Actual setting may not be supported by the camera. - - - - Frames per second - - - - MJPEG - - Tuning / Debug @@ -116,6 +84,10 @@ Don't roll or change position. Zoom factor for the face region. Applied before the patch is fed into the pose estimation model. There is a sweet spot near 1. + + Camera override + + neuralnet_tracker_ns::NeuralNetDialog diff --git a/tracker-neuralnet/lang/ru_RU.ts b/tracker-neuralnet/lang/ru_RU.ts index fcca70a9..4c9cec04 100644 --- a/tracker-neuralnet/lang/ru_RU.ts +++ b/tracker-neuralnet/lang/ru_RU.ts @@ -48,38 +48,6 @@ Don't roll or change position. Camera Configuration - - Camera name - - - - The requested resolution for cases where the camera delivers maximum frame rate only for a particular resolution. The image may still be downscaled to the internal resolution. - - - - Field of view. Needed to transform the pose to world coordinates. - - - - Diagonal FOV - - - - Resolution - - - - Requested video frame rate. Actual setting may not be supported by the camera. - - - - Frames per second - - - - MJPEG - - Tuning / Debug @@ -116,6 +84,10 @@ Don't roll or change position. Zoom factor for the face region. Applied before the patch is fed into the pose estimation model. There is a sweet spot near 1. + + Camera override + + neuralnet_tracker_ns::NeuralNetDialog diff --git a/tracker-neuralnet/lang/stub.ts b/tracker-neuralnet/lang/stub.ts index ecd559b1..5936d630 100644 --- a/tracker-neuralnet/lang/stub.ts +++ b/tracker-neuralnet/lang/stub.ts @@ -48,38 +48,6 @@ Don't roll or change position. Camera Configuration - - Camera name - - - - The requested resolution for cases where the camera delivers maximum frame rate only for a particular resolution. The image may still be downscaled to the internal resolution. - - - - Field of view. Needed to transform the pose to world coordinates. - - - - Diagonal FOV - - - - Resolution - - - - Requested video frame rate. Actual setting may not be supported by the camera. - - - - Frames per second - - - - MJPEG - - Tuning / Debug @@ -116,6 +84,10 @@ Don't roll or change position. Zoom factor for the face region. Applied before the patch is fed into the pose estimation model. There is a sweet spot near 1. + + Camera override + + neuralnet_tracker_ns::NeuralNetDialog diff --git a/tracker-neuralnet/lang/zh_CN.ts b/tracker-neuralnet/lang/zh_CN.ts index ab458d6f..13dc34cf 100644 --- a/tracker-neuralnet/lang/zh_CN.ts +++ b/tracker-neuralnet/lang/zh_CN.ts @@ -48,38 +48,6 @@ Don't roll or change position. Camera Configuration - - Camera name - - - - The requested resolution for cases where the camera delivers maximum frame rate only for a particular resolution. The image may still be downscaled to the internal resolution. - - - - Field of view. Needed to transform the pose to world coordinates. - - - - Diagonal FOV - - - - Resolution - - - - Requested video frame rate. Actual setting may not be supported by the camera. - - - - Frames per second - - - - MJPEG - - Tuning / Debug @@ -116,6 +84,10 @@ Don't roll or change position. Zoom factor for the face region. Applied before the patch is fed into the pose estimation model. There is a sweet spot near 1. + + Camera override + + neuralnet_tracker_ns::NeuralNetDialog diff --git a/tracker-neuralnet/neuralnet-trackercontrols.ui b/tracker-neuralnet/neuralnet-trackercontrols.ui index 009b15fd..9fa74b32 100644 --- a/tracker-neuralnet/neuralnet-trackercontrols.ui +++ b/tracker-neuralnet/neuralnet-trackercontrols.ui @@ -9,233 +9,14 @@ 0 0 - 608 - 384 + 654 + 253 Tracker settings - - - - - 0 - 0 - - - - true - - - Camera Configuration - - - false - - - false - - - - 10 - - - 8 - - - - - QLayout::SetDefaultConstraint - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 2 - - - - - Camera name - - - - - - - - 0 - 0 - - - - The requested resolution for cases where the camera delivers maximum frame rate only for a particular resolution. The image may still be downscaled to the internal resolution. - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - Field of view. Needed to transform the pose to world coordinates. - - - - - - 35 - - - 90 - - - - - - - Diagonal FOV - - - - - - - Resolution - - - - - - - Exposure preset - - - - - - - - 0 - 0 - - - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 2 - - - - - - 0 - 0 - - - - Requested video frame rate. Actual setting may not be supported by the camera. - - - - - - - Frames per second - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - - - - - - - MJPEG - - - - - - - - 0 - 0 - - - - Camera settings - - - - - - - - @@ -257,8 +38,8 @@ Tuning / Debug - - + + Qt::Vertical @@ -277,33 +58,6 @@ - - - - Qt::Vertical - - - - - - - - 0 - 0 - - - - ROI Smoothing Alpha - - - - - - - ROI Zoom - - - @@ -311,19 +65,22 @@ - - - - - 0 - 0 - - + + - Show the image patch that the pose estimation model sees. + Zoom factor for the face region. Applied before the patch is fed into the pose estimation model. There is a sweet spot near 1. - - Show Network Input + + 0.100000000000000 + + + 2.000000000000000 + + + 0.010000000000000 + + + 1.000000000000000 @@ -361,29 +118,53 @@ - - + + - Thread Count + ROI Zoom - - - - Zoom factor for the face region. Applied before the patch is fed into the pose estimation model. There is a sweet spot near 1. + + + + + 0 + 0 + - - 0.100000000000000 + + ROI Smoothing Alpha - - 2.000000000000000 + + + + + + + 0 + 0 + - - 0.010000000000000 + + Show the image patch that the pose estimation model sees. - - 1.000000000000000 + + Show Network Input + + + + + + + Qt::Vertical + + + + + + + Thread Count @@ -403,224 +184,373 @@ - - - - - 0 - 0 - + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + true - - Head Center Offset + + QFrame::Panel - - - + + QFrame::Sunken + + + + + + + + + + + 0 + + + - + 0 0 - - - 16777215 - 16777215 - + + true - - QFrame::NoFrame + + Camera Configuration + + + false - - QFrame::Raised + + false - - - QLayout::SetDefaultConstraint + + + 10 - - 0 + + 8 - - - - - 150 - 16777215 - - - - mm - - - -65535 - - - 65536 - - - - - - - - 150 - 16777215 - - - - mm - - - -65535 - - - 65536 - - - - - - - - 0 - 0 - - - - Up - - - - - - - - 0 - 0 - + + + + QLayout::SetDefaultConstraint - - Forward + + 0 - - - - - - - 150 - 16777215 - + + 0 - - mm + + 0 - - -65535 + + 0 - - 65536 - - - - - - - - 0 - 0 - + + 16 - - Right + + 2 - + + + + + 0 + 0 + + + + + + + + Camera override + + + + + + + + 0 + 0 + + + + + + + + Exposure preset + + + + + + + + 0 + 0 + + + + Camera settings + + + + - - + + - + 0 0 - - - 260 - 0 - - - - QFrame::NoFrame + + true - - QFrame::Raised + + Head Center Offset - - - - - Use only yaw and pitch while calibrating. -Don't roll or change position. - - - Qt::AlignCenter - - - true - - - false - - - - - + + + 0 + + + - + 0 0 + + + 16777215 + 16777215 + + - QFrame::Panel + QFrame::NoFrame - QFrame::Sunken - - - - - - true + QFrame::Raised + + + QLayout::SetDefaultConstraint + + + 0 + + + 0 + + + + + + 150 + 16777215 + + + + mm + + + -65535 + + + 65536 + + + + + + + + 150 + 16777215 + + + + mm + + + -65535 + + + 65536 + + + + + + + + 0 + 0 + + + + Up + + + + + + + + 0 + 0 + + + + Forward + + + + + + + + 150 + 16777215 + + + + mm + + + -65535 + + + 65536 + + + + + + + + 0 + 0 + + + + Right + + + + - - - - false - + + - + 0 0 - - Start calibration + + + 260 + 0 + + + + QFrame::NoFrame - - true + + QFrame::Raised + + + 0 + + + + + + 0 + 0 + + + + Use only yaw and pitch while calibrating. +Don't roll or change position. + + + Qt::AlignCenter + + + true + + + false + + + + + + + + 0 + 0 + + + + QFrame::Panel + + + QFrame::Sunken + + + + + + true + + + + + + + false + + + + 0 + 0 + + + + Start calibration + + + true + + + + @@ -629,29 +559,6 @@ Don't roll or change position. - - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - true - - - QFrame::Panel - - - QFrame::Sunken - - - - - - @@ -668,13 +575,7 @@ Don't roll or change position. - camera_settings cameraName - cameraFOV - resolution - exposure_preset - use_mjpeg - cameraFPS tx_spin ty_spin tz_spin -- cgit v1.2.3