summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2014-09-22 23:37:08 +0200
committerStanislaw Halik <sthalik@misaki.pl>2014-09-22 23:37:08 +0200
commitfbf579e102af6eb178d9b4b07f0e1e3956985e56 (patch)
tree9d3d5ac85fa56ab1e36d19afe587250b5c264ce1
parent25d9ab287523961df97355da9728c9d3adf946bc (diff)
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
-rw-r--r--ftnoir_tracker_pt/camera.cpp13
-rw-r--r--ftnoir_tracker_pt/camera.h1
-rw-r--r--ftnoir_tracker_pt/ftnoir_tracker_pt.cpp1
3 files changed, 0 insertions, 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<RotationType>(static_cast<int>(s.cam_roll));
point_extractor.threshold_val = s.threshold;
point_extractor.threshold_secondary_val = s.threshold_secondary;