diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2018-12-07 05:14:45 +0100 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2018-12-07 05:14:45 +0100 |
commit | f95a4641a37fba390487e53a7f57982e22266910 (patch) | |
tree | c8abbc2f893c61ba1694bce712845bb80858b61d | |
parent | c804162354aabf6d9a6f0528cdb216c2203b760d (diff) |
tracker/aruco: add more camera fps options
These coincide with power line frequencies.
Fixes #794
Users will need to adjust existing settings.
-rw-r--r-- | tracker-aruco/aruco-trackercontrols.ui | 15 | ||||
-rw-r--r-- | tracker-aruco/ftnoir_tracker_aruco.cpp | 27 | ||||
-rw-r--r-- | tracker-aruco/lang/nl_NL.ts | 12 | ||||
-rw-r--r-- | tracker-aruco/lang/ru_RU.ts | 12 | ||||
-rw-r--r-- | tracker-aruco/lang/stub.ts | 12 | ||||
-rw-r--r-- | 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 @@ -166,6 +166,11 @@ </item> <item> <property name="text"> + <string>50</string> + </property> + </item> + <item> + <property name="text"> <string>60</string> </property> </item> @@ -176,6 +181,16 @@ </item> <item> <property name="text"> + <string>100</string> + </property> + </item> + <item> + <property name="text"> + <string>120</string> + </property> + </item> + <item> + <property name="text"> <string>125</string> </property> </item> 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 @@ <source>Toggle calibration</source> <translation>Schakel tussen kalibratie</translation> </message> + <message> + <source>50</source> + <translation type="unfinished">50</translation> + </message> + <message> + <source>100</source> + <translation type="unfinished">100</translation> + </message> + <message> + <source>120</source> + <translation type="unfinished">120</translation> + </message> </context> </TS> 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 @@ <source>Toggle calibration</source> <translation type="unfinished"></translation> </message> + <message> + <source>50</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>100</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>120</source> + <translation type="unfinished"></translation> + </message> </context> </TS> 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 @@ <source>Toggle calibration</source> <translation type="unfinished"></translation> </message> + <message> + <source>50</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>100</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>120</source> + <translation type="unfinished"></translation> + </message> </context> </TS> 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 @@ <source>Toggle calibration</source> <translation type="unfinished"></translation> </message> + <message> + <source>50</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>100</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>120</source> + <translation type="unfinished"></translation> + </message> </context> </TS> |