diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2018-01-18 23:45:42 +0100 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2018-01-18 23:55:02 +0100 |
commit | 0657dc14e07ee705a8ab0bba67dfbe04c603db49 (patch) | |
tree | e554cf0c59ddf710bb8c2b3bae3c478f5b9ffb66 /tracker-pt | |
parent | 65523fe1304a7e61889abb1e6854192a43c6dcf0 (diff) |
tracker/pt: move impl bits away from pt-base
Diffstat (limited to 'tracker-pt')
-rw-r--r-- | tracker-pt/CMakeLists.txt | 4 | ||||
-rw-r--r-- | tracker-pt/ftnoir_tracker_pt.qrc | 1 | ||||
-rw-r--r-- | tracker-pt/ftnoir_tracker_pt_dialog.h | 2 | ||||
-rw-r--r-- | tracker-pt/module/CMakeLists.txt | 6 | ||||
-rw-r--r-- | tracker-pt/module/Resources/Logo_IR.png | bin | 0 -> 10386 bytes | |||
-rw-r--r-- | tracker-pt/module/camera.cpp (renamed from tracker-pt/camera.cpp) | 0 | ||||
-rw-r--r-- | tracker-pt/module/camera.h (renamed from tracker-pt/camera.h) | 0 | ||||
-rw-r--r-- | tracker-pt/module/frame.cpp (renamed from tracker-pt/frame.cpp) | 0 | ||||
-rw-r--r-- | tracker-pt/module/frame.hpp (renamed from tracker-pt/frame.hpp) | 0 | ||||
-rw-r--r-- | tracker-pt/module/ftnoir_tracker_pt.qrc | 5 | ||||
-rw-r--r-- | tracker-pt/module/lang/nl_NL.ts | 4 | ||||
-rw-r--r-- | tracker-pt/module/lang/ru_RU.ts | 4 | ||||
-rw-r--r-- | tracker-pt/module/lang/stub.ts | 4 | ||||
-rw-r--r-- | tracker-pt/module/module.cpp (renamed from tracker-pt/module.cxx) | 0 | ||||
-rw-r--r-- | tracker-pt/module/point_extractor.cpp (renamed from tracker-pt/point_extractor.cpp) | 0 | ||||
-rw-r--r-- | tracker-pt/module/point_extractor.h (renamed from tracker-pt/point_extractor.h) | 0 |
16 files changed, 25 insertions, 5 deletions
diff --git a/tracker-pt/CMakeLists.txt b/tracker-pt/CMakeLists.txt index 53d86320..ebabd364 100644 --- a/tracker-pt/CMakeLists.txt +++ b/tracker-pt/CMakeLists.txt @@ -4,7 +4,5 @@ if(OpenCV_FOUND) otr_module(tracker-pt-base STATIC) target_include_directories(opentrack-tracker-pt-base SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS}) target_link_libraries(opentrack-tracker-pt-base opentrack-cv ${modules}) - - otr_module(tracker-pt SOURCES module.cxx) - target_link_libraries(opentrack-tracker-pt opentrack-tracker-pt-base) endif() +add_subdirectory(module) diff --git a/tracker-pt/ftnoir_tracker_pt.qrc b/tracker-pt/ftnoir_tracker_pt.qrc index a8f9a1af..8c270540 100644 --- a/tracker-pt/ftnoir_tracker_pt.qrc +++ b/tracker-pt/ftnoir_tracker_pt.qrc @@ -4,6 +4,5 @@ <file>Resources/cap_side.png</file> <file>Resources/clip_front.png</file> <file>Resources/clip_side.png</file> - <file>Resources/Logo_IR.png</file> </qresource> </RCC> diff --git a/tracker-pt/ftnoir_tracker_pt_dialog.h b/tracker-pt/ftnoir_tracker_pt_dialog.h index 655e52ca..66835c10 100644 --- a/tracker-pt/ftnoir_tracker_pt_dialog.h +++ b/tracker-pt/ftnoir_tracker_pt_dialog.h @@ -10,7 +10,7 @@ #include "pt-api.hpp" #include "ftnoir_tracker_pt.h" -#include "ui_FTNoIR_PT_Controls.h" +#include "tracker-pt/ui_FTNoIR_PT_Controls.h" #include "cv/translation-calibrator.hpp" #include "cv/video-widget.hpp" #include "compat/correlation-calibrator.hpp" diff --git a/tracker-pt/module/CMakeLists.txt b/tracker-pt/module/CMakeLists.txt new file mode 100644 index 00000000..1d1b4458 --- /dev/null +++ b/tracker-pt/module/CMakeLists.txt @@ -0,0 +1,6 @@ +find_package(OpenCV 3.0 QUIET) +if(OpenCV_FOUND) + otr_module(tracker-pt) + target_link_libraries(opentrack-tracker-pt opentrack-tracker-pt-base) + target_include_directories(opentrack-tracker-pt PRIVATE "${CMAKE_SOURCE_DIR}/tracker-pt") +endif() diff --git a/tracker-pt/module/Resources/Logo_IR.png b/tracker-pt/module/Resources/Logo_IR.png Binary files differnew file mode 100644 index 00000000..95032a25 --- /dev/null +++ b/tracker-pt/module/Resources/Logo_IR.png diff --git a/tracker-pt/camera.cpp b/tracker-pt/module/camera.cpp index ba4583da..ba4583da 100644 --- a/tracker-pt/camera.cpp +++ b/tracker-pt/module/camera.cpp diff --git a/tracker-pt/camera.h b/tracker-pt/module/camera.h index 96234840..96234840 100644 --- a/tracker-pt/camera.h +++ b/tracker-pt/module/camera.h diff --git a/tracker-pt/frame.cpp b/tracker-pt/module/frame.cpp index e403af07..e403af07 100644 --- a/tracker-pt/frame.cpp +++ b/tracker-pt/module/frame.cpp diff --git a/tracker-pt/frame.hpp b/tracker-pt/module/frame.hpp index 9e4f809a..9e4f809a 100644 --- a/tracker-pt/frame.hpp +++ b/tracker-pt/module/frame.hpp diff --git a/tracker-pt/module/ftnoir_tracker_pt.qrc b/tracker-pt/module/ftnoir_tracker_pt.qrc new file mode 100644 index 00000000..dfeb7369 --- /dev/null +++ b/tracker-pt/module/ftnoir_tracker_pt.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>Resources/Logo_IR.png</file> + </qresource> +</RCC> diff --git a/tracker-pt/module/lang/nl_NL.ts b/tracker-pt/module/lang/nl_NL.ts new file mode 100644 index 00000000..9e739505 --- /dev/null +++ b/tracker-pt/module/lang/nl_NL.ts @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="nl_NL"> +</TS> diff --git a/tracker-pt/module/lang/ru_RU.ts b/tracker-pt/module/lang/ru_RU.ts new file mode 100644 index 00000000..f62cf2e1 --- /dev/null +++ b/tracker-pt/module/lang/ru_RU.ts @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="ru_RU"> +</TS> diff --git a/tracker-pt/module/lang/stub.ts b/tracker-pt/module/lang/stub.ts new file mode 100644 index 00000000..6401616d --- /dev/null +++ b/tracker-pt/module/lang/stub.ts @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1"> +</TS> diff --git a/tracker-pt/module.cxx b/tracker-pt/module/module.cpp index 5c298ca5..5c298ca5 100644 --- a/tracker-pt/module.cxx +++ b/tracker-pt/module/module.cpp diff --git a/tracker-pt/point_extractor.cpp b/tracker-pt/module/point_extractor.cpp index b67c4036..b67c4036 100644 --- a/tracker-pt/point_extractor.cpp +++ b/tracker-pt/module/point_extractor.cpp diff --git a/tracker-pt/point_extractor.h b/tracker-pt/module/point_extractor.h index 1b6f55a2..1b6f55a2 100644 --- a/tracker-pt/point_extractor.h +++ b/tracker-pt/module/point_extractor.h |