diff options
Diffstat (limited to 'tracker-rs')
| -rw-r--r-- | tracker-rs/ftnoir_tracker_rs.cpp | 40 | ||||
| -rw-r--r-- | tracker-rs/ftnoir_tracker_rs.h | 2 |
2 files changed, 21 insertions, 21 deletions
diff --git a/tracker-rs/ftnoir_tracker_rs.cpp b/tracker-rs/ftnoir_tracker_rs.cpp index 4a59d74a..1ab32992 100644 --- a/tracker-rs/ftnoir_tracker_rs.cpp +++ b/tracker-rs/ftnoir_tracker_rs.cpp @@ -8,7 +8,7 @@ #include "ftnoir_tracker_rs.h" #include "ftnoir_tracker_rs_controls.h" #include "imagewidget.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" #include "opentrack-library-path.h" #include <QMessageBox> #include <QProcess> @@ -46,7 +46,7 @@ void RSTracker::configurePreviewFrame() void RSTracker::start_tracker(QFrame* previewFrame) { - qDebug() << "tracker_rs: starting tracker"; + qDebug() << "tracker_rs: starting tracker"; mPreviewFrame = previewFrame; @@ -58,20 +58,20 @@ void RSTracker::start_tracker(QFrame* previewFrame) } void RSTracker::startPreview(){ - qDebug() << "tracker_rs: starting preview"; + qDebug() << "tracker_rs: starting preview"; mPreviewUpdateTimer.start(kPreviewUpdateInterval); } void RSTracker::updatePreview(){ - if (mImageWidget != nullptr && mImageWidget->isEnabled() && mTrackerWorkerThread.isRunning()) - mImageWidget->setImage(mTrackerWorkerThread.getPreview()); - else - qDebug() << "tracker_rs: not updating preview. worker thread running: " << mTrackerWorkerThread.isRunning(); + if (mImageWidget != nullptr && mImageWidget->isEnabled() && mTrackerWorkerThread.isRunning()) + mImageWidget->setImage(mTrackerWorkerThread.getPreview()); + else + qDebug() << "tracker_rs: not updating preview. worker thread running: " << mTrackerWorkerThread.isRunning(); } void RSTracker::stopPreview(){ - mPreviewUpdateTimer.stop(); - qDebug() << "tracker_rs: stopped preview"; + mPreviewUpdateTimer.stop(); + qDebug() << "tracker_rs: stopped preview"; } void RSTracker::handleTrackingEnded(int exitCode){ @@ -98,17 +98,17 @@ void RSTracker::showRealSenseErrorMessageBox(int exitCode) msgBox.setIcon(QMessageBox::Critical); msgBox.setText("RealSense Tracking Error"); - switch(exitCode){ - case -101: //The implementation got an invalid handle from the RealSense SDK session/modules + switch(exitCode){ + case -101: //The implementation got an invalid handle from the RealSense SDK session/modules msgBox.setInformativeText("Couldn't initialize RealSense tracking. Please make sure SDK Runtime 2016 R2 is installed."); - break; - case -301: //RealSense SDK runtime execution aborted. - msgBox.setInformativeText("Tracking stopped after the RealSense SDK Runtime execution has aborted."); - break; - case -601: //RealSense Camera stream configuration has changed. - msgBox.setInformativeText("Tracking stopped after another program changed camera streams configuration."); - break; - default: + break; + case -301: //RealSense SDK runtime execution aborted. + msgBox.setInformativeText("Tracking stopped after the RealSense SDK Runtime execution has aborted."); + break; + case -601: //RealSense Camera stream configuration has changed. + msgBox.setInformativeText("Tracking stopped after another program changed camera streams configuration."); + break; + default: msgBox.setInformativeText("Status code: " + QString::number(exitCode) + ".\n\nNote that you need the latest camera drivers and the SDK runtime 2016 R2 to be installed."); } @@ -126,7 +126,7 @@ void RSTracker::data(double *data) } RSTracker::~RSTracker() { - qDebug() << "tracker is being destroyed."; + qDebug() << "tracker is being destroyed."; stopPreview(); diff --git a/tracker-rs/ftnoir_tracker_rs.h b/tracker-rs/ftnoir_tracker_rs.h index 845e0beb..083794ed 100644 --- a/tracker-rs/ftnoir_tracker_rs.h +++ b/tracker-rs/ftnoir_tracker_rs.h @@ -7,7 +7,7 @@ #pragma once -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" #include "ui_ftnoir_tracker_rs_controls.h" #include "ftnoir_tracker_rs_worker.h" #include <QTimer> |