From 8e0334858ea860d558cb78779d3edda9f9a9fb0f Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 20 Jan 2023 05:54:14 +0100 Subject: tracker/nn: remove hardcoded camera settings from ui --- tracker-neuralnet/ftnoir_tracker_neuralnet.cpp | 8 + tracker-neuralnet/lang/nl_NL.ts | 72 ----- tracker-neuralnet/lang/ru_RU.ts | 72 ----- tracker-neuralnet/lang/stub.ts | 72 ----- tracker-neuralnet/lang/zh_CN.ts | 72 ----- tracker-neuralnet/neuralnet-trackercontrols.ui | 400 ++----------------------- 6 files changed, 30 insertions(+), 666 deletions(-) (limited to 'tracker-neuralnet') diff --git a/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp b/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp index ebd626b0..e9a490fa 100644 --- a/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp +++ b/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp @@ -693,16 +693,19 @@ std::tuple NeuralNetTracker::stats() const void NeuralNetDialog::make_fps_combobox() { +#if 0 for (int k = 0; k < fps_MAX; k++) { const int hz = enum_to_fps(k); const QString name = (hz == 0) ? tr("Default") : QString::number(hz); ui_.cameraFPS->addItem(name, k); } +#endif } void NeuralNetDialog::make_resolution_combobox() { +#if 0 int k=0; for (const auto [w, h] : resolution_choices) { @@ -711,6 +714,7 @@ void NeuralNetDialog::make_resolution_combobox() : QString::number(w) + " x " + QString::number(h); ui_.resolution->addItem(s, k++); } +#endif } @@ -722,14 +726,17 @@ NeuralNetDialog::NeuralNetDialog() : make_fps_combobox(); make_resolution_combobox(); +#if 0 for (const auto& str : video::camera_names()) ui_.cameraName->addItem(str); tie_setting(settings_.camera_name, ui_.cameraName); tie_setting(settings_.fov, ui_.cameraFOV); +#endif tie_setting(settings_.offset_fwd, ui_.tx_spin); tie_setting(settings_.offset_up, ui_.ty_spin); tie_setting(settings_.offset_right, ui_.tz_spin); +#if 0 tie_setting(settings_.show_network_input, ui_.showNetworkInput); tie_setting(settings_.roi_filter_alpha, ui_.roiFilterAlpha); tie_setting(settings_.use_mjpeg, ui_.use_mjpeg); @@ -737,6 +744,7 @@ NeuralNetDialog::NeuralNetDialog() : tie_setting(settings_.num_threads, ui_.threadCount); tie_setting(settings_.resolution, ui_.resolution); tie_setting(settings_.force_fps, ui_.cameraFPS); +#endif connect(ui_.buttonBox, SIGNAL(accepted()), this, SLOT(doOK())); connect(ui_.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel())); diff --git a/tracker-neuralnet/lang/nl_NL.ts b/tracker-neuralnet/lang/nl_NL.ts index dbcd3c8c..25742b8f 100644 --- a/tracker-neuralnet/lang/nl_NL.ts +++ b/tracker-neuralnet/lang/nl_NL.ts @@ -7,26 +7,10 @@ Tracker settings Tracker-instellingen - - Frames per second - Frames per seconde - - - Camera name - Cameranaam - - - Diagonal FOV - Diagonale FOV - Camera settings Camera-instellingen - - Camera Configuration - - Head Center Offset @@ -56,62 +40,6 @@ Don't roll or change position. Up - - Show Network Input - - - - MJPEG - - - - Tuning / Debug - - - - ROI Smoothing Alpha - - - - ROI Zoom - - - - Thread Count - - - - Resolution - - - - Field of view. Needed to transform the pose to world coordinates. - - - - Requested video frame rate. Actual setting may not be supported by the camera. - - - - 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. - - - - Number of threads. Can be used to balance the CPU load between the game and the tracker. - - - - Show the image patch that the pose estimation model sees. - - - - Amount of smoothing of the face region coordinates. Can help stabilize the pose. - - - - Zoom factor for the face region. Applied before the patch is fed into the pose estimation model. There is a sweet spot near 1. - - neuralnet_tracker_ns::NeuralNetDialog diff --git a/tracker-neuralnet/lang/ru_RU.ts b/tracker-neuralnet/lang/ru_RU.ts index a80c7e3d..5b311a19 100644 --- a/tracker-neuralnet/lang/ru_RU.ts +++ b/tracker-neuralnet/lang/ru_RU.ts @@ -7,26 +7,10 @@ Tracker settings - - Diagonal FOV - - Camera settings - - Frames per second - - - - Camera name - - - - Camera Configuration - - Head Center Offset @@ -56,62 +40,6 @@ Don't roll or change position. Up - - Show Network Input - - - - MJPEG - - - - Tuning / Debug - - - - ROI Smoothing Alpha - - - - ROI Zoom - - - - Thread Count - - - - Resolution - - - - Field of view. Needed to transform the pose to world coordinates. - - - - Requested video frame rate. Actual setting may not be supported by the camera. - - - - 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. - - - - Number of threads. Can be used to balance the CPU load between the game and the tracker. - - - - Show the image patch that the pose estimation model sees. - - - - Amount of smoothing of the face region coordinates. Can help stabilize the pose. - - - - Zoom factor for the face region. Applied before the patch is fed into the pose estimation model. There is a sweet spot near 1. - - neuralnet_tracker_ns::NeuralNetDialog diff --git a/tracker-neuralnet/lang/stub.ts b/tracker-neuralnet/lang/stub.ts index 4cde86a9..62ce527b 100644 --- a/tracker-neuralnet/lang/stub.ts +++ b/tracker-neuralnet/lang/stub.ts @@ -7,26 +7,10 @@ Tracker settings - - Diagonal FOV - - Camera settings - - Frames per second - - - - Camera name - - - - Camera Configuration - - Head Center Offset @@ -56,62 +40,6 @@ Don't roll or change position. Up - - Show Network Input - - - - MJPEG - - - - Tuning / Debug - - - - ROI Smoothing Alpha - - - - ROI Zoom - - - - Thread Count - - - - Resolution - - - - Field of view. Needed to transform the pose to world coordinates. - - - - Requested video frame rate. Actual setting may not be supported by the camera. - - - - 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. - - - - Number of threads. Can be used to balance the CPU load between the game and the tracker. - - - - Show the image patch that the pose estimation model sees. - - - - Amount of smoothing of the face region coordinates. Can help stabilize the pose. - - - - Zoom factor for the face region. Applied before the patch is fed into the pose estimation model. There is a sweet spot near 1. - - neuralnet_tracker_ns::NeuralNetDialog diff --git a/tracker-neuralnet/lang/zh_CN.ts b/tracker-neuralnet/lang/zh_CN.ts index c3a91211..39a6c0e2 100644 --- a/tracker-neuralnet/lang/zh_CN.ts +++ b/tracker-neuralnet/lang/zh_CN.ts @@ -7,26 +7,10 @@ Tracker settings - - Diagonal FOV - - - - Camera name - - - - Frames per second - - Camera settings - - Camera Configuration - - Head Center Offset @@ -56,62 +40,6 @@ Don't roll or change position. Up - - Show Network Input - - - - MJPEG - - - - Tuning / Debug - - - - ROI Smoothing Alpha - - - - ROI Zoom - - - - Thread Count - - - - Resolution - - - - Field of view. Needed to transform the pose to world coordinates. - - - - Requested video frame rate. Actual setting may not be supported by the camera. - - - - 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. - - - - Number of threads. Can be used to balance the CPU load between the game and the tracker. - - - - Show the image patch that the pose estimation model sees. - - - - Amount of smoothing of the face region coordinates. Can help stabilize the pose. - - - - Zoom factor for the face region. Applied before the patch is fed into the pose estimation model. There is a sweet spot near 1. - - neuralnet_tracker_ns::NeuralNetDialog diff --git a/tracker-neuralnet/neuralnet-trackercontrols.ui b/tracker-neuralnet/neuralnet-trackercontrols.ui index 750e6ef3..01fdd4bd 100644 --- a/tracker-neuralnet/neuralnet-trackercontrols.ui +++ b/tracker-neuralnet/neuralnet-trackercontrols.ui @@ -9,391 +9,38 @@ 0 0 - 671 - 357 + 445 + 226 Tracker settings - - - - - 0 - 0 - - - - true - - - Camera Configuration - - - false - - - false - - - - 10 - - - 8 - - - - - QLayout::SetDefaultConstraint - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 2 - - - - - - 0 - 0 - - - - - - - - Diagonal FOV - - - - - - - Camera name - - - - - - - - 0 - 0 - - - - Field of view. Needed to transform the pose to world coordinates. - - - - - - 35 - - - 90 - - - - - - - - 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. - - - - - - - Resolution - - - - - - - - - 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 - - - - - - - - - + QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - 0 - 0 - - - - - 0 - 0 - - + + true - - Tuning / Debug + + QFrame::Panel + + + QFrame::Sunken + + + - - - - - Qt::Vertical - - - - - - - Number of threads. Can be used to balance the CPU load between the game and the tracker. - - - 1 - - - 32 - - - - - - - Qt::Vertical - - - - - - - - 0 - 0 - - - - ROI Smoothing Alpha - - - - - - - ROI Zoom - - - - - - - Qt::Vertical - - - - - - - - 0 - 0 - - - - Show the image patch that the pose estimation model sees. - - - Show Network Input - - - - - - - - 0 - 0 - - - - - 150 - 16777215 - - - - Amount of smoothing of the face region coordinates. Can help stabilize the pose. - - - false - - - 2 - - - 1.000000000000000 - - - 0.010000000000000 - - - 1.000000000000000 - - - - - - - Thread Count - - - - - - - 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.100000000000000 - - - 2.000000000000000 - - - 0.010000000000000 - - - 1.000000000000000 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - + @@ -613,19 +260,16 @@ Don't roll or change position. - - - - true - - - QFrame::Panel - - - QFrame::Sunken + + + + + 0 + 0 + - + Camera settings -- cgit v1.2.3