pt, aruco, ht: select camera by name, not index

2 files changed, 5 insertions, 4 deletions

diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
index bd5595e1..b922c0b2 100644
--- a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
+++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
@@ -49,7 +49,7 @@ void Tracker::load_settings(ht_config_t* config)
     config->max_keypoints = 150;
     config->keypoint_distance = 3.5;
     config->force_fps = nframes;
-    config->camera_index = s.camera_idx - 1;
+    config->camera_index = camera_name_to_index(s.camera_name);
     config->ransac_num_iters = 100;
     config->ransac_max_reprojection_error = 10;
     config->ransac_max_inlier_error = 10;
@@ -164,7 +164,7 @@ TrackerControls::TrackerControls()
     QList<QString> names = get_camera_names();
     names.prepend("Any available");
     ui.cameraName->addItems(names);
-    tie_setting(s.camera_idx, ui.cameraName);
+    tie_setting(s.camera_name, ui.cameraName);
     tie_setting(s.fps, ui.cameraFPS);
     tie_setting(s.fov, ui.cameraFOV);
     tie_setting(s.resolution, ui.resolution);
diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.h b/ftnoir_tracker_ht/ftnoir_tracker_ht.h
index ce264b8c..cd4ffa16 100644
--- a/ftnoir_tracker_ht/ftnoir_tracker_ht.h
+++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.h
@@ -20,12 +20,13 @@ using namespace options;
 
 struct settings : opts {
     value<double> fov;
-    value<int> fps, camera_idx, resolution;
+    value<QString> camera_name;
+    value<int> fps, resolution;
     settings() :
         opts("HT-Tracker"),
         fov(b, "fov", 56),
+        camera_name(b, "camera-name", ""),
         fps(b, "fps", 0),
-        camera_idx(b, "camera-index", 0),
         resolution(b, "resolution", 0)
     {}
 };