diff options
| -rw-r--r-- | tracker-trackhat/camera.cpp | 2 | ||||
| -rw-r--r-- | tracker-trackhat/dialog.cpp | 2 | ||||
| -rw-r--r-- | tracker-trackhat/dialog.ui | 48 | ||||
| -rw-r--r-- | tracker-trackhat/lang/nl_NL.ts | 4 | ||||
| -rw-r--r-- | tracker-trackhat/lang/ru_RU.ts | 4 | ||||
| -rw-r--r-- | tracker-trackhat/lang/stub.ts | 4 | ||||
| -rw-r--r-- | tracker-trackhat/lang/zh_CN.ts | 4 | ||||
| -rw-r--r-- | tracker-trackhat/settings.cpp | 2 | ||||
| -rw-r--r-- | tracker-trackhat/trackhat.hpp | 2 |
9 files changed, 6 insertions, 66 deletions
diff --git a/tracker-trackhat/camera.cpp b/tracker-trackhat/camera.cpp index 94b81272..dd1f3d3a 100644 --- a/tracker-trackhat/camera.cpp +++ b/tracker-trackhat/camera.cpp @@ -54,7 +54,7 @@ trackhat_camera::trackhat_camera() s.set_raii_dtor_state(false); t.set_raii_dtor_state(false); - for (auto* slider : { &t.exposure, &t.threshold, }) + for (auto* slider : { &t.exposure, /*&t.threshold,*/ }) { QObject::connect(slider, options::value_::value_changed<options::slider_value>(), &sig, &trackhat_impl::setting_receiver::settings_changed, diff --git a/tracker-trackhat/dialog.cpp b/tracker-trackhat/dialog.cpp index 19563143..cfff03ba 100644 --- a/tracker-trackhat/dialog.cpp +++ b/tracker-trackhat/dialog.cpp @@ -45,6 +45,7 @@ trackhat_dialog::trackhat_dialog() // threshold +#if 0 tie_setting(t.threshold, ui.threshold_slider); ui.threshold_label->setValue((int)*t.threshold); @@ -52,6 +53,7 @@ trackhat_dialog::trackhat_dialog() connect(&t.threshold, value_::value_changed<slider_value>(), ui.threshold_label, [=] { ui.threshold_label->setValue((int)*t.threshold); }, Qt::QueuedConnection); +#endif // point filter diff --git a/tracker-trackhat/dialog.ui b/tracker-trackhat/dialog.ui index 3195cf24..30cf78db 100644 --- a/tracker-trackhat/dialog.ui +++ b/tracker-trackhat/dialog.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>365</width> - <height>460</height> + <height>429</height> </rect> </property> <property name="minimumSize"> @@ -30,32 +30,6 @@ <string>Camera</string> </property> <layout class="QGridLayout" name="gridLayout"> - <item row="1" column="1"> - <widget class="QSlider" name="threshold_slider"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Maximum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimum"> - <number>64</number> - </property> - <property name="maximum"> - <number>254</number> - </property> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>Threshold</string> - </property> - </widget> - </item> <item row="0" column="2"> <widget class="QSpinBox" name="exposure_label"> <property name="focusPolicy"> @@ -94,25 +68,6 @@ </property> </widget> </item> - <item row="1" column="2"> - <widget class="QSpinBox" name="threshold_label"> - <property name="focusPolicy"> - <enum>Qt::NoFocus</enum> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - <property name="buttonSymbols"> - <enum>QAbstractSpinBox::NoButtons</enum> - </property> - <property name="maximum"> - <number>999</number> - </property> - </widget> - </item> <item row="0" column="0"> <widget class="QLabel" name="label"> <property name="text"> @@ -553,7 +508,6 @@ </widget> <tabstops> <tabstop>exposure_slider</tabstop> - <tabstop>threshold_slider</tabstop> <tabstop>model_type</tabstop> <tabstop>min_point_size</tabstop> <tabstop>max_point_size</tabstop> diff --git a/tracker-trackhat/lang/nl_NL.ts b/tracker-trackhat/lang/nl_NL.ts index 9166a143..73e375fc 100644 --- a/tracker-trackhat/lang/nl_NL.ts +++ b/tracker-trackhat/lang/nl_NL.ts @@ -48,10 +48,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Threshold</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Exposure</source> <translation type="unfinished"></translation> </message> diff --git a/tracker-trackhat/lang/ru_RU.ts b/tracker-trackhat/lang/ru_RU.ts index 3d587010..091c2101 100644 --- a/tracker-trackhat/lang/ru_RU.ts +++ b/tracker-trackhat/lang/ru_RU.ts @@ -48,10 +48,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Threshold</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Exposure</source> <translation type="unfinished"></translation> </message> diff --git a/tracker-trackhat/lang/stub.ts b/tracker-trackhat/lang/stub.ts index d1a07ea6..548138a3 100644 --- a/tracker-trackhat/lang/stub.ts +++ b/tracker-trackhat/lang/stub.ts @@ -12,10 +12,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Threshold</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Exposure</source> <translation type="unfinished"></translation> </message> diff --git a/tracker-trackhat/lang/zh_CN.ts b/tracker-trackhat/lang/zh_CN.ts index ca9ff5c6..cb881fa8 100644 --- a/tracker-trackhat/lang/zh_CN.ts +++ b/tracker-trackhat/lang/zh_CN.ts @@ -48,10 +48,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Threshold</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Exposure</source> <translation type="unfinished"></translation> </message> diff --git a/tracker-trackhat/settings.cpp b/tracker-trackhat/settings.cpp index 0e47ddd0..ec46b1e9 100644 --- a/tracker-trackhat/settings.cpp +++ b/tracker-trackhat/settings.cpp @@ -91,7 +91,7 @@ bool trackhat_camera::init_regs() { auto exp = (uint8_t)t.effective_exposure(); auto exp2 = (uint8_t)(exp == 0xff ? 0xf0 : 0xff); - auto thres = (uint8_t)t.threshold; + auto thres = (uint8_t)0xfe; auto thres2 = (uint8_t)3; auto gain = (uint8_t)t.effective_gain(); diff --git a/tracker-trackhat/trackhat.hpp b/tracker-trackhat/trackhat.hpp index 1ae67e1c..6e228f9c 100644 --- a/tracker-trackhat/trackhat.hpp +++ b/tracker-trackhat/trackhat.hpp @@ -37,7 +37,7 @@ struct trackhat_settings : opts int effective_gain() const; trackhat_settings(); value<slider_value> exposure{b, "exposure", {min_exposure, min_exposure, max_exposure + max_gain - min_gain}}; - value<slider_value> threshold{b, "threshold", {0x97, 64, 0xfe}}; + //value<slider_value> threshold{b, "threshold", {0x97, 64, 0xfe}}; value<model_type> model{b, "model", model_mini_clip_left}; value<double> min_pt_size{b, "min-point-size", 10}; value<double> max_pt_size{b, "max-point-size", 50}; |