From ff38e35d832b7c7a3e189bee4a80271fd3a3c978 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Thu, 21 Feb 2019 19:11:19 +0100 Subject: tracker/pt: don't `namespace pt_module' for core PT stuff --- tracker-pt/ftnoir_tracker_pt.cpp | 6 ++- tracker-pt/ftnoir_tracker_pt.h | 10 ++-- tracker-pt/ftnoir_tracker_pt_dialog.cpp | 4 ++ tracker-pt/ftnoir_tracker_pt_dialog.h | 6 +++ tracker-pt/lang/nl_NL.ts | 94 ++++++++++++++++----------------- tracker-pt/lang/ru_RU.ts | 94 ++++++++++++++++----------------- tracker-pt/lang/stub.ts | 94 ++++++++++++++++----------------- tracker-pt/lang/zh_CN.ts | 94 ++++++++++++++++----------------- tracker-pt/point_tracker.cpp | 4 +- tracker-pt/point_tracker.h | 8 +-- tracker-pt/pt-settings.hpp | 6 +-- 11 files changed, 216 insertions(+), 204 deletions(-) (limited to 'tracker-pt') diff --git a/tracker-pt/ftnoir_tracker_pt.cpp b/tracker-pt/ftnoir_tracker_pt.cpp index 75d7e5a6..4223da26 100644 --- a/tracker-pt/ftnoir_tracker_pt.cpp +++ b/tracker-pt/ftnoir_tracker_pt.cpp @@ -18,7 +18,9 @@ #include #include -namespace pt_module { +using namespace options; + +namespace pt_impl { Tracker_PT::Tracker_PT(pointer const& traits) : traits { traits }, @@ -212,4 +214,4 @@ Affine Tracker_PT::pose() const return point_tracker.pose(); } -} // ns pt_module +} // ns pt_impl diff --git a/tracker-pt/ftnoir_tracker_pt.h b/tracker-pt/ftnoir_tracker_pt.h index 77835602..a53218df 100644 --- a/tracker-pt/ftnoir_tracker_pt.h +++ b/tracker-pt/ftnoir_tracker_pt.h @@ -12,6 +12,7 @@ #include "pt-api.hpp" #include "point_tracker.h" #include "cv/numeric.hpp" +#include "video/video-widget.hpp" #include #include @@ -23,10 +24,9 @@ #include #include -class TrackerDialog_PT; -class video_widget; +namespace pt_impl { -namespace pt_module { +class TrackerDialog_PT; using namespace numeric_types; @@ -34,7 +34,7 @@ class Tracker_PT : public QThread, public ITracker { Q_OBJECT - friend class ::TrackerDialog_PT; + friend class TrackerDialog_PT; public: template using pointer = pt_pointer; @@ -80,4 +80,4 @@ private: } // ns pt_impl -using Tracker_PT = pt_module::Tracker_PT; +using Tracker_PT = pt_impl::Tracker_PT; diff --git a/tracker-pt/ftnoir_tracker_pt_dialog.cpp b/tracker-pt/ftnoir_tracker_pt_dialog.cpp index 51a5c74f..91d5d4e7 100644 --- a/tracker-pt/ftnoir_tracker_pt_dialog.cpp +++ b/tracker-pt/ftnoir_tracker_pt_dialog.cpp @@ -19,6 +19,8 @@ using namespace options; +namespace pt_impl { + TrackerDialog_PT::TrackerDialog_PT(const QString& module_name) : s(module_name), tracker(nullptr), @@ -277,3 +279,5 @@ void TrackerDialog_PT::unregister_tracker() poll_tracker_info(); timer.stop(); } + +} // ns pt_impl diff --git a/tracker-pt/ftnoir_tracker_pt_dialog.h b/tracker-pt/ftnoir_tracker_pt_dialog.h index 3bd1a561..66981ee6 100644 --- a/tracker-pt/ftnoir_tracker_pt_dialog.h +++ b/tracker-pt/ftnoir_tracker_pt_dialog.h @@ -17,6 +17,8 @@ #include #include +namespace pt_impl { + class TrackerDialog_PT : public ITrackerDialog { Q_OBJECT @@ -47,3 +49,7 @@ protected: Ui::UICPTClientControls ui; }; + +} // ns pt_impl + +using TrackerDialog_PT = pt_impl::TrackerDialog_PT; diff --git a/tracker-pt/lang/nl_NL.ts b/tracker-pt/lang/nl_NL.ts index c20f12d0..1456157c 100644 --- a/tracker-pt/lang/nl_NL.ts +++ b/tracker-pt/lang/nl_NL.ts @@ -1,53 +1,6 @@ - - TrackerDialog_PT - - Brightness %1/255 - - - - LED radius %1 pixels - - - - %1 yaw samples. Yaw more to %2 samples for stable calibration. - - - - %1 pitch samples. Pitch more to %2 samples for stable calibration. - - - - %1 samples. Over %2, good! - - - - Stop calibration - - - - Start calibration - - - - %1x%2 @ %3 FPS - - - - %1 OK! - - - - %1 BAD! - - - - Tracker offline - - - UICPTClientControls @@ -280,6 +233,53 @@ Don't roll or change position. + + pt_impl::TrackerDialog_PT + + Brightness %1/255 + + + + LED radius %1 pixels + + + + %1 yaw samples. Yaw more to %2 samples for stable calibration. + + + + %1 pitch samples. Pitch more to %2 samples for stable calibration. + + + + %1 samples. Over %2, good! + + + + Stop calibration + + + + Start calibration + + + + %1x%2 @ %3 FPS + + + + %1 OK! + + + + %1 BAD! + + + + Tracker offline + + + pt_module::metadata_pt diff --git a/tracker-pt/lang/ru_RU.ts b/tracker-pt/lang/ru_RU.ts index 494a5a17..c91dd087 100644 --- a/tracker-pt/lang/ru_RU.ts +++ b/tracker-pt/lang/ru_RU.ts @@ -1,53 +1,6 @@ - - TrackerDialog_PT - - %1 samples. Over %2, good! - Получено %1 образца(-ов). Больше %2, отлично!! - - - %1 yaw samples. Yaw more to %2 samples for stable calibration. - По оси YAW выполнено: %1 замер(а/ов). Для стабильного результата необходимо не меньше %2 - - - Brightness %1/255 - - - - LED radius %1 pixels - - - - %1 pitch samples. Pitch more to %2 samples for stable calibration. - По оси Pitch выполнено: %1 замер(а/ов). Для стабильного результата необходимо не меньше %2 - - - Stop calibration - Остановить калибровку - - - Start calibration - Начать калибровку - - - %1x%2 @ %3 FPS - - - - %1 OK! - - - - %1 BAD! - - - - Tracker offline - Отслеживание отключено - - UICPTClientControls @@ -285,6 +238,53 @@ ROLL или X/Y-смещения. + + pt_impl::TrackerDialog_PT + + Brightness %1/255 + + + + LED radius %1 pixels + + + + %1 yaw samples. Yaw more to %2 samples for stable calibration. + По оси YAW выполнено: %1 замер(а/ов). Для стабильного результата необходимо не меньше %2 + + + %1 pitch samples. Pitch more to %2 samples for stable calibration. + По оси Pitch выполнено: %1 замер(а/ов). Для стабильного результата необходимо не меньше %2 + + + %1 samples. Over %2, good! + Получено %1 образца(-ов). Больше %2, отлично!! + + + Stop calibration + Остановить калибровку + + + Start calibration + Начать калибровку + + + %1x%2 @ %3 FPS + + + + %1 OK! + + + + %1 BAD! + + + + Tracker offline + Отслеживание отключено + + pt_module::metadata_pt diff --git a/tracker-pt/lang/stub.ts b/tracker-pt/lang/stub.ts index a1b9819f..36090e5e 100644 --- a/tracker-pt/lang/stub.ts +++ b/tracker-pt/lang/stub.ts @@ -1,53 +1,6 @@ - - TrackerDialog_PT - - Brightness %1/255 - - - - LED radius %1 pixels - - - - %1 yaw samples. Yaw more to %2 samples for stable calibration. - - - - %1 pitch samples. Pitch more to %2 samples for stable calibration. - - - - %1 samples. Over %2, good! - - - - Stop calibration - - - - Start calibration - - - - %1x%2 @ %3 FPS - - - - %1 OK! - - - - %1 BAD! - - - - Tracker offline - - - UICPTClientControls @@ -280,6 +233,53 @@ Don't roll or change position. + + pt_impl::TrackerDialog_PT + + Brightness %1/255 + + + + LED radius %1 pixels + + + + %1 yaw samples. Yaw more to %2 samples for stable calibration. + + + + %1 pitch samples. Pitch more to %2 samples for stable calibration. + + + + %1 samples. Over %2, good! + + + + Stop calibration + + + + Start calibration + + + + %1x%2 @ %3 FPS + + + + %1 OK! + + + + %1 BAD! + + + + Tracker offline + + + pt_module::metadata_pt diff --git a/tracker-pt/lang/zh_CN.ts b/tracker-pt/lang/zh_CN.ts index 38fd40b1..667c2811 100644 --- a/tracker-pt/lang/zh_CN.ts +++ b/tracker-pt/lang/zh_CN.ts @@ -1,53 +1,6 @@ - - TrackerDialog_PT - - Brightness %1/255 - 亮度 %1/255 - - - LED radius %1 pixels - 光源半径 %1 像素 - - - %1 yaw samples. Yaw more to %2 samples for stable calibration. - - - - %1 pitch samples. Pitch more to %2 samples for stable calibration. - - - - %1 samples. Over %2, good! - %1 样本。%2 正常 - - - Stop calibration - 停止校准 - - - Start calibration - 开始校准 - - - %1x%2 @ %3 FPS - %1x%2 @ %3 帧 - - - %1 OK! - %1 正常 - - - %1 BAD! - %1 异常 - - - Tracker offline - 跟踪器脱机 - - UICPTClientControls @@ -280,6 +233,53 @@ Don't roll or change position. + + pt_impl::TrackerDialog_PT + + Brightness %1/255 + 亮度 %1/255 + + + LED radius %1 pixels + 光源半径 %1 像素 + + + %1 yaw samples. Yaw more to %2 samples for stable calibration. + + + + %1 pitch samples. Pitch more to %2 samples for stable calibration. + + + + %1 samples. Over %2, good! + %1 样本。%2 正常 + + + Stop calibration + 停止校准 + + + Start calibration + 开始校准 + + + %1x%2 @ %3 FPS + %1x%2 @ %3 帧 + + + %1 OK! + %1 正常 + + + %1 BAD! + %1 异常 + + + Tracker offline + 跟踪器脱机 + + pt_module::metadata_pt diff --git a/tracker-pt/point_tracker.cpp b/tracker-pt/point_tracker.cpp index bda412e2..ef70789a 100644 --- a/tracker-pt/point_tracker.cpp +++ b/tracker-pt/point_tracker.cpp @@ -14,7 +14,7 @@ #include -namespace pt_module { +namespace pt_impl { using namespace numeric_types; @@ -363,4 +363,4 @@ void PointTracker::reset_state() X_CM_expected = {}; } -} // ns pt_module +} // ns pt_impl diff --git a/tracker-pt/point_tracker.h b/tracker-pt/point_tracker.h index 6f3e0cee..70c7a9fc 100644 --- a/tracker-pt/point_tracker.h +++ b/tracker-pt/point_tracker.h @@ -21,7 +21,7 @@ #include -namespace pt_module { +namespace pt_impl { // ---------------------------------------------------------------------------- // Describes a 3-point model @@ -82,7 +82,7 @@ private: bool init_phase = true; }; -} // ns pt_module +} // ns pt_impl -using PointTracker = pt_module::PointTracker; -using PointModel = pt_module::PointModel; +using PointTracker = pt_impl::PointTracker; +using PointModel = pt_impl::PointModel; diff --git a/tracker-pt/pt-settings.hpp b/tracker-pt/pt-settings.hpp index df45b499..723ee08d 100644 --- a/tracker-pt/pt-settings.hpp +++ b/tracker-pt/pt-settings.hpp @@ -15,7 +15,7 @@ enum pt_color_type pt_color_green_only = 7, }; -namespace pt_settings_detail { +namespace pt_impl { using namespace options; @@ -68,6 +68,6 @@ struct pt_settings final : options::opts # pragma clang diagnostic pop #endif -} // ns pt_settings_detail +} // ns pt_impl -using pt_settings = pt_settings_detail::pt_settings; +using pt_settings = pt_impl::pt_settings; -- cgit v1.2.3