minor fixes now

2 files changed, 6 insertions, 6 deletions

diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h b/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h
index 1abb8897..4c6bab48 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h
@@ -19,7 +19,7 @@ struct settings_pt : opts
 
     value<int> t_MH_x, t_MH_y, t_MH_z;
     value<int> fov, camera_mode;
-    value<bool> is_cap;
+    value<int> model_used;
 
     settings_pt() :
         opts("tracker-pt"),
@@ -29,9 +29,9 @@ struct settings_pt : opts
         t_MH_x(b, "model-centroid-x", 0),
         t_MH_y(b, "model-centroid-y", 0),
         t_MH_z(b, "model-centroid-z", 0),
-        fov(b, "camera-fov", 56),
+        fov(b, "camera-fov", 0),
         camera_mode(b, "camera-mode", 0),
-        is_cap(b, "model-is-cap", true)
+        model_used(b, "model-used", 0)
     {}
 };
 
diff --git a/ftnoir_tracker_pt/point_tracker.h b/ftnoir_tracker_pt/point_tracker.h
index 39071351..344a05c0 100644
--- a/ftnoir_tracker_pt/point_tracker.h
+++ b/ftnoir_tracker_pt/point_tracker.h
@@ -70,8 +70,6 @@ public:
 
     cv::Matx22f P;
     
-    enum Model { Clip = 0, Cap = 1 };
-        
     PointModel(settings_pt& s)
     {
         set_model(s);
@@ -86,9 +84,11 @@ public:
         P = 1.0/(s11*s22-s12*s12) * cv::Matx22f(s22, -s12, -s12,  s11);
     }
     
+    enum { Cap = 0, Clip = 1 };
+    
     void set_model(settings_pt& s)
     {
-        if (s.is_cap)
+        if (s.model_used == Cap)
         {
             const double z = 100, x = 120, y = 60;
             M01 = cv::Vec3f(-x, -y, -z);