summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-07-20 08:09:59 +0200
committerStanislaw Halik <sthalik@misaki.pl>2015-07-20 08:09:59 +0200
commiteca75bfc0f1b6b990076232f7d27e4d1d2f55dd3 (patch)
tree158672fae919925ecf01b7fbd79cbd7ed6f37966
parente9b42b3d4eabd1d4fbcdfb990c26f286259be8d2 (diff)
aruco: make fov int, not double
-rw-r--r--ftnoir_tracker_aruco/aruco-trackercontrols.ui41
-rw-r--r--ftnoir_tracker_aruco/ftnoir_tracker_aruco.h3
2 files changed, 21 insertions, 23 deletions
diff --git a/ftnoir_tracker_aruco/aruco-trackercontrols.ui b/ftnoir_tracker_aruco/aruco-trackercontrols.ui
index bc384f39..7e32936c 100644
--- a/ftnoir_tracker_aruco/aruco-trackercontrols.ui
+++ b/ftnoir_tracker_aruco/aruco-trackercontrols.ui
@@ -33,28 +33,6 @@
<item row="0" column="0">
<widget class="QFrame" name="frame">
<layout class="QGridLayout" name="gridLayout_3">
- <item row="0" column="1">
- <widget class="QDoubleSpinBox" name="cameraFOV">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="locale">
- <locale language="English" country="UnitedStates"/>
- </property>
- <property name="minimum">
- <double>35.000000000000000</double>
- </property>
- <property name="maximum">
- <double>180.000000000000000</double>
- </property>
- <property name="value">
- <double>52.000000000000000</double>
- </property>
- </widget>
- </item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
@@ -172,6 +150,25 @@
</property>
</widget>
</item>
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="cameraFOV">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="locale">
+ <locale language="English" country="UnitedStates"/>
+ </property>
+ <property name="minimum">
+ <number>10</number>
+ </property>
+ <property name="maximum">
+ <number>180</number>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h
index 86e8d1b9..9691a75c 100644
--- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h
+++ b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h
@@ -26,7 +26,8 @@
using namespace options;
struct settings : opts {
- value<double> fov, headpos_x, headpos_y, headpos_z;
+ value<int> fov;
+ value<double> headpos_x, headpos_y, headpos_z;
value<QString> camera_name;
value<int> force_fps, resolution;
settings() :