diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index edb7b3cb67..2858794f8a 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -193,6 +193,13 @@ Menu::Menu() : appInstance->getWebcam(), SLOT(setSkeletonTrackingOn(bool))); + addCheckableActionToQMenuAndActionHash(viewMenu, + MenuOption::LEDTracking, + 0, + false, + appInstance->getWebcam()->getGrabber(), + SLOT(setLEDTrackingOn(bool))); + addDisabledActionAndSeparator(viewMenu, "Stats"); addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Stats, Qt::Key_Slash); addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Log, Qt::CTRL | Qt::Key_L); diff --git a/interface/src/Menu.h b/interface/src/Menu.h index e484fe5c04..5a80d5c8fe 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -176,6 +176,7 @@ namespace MenuOption { const QString ShowTrueColors = "Show TRUE Colors"; const QString SimulateLeapHand = "Simulate Leap Hand"; const QString SkeletonTracking = "Skeleton Tracking"; + const QString LEDTracking = "LED Tracking"; const QString Stars = "Stars"; const QString Stats = "Stats"; const QString TestPing = "Test Ping"; diff --git a/interface/src/Webcam.cpp b/interface/src/Webcam.cpp index 349816a4ed..4132c6f70e 100644 --- a/interface/src/Webcam.cpp +++ b/interface/src/Webcam.cpp @@ -285,8 +285,9 @@ void Webcam::setFrame(const Mat& color, int format, const Mat& depth, float midF QTimer::singleShot(qMax((int)remaining / 1000, 0), _grabber, SLOT(grabFrame())); } -FrameGrabber::FrameGrabber() : _initialized(false), _videoSendMode(FULL_FRAME_VIDEO), _depthOnly(false), _capture(0), - _searchWindow(0, 0, 0, 0), _smoothedMidFaceDepth(UNINITIALIZED_FACE_DEPTH), _colorCodec(), _depthCodec(), _frameCount(0) { +FrameGrabber::FrameGrabber() : _initialized(false), _videoSendMode(FULL_FRAME_VIDEO), + _depthOnly(false), _ledTrackingOn(false), _capture(0), _searchWindow(0, 0, 0, 0), + _smoothedMidFaceDepth(UNINITIALIZED_FACE_DEPTH), _colorCodec(), _depthCodec(), _frameCount(0) { } FrameGrabber::~FrameGrabber() { diff --git a/interface/src/Webcam.h b/interface/src/Webcam.h index 16b9339eb0..a1c6b0fcc2 100644 --- a/interface/src/Webcam.h +++ b/interface/src/Webcam.h @@ -113,6 +113,7 @@ public slots: void cycleVideoSendMode(); void setDepthOnly(bool depthOnly); + void setLEDTrackingOn(bool ledTrackingOn) { _ledTrackingOn = ledTrackingOn; } void reset(); void shutdown(); void grabFrame(); @@ -128,6 +129,7 @@ private: bool _initialized; VideoSendMode _videoSendMode; bool _depthOnly; + bool _ledTrackingOn; CvCapture* _capture; cv::CascadeClassifier _faceCascade; cv::Mat _hsvFrame;