History

Enclose entire functions in ifdef

Atlante45 committed 11 years ago

Commit 4ccc2bb1 parent dde11c52 files · +8 −15Browse files

Unified · Split

2 files
  1. interface/src/Application.cpp +5 −14
  2. interface/src/Application.h +3 −1
interface/src/Application.cpp+5−14
@@ -2304,8 +2304,8 @@ void Application::setActiveFaceTracker() { · 2303 unmodified lines
2304#endif2304#endif
2305}2305}
2306 2306
2307void Application::setActiveEyeTracker() {
2308#ifdef HAVE_IVIEWHMD2307#ifdef HAVE_IVIEWHMD
2308void Application::setActiveEyeTracker() {
2309 auto eyeTracker = DependencyManager::get<EyeTracker>();2309 auto eyeTracker = DependencyManager::get<EyeTracker>();
2310 if (!eyeTracker->isInitialized()) {2310 if (!eyeTracker->isInitialized()) {
2311 return;2311 return;
@@ -2318,29 +2318,20 @@ void Application::setActiveEyeTracker() { · 6 unmodified lines
2318 Menu::getInstance()->getActionForOption(MenuOption::OnePointCalibration)->setEnabled(isEyeTracking && !isSimulating);2318 Menu::getInstance()->getActionForOption(MenuOption::OnePointCalibration)->setEnabled(isEyeTracking && !isSimulating);
2319 Menu::getInstance()->getActionForOption(MenuOption::ThreePointCalibration)->setEnabled(isEyeTracking && !isSimulating);2319 Menu::getInstance()->getActionForOption(MenuOption::ThreePointCalibration)->setEnabled(isEyeTracking && !isSimulating);
2320 Menu::getInstance()->getActionForOption(MenuOption::FivePointCalibration)->setEnabled(isEyeTracking && !isSimulating);2320 Menu::getInstance()->getActionForOption(MenuOption::FivePointCalibration)->setEnabled(isEyeTracking && !isSimulating);
2321#endif
2322}2321}
2323 2322
2324void Application::calibrateEyeTracker1Point() {2323void Application::calibrateEyeTracker1Point() {
2325#ifdef HAVE_IVIEWHMD2324 DependencyManager::get<EyeTracker>()->calibrate(1);
2326 auto eyeTracker = DependencyManager::get<EyeTracker>();
2327 eyeTracker->calibrate(1);
2328#endif
2329}2325}
2330 2326
2331void Application::calibrateEyeTracker3Points() {2327void Application::calibrateEyeTracker3Points() {
2332#ifdef HAVE_IVIEWHMD2328 DependencyManager::get<EyeTracker>()->calibrate(3);
2333 auto eyeTracker = DependencyManager::get<EyeTracker>();
2334 eyeTracker->calibrate(3);
2335#endif
2336}2329}
2337 2330
2338void Application::calibrateEyeTracker5Points() {2331void Application::calibrateEyeTracker5Points() {
2339#ifdef HAVE_IVIEWHMD2332 DependencyManager::get<EyeTracker>()->calibrate(5);
2340 auto eyeTracker = DependencyManager::get<EyeTracker>();
2341 eyeTracker->calibrate(5);
2342#endif
2343}2333}
2334#endif
2344 2335
2345bool Application::exportEntities(const QString& filename, const QVector<EntityItemID>& entityIDs) {2336bool Application::exportEntities(const QString& filename, const QVector<EntityItemID>& entityIDs) {
2346 QVector<EntityItemPointer> entities;2337 QVector<EntityItemPointer> entities;
interface/src/Application.h+3−1
@@ -350,11 +350,13 @@ public slots: · 349 unmodified lines
350 350
351 void resetSensors();351 void resetSensors();
352 void setActiveFaceTracker();352 void setActiveFaceTracker();
353 353
354#ifdef HAVE_IVIEWHMD
354 void setActiveEyeTracker();355 void setActiveEyeTracker();
355 void calibrateEyeTracker1Point();356 void calibrateEyeTracker1Point();
356 void calibrateEyeTracker3Points();357 void calibrateEyeTracker3Points();
357 void calibrateEyeTracker5Points();358 void calibrateEyeTracker5Points();
359#endif
358 360
359 void aboutApp();361 void aboutApp();
360 void showEditEntitiesHelp();362 void showEditEntitiesHelp();