From a0551b8b54606face008d865f23bc112086925fe Mon Sep 17 00:00:00 2001 From: Stéphane Lenclud Date: Mon, 1 Apr 2019 20:18:02 +0200 Subject: Easy Tracker: Preview cross hair now showing top point. Deleting home made P3P solver we branched from pt now that our OpenCV solution is working. --- tracker-points/ftnoir_tracker_pt.h | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'tracker-points/ftnoir_tracker_pt.h') diff --git a/tracker-points/ftnoir_tracker_pt.h b/tracker-points/ftnoir_tracker_pt.h index 9388bd03..0aba736c 100644 --- a/tracker-points/ftnoir_tracker_pt.h +++ b/tracker-points/ftnoir_tracker_pt.h @@ -10,7 +10,6 @@ #include "api/plugin-api.hpp" #include "pt-api.hpp" -#include "point_tracker.h" #include "cv/numeric.hpp" #include "video/video-widget.hpp" @@ -26,25 +25,24 @@ namespace pt_impl { -class TrackerDialog_PT; +class EasyTrackerDialog; using namespace numeric_types; -struct Tracker_PT : QThread, ITracker +struct EasyTracker : QThread, ITracker { - friend class TrackerDialog_PT; + friend class EasyTrackerDialog; template using pointer = pt_pointer; - explicit Tracker_PT(pointer const& pt_runtime_traits); - ~Tracker_PT() override; + explicit EasyTracker(pointer const& pt_runtime_traits); + ~EasyTracker() override; module_status start_tracker(QFrame* parent_window) override; void data(double* data) override; bool center() override; int get_n_points(); [[nodiscard]] bool get_cam_info(pt_camera_info& info); - Affine pose() const; private: void run() override; @@ -56,7 +54,6 @@ private: QMutex camera_mtx; - PointTracker point_tracker; pt_settings s; @@ -82,7 +79,7 @@ private: std::vector iRotations; // Angle solutions, pitch, yaw, roll, in this order std::vector iAngles; - // The index of our best solution + // The index of our best solution in the above arrays int iBestSolutionIndex = -1; // Best translation cv::Vec3d iBestTranslation; @@ -92,4 +89,4 @@ private: } // ns pt_impl -using Tracker_PT = pt_impl::Tracker_PT; +using Tracker_PT = pt_impl::EasyTracker; -- cgit v1.2.3