From 7ac30c677d9a68b2acba08bbc0d8fc8a52552e58 Mon Sep 17 00:00:00 2001 From: sharpTrick Date: Wed, 16 Feb 2022 18:16:52 -0700 Subject: Added more max_clamp options --- gui/mapping-dialog.cpp | 23 +++++++++++++++-- gui/mapping-dialog.ui | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++ spline/axis-opts.hpp | 8 ++++++ 3 files changed, 98 insertions(+), 2 deletions(-) diff --git a/gui/mapping-dialog.cpp b/gui/mapping-dialog.cpp index af35c999..cdbf532e 100644 --- a/gui/mapping-dialog.cpp +++ b/gui/mapping-dialog.cpp @@ -59,6 +59,10 @@ mapping_dialog::mapping_dialog(Mappings& m) : m(m), widgets{} tie_setting(s.a_y.clamp_x_, ui.max_y_translation); tie_setting(s.a_z.clamp_x_, ui.max_z_translation); + tie_setting(s.a_x.clamp_y_, ui.max_x_out); + tie_setting(s.a_y.clamp_y_, ui.max_y_out); + tie_setting(s.a_z.clamp_y_, ui.max_z_out); + tie_setting(s.a_pitch.clamp_y_, ui.max_pitch_output); } @@ -96,9 +100,13 @@ void mapping_dialog::load() x->addItem(tr("%1°").arg(y), y); for (QComboBox* x : { ui.max_x_translation, ui.max_y_translation, ui.max_z_translation }) - for (a y : { a::t30, a::t20, a::t15, a::t10, a::t100 }) + for (a y : { a::t30, a::t20, a::t15, a::t10, a::t75, a::t100, a::t150, a::t300, a::t600 }) x->addItem(tr("%1 cm").arg(int(y)), y); + for (QComboBox* x : { ui.max_x_out, ui.max_y_out, ui.max_z_out }) + for (a y : { a::o_t75, a::o_t100, a::o_t150, a::o_t300, a::o_t600 }) + x->addItem(tr("%1 cm").arg(abs(int(y))), y); + for (int i = 0; qfcs[i].qfc; i++) { const bool altp = qfcs[i].altp; @@ -122,8 +130,12 @@ void mapping_dialog::load() value = 1; else if (clamp_x <= a::r45) value = 5; - else + else if (clamp_x <= a::t150) value = 10; + else if (clamp_x <= a::t300) + value = 25; + else + value = 50; qfc.set_x_step(value); }; @@ -139,6 +151,13 @@ void mapping_dialog::load() value = 10; break; case a::o_t75: value = 5; break; + case a::o_t100: + case a::o_t150: + value = 10; break; + case a::o_t300: + value = 50; break; + case a::o_t600: + value = 100; break; } qfc.set_y_step(value); }; diff --git a/gui/mapping-dialog.ui b/gui/mapping-dialog.ui index 8d72533d..545b5ae5 100644 --- a/gui/mapping-dialog.ui +++ b/gui/mapping-dialog.ui @@ -352,6 +352,29 @@ + + + + + 0 + 0 + + + + Max output + + + + + + + + 0 + 0 + + + + @@ -432,6 +455,29 @@ + + + + + 0 + 0 + + + + Max output + + + + + + + + 0 + 0 + + + + @@ -512,6 +558,29 @@ + + + + + 0 + 0 + + + + Max output + + + + + + + + 0 + 0 + + + + diff --git a/spline/axis-opts.hpp b/spline/axis-opts.hpp index c773dd61..b389f4b9 100644 --- a/spline/axis-opts.hpp +++ b/spline/axis-opts.hpp @@ -29,7 +29,11 @@ public: r15 = 15, r10 = 10, + t600 = 600, + t300 = 300, + t150 = 150, t100 = 100, + t75 = 75, t30 = 30, t20 = 20, t15 = 15, @@ -38,6 +42,10 @@ public: o_r180 = -180, o_r90 = -90, o_t75 = -75, + o_t100 = -100, + o_t150 = -150, + o_t300 = -300, + o_t600 = -600, x1000 = 1000, }; -- cgit v1.2.3 From 1cd33f5a502ff19dfa0eeae5846749ae70f4328f Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 28 Mar 2022 23:18:28 +0200 Subject: gui: fix vertically stretched layout in options dlg --- gui/process_widget.ui | 13 ++++++++----- gui/settings-dialog.ui | 30 ++++++++++++++++++++++++++++-- 2 files changed, 36 insertions(+), 7 deletions(-) diff --git a/gui/process_widget.ui b/gui/process_widget.ui index 9e7b4973..005b0d9b 100644 --- a/gui/process_widget.ui +++ b/gui/process_widget.ui @@ -7,7 +7,7 @@ 0 0 366 - 325 + 380 @@ -24,7 +24,7 @@ - + 0 0 @@ -83,12 +83,15 @@ - 5 + 4 + + + 4 - + 0 0 @@ -108,7 +111,7 @@ - + 0 0 diff --git a/gui/settings-dialog.ui b/gui/settings-dialog.ui index 2821077a..792e2550 100644 --- a/gui/settings-dialog.ui +++ b/gui/settings-dialog.ui @@ -6,8 +6,8 @@ 0 0 - 565 - 641 + 540 + 613 @@ -977,6 +977,19 @@ + + + + Qt::Vertical + + + + 20 + 1 + + + + @@ -1837,6 +1850,19 @@ + + + + Qt::Vertical + + + + 20 + 1 + + + + -- cgit v1.2.3 From 8a3a1b9510d20dfb81c3c737779bb9de3c73f15a Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 28 Mar 2022 23:18:49 +0200 Subject: opentrack: require more vertical space for embedding --- opentrack/main-window.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opentrack/main-window.cpp b/opentrack/main-window.cpp index c514f304..1fded8e0 100644 --- a/opentrack/main-window.cpp +++ b/opentrack/main-window.cpp @@ -602,7 +602,7 @@ bool main_window::module_tabs_enabled() const return false; // Windows 10: 40px, Windows 11: 48px, KDE: 51px constexpr int taskbar_size = 51; - constexpr int min_avail_height = 864 - taskbar_size; + constexpr int min_avail_height = 910 - taskbar_size; QRect rect = d->availableGeometry(this); return rect.height() >= min_avail_height; } -- cgit v1.2.3 From 9e403da98b9ca8f43f928b9f5c899aba7fa5471d Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 28 Mar 2022 23:19:34 +0200 Subject: tracker/pt: add point filter deadzone --- tracker-pt/FTNoIR_PT_Controls.ui | 121 +++++++++++++++++++++++++------- tracker-pt/ftnoir_tracker_pt_dialog.cpp | 6 ++ tracker-pt/lang/nl_NL.ts | 4 ++ tracker-pt/lang/ru_RU.ts | 4 ++ tracker-pt/lang/stub.ts | 4 ++ tracker-pt/lang/zh_CN.ts | 4 ++ tracker-pt/point-filter.cpp | 6 +- tracker-pt/pt-settings.hpp | 1 + 8 files changed, 121 insertions(+), 29 deletions(-) diff --git a/tracker-pt/FTNoIR_PT_Controls.ui b/tracker-pt/FTNoIR_PT_Controls.ui index 5a9b1963..7abfe088 100644 --- a/tracker-pt/FTNoIR_PT_Controls.ui +++ b/tracker-pt/FTNoIR_PT_Controls.ui @@ -9,10 +9,16 @@ 0 0 - 387 - 658 + 413 + 683 + + + 0 + 0 + + PointTracker Settings @@ -647,26 +653,35 @@ Point filter - - + + - + 0 0 - - Filter point centers prior to pose estimation. + + 0 - - Enable + + 99 + + + 1 + + + 10 + + + Qt::Horizontal - - + + - + 0 0 @@ -684,14 +699,7 @@ QAbstractSpinBox::NoButtons - 999.990000000000009 - - - - - - - Limit + 1.000000000000000 @@ -699,7 +707,7 @@ - 0 + 10 0 @@ -720,8 +728,63 @@ - - + + + + + 0 + 0 + + + + Filter point centers prior to pose estimation. + + + Enable + + + + + + + Limit + + + + + + + + 2 + 0 + + + + Qt::NoFocus + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 999.990000000000009 + + + + + + + Deadzone + + + + + 0 @@ -732,21 +795,21 @@ 0 - 99 + 100 1 - 10 + 3 Qt::Horizontal - - + + 0 @@ -765,6 +828,9 @@ QAbstractSpinBox::NoButtons + + px + 1.000000000000000 @@ -1638,6 +1704,7 @@ Don't roll or change position. enable_point_filter point_filter_slider point_filter_limit_slider + point_filter_deadzone_slider model_tabs clip_tlength_spin clip_theight_spin diff --git a/tracker-pt/ftnoir_tracker_pt_dialog.cpp b/tracker-pt/ftnoir_tracker_pt_dialog.cpp index 2bab280a..160eb831 100644 --- a/tracker-pt/ftnoir_tracker_pt_dialog.cpp +++ b/tracker-pt/ftnoir_tracker_pt_dialog.cpp @@ -126,6 +126,12 @@ TrackerDialog_PT::TrackerDialog_PT(const QString& module_name) : [this] { ui.point_filter_limit_label->setValue(*s.point_filter_limit); }, Qt::QueuedConnection); ui.point_filter_label->setValue(*s.point_filter_coefficient); ui.point_filter_limit_label->setValue(*s.point_filter_limit); + + tie_setting(s.point_filter_deadzone, ui.point_filter_deadzone_slider); + ui.point_filter_deadzone_label->setValue(*s.point_filter_deadzone); + + connect(&s.point_filter_deadzone, value_::value_changed(), ui.point_filter_deadzone_label, + [this] { ui.point_filter_deadzone_label->setValue(*s.point_filter_deadzone); }, Qt::QueuedConnection); } QString TrackerDialog_PT::threshold_display_text(int threshold_value) diff --git a/tracker-pt/lang/nl_NL.ts b/tracker-pt/lang/nl_NL.ts index 72cb5d6d..368b97a0 100644 --- a/tracker-pt/lang/nl_NL.ts +++ b/tracker-pt/lang/nl_NL.ts @@ -296,6 +296,10 @@ Don't roll or change position. Grayscale (from hardware) + + Deadzone + + pt_impl::TrackerDialog_PT diff --git a/tracker-pt/lang/ru_RU.ts b/tracker-pt/lang/ru_RU.ts index 469fabd1..43dca4cf 100644 --- a/tracker-pt/lang/ru_RU.ts +++ b/tracker-pt/lang/ru_RU.ts @@ -301,6 +301,10 @@ ROLL или X/Y-смещения. Grayscale (from hardware) + + Deadzone + + pt_impl::TrackerDialog_PT diff --git a/tracker-pt/lang/stub.ts b/tracker-pt/lang/stub.ts index e2781648..9cb5daa7 100644 --- a/tracker-pt/lang/stub.ts +++ b/tracker-pt/lang/stub.ts @@ -296,6 +296,10 @@ Don't roll or change position. Grayscale (from hardware) + + Deadzone + + pt_impl::TrackerDialog_PT diff --git a/tracker-pt/lang/zh_CN.ts b/tracker-pt/lang/zh_CN.ts index 8e04a130..668672c1 100644 --- a/tracker-pt/lang/zh_CN.ts +++ b/tracker-pt/lang/zh_CN.ts @@ -296,6 +296,10 @@ Don't roll or change position. Grayscale (from hardware) + + Deadzone + + pt_impl::TrackerDialog_PT diff --git a/tracker-pt/point-filter.cpp b/tracker-pt/point-filter.cpp index 7548d515..b03562ed 100644 --- a/tracker-pt/point-filter.cpp +++ b/tracker-pt/point-filter.cpp @@ -40,12 +40,14 @@ const PointOrder& point_filter::operator()(const PointOrder& input) return A * pow((f)10, (f)-log10_pos) * rest; ); - f dist = 0; + f dist = 0, dz = (float)s.point_filter_deadzone / 800; // sqrt(640^2 + 480^2) for (unsigned i = 0; i < 3; i++) { vec2 tmp = input[i] - state_[i]; - dist = std::max(dist, sqrt(tmp.dot(tmp))); + f x = sqrt(tmp.dot(tmp)); + x = std::max((f)0, x - dz); + dist = std::max(dist, x); } if (dist < (f)1e-6) diff --git a/tracker-pt/pt-settings.hpp b/tracker-pt/pt-settings.hpp index 54f13283..6f7a18d5 100644 --- a/tracker-pt/pt-settings.hpp +++ b/tracker-pt/pt-settings.hpp @@ -71,6 +71,7 @@ struct pt_settings final : options::opts value enable_point_filter{ b, "enable-point-filter", false }; value point_filter_coefficient { b, "point-filter-coefficient", { 1.0, 0, 4 } }; value point_filter_limit { b, "point-filter-limit", { 0.1, 0.01, 1 }}; + value point_filter_deadzone { b, "point-filter-deadzone", {0, 0, 1} }; explicit pt_settings(const QString& name) : opts(name) {} }; -- cgit v1.2.3 From 9bcab9fb4274c6e1aa1a2621dbfedf829e7fcfc5 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 29 Mar 2022 00:01:31 +0200 Subject: fix i18n generation --- api/lang/zh_CN.ts | 2 +- cmake/opentrack-i18n.cmake | 1 + cmake/translation-stub.ts | 2 +- compat/lang/zh_CN.ts | 2 +- csv/lang/zh_CN.ts | 2 +- cv/lang/zh_CN.ts | 2 +- dinput/lang/zh_CN.ts | 2 +- filter-accela/lang/zh_CN.ts | 2 +- filter-ewma2/lang/zh_CN.ts | 2 +- filter-hamilton/lang/zh_CN.ts | 2 +- filter-kalman/lang/zh_CN.ts | 2 +- logic/lang/zh_CN.ts | 2 +- migration/lang/zh_CN.ts | 2 +- options/lang/zh_CN.ts | 2 +- pose-widget/lang/zh_CN.ts | 2 +- proto-flightgear/lang/zh_CN.ts | 2 +- proto-fsuipc/lang/zh_CN.ts | 2 +- proto-ft/lang/zh_CN.ts | 2 +- proto-iokit-foohid/lang/zh_CN.ts | 2 +- proto-libevdev/lang/zh_CN.ts | 2 +- proto-mouse/lang/zh_CN.ts | 2 +- proto-simconnect/lang/zh_CN.ts | 2 +- proto-udp/lang/zh_CN.ts | 2 +- proto-vjoystick/lang/zh_CN.ts | 2 +- proto-wine/lang/zh_CN.ts | 2 +- qxt-mini/lang/zh_CN.ts | 2 +- spline/lang/zh_CN.ts | 2 +- tracker-aruco/lang/zh_CN.ts | 2 +- tracker-freepie-udp/lang/zh_CN.ts | 2 +- tracker-fusion/lang/zh_CN.ts | 2 +- tracker-hatire/lang/zh_CN.ts | 2 +- tracker-hydra/lang/zh_CN.ts | 2 +- tracker-joystick/lang/zh_CN.ts | 2 +- tracker-kinect-face/lang/zh_CN.ts | 2 +- tracker-linux-joystick/lang/zh_CN.ts | 2 +- tracker-neuralnet/lang/zh_CN.ts | 2 +- tracker-pt/module/lang/zh_CN.ts | 2 +- tracker-rift-140/lang/zh_CN.ts | 2 +- tracker-rs/lang/zh_CN.ts | 2 +- tracker-s2bot/lang/zh_CN.ts | 2 +- tracker-steamvr/lang/zh_CN.ts | 2 +- tracker-test/lang/zh_CN.ts | 2 +- tracker-tobii/lang/zh_CN.ts | 2 +- tracker-udp/lang/zh_CN.ts | 2 +- tracker-wii/lang/zh_CN.ts | 2 +- tracker-wii/wiiyourself/lang/zh_CN.ts | 2 +- video-opencv/lang/nl_NL.ts | 2 +- video-opencv/lang/ru_RU.ts | 2 +- video-opencv/lang/zh_CN.ts | 2 +- video-ps3eye/lang/nl_NL.ts | 2 +- video-ps3eye/lang/ru_RU.ts | 2 +- video-ps3eye/lang/zh_CN.ts | 2 +- video/lang/nl_NL.ts | 2 +- video/lang/ru_RU.ts | 2 +- video/lang/zh_CN.ts | 2 +- 55 files changed, 55 insertions(+), 54 deletions(-) diff --git a/api/lang/zh_CN.ts b/api/lang/zh_CN.ts index d29cce1b..26bf67a5 100644 --- a/api/lang/zh_CN.ts +++ b/api/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + module_status_mixin diff --git a/cmake/opentrack-i18n.cmake b/cmake/opentrack-i18n.cmake index 2902a14b..6c424017 100644 --- a/cmake/opentrack-i18n.cmake +++ b/cmake/opentrack-i18n.cmake @@ -24,6 +24,7 @@ function(otr_i18n_for_target_directory n) if (NOT EXISTS "${t}") file(MAKE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/lang") file(READ "${CMAKE_SOURCE_DIR}/cmake/translation-stub.ts" stub) + string(REPLACE "@LANG@" "${i}" stub "${stub}") file(WRITE "${t}" "${stub}") endif() endforeach() diff --git a/cmake/translation-stub.ts b/cmake/translation-stub.ts index 6401616d..9d616636 100644 --- a/cmake/translation-stub.ts +++ b/cmake/translation-stub.ts @@ -1,4 +1,4 @@ - + diff --git a/compat/lang/zh_CN.ts b/compat/lang/zh_CN.ts index 6401616d..e5ca8aa9 100644 --- a/compat/lang/zh_CN.ts +++ b/compat/lang/zh_CN.ts @@ -1,4 +1,4 @@ - + diff --git a/csv/lang/zh_CN.ts b/csv/lang/zh_CN.ts index 6401616d..e5ca8aa9 100644 --- a/csv/lang/zh_CN.ts +++ b/csv/lang/zh_CN.ts @@ -1,4 +1,4 @@ - + diff --git a/cv/lang/zh_CN.ts b/cv/lang/zh_CN.ts index 6401616d..e5ca8aa9 100644 --- a/cv/lang/zh_CN.ts +++ b/cv/lang/zh_CN.ts @@ -1,4 +1,4 @@ - + diff --git a/dinput/lang/zh_CN.ts b/dinput/lang/zh_CN.ts index 6401616d..e5ca8aa9 100644 --- a/dinput/lang/zh_CN.ts +++ b/dinput/lang/zh_CN.ts @@ -1,4 +1,4 @@ - + diff --git a/filter-accela/lang/zh_CN.ts b/filter-accela/lang/zh_CN.ts index 4b77b3d7..d63527b5 100644 --- a/filter-accela/lang/zh_CN.ts +++ b/filter-accela/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + AccelaUICdialog_accela diff --git a/filter-ewma2/lang/zh_CN.ts b/filter-ewma2/lang/zh_CN.ts index dc39f91f..89d82ec4 100644 --- a/filter-ewma2/lang/zh_CN.ts +++ b/filter-ewma2/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + UICdialog_ewma diff --git a/filter-hamilton/lang/zh_CN.ts b/filter-hamilton/lang/zh_CN.ts index a8af9f98..4fc4d812 100644 --- a/filter-hamilton/lang/zh_CN.ts +++ b/filter-hamilton/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + UICdialog_hamilton diff --git a/filter-kalman/lang/zh_CN.ts b/filter-kalman/lang/zh_CN.ts index 29fae5c0..eab4059e 100644 --- a/filter-kalman/lang/zh_CN.ts +++ b/filter-kalman/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + KalmanUICdialog_kalman diff --git a/logic/lang/zh_CN.ts b/logic/lang/zh_CN.ts index cc15f98a..75cb2e68 100644 --- a/logic/lang/zh_CN.ts +++ b/logic/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + Work diff --git a/migration/lang/zh_CN.ts b/migration/lang/zh_CN.ts index 6401616d..e5ca8aa9 100644 --- a/migration/lang/zh_CN.ts +++ b/migration/lang/zh_CN.ts @@ -1,4 +1,4 @@ - + diff --git a/options/lang/zh_CN.ts b/options/lang/zh_CN.ts index 6401616d..e5ca8aa9 100644 --- a/options/lang/zh_CN.ts +++ b/options/lang/zh_CN.ts @@ -1,4 +1,4 @@ - + diff --git a/pose-widget/lang/zh_CN.ts b/pose-widget/lang/zh_CN.ts index 6401616d..e5ca8aa9 100644 --- a/pose-widget/lang/zh_CN.ts +++ b/pose-widget/lang/zh_CN.ts @@ -1,4 +1,4 @@ - + diff --git a/proto-flightgear/lang/zh_CN.ts b/proto-flightgear/lang/zh_CN.ts index dc093c57..ba70f8a0 100644 --- a/proto-flightgear/lang/zh_CN.ts +++ b/proto-flightgear/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + UICFGControls diff --git a/proto-fsuipc/lang/zh_CN.ts b/proto-fsuipc/lang/zh_CN.ts index 031e1916..8df82996 100644 --- a/proto-fsuipc/lang/zh_CN.ts +++ b/proto-fsuipc/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + FSUIPCControls diff --git a/proto-ft/lang/zh_CN.ts b/proto-ft/lang/zh_CN.ts index 2fd6bcd7..7706d27c 100644 --- a/proto-ft/lang/zh_CN.ts +++ b/proto-ft/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + FTControls diff --git a/proto-iokit-foohid/lang/zh_CN.ts b/proto-iokit-foohid/lang/zh_CN.ts index 6401616d..e5ca8aa9 100644 --- a/proto-iokit-foohid/lang/zh_CN.ts +++ b/proto-iokit-foohid/lang/zh_CN.ts @@ -1,4 +1,4 @@ - + diff --git a/proto-libevdev/lang/zh_CN.ts b/proto-libevdev/lang/zh_CN.ts index ffafa2ec..f5e8694c 100644 --- a/proto-libevdev/lang/zh_CN.ts +++ b/proto-libevdev/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + UICLibevdevControls diff --git a/proto-mouse/lang/zh_CN.ts b/proto-mouse/lang/zh_CN.ts index 2a811df1..36af1181 100644 --- a/proto-mouse/lang/zh_CN.ts +++ b/proto-mouse/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + UI_mouse diff --git a/proto-simconnect/lang/zh_CN.ts b/proto-simconnect/lang/zh_CN.ts index 50d0fa8a..86e487f2 100644 --- a/proto-simconnect/lang/zh_CN.ts +++ b/proto-simconnect/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + UICSCControls diff --git a/proto-udp/lang/zh_CN.ts b/proto-udp/lang/zh_CN.ts index ca1bc409..b2a750b8 100644 --- a/proto-udp/lang/zh_CN.ts +++ b/proto-udp/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + UICFTNControls diff --git a/proto-vjoystick/lang/zh_CN.ts b/proto-vjoystick/lang/zh_CN.ts index 39a74043..443316ba 100644 --- a/proto-vjoystick/lang/zh_CN.ts +++ b/proto-vjoystick/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + vjoystick diff --git a/proto-wine/lang/zh_CN.ts b/proto-wine/lang/zh_CN.ts index dd4f946f..b7c9ea7d 100644 --- a/proto-wine/lang/zh_CN.ts +++ b/proto-wine/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + UICFTControls diff --git a/qxt-mini/lang/zh_CN.ts b/qxt-mini/lang/zh_CN.ts index 6401616d..e5ca8aa9 100644 --- a/qxt-mini/lang/zh_CN.ts +++ b/qxt-mini/lang/zh_CN.ts @@ -1,4 +1,4 @@ - + diff --git a/spline/lang/zh_CN.ts b/spline/lang/zh_CN.ts index 6401616d..e5ca8aa9 100644 --- a/spline/lang/zh_CN.ts +++ b/spline/lang/zh_CN.ts @@ -1,4 +1,4 @@ - + diff --git a/tracker-aruco/lang/zh_CN.ts b/tracker-aruco/lang/zh_CN.ts index 88b1054c..71fa163c 100644 --- a/tracker-aruco/lang/zh_CN.ts +++ b/tracker-aruco/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + Form diff --git a/tracker-freepie-udp/lang/zh_CN.ts b/tracker-freepie-udp/lang/zh_CN.ts index 1072784a..b886451c 100644 --- a/tracker-freepie-udp/lang/zh_CN.ts +++ b/tracker-freepie-udp/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + UI_freepie_udp_dialog diff --git a/tracker-fusion/lang/zh_CN.ts b/tracker-fusion/lang/zh_CN.ts index 7aed6201..e1345e4c 100644 --- a/tracker-fusion/lang/zh_CN.ts +++ b/tracker-fusion/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + fusion_dialog diff --git a/tracker-hatire/lang/zh_CN.ts b/tracker-hatire/lang/zh_CN.ts index 0d22bf81..c415b50c 100644 --- a/tracker-hatire/lang/zh_CN.ts +++ b/tracker-hatire/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + UIHATControls diff --git a/tracker-hydra/lang/zh_CN.ts b/tracker-hydra/lang/zh_CN.ts index f5440284..f1257856 100644 --- a/tracker-hydra/lang/zh_CN.ts +++ b/tracker-hydra/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + UIHydraControls diff --git a/tracker-joystick/lang/zh_CN.ts b/tracker-joystick/lang/zh_CN.ts index a169a05c..b4729a64 100644 --- a/tracker-joystick/lang/zh_CN.ts +++ b/tracker-joystick/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + UIJoystickControls diff --git a/tracker-kinect-face/lang/zh_CN.ts b/tracker-kinect-face/lang/zh_CN.ts index de0e4f95..1e1b55d1 100644 --- a/tracker-kinect-face/lang/zh_CN.ts +++ b/tracker-kinect-face/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + KinectFaceMetadata diff --git a/tracker-linux-joystick/lang/zh_CN.ts b/tracker-linux-joystick/lang/zh_CN.ts index 12dc1400..e7813c3a 100644 --- a/tracker-linux-joystick/lang/zh_CN.ts +++ b/tracker-linux-joystick/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + UILinuxJoystickControls diff --git a/tracker-neuralnet/lang/zh_CN.ts b/tracker-neuralnet/lang/zh_CN.ts index 2d0dd8ff..655d2118 100644 --- a/tracker-neuralnet/lang/zh_CN.ts +++ b/tracker-neuralnet/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + Form diff --git a/tracker-pt/module/lang/zh_CN.ts b/tracker-pt/module/lang/zh_CN.ts index 03d19f4e..c39728a1 100644 --- a/tracker-pt/module/lang/zh_CN.ts +++ b/tracker-pt/module/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + pt_module::metadata_pt diff --git a/tracker-rift-140/lang/zh_CN.ts b/tracker-rift-140/lang/zh_CN.ts index 26ab2040..ff552d19 100644 --- a/tracker-rift-140/lang/zh_CN.ts +++ b/tracker-rift-140/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + dialog_rift_140 diff --git a/tracker-rs/lang/zh_CN.ts b/tracker-rs/lang/zh_CN.ts index fe0faa6a..d843896e 100644 --- a/tracker-rs/lang/zh_CN.ts +++ b/tracker-rs/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + RSTracker diff --git a/tracker-s2bot/lang/zh_CN.ts b/tracker-s2bot/lang/zh_CN.ts index babca884..c5623b8d 100644 --- a/tracker-s2bot/lang/zh_CN.ts +++ b/tracker-s2bot/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + UI_s2bot_dialog diff --git a/tracker-steamvr/lang/zh_CN.ts b/tracker-steamvr/lang/zh_CN.ts index 7b68034b..2c6f7230 100644 --- a/tracker-steamvr/lang/zh_CN.ts +++ b/tracker-steamvr/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + dialog diff --git a/tracker-test/lang/zh_CN.ts b/tracker-test/lang/zh_CN.ts index 78f647f5..5df28f2f 100644 --- a/tracker-test/lang/zh_CN.ts +++ b/tracker-test/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + test_metadata diff --git a/tracker-tobii/lang/zh_CN.ts b/tracker-tobii/lang/zh_CN.ts index cd8a2bdc..9ea8f636 100644 --- a/tracker-tobii/lang/zh_CN.ts +++ b/tracker-tobii/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + UITobiiControls diff --git a/tracker-udp/lang/zh_CN.ts b/tracker-udp/lang/zh_CN.ts index 0ebbf95f..6730c9b8 100644 --- a/tracker-udp/lang/zh_CN.ts +++ b/tracker-udp/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + UICFTNClientControls diff --git a/tracker-wii/lang/zh_CN.ts b/tracker-wii/lang/zh_CN.ts index d67c57ad..6959d95b 100644 --- a/tracker-wii/lang/zh_CN.ts +++ b/tracker-wii/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + wii_metadata_pt diff --git a/tracker-wii/wiiyourself/lang/zh_CN.ts b/tracker-wii/wiiyourself/lang/zh_CN.ts index 6401616d..e5ca8aa9 100644 --- a/tracker-wii/wiiyourself/lang/zh_CN.ts +++ b/tracker-wii/wiiyourself/lang/zh_CN.ts @@ -1,4 +1,4 @@ - + diff --git a/video-opencv/lang/nl_NL.ts b/video-opencv/lang/nl_NL.ts index 6401616d..9e739505 100644 --- a/video-opencv/lang/nl_NL.ts +++ b/video-opencv/lang/nl_NL.ts @@ -1,4 +1,4 @@ - + diff --git a/video-opencv/lang/ru_RU.ts b/video-opencv/lang/ru_RU.ts index 6401616d..f62cf2e1 100644 --- a/video-opencv/lang/ru_RU.ts +++ b/video-opencv/lang/ru_RU.ts @@ -1,4 +1,4 @@ - + diff --git a/video-opencv/lang/zh_CN.ts b/video-opencv/lang/zh_CN.ts index 6401616d..e5ca8aa9 100644 --- a/video-opencv/lang/zh_CN.ts +++ b/video-opencv/lang/zh_CN.ts @@ -1,4 +1,4 @@ - + diff --git a/video-ps3eye/lang/nl_NL.ts b/video-ps3eye/lang/nl_NL.ts index 81ffc826..f3a16fd4 100644 --- a/video-ps3eye/lang/nl_NL.ts +++ b/video-ps3eye/lang/nl_NL.ts @@ -1,6 +1,6 @@ - + Dialog diff --git a/video-ps3eye/lang/ru_RU.ts b/video-ps3eye/lang/ru_RU.ts index 81ffc826..1edcf50d 100644 --- a/video-ps3eye/lang/ru_RU.ts +++ b/video-ps3eye/lang/ru_RU.ts @@ -1,6 +1,6 @@ - + Dialog diff --git a/video-ps3eye/lang/zh_CN.ts b/video-ps3eye/lang/zh_CN.ts index 81ffc826..cb1d7410 100644 --- a/video-ps3eye/lang/zh_CN.ts +++ b/video-ps3eye/lang/zh_CN.ts @@ -1,6 +1,6 @@ - + Dialog diff --git a/video/lang/nl_NL.ts b/video/lang/nl_NL.ts index 6401616d..9e739505 100644 --- a/video/lang/nl_NL.ts +++ b/video/lang/nl_NL.ts @@ -1,4 +1,4 @@ - + diff --git a/video/lang/ru_RU.ts b/video/lang/ru_RU.ts index 6401616d..f62cf2e1 100644 --- a/video/lang/ru_RU.ts +++ b/video/lang/ru_RU.ts @@ -1,4 +1,4 @@ - + diff --git a/video/lang/zh_CN.ts b/video/lang/zh_CN.ts index 6401616d..e5ca8aa9 100644 --- a/video/lang/zh_CN.ts +++ b/video/lang/zh_CN.ts @@ -1,4 +1,4 @@ - + -- cgit v1.2.3 From 1da5fb05e750e8c74c88dcb8cd701ad0e9c2dd5d Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 29 Mar 2022 00:01:57 +0200 Subject: compat/timer: fix lupdate on number separator --- compat/timer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compat/timer.cpp b/compat/timer.cpp index e68b6d8d..fdea185a 100644 --- a/compat/timer.cpp +++ b/compat/timer.cpp @@ -66,7 +66,7 @@ void Timer::gettime(timespec* state) BOOL ret = QueryPerformanceCounter(&d); assert(ret && "QueryPerformanceCounter failed"); - constexpr int nsec = 1'000'000'000; + constexpr int nsec = 1'000'000 * 1000; state->tv_sec = (time_t)(d.QuadPart/freq); state->tv_nsec = (decltype(state->tv_nsec))(d.QuadPart % freq * nsec / freq); } -- cgit v1.2.3 From fd38b6eefeaee5c1a2643161421beade9ba0eaab Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 23 Apr 2022 15:32:46 +0200 Subject: tracker/neuralnet: add libomp redistributable for msvc Issue: #1394 --- tracker-neuralnet/CMakeLists.txt | 3 +++ tracker-neuralnet/redist/vcomp140.dll | Bin 0 -> 151976 bytes 2 files changed, 3 insertions(+) create mode 100644 tracker-neuralnet/redist/vcomp140.dll diff --git a/tracker-neuralnet/CMakeLists.txt b/tracker-neuralnet/CMakeLists.txt index 3623808a..01fc9976 100644 --- a/tracker-neuralnet/CMakeLists.txt +++ b/tracker-neuralnet/CMakeLists.txt @@ -29,4 +29,7 @@ if(OpenCV_FOUND AND ONNXRuntime_FOUND AND OpenMP_FOUND) ) otr_install_lib("${ONNXRuntime_RUNTIME}" ".") + if(MSVC) + otr_install_lib("redist/vcomp140.dll" "${opentrack-bin}") + endif() endif() diff --git a/tracker-neuralnet/redist/vcomp140.dll b/tracker-neuralnet/redist/vcomp140.dll new file mode 100644 index 00000000..42c069b9 Binary files /dev/null and b/tracker-neuralnet/redist/vcomp140.dll differ -- cgit v1.2.3 From f6e5dc41dfac32e85619de60c2683b3804df2077 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 23 Apr 2022 15:53:35 +0200 Subject: tracker/nn: only install shared library on win32 --- tracker-neuralnet/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tracker-neuralnet/CMakeLists.txt b/tracker-neuralnet/CMakeLists.txt index 01fc9976..f414c920 100644 --- a/tracker-neuralnet/CMakeLists.txt +++ b/tracker-neuralnet/CMakeLists.txt @@ -28,7 +28,9 @@ if(OpenCV_FOUND AND ONNXRuntime_FOUND AND OpenMP_FOUND) PERMISSIONS ${opentrack-perms-file} ) - otr_install_lib("${ONNXRuntime_RUNTIME}" ".") + if(WIN32) + otr_install_lib("${ONNXRuntime_RUNTIME}" ".") + endif() if(MSVC) otr_install_lib("redist/vcomp140.dll" "${opentrack-bin}") endif() -- cgit v1.2.3