summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-08-14 15:29:39 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-08-14 15:29:39 +0200
commita95313c4ecde314abeb00ee9b5cb287e64658e83 (patch)
treefe01b4a0f45fcd578ffc6e9dbbfc0826b88072c6
parent1577bef63662b9fec3fb7b8a2e31a544a2d76e1e (diff)
tracker/aruco: show 75 FPS option in combobox
Reported-by: @andregm3 Closes #409
-rw-r--r--tracker-aruco/aruco-trackercontrols.ui5
-rw-r--r--tracker-aruco/ftnoir_tracker_aruco.cpp5
2 files changed, 9 insertions, 1 deletions
diff --git a/tracker-aruco/aruco-trackercontrols.ui b/tracker-aruco/aruco-trackercontrols.ui
index 7e32936c..807fa909 100644
--- a/tracker-aruco/aruco-trackercontrols.ui
+++ b/tracker-aruco/aruco-trackercontrols.ui
@@ -116,6 +116,11 @@
</item>
<item>
<property name="text">
+ <string>75</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 802e832b..64f404cc 100644
--- a/tracker-aruco/ftnoir_tracker_aruco.cpp
+++ b/tracker-aruco/ftnoir_tracker_aruco.cpp
@@ -153,9 +153,12 @@ bool Tracker::open_camera()
fps = 60;
break;
case 3:
- fps = 125;
+ fps = 75;
break;
case 4:
+ fps = 125;
+ break;
+ case 5:
fps = 200;
break;
}