diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-08 06:51:51 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-08 06:51:51 +0200 |
commit | 027fd0f8b4efcf005a0bba850109089737f40a3f (patch) | |
tree | 44261588d2024e3704b1acc9111682ad091dccff /ftnoir_tracker_pt | |
parent | ab47eac174db02710a7fa6c194e00c31cef755a4 (diff) |
retab and reformat only
Diffstat (limited to 'ftnoir_tracker_pt')
-rw-r--r-- | ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.h | 28 | ||||
-rw-r--r-- | ftnoir_tracker_pt/point_tracker.h | 14 | ||||
-rw-r--r-- | ftnoir_tracker_pt/trans_calib.h | 4 |
3 files changed, 23 insertions, 23 deletions
diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.h b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.h index b9aba4a6..7e75d2a4 100644 --- a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.h +++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.h @@ -26,30 +26,30 @@ // The dialog that shows up when the user presses "Settings" class TrackerDialog_PT : public ITrackerDialog, protected camera_dialog<Tracker_PT> { - Q_OBJECT + Q_OBJECT public: - TrackerDialog_PT(); - void register_tracker(ITracker *tracker) override; - void unregister_tracker() override; + TrackerDialog_PT(); + void register_tracker(ITracker *tracker) override; + void unregister_tracker() override; void save(); - void trans_calib_step(); + void trans_calib_step(); public slots: - void doOK(); - void doCancel(); + void doOK(); + void doCancel(); - void startstop_trans_calib(bool start); - void poll_tracker_info(); + void startstop_trans_calib(bool start); + void poll_tracker_info(); void camera_settings(); private: settings_pt s; - Tracker_PT* tracker; - QTimer timer; + Tracker_PT* tracker; + QTimer timer; - TranslationCalibrator trans_calib; - bool trans_calib_running; + TranslationCalibrator trans_calib; + bool trans_calib_running; - Ui::UICPTClientControls ui; + Ui::UICPTClientControls ui; }; #endif //FTNOIR_TRACKER_PT_DIALOG_H diff --git a/ftnoir_tracker_pt/point_tracker.h b/ftnoir_tracker_pt/point_tracker.h index 935e2eaa..7c710704 100644 --- a/ftnoir_tracker_pt/point_tracker.h +++ b/ftnoir_tracker_pt/point_tracker.h @@ -63,22 +63,22 @@ class PointModel public: static constexpr int N_POINTS = 3; - cv::Vec3f M01; // M01 in model frame - cv::Vec3f M02; // M02 in model frame + cv::Vec3f M01; // M01 in model frame + cv::Vec3f M02; // M02 in model frame - cv::Vec3f u; // unit vector perpendicular to M01,M02-plane + cv::Vec3f u; // unit vector perpendicular to M01,M02-plane cv::Matx22f P; enum Model { Clip = 0, Cap = 1, Custom = 2 }; - + PointModel(settings_pt& s) { set_model(s); // calculate u u = M01.cross(M02); u /= norm(u); - + // calculate projection matrix on M01,M02 plane float s11 = M01.dot(M01); float s12 = M01.dot(M02); @@ -140,8 +140,8 @@ private: Affine X_CM; // trafo from model to camera - Timer t; - bool init_phase; + Timer t; + bool init_phase; }; #endif //POINTTRACKER_H diff --git a/ftnoir_tracker_pt/trans_calib.h b/ftnoir_tracker_pt/trans_calib.h index c2c02b38..e20fc767 100644 --- a/ftnoir_tracker_pt/trans_calib.h +++ b/ftnoir_tracker_pt/trans_calib.h @@ -32,8 +32,8 @@ public: cv::Vec3f get_estimate(); private: - cv::Matx66f P; // normalized precision matrix = inverse covariance - cv::Vec6f y; // P*(-t_MH, t_CH) + cv::Matx66f P; // normalized precision matrix = inverse covariance + cv::Vec6f y; // P*(-t_MH, t_CH) }; #endif //TRANSCALIB_H |