From fbf579e102af6eb178d9b4b07f0e1e3956985e56 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 22 Sep 2014 23:37:08 +0200 Subject: fixup! fixup! PT tracker feature removal Some PT features got under the knife: - dynamic pose resolution velocity prediction model - tracker dialog's tracker tab - focal length coefficient --- ftnoir_tracker_pt/camera.cpp | 13 ------------- ftnoir_tracker_pt/camera.h | 1 - ftnoir_tracker_pt/ftnoir_tracker_pt.cpp | 1 - 3 files changed, 15 deletions(-) diff --git a/ftnoir_tracker_pt/camera.cpp b/ftnoir_tracker_pt/camera.cpp index 686e1b9b..74b24093 100644 --- a/ftnoir_tracker_pt/camera.cpp +++ b/ftnoir_tracker_pt/camera.cpp @@ -108,14 +108,6 @@ void Camera::set_device_index(int index) } } -void Camera::set_f(float f) -{ - if (cam_desired.f != f) - { - cam_desired.f = f; - _set_f(); - } -} void Camera::set_fps(int fps) { if (cam_desired.fps != fps) @@ -201,11 +193,6 @@ void CVCamera::_set_index() if (active) restart(); } -void CVCamera::_set_f() -{ - cam_info.f = cam_desired.f; -} - void CVCamera::_set_fps() { if (cap) cap->set(CV_CAP_PROP_FPS, cam_desired.fps); diff --git a/ftnoir_tracker_pt/camera.h b/ftnoir_tracker_pt/camera.h index 9836435c..e2ba56c4 100644 --- a/ftnoir_tracker_pt/camera.h +++ b/ftnoir_tracker_pt/camera.h @@ -48,7 +48,6 @@ public: // calls corresponding template methods and reinitializes frame rate calculation void set_device_index(int index); - void set_f(float f); void set_fps(int fps); void set_res(int x_res, int y_res); diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp b/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp index 82408ec6..23da97ca 100644 --- a/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp +++ b/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp @@ -122,7 +122,6 @@ void Tracker::apply_inner() camera.set_device_index(s.cam_index); camera.set_res(s.cam_res_x, s.cam_res_y); camera.set_fps(s.cam_fps); - camera.set_f(1); frame_rotation.rotation = static_cast(static_cast(s.cam_roll)); point_extractor.threshold_val = s.threshold; point_extractor.threshold_secondary_val = s.threshold_secondary; -- cgit v1.2.3