diff options
Diffstat (limited to 'tracker-pt/ftnoir_tracker_pt.h')
| -rw-r--r-- | tracker-pt/ftnoir_tracker_pt.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/tracker-pt/ftnoir_tracker_pt.h b/tracker-pt/ftnoir_tracker_pt.h index 8cf609c3..77835602 100644 --- a/tracker-pt/ftnoir_tracker_pt.h +++ b/tracker-pt/ftnoir_tracker_pt.h @@ -24,11 +24,11 @@ #include <QLayout> class TrackerDialog_PT; -class cv_video_widget; +class video_widget; namespace pt_module { -using namespace types; +using namespace numeric_types; class Tracker_PT : public QThread, public ITracker { @@ -45,9 +45,9 @@ public: void data(double* data) override; bool center() override; - Affine pose(); int get_n_points(); - bool get_cam_info(pt_camera_info* info); + [[nodiscard]] bool get_cam_info(pt_camera_info& info); + Affine pose() const; public slots: bool maybe_reopen_camera(); void set_fov(int value); @@ -57,7 +57,6 @@ private: pointer<pt_runtime_traits> traits; QMutex camera_mtx; - QMutex data_mtx; PointTracker point_tracker; @@ -70,16 +69,13 @@ private: pointer<pt_point_extractor> point_extractor; pointer<pt_camera> camera; - pointer<cv_video_widget> video_widget; + pointer<video_widget> widget; pointer<pt_frame> frame; pointer<pt_preview> preview_frame; std::atomic<unsigned> point_count { 0 }; std::atomic<bool> ever_success { false }; - std::atomic_flag center_flag = ATOMIC_FLAG_INIT; - - static constexpr inline f rad2deg = f(180/M_PI); - //static constexpr float deg2rad = float(M_PI/180); + mutable QMutex center_lock, data_lock; }; } // ns pt_impl |