From f95a4641a37fba390487e53a7f57982e22266910 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 7 Dec 2018 05:14:45 +0100 Subject: tracker/aruco: add more camera fps options These coincide with power line frequencies. Fixes #794 Users will need to adjust existing settings. --- tracker-aruco/aruco-trackercontrols.ui | 15 +++++++++++++++ tracker-aruco/ftnoir_tracker_aruco.cpp | 27 +++++++++------------------ tracker-aruco/lang/nl_NL.ts | 12 ++++++++++++ tracker-aruco/lang/ru_RU.ts | 12 ++++++++++++ tracker-aruco/lang/stub.ts | 12 ++++++++++++ tracker-aruco/lang/zh_CN.ts | 12 ++++++++++++ 6 files changed, 72 insertions(+), 18 deletions(-) diff --git a/tracker-aruco/aruco-trackercontrols.ui b/tracker-aruco/aruco-trackercontrols.ui index a1600a8f..f2c18c1d 100644 --- a/tracker-aruco/aruco-trackercontrols.ui +++ b/tracker-aruco/aruco-trackercontrols.ui @@ -164,6 +164,11 @@ 30 + + + 50 + + 60 @@ -174,6 +179,16 @@ 75 + + + 100 + + + + + 120 + + 125 diff --git a/tracker-aruco/ftnoir_tracker_aruco.cpp b/tracker-aruco/ftnoir_tracker_aruco.cpp index 502b50ad..db8e499a 100644 --- a/tracker-aruco/ftnoir_tracker_aruco.cpp +++ b/tracker-aruco/ftnoir_tracker_aruco.cpp @@ -144,24 +144,15 @@ bool aruco_tracker::open_camera() switch (*s.force_fps) { default: - case 0: - fps = 0; - break; - case 1: - fps = 30; - break; - case 2: - fps = 60; - break; - case 3: - fps = 75; - break; - case 4: - fps = 125; - break; - case 5: - fps = 200; - break; + case 0: fps = 0; break; + case 1: fps = 30; break; + case 2: fps = 50; break; + case 3: fps = 60; break; + case 4: fps = 75; break; + case 5: fps = 100; break; + case 6: fps = 120; break; + case 7: fps = 125; break; + case 8: fps = 200; break; } QMutexLocker l(&camera_mtx); diff --git a/tracker-aruco/lang/nl_NL.ts b/tracker-aruco/lang/nl_NL.ts index a4136086..ad34d973 100644 --- a/tracker-aruco/lang/nl_NL.ts +++ b/tracker-aruco/lang/nl_NL.ts @@ -83,5 +83,17 @@ Toggle calibration Schakel tussen kalibratie + + 50 + 50 + + + 100 + 100 + + + 120 + 120 + diff --git a/tracker-aruco/lang/ru_RU.ts b/tracker-aruco/lang/ru_RU.ts index f2088d1d..fb54c20f 100644 --- a/tracker-aruco/lang/ru_RU.ts +++ b/tracker-aruco/lang/ru_RU.ts @@ -83,5 +83,17 @@ Toggle calibration + + 50 + + + + 100 + + + + 120 + + diff --git a/tracker-aruco/lang/stub.ts b/tracker-aruco/lang/stub.ts index aadcbd03..39d584a3 100644 --- a/tracker-aruco/lang/stub.ts +++ b/tracker-aruco/lang/stub.ts @@ -83,5 +83,17 @@ Toggle calibration + + 50 + + + + 100 + + + + 120 + + diff --git a/tracker-aruco/lang/zh_CN.ts b/tracker-aruco/lang/zh_CN.ts index 2f497e98..9115340f 100644 --- a/tracker-aruco/lang/zh_CN.ts +++ b/tracker-aruco/lang/zh_CN.ts @@ -83,5 +83,17 @@ Toggle calibration + + 50 + + + + 100 + + + + 120 + + -- cgit v1.2.3