diff options
Diffstat (limited to 'tracker-pt')
| -rw-r--r-- | tracker-pt/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tracker-pt/ftnoir_tracker_pt.cpp | 8 | ||||
| -rw-r--r-- | tracker-pt/ftnoir_tracker_pt.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/tracker-pt/CMakeLists.txt b/tracker-pt/CMakeLists.txt index 94e0a9d5..f12f530b 100644 --- a/tracker-pt/CMakeLists.txt +++ b/tracker-pt/CMakeLists.txt @@ -2,7 +2,7 @@ find_package(OpenCV QUIET) if(OpenCV_FOUND) otr_module(tracker-pt-base STATIC) target_include_directories(${self} SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS}) - target_link_libraries(${self} opencv_imgproc opentrack-cv opentrack-video opencv_core) + target_link_libraries(${self} opencv_imgproc opentrack-cv opencv_core) set_property(TARGET ${self} PROPERTY OUTPUT_NAME "pt-base") endif() add_subdirectory(module) diff --git a/tracker-pt/ftnoir_tracker_pt.cpp b/tracker-pt/ftnoir_tracker_pt.cpp index ed29906f..b717e4a1 100644 --- a/tracker-pt/ftnoir_tracker_pt.cpp +++ b/tracker-pt/ftnoir_tracker_pt.cpp @@ -94,11 +94,11 @@ void Tracker_PT::run() vec3 p = X_GH.t; // head (center?) position in global space preview_frame->draw_head_center((p[0] * fx) / p[2], (p[1] * fx) / p[2]); - video_widget->update_image(preview_frame->get_bitmap()); + widget->update_image(preview_frame->get_bitmap()); { int w = -1, h = -1; - video_widget->get_preview_size(w, h); + widget->get_preview_size(w, h); if (w != preview_width || h != preview_height) { preview_width = w; preview_height = h; @@ -127,10 +127,10 @@ module_status Tracker_PT::start_tracker(QFrame* video_frame) { //video_frame->setAttribute(Qt::WA_NativeWindow); - video_widget = std::make_unique<cv_video_widget>(video_frame); + widget = std::make_unique<video_widget>(video_frame); layout = std::make_unique<QHBoxLayout>(video_frame); layout->setContentsMargins(0, 0, 0, 0); - layout->addWidget(video_widget.get()); + layout->addWidget(widget.get()); video_frame->setLayout(layout.get()); //video_widget->resize(video_frame->width(), video_frame->height()); video_frame->show(); diff --git a/tracker-pt/ftnoir_tracker_pt.h b/tracker-pt/ftnoir_tracker_pt.h index 0226fd87..77835602 100644 --- a/tracker-pt/ftnoir_tracker_pt.h +++ b/tracker-pt/ftnoir_tracker_pt.h @@ -24,7 +24,7 @@ #include <QLayout> class TrackerDialog_PT; -class cv_video_widget; +class video_widget; namespace pt_module { @@ -69,7 +69,7 @@ private: pointer<pt_point_extractor> point_extractor; pointer<pt_camera> camera; - pointer<cv_video_widget> video_widget; + pointer<video_widget> widget; pointer<pt_frame> frame; pointer<pt_preview> preview_frame; |