summaryrefslogtreecommitdiffhomepage
path: root/tracker-pt
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-08-12 18:00:49 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-08-12 18:00:49 +0200
commit9040b187a1c4fa380f8a12207b9dd6d04b3a10ac (patch)
tree115e1351571d690c1261a9d512e6d44e717f3051 /tracker-pt
parent13a18b149764509a3f460be86590250cdcf690fb (diff)
all: rename modules s#^opentrack-##. and opentrack -> api
Adjust usages.
Diffstat (limited to 'tracker-pt')
-rw-r--r--tracker-pt/camera.cpp4
-rw-r--r--tracker-pt/ftnoir_tracker_pt.cpp4
-rw-r--r--tracker-pt/ftnoir_tracker_pt.h6
-rw-r--r--tracker-pt/ftnoir_tracker_pt_dialog.cpp2
-rw-r--r--tracker-pt/ftnoir_tracker_pt_dialog.h2
-rw-r--r--tracker-pt/ftnoir_tracker_pt_settings.h4
-rw-r--r--tracker-pt/point_extractor.cpp2
-rw-r--r--tracker-pt/point_extractor.h2
-rw-r--r--tracker-pt/point_tracker.cpp8
-rw-r--r--tracker-pt/point_tracker.h2
10 files changed, 21 insertions, 15 deletions
diff --git a/tracker-pt/camera.cpp b/tracker-pt/camera.cpp
index e5901da1..c15bb2be 100644
--- a/tracker-pt/camera.cpp
+++ b/tracker-pt/camera.cpp
@@ -6,8 +6,8 @@
*/
#include "camera.h"
-#include "opentrack-compat/sleep.hpp"
-#include "opentrack-compat/camera-names.hpp"
+#include "compat/sleep.hpp"
+#include "compat/camera-names.hpp"
#include <string>
#include <QDebug>
diff --git a/tracker-pt/ftnoir_tracker_pt.cpp b/tracker-pt/ftnoir_tracker_pt.cpp
index 429a0305..eaf1de0d 100644
--- a/tracker-pt/ftnoir_tracker_pt.cpp
+++ b/tracker-pt/ftnoir_tracker_pt.cpp
@@ -12,8 +12,8 @@
#include <QDebug>
#include <QFile>
#include <QCoreApplication>
-#include "opentrack-compat/camera-names.hpp"
-#include "opentrack-compat/sleep.hpp"
+#include "compat/camera-names.hpp"
+#include "compat/sleep.hpp"
#include <functional>
//#define PT_PERF_LOG //log performance
diff --git a/tracker-pt/ftnoir_tracker_pt.h b/tracker-pt/ftnoir_tracker_pt.h
index f515715e..04a6646f 100644
--- a/tracker-pt/ftnoir_tracker_pt.h
+++ b/tracker-pt/ftnoir_tracker_pt.h
@@ -9,15 +9,15 @@
#ifndef FTNOIR_TRACKER_PT_H
#define FTNOIR_TRACKER_PT_H
-#include "opentrack/plugin-api.hpp"
+#include "api/plugin-api.hpp"
#include "ftnoir_tracker_pt_settings.h"
#include "camera.h"
#include "point_extractor.h"
#include "point_tracker.h"
-#include "opentrack-compat/timer.hpp"
+#include "compat/timer.hpp"
#include "cv/camera-dialog.hpp"
#include "cv/video-widget.hpp"
-#include "opentrack-compat/pi-constant.hpp"
+#include "compat/pi-constant.hpp"
#include <QThread>
#include <QMutex>
diff --git a/tracker-pt/ftnoir_tracker_pt_dialog.cpp b/tracker-pt/ftnoir_tracker_pt_dialog.cpp
index 9b09722f..307be1f2 100644
--- a/tracker-pt/ftnoir_tracker_pt_dialog.cpp
+++ b/tracker-pt/ftnoir_tracker_pt_dialog.cpp
@@ -12,7 +12,7 @@
#include <QDebug>
#include <opencv2/core/core.hpp>
#include <memory>
-#include "opentrack-compat/camera-names.hpp"
+#include "compat/camera-names.hpp"
#include <vector>
//-----------------------------------------------------------------------------
diff --git a/tracker-pt/ftnoir_tracker_pt_dialog.h b/tracker-pt/ftnoir_tracker_pt_dialog.h
index d2647a94..49e8f1b0 100644
--- a/tracker-pt/ftnoir_tracker_pt_dialog.h
+++ b/tracker-pt/ftnoir_tracker_pt_dialog.h
@@ -8,7 +8,7 @@
#ifndef FTNOIR_TRACKER_PT_DIALOG_H
#define FTNOIR_TRACKER_PT_DIALOG_H
-#include "opentrack/plugin-api.hpp"
+#include "api/plugin-api.hpp"
#include "ftnoir_tracker_pt_settings.h"
#include "ftnoir_tracker_pt.h"
#include "ui_FTNoIR_PT_Controls.h"
diff --git a/tracker-pt/ftnoir_tracker_pt_settings.h b/tracker-pt/ftnoir_tracker_pt_settings.h
index f5256f18..c076082a 100644
--- a/tracker-pt/ftnoir_tracker_pt_settings.h
+++ b/tracker-pt/ftnoir_tracker_pt_settings.h
@@ -8,7 +8,7 @@
#pragma once
-#include "opentrack-compat/pi-constant.hpp"
+#include "compat/pi-constant.hpp"
#include <limits>
#include <opencv2/core.hpp>
@@ -28,7 +28,7 @@ struct pt_types
using mat22 = mat<2, 2>;
};
-#include "opentrack-compat/options.hpp"
+#include "compat/options.hpp"
using namespace options;
struct settings_pt : opts
diff --git a/tracker-pt/point_extractor.cpp b/tracker-pt/point_extractor.cpp
index e749934e..f4034b28 100644
--- a/tracker-pt/point_extractor.cpp
+++ b/tracker-pt/point_extractor.cpp
@@ -10,7 +10,7 @@
#include <QDebug>
#ifdef DEBUG_EXTRACTION
-# include "opentrack-compat/timer.hpp"
+# include "compat/timer.hpp"
#endif
#include <opencv2/videoio.hpp>
diff --git a/tracker-pt/point_extractor.h b/tracker-pt/point_extractor.h
index 9ef2adb4..0a019ec0 100644
--- a/tracker-pt/point_extractor.h
+++ b/tracker-pt/point_extractor.h
@@ -13,7 +13,7 @@
#include <opencv2/imgproc/imgproc.hpp>
#include "ftnoir_tracker_pt_settings.h"
-#include "opentrack-compat/pi-constant.hpp"
+#include "compat/pi-constant.hpp"
#include <vector>
diff --git a/tracker-pt/point_tracker.cpp b/tracker-pt/point_tracker.cpp
index a2511118..fe8ff0f2 100644
--- a/tracker-pt/point_tracker.cpp
+++ b/tracker-pt/point_tracker.cpp
@@ -6,7 +6,7 @@
*/
#include "point_tracker.h"
-#include "opentrack-compat/nan.hpp"
+#include "compat/nan.hpp"
#include <vector>
#include <algorithm>
@@ -325,11 +325,17 @@ int PointTracker::POSIT(const PointModel& model, const PointOrder& order_, f foc
for (int i = 0; i < 3; i++)
for (int j = 0; j < 3; j++)
if (nanp(r(i, j)))
+ {
+ qDebug() << "posit nan";
return -1;
+ }
for (unsigned i = 0; i < 3; i++)
if (nanp(t[i]))
+ {
+ qDebug() << "posit nan";
return -1;
+ }
// apply results
X_CM.R = r;
diff --git a/tracker-pt/point_tracker.h b/tracker-pt/point_tracker.h
index 00e371f5..6ed91069 100644
--- a/tracker-pt/point_tracker.h
+++ b/tracker-pt/point_tracker.h
@@ -8,7 +8,7 @@
#ifndef POINTTRACKER_H
#define POINTTRACKER_H
-#include "opentrack-compat/timer.hpp"
+#include "compat/timer.hpp"
#include "ftnoir_tracker_pt_settings.h"
#include <opencv2/core/core.hpp>
#include <memory>