summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2014-01-04 13:44:39 +0100
committerStanislaw Halik <sthalik@misaki.pl>2014-01-04 13:44:39 +0100
commit4bef8ec6aebad1b709efd7393cb9f4a63b28ebf3 (patch)
treec555130cbea107f0cbe7f69bd103cfe9065b2613
parent8b845f242495a91aca45cd1bf59d1823517b32c8 (diff)
allow aruco to run at 180 hz
-rw-r--r--ftnoir_tracker_aruco/aruco-trackercontrols.ui9
-rw-r--r--ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp3
2 files changed, 10 insertions, 2 deletions
diff --git a/ftnoir_tracker_aruco/aruco-trackercontrols.ui b/ftnoir_tracker_aruco/aruco-trackercontrols.ui
index 3bf141de..3f5a1d2a 100644
--- a/ftnoir_tracker_aruco/aruco-trackercontrols.ui
+++ b/ftnoir_tracker_aruco/aruco-trackercontrols.ui
@@ -30,7 +30,7 @@
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="spacing">
- <number>-1</number>
+ <number>7</number>
</property>
<item row="2" column="1" colspan="2">
<widget class="QComboBox" name="cameraName"/>
@@ -94,6 +94,11 @@
<string>120</string>
</property>
</item>
+ <item>
+ <property name="text">
+ <string>180</string>
+ </property>
+ </item>
</widget>
</item>
<item row="6" column="2" rowspan="4" colspan="3">
@@ -186,7 +191,7 @@
</property>
<layout class="QFormLayout" name="formLayout">
<property name="horizontalSpacing">
- <number>-1</number>
+ <number>7</number>
</property>
<property name="leftMargin">
<number>6</number>
diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp
index b4f35c6f..136a983a 100644
--- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp
+++ b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp
@@ -157,6 +157,9 @@ void Tracker::run()
case 3:
fps = 120;
break;
+ case 4:
+ fps = 180;
+ break;
}
camera = cv::VideoCapture(s.camera_index);
if (r.width)