diff options
Diffstat (limited to 'tracker-easy')
-rw-r--r-- | tracker-easy/lang/nl_NL.ts | 44 | ||||
-rw-r--r-- | tracker-easy/lang/ru_RU.ts | 44 | ||||
-rw-r--r-- | tracker-easy/lang/stub.ts | 44 | ||||
-rw-r--r-- | tracker-easy/lang/zh_CN.ts | 44 | ||||
-rw-r--r-- | tracker-easy/settings.h | 2 | ||||
-rw-r--r-- | tracker-easy/tracker-easy-dialog.cpp | 33 | ||||
-rw-r--r-- | tracker-easy/tracker-easy-dialog.h | 1 | ||||
-rw-r--r-- | tracker-easy/tracker-easy-settings.ui | 381 |
8 files changed, 174 insertions, 419 deletions
diff --git a/tracker-easy/lang/nl_NL.ts b/tracker-easy/lang/nl_NL.ts index 21ea306e..22a99106 100644 --- a/tracker-easy/lang/nl_NL.ts +++ b/tracker-easy/lang/nl_NL.ts @@ -4,14 +4,6 @@ <context> <name>EasyTracker::Dialog</name> <message> - <source>Brightness %1/255</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>LED radius %1 pixels</source> - <translation type="unfinished"></translation> - </message> - <message> <source>%1 yaw samples. Yaw more to %2 samples for stable calibration.</source> <translation type="unfinished"></translation> </message> @@ -54,10 +46,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Camera settings</source> - <translation type="unfinished"></translation> - </message> - <message> <source>°</source> <translation type="unfinished"></translation> </message> @@ -110,34 +98,14 @@ <translation type="unfinished"></translation> </message> <message> - <source>Point extraction</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Max size</source> <translation type="unfinished"></translation> </message> <message> - <source>Threshold</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Min size</source> <translation type="unfinished"></translation> </message> <message> - <source>Intensity threshold for point extraction</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Automatic threshold</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Enable, slider sets point size</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Maximum point diameter</source> <translation type="unfinished"></translation> </message> @@ -146,10 +114,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Value</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Model</source> <translation type="unfinished"></translation> </message> @@ -282,5 +246,13 @@ Don't roll or change position.</source> <source>AP3P</source> <translation type="unfinished"></translation> </message> + <message> + <source>Tracker</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Settings</source> + <translation type="unfinished"></translation> + </message> </context> </TS> diff --git a/tracker-easy/lang/ru_RU.ts b/tracker-easy/lang/ru_RU.ts index bc725e23..d45c89d1 100644 --- a/tracker-easy/lang/ru_RU.ts +++ b/tracker-easy/lang/ru_RU.ts @@ -4,14 +4,6 @@ <context> <name>EasyTracker::Dialog</name> <message> - <source>Brightness %1/255</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>LED radius %1 pixels</source> - <translation type="unfinished"></translation> - </message> - <message> <source>%1 yaw samples. Yaw more to %2 samples for stable calibration.</source> <translation type="unfinished">По оси YAW выполнено: %1 замер(а/ов). Для стабильного результата необходимо не меньше %2</translation> </message> @@ -54,10 +46,6 @@ <translation>Камера</translation> </message> <message> - <source>Camera settings</source> - <translation>Настройка камеры</translation> - </message> - <message> <source>°</source> <translation></translation> </message> @@ -110,34 +98,14 @@ <translation>Параметры камеры (если доступно)</translation> </message> <message> - <source>Point extraction</source> - <translation>Извлечение точек</translation> - </message> - <message> <source>Max size</source> <translation>Макс.размер</translation> </message> <message> - <source>Threshold</source> - <translation>Порог</translation> - </message> - <message> <source>Min size</source> <translation>Мин.размер</translation> </message> <message> - <source>Intensity threshold for point extraction</source> - <translation>Порог интенсивности для извлечения точки</translation> - </message> - <message> - <source>Automatic threshold</source> - <translation>Автоматич. порог</translation> - </message> - <message> - <source>Enable, slider sets point size</source> - <translation>Полузнок устанавливает размер точек</translation> - </message> - <message> <source>Maximum point diameter</source> <translation></translation> </message> @@ -146,10 +114,6 @@ <translation></translation> </message> <message> - <source>Value</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Model</source> <translation>Модель</translation> </message> @@ -287,5 +251,13 @@ ROLL или X/Y-смещения.</translation> <source>AP3P</source> <translation type="unfinished"></translation> </message> + <message> + <source>Tracker</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Settings</source> + <translation type="unfinished"></translation> + </message> </context> </TS> diff --git a/tracker-easy/lang/stub.ts b/tracker-easy/lang/stub.ts index 75e29070..1b58a8f4 100644 --- a/tracker-easy/lang/stub.ts +++ b/tracker-easy/lang/stub.ts @@ -4,14 +4,6 @@ <context> <name>EasyTracker::Dialog</name> <message> - <source>Brightness %1/255</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>LED radius %1 pixels</source> - <translation type="unfinished"></translation> - </message> - <message> <source>%1 yaw samples. Yaw more to %2 samples for stable calibration.</source> <translation type="unfinished"></translation> </message> @@ -54,10 +46,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Camera settings</source> - <translation type="unfinished"></translation> - </message> - <message> <source>°</source> <translation type="unfinished"></translation> </message> @@ -110,34 +98,14 @@ <translation type="unfinished"></translation> </message> <message> - <source>Point extraction</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Max size</source> <translation type="unfinished"></translation> </message> <message> - <source>Threshold</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Min size</source> <translation type="unfinished"></translation> </message> <message> - <source>Intensity threshold for point extraction</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Automatic threshold</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Enable, slider sets point size</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Maximum point diameter</source> <translation type="unfinished"></translation> </message> @@ -146,10 +114,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Value</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Model</source> <translation type="unfinished"></translation> </message> @@ -282,5 +246,13 @@ Don't roll or change position.</source> <source>AP3P</source> <translation type="unfinished"></translation> </message> + <message> + <source>Tracker</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Settings</source> + <translation type="unfinished"></translation> + </message> </context> </TS> diff --git a/tracker-easy/lang/zh_CN.ts b/tracker-easy/lang/zh_CN.ts index 68172059..d524aaed 100644 --- a/tracker-easy/lang/zh_CN.ts +++ b/tracker-easy/lang/zh_CN.ts @@ -4,14 +4,6 @@ <context> <name>EasyTracker::Dialog</name> <message> - <source>Brightness %1/255</source> - <translation type="unfinished">亮度 %1/255</translation> - </message> - <message> - <source>LED radius %1 pixels</source> - <translation type="unfinished">光源半径 %1 像素</translation> - </message> - <message> <source>%1 yaw samples. Yaw more to %2 samples for stable calibration.</source> <translation type="unfinished"></translation> </message> @@ -54,10 +46,6 @@ <translation>摄像头</translation> </message> <message> - <source>Camera settings</source> - <translation>摄像头设置</translation> - </message> - <message> <source>°</source> <translation>度</translation> </message> @@ -110,34 +98,14 @@ <translation>摄像头设置 (连接时)</translation> </message> <message> - <source>Point extraction</source> - <translation>跟踪点解析</translation> - </message> - <message> <source>Max size</source> <translation>最大</translation> </message> <message> - <source>Threshold</source> - <translation>大小门限值</translation> - </message> - <message> <source>Min size</source> <translation>最小</translation> </message> <message> - <source>Intensity threshold for point extraction</source> - <translation>点密度</translation> - </message> - <message> - <source>Automatic threshold</source> - <translation>自动门限值</translation> - </message> - <message> - <source>Enable, slider sets point size</source> - <translation>激活,滑动,设置跟踪点大小</translation> - </message> - <message> <source>Maximum point diameter</source> <translation>最大点直径</translation> </message> @@ -226,10 +194,6 @@ <translation>设备信息:</translation> </message> <message> - <source>Value</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Use only yaw and pitch while calibrating. Don't roll or change position.</source> <translation>用pitch和yaw校准。不要roll或者变换位置</translation> @@ -282,5 +246,13 @@ Don't roll or change position.</source> <source>AP3P</source> <translation type="unfinished"></translation> </message> + <message> + <source>Tracker</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Settings</source> + <translation type="unfinished"></translation> + </message> </context> </TS> diff --git a/tracker-easy/settings.h b/tracker-easy/settings.h index 4d043e6a..b4c14967 100644 --- a/tracker-easy/settings.h +++ b/tracker-easy/settings.h @@ -48,10 +48,8 @@ namespace EasyTracker { value<bool> debug{ b, "debug", false }; - value<bool> auto_threshold{ b, "automatic-threshold", true }; value<int> PnpSolver{ b, "pnp-solver", cv::SOLVEPNP_P3P }; - value<slider_value> threshold_slider{ b, "threshold-slider", { 128, 0, 255 } }; explicit Settings(const QString& name) : opts(name) {} }; diff --git a/tracker-easy/tracker-easy-dialog.cpp b/tracker-easy/tracker-easy-dialog.cpp index 36c5d99d..fe0091c5 100644 --- a/tracker-easy/tracker-easy-dialog.cpp +++ b/tracker-easy/tracker-easy-dialog.cpp @@ -42,8 +42,6 @@ namespace EasyTracker tie_setting(s.cam_res_y, ui.res_y_spin); tie_setting(s.cam_fps, ui.fps_spin); - tie_setting(s.threshold_slider, ui.threshold_slider); - tie_setting(s.min_point_size, ui.mindiam_spin); tie_setting(s.max_point_size, ui.maxdiam_spin); tie_setting(s.DeadzoneRectHalfEdgeSize, ui.spinDeadzone); @@ -75,7 +73,6 @@ namespace EasyTracker tie_setting(s.debug, ui.debug); - tie_setting(s.auto_threshold, ui.auto_threshold); connect(ui.tcalib_button, SIGNAL(toggled(bool)), this, SLOT(startstop_trans_calib(bool))); @@ -102,37 +99,9 @@ namespace EasyTracker tie_setting(s.PnpSolver, ui.comboBoxSolvers); - tie_setting(s.threshold_slider, ui.threshold_value_display, [this](const slider_value& val) { - return threshold_display_text(int(val)); - }); - - // refresh threshold display on auto-threshold checkbox state change - tie_setting(s.auto_threshold, - this, - [this](bool) { s.threshold_slider.notify(); }); - } - - QString Dialog::threshold_display_text(int threshold_value) - { - if (!s.auto_threshold) - return tr("Brightness %1/255").arg(threshold_value); - else - { - int w = s.cam_res_x, h = s.cam_res_y; - - if (w * h <= 0) - { - w = 640; - h = 480; - } - - //SL: What are we suppose to do here? - double value = 0.0f; - - return tr("LED radius %1 pixels").arg(value, 0, 'f', 2); - } } + void Dialog::startstop_trans_calib(bool start) { QMutexLocker l(&calibrator_mutex); diff --git a/tracker-easy/tracker-easy-dialog.h b/tracker-easy/tracker-easy-dialog.h index f5a52d0c..768eaa21 100644 --- a/tracker-easy/tracker-easy-dialog.h +++ b/tracker-easy/tracker-easy-dialog.h @@ -38,7 +38,6 @@ namespace EasyTracker signals: void poll_tracker_info(); protected: - QString threshold_display_text(int threshold_value); Settings s; Tracker* tracker; diff --git a/tracker-easy/tracker-easy-settings.ui b/tracker-easy/tracker-easy-settings.ui index 9ff929dc..2ec56a04 100644 --- a/tracker-easy/tracker-easy-settings.ui +++ b/tracker-easy/tracker-easy-settings.ui @@ -117,9 +117,9 @@ <property name="currentIndex"> <number>0</number> </property> - <widget class="QWidget" name="tab_2"> + <widget class="QWidget" name="tabTracker"> <attribute name="title"> - <string>Camera</string> + <string>Tracker</string> </attribute> <layout class="QVBoxLayout" name="verticalLayout"> <item> @@ -131,35 +131,25 @@ </sizepolicy> </property> <property name="title"> - <string>Camera settings</string> + <string>Camera</string> </property> <layout class="QGridLayout" name="gridLayout_2"> - <item row="5" column="0"> - <widget class="QLabel" name="label_5"> + <item row="3" column="1"> + <widget class="QSpinBox" name="fps_spin"> <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> + <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="text"> - <string>Debug (full size preview)</string> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="label_2"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <property name="toolTip"> + <string>Desired capture framerate</string> </property> - <property name="text"> - <string>Device</string> + <property name="suffix"> + <string> Hz</string> </property> - <property name="buddy"> - <cstring>camdevice_combo</cstring> + <property name="maximum"> + <number>2000</number> </property> </widget> </item> @@ -176,8 +166,8 @@ </property> </widget> </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_41"> + <item row="5" column="0"> + <widget class="QLabel" name="label_9"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> <horstretch>0</horstretch> @@ -185,12 +175,12 @@ </sizepolicy> </property> <property name="text"> - <string>Height</string> + <string>Camera settings (when available)</string> </property> </widget> </item> - <item row="7" column="0"> - <widget class="QLabel" name="label_12"> + <item row="1" column="0"> + <widget class="QLabel" name="label_36"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> <horstretch>0</horstretch> @@ -198,38 +188,25 @@ </sizepolicy> </property> <property name="text"> - <string>Perspective-N-Point solver</string> - </property> - </widget> - </item> - <item row="5" column="1"> - <widget class="QCheckBox" name="debug"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string/> + <string>Width</string> </property> </widget> </item> - <item row="6" column="1"> - <widget class="QPushButton" name="camera_settings"> + <item row="2" column="0"> + <widget class="QLabel" name="label_41"> <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> + <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> <property name="text"> - <string>Open</string> + <string>Height</string> </property> </widget> </item> - <item row="6" column="0"> - <widget class="QLabel" name="label_9"> + <item row="3" column="0"> + <widget class="QLabel" name="label_37"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> <horstretch>0</horstretch> @@ -237,54 +214,24 @@ </sizepolicy> </property> <property name="text"> - <string>Camera settings (when available)</string> + <string>FPS</string> + </property> + <property name="buddy"> + <cstring>fps_spin</cstring> </property> </widget> </item> - <item row="7" column="1"> - <widget class="QComboBox" name="comboBoxSolvers"> + <item row="5" column="1"> + <widget class="QPushButton" name="camera_settings"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="toolTip"> - <string>Make sure you pick a solver supporting the number of marker you are using. For three points detection use either P3P or AP3P.</string> - </property> - <property name="currentText"> - <string>P3P</string> + <property name="text"> + <string>Open</string> </property> - <item> - <property name="text"> - <string>ITERATIVE</string> - </property> - </item> - <item> - <property name="text"> - <string>EPNP</string> - </property> - </item> - <item> - <property name="text"> - <string>P3P</string> - </property> - </item> - <item> - <property name="text"> - <string>DLS</string> - </property> - </item> - <item> - <property name="text"> - <string>UPNP</string> - </property> - </item> - <item> - <property name="text"> - <string>AP3P</string> - </property> - </item> </widget> </item> <item row="4" column="1"> @@ -309,30 +256,8 @@ </property> </widget> </item> - <item row="2" column="1"> - <widget class="QSpinBox" name="res_y_spin"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>Desired capture height</string> - </property> - <property name="suffix"> - <string> px</string> - </property> - <property name="maximum"> - <number>2000</number> - </property> - <property name="singleStep"> - <number>10</number> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_36"> + <item row="0" column="0"> + <widget class="QLabel" name="label_2"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> <horstretch>0</horstretch> @@ -340,25 +265,15 @@ </sizepolicy> </property> <property name="text"> - <string>Width</string> - </property> - </widget> - </item> - <item row="4" column="0"> - <widget class="QLabel" name="label_4"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <string>Device</string> </property> - <property name="text"> - <string>Diagonal field of view</string> + <property name="buddy"> + <cstring>camdevice_combo</cstring> </property> </widget> </item> - <item row="3" column="1"> - <widget class="QSpinBox" name="fps_spin"> + <item row="2" column="1"> + <widget class="QSpinBox" name="res_y_spin"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <horstretch>0</horstretch> @@ -366,29 +281,16 @@ </sizepolicy> </property> <property name="toolTip"> - <string>Desired capture framerate</string> + <string>Desired capture height</string> </property> <property name="suffix"> - <string> Hz</string> + <string> px</string> </property> <property name="maximum"> <number>2000</number> </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="label_37"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>FPS</string> - </property> - <property name="buddy"> - <cstring>fps_spin</cstring> + <property name="singleStep"> + <number>10</number> </property> </widget> </item> @@ -414,6 +316,19 @@ </property> </widget> </item> + <item row="4" column="0"> + <widget class="QLabel" name="label_4"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Diagonal field of view</string> + </property> + </widget> + </item> </layout> </widget> </item> @@ -426,31 +341,27 @@ </sizepolicy> </property> <property name="title"> - <string>Point extraction</string> + <string>Settings</string> </property> <layout class="QGridLayout" name="gridLayout_7"> - <item row="3" column="1"> - <widget class="QLabel" name="threshold_value_display"> + <item row="2" column="0"> + <widget class="QLabel" name="label_7"> <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> + <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> <property name="text"> - <string/> + <string>Min size</string> </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="label_14"> - <property name="text"> - <string>Value</string> + <property name="buddy"> + <cstring>mindiam_spin</cstring> </property> </widget> </item> - <item row="4" column="0"> - <widget class="QLabel" name="label_7"> + <item row="5" column="0"> + <widget class="QLabel" name="labelDeadzone"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <horstretch>0</horstretch> @@ -458,15 +369,15 @@ </sizepolicy> </property> <property name="text"> - <string>Min size</string> + <string>Deadzone</string> </property> <property name="buddy"> - <cstring>mindiam_spin</cstring> + <cstring>maxdiam_spin</cstring> </property> </widget> </item> - <item row="1" column="1" colspan="2"> - <widget class="QCheckBox" name="auto_threshold"> + <item row="3" column="0"> + <widget class="QLabel" name="label_8"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <horstretch>0</horstretch> @@ -474,50 +385,54 @@ </sizepolicy> </property> <property name="text"> - <string>Enable, slider sets point size</string> + <string>Max size</string> + </property> + <property name="buddy"> + <cstring>maxdiam_spin</cstring> </property> </widget> </item> - <item row="2" column="0"> - <widget class="QLabel" name="label"> + <item row="0" column="0"> + <widget class="QLabel" name="label_5"> <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> + <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> <property name="text"> - <string>Threshold</string> - </property> - <property name="buddy"> - <cstring>threshold_slider</cstring> + <string>Debug (full size preview)</string> </property> </widget> </item> - <item row="4" column="1"> - <widget class="QDoubleSpinBox" name="mindiam_spin"> + <item row="0" column="1"> + <widget class="QCheckBox" name="debug"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="toolTip"> - <string>Minimum point diameter</string> - </property> - <property name="suffix"> - <string> px</string> + <property name="text"> + <string/> </property> - <property name="decimals"> - <number>1</number> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_12"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="singleStep"> - <double>0.100000000000000</double> + <property name="text"> + <string>Perspective-N-Point solver</string> </property> </widget> </item> - <item row="2" column="1"> - <widget class="QSlider" name="threshold_slider"> + <item row="1" column="1"> + <widget class="QComboBox" name="comboBoxSolvers"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <horstretch>0</horstretch> @@ -525,30 +440,45 @@ </sizepolicy> </property> <property name="toolTip"> - <string>Intensity threshold for point extraction</string> - </property> - <property name="maximum"> - <number>255</number> - </property> - <property name="pageStep"> - <number>1</number> - </property> - <property name="value"> - <number>127</number> - </property> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="tickPosition"> - <enum>QSlider::TicksBothSides</enum> + <string>Make sure you pick a solver supporting the number of marker you are using. For three points detection use either P3P or AP3P.</string> </property> - <property name="tickInterval"> - <number>25</number> + <property name="currentText"> + <string>ITERATIVE</string> </property> + <item> + <property name="text"> + <string>ITERATIVE</string> + </property> + </item> + <item> + <property name="text"> + <string>EPNP</string> + </property> + </item> + <item> + <property name="text"> + <string>P3P</string> + </property> + </item> + <item> + <property name="text"> + <string>DLS</string> + </property> + </item> + <item> + <property name="text"> + <string>UPNP</string> + </property> + </item> + <item> + <property name="text"> + <string>AP3P</string> + </property> + </item> </widget> </item> - <item row="5" column="1"> - <widget class="QDoubleSpinBox" name="maxdiam_spin"> + <item row="2" column="1"> + <widget class="QDoubleSpinBox" name="mindiam_spin"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <horstretch>0</horstretch> @@ -556,7 +486,7 @@ </sizepolicy> </property> <property name="toolTip"> - <string>Maximum point diameter</string> + <string>Minimum point diameter</string> </property> <property name="suffix"> <string> px</string> @@ -569,52 +499,29 @@ </property> </widget> </item> - <item row="5" column="0"> - <widget class="QLabel" name="label_8"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Max size</string> - </property> - <property name="buddy"> - <cstring>maxdiam_spin</cstring> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_11"> + <item row="3" column="1"> + <widget class="QDoubleSpinBox" name="maxdiam_spin"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="text"> - <string>Automatic threshold</string> + <property name="toolTip"> + <string>Maximum point diameter</string> </property> - </widget> - </item> - <item row="6" column="0"> - <widget class="QLabel" name="labelDeadzone"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <property name="suffix"> + <string> px</string> </property> - <property name="text"> - <string>Deadzone</string> + <property name="decimals"> + <number>1</number> </property> - <property name="buddy"> - <cstring>maxdiam_spin</cstring> + <property name="singleStep"> + <double>0.100000000000000</double> </property> </widget> </item> - <item row="6" column="1"> + <item row="5" column="1"> <widget class="QSpinBox" name="spinDeadzone"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> @@ -1402,13 +1309,7 @@ Don't roll or change position.</string> <tabstop>res_y_spin</tabstop> <tabstop>fps_spin</tabstop> <tabstop>fov</tabstop> - <tabstop>debug</tabstop> <tabstop>camera_settings</tabstop> - <tabstop>comboBoxSolvers</tabstop> - <tabstop>auto_threshold</tabstop> - <tabstop>threshold_slider</tabstop> - <tabstop>mindiam_spin</tabstop> - <tabstop>maxdiam_spin</tabstop> <tabstop>model_tabs</tabstop> <tabstop>clip_tlength_spin</tabstop> <tabstop>clip_theight_spin</tabstop> |