From 88f347a6160c1f1b79840c6489fb963a4b6a8cad Mon Sep 17 00:00:00 2001 From: Wim Vriend Date: Fri, 28 May 2010 18:48:28 +0000 Subject: WVR: Begin implementing Global HotKey and Threshold over movement-values. git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@2 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb --- FaceTrackNoIR.ncb | Bin 31034368 -> 31034368 bytes FaceTrackNoIR.suo | Bin 172544 -> 172544 bytes FaceTrackNoIR/FaceApp.cpp | 28 +- FaceTrackNoIR/FaceTrackNoIR.ui | 758 ++++++++++++++++++++---- FaceTrackNoIR/GeneratedFiles/ui_FaceTrackNoIR.h | 367 ++++++++---- FaceTrackNoIR/Release/BuildLog.htm | Bin 14980 -> 12906 bytes FaceTrackNoIR/Release/FaceApp.obj | Bin 168965 -> 173017 bytes FaceTrackNoIR/Release/FaceTrackNoIR.obj | Bin 626334 -> 654850 bytes FaceTrackNoIR/Release/main.obj | Bin 174184 -> 174184 bytes FaceTrackNoIR/Release/moc_FaceApp.obj | Bin 169009 -> 169005 bytes FaceTrackNoIR/Release/moc_FaceTrackNoIR.obj | Bin 174472 -> 174472 bytes FaceTrackNoIR/Release/mt.dep | 2 +- FaceTrackNoIR/Release/tracker.obj | Bin 269242 -> 269242 bytes FaceTrackNoIR/Release/vc90.idb | Bin 2550784 -> 2550784 bytes FaceTrackNoIR/Release/vc90.pdb | Bin 2035712 -> 2043904 bytes FaceTrackNoIR/tracker.cpp | 14 +- bin/FaceTrackNoIR.exe | Bin 433152 -> 442368 bytes 17 files changed, 931 insertions(+), 238 deletions(-) diff --git a/FaceTrackNoIR.ncb b/FaceTrackNoIR.ncb index 0c1f7997..6cb4526c 100644 Binary files a/FaceTrackNoIR.ncb and b/FaceTrackNoIR.ncb differ diff --git a/FaceTrackNoIR.suo b/FaceTrackNoIR.suo index ff054956..b0e584f8 100644 Binary files a/FaceTrackNoIR.suo and b/FaceTrackNoIR.suo differ diff --git a/FaceTrackNoIR/FaceApp.cpp b/FaceTrackNoIR/FaceApp.cpp index b993c5cf..d21360d3 100644 --- a/FaceTrackNoIR/FaceApp.cpp +++ b/FaceTrackNoIR/FaceApp.cpp @@ -16,7 +16,20 @@ bool FaceApp::winEventFilter( MSG * msg, long * result ) mainWindow->getGameProgramName(); } } - + + if (msgType == WM_HOTKEY) { + switch ( msg->wParam ) { + case 777: + qDebug() << "FaceApp::winEventFilter says: HOME pressed"; + break; + case 778: + qDebug() << "FaceApp::winEventFilter says: END pressed"; + break; + default: + qDebug() << "FaceApp::winEventFilter says: unknown HotKey pressed"; + break; + } + } return( false ); } @@ -27,7 +40,18 @@ void FaceApp::SetupEventFilter( FaceTrackNoIR *window ) { mainWindow = window; msgID_FTClient = RegisterWindowMessageA ( FT_PROGRAMID ); - qDebug() << "FaceApp::SetupEventFilter says: Message ID =" << msgID_FTClient; + if ( RegisterHotKey( window->winId(), 777, MOD_WIN, VK_HOME ) ) { + qDebug() << "FaceApp::SetupEventFilter says: RegisterHotKey HOME =" << VK_HOME; + } + if ( RegisterHotKey( window->winId(), 778, MOD_WIN, VK_END ) ) { + qDebug() << "FaceApp::SetupEventFilter says: RegisterHotKey END =" << VK_END; + } + + QAbstractEventDispatcher *evtdis = QAbstractEventDispatcher::instance(); + if (evtdis != NULL) { + qDebug() << "FaceApp::SetupEventFilter says: EventDispatcher found!"; + } + } \ No newline at end of file diff --git a/FaceTrackNoIR/FaceTrackNoIR.ui b/FaceTrackNoIR/FaceTrackNoIR.ui index 18c3631c..13a0aac8 100644 --- a/FaceTrackNoIR/FaceTrackNoIR.ui +++ b/FaceTrackNoIR/FaceTrackNoIR.ui @@ -919,6 +919,144 @@ color:#000; + + + + + + + 25 + 0 + + + + + 150 + 16777215 + + + + color:#ccc; +background:none; + + + Smoothing (samples) + + + + + + + + 50 + 15 + + + + 1 + + + 120 + + + 10 + + + 10 + + + Qt::Horizontal + + + QSlider::NoTicks + + + + + + + + 50 + 22 + + + + 120 + + + 10 + + + + + + + + 50 + 15 + + + + 0 + + + 45 + + + 2 + + + 5 + + + Qt::Horizontal + + + QSlider::NoTicks + + + + + + + + 50 + 22 + + + + 45 + + + 5 + + + + + + + + 25 + 0 + + + + + 150 + 16777215 + + + + color:#ccc; +background:none; + + + Rotation Neutral Zone (degr.) + + + + + @@ -1025,19 +1163,6 @@ background:none; - - - - Qt::Horizontal - - - - 0 - 20 - - - - @@ -1101,7 +1226,7 @@ opacity:100; background:none; - Sensitivity + Sensitivity (100 = x1) @@ -1172,7 +1297,7 @@ background:none; - + @@ -1195,7 +1320,7 @@ background:none; - + @@ -1220,7 +1345,7 @@ background:none; - + @@ -1239,7 +1364,7 @@ background:none; - + @@ -1325,7 +1450,7 @@ background:none; - + @@ -1348,7 +1473,7 @@ background:none; - + @@ -1440,7 +1565,7 @@ background:none; - + @@ -1463,7 +1588,7 @@ background:none; - + @@ -1488,7 +1613,7 @@ background:none; - + @@ -1507,14 +1632,14 @@ background:none; - + - + @@ -1537,28 +1662,28 @@ background:none; - + - + - + - + @@ -1581,29 +1706,157 @@ background:none; - + - + - - - - - - + + - 25 + 50 + 15 + + + + 500 + + + 10 + + + 100 + + + Qt::Horizontal + + + QSlider::NoTicks + + + + + + + + 50 + 15 + + + + 500 + + + 10 + + + 100 + + + Qt::Horizontal + + + QSlider::NoTicks + + + + + + + + 50 + 15 + + + + 500 + + + 10 + + + 100 + + + Qt::Horizontal + + + QSlider::NoTicks + + + + + + + + 50 + 22 + + + + 500 + + + 10 + + + 100 + + + + + + + + 50 + 22 + + + + 500 + + + 10 + + + 100 + + + + + + + + 50 + 22 + + + + 500 + + + 10 + + + 100 + + + + + + + + 100 0 @@ -1618,29 +1871,26 @@ background:none; background:none; - Smoothing (samples) + Threshold (100 = 1) - - + + 50 15 - - 1 - - 120 + 500 10 - 10 + 100 Qt::Horizontal @@ -1650,41 +1900,47 @@ background:none; - - + + 50 - 22 + 15 - 120 + 500 - + 10 + + 100 + + + Qt::Horizontal + + + QSlider::NoTicks + - - + + 50 15 - - 0 - - 45 + 500 - 2 + 10 - 5 + 100 Qt::Horizontal @@ -1694,8 +1950,8 @@ background:none; - - + + 50 @@ -1703,31 +1959,82 @@ background:none; - 45 + 500 + + + 10 - 5 + 100 - - - - Qt::Horizontal + + + + + 50 + 22 + + + + 500 + + + 10 - + + 100 + + + + + + - 13 - 20 + 50 + 22 - + + 500 + + + 10 + + + 100 + + - - + + - 25 + 100 + 0 + + + + + 150 + 16777215 + + + + color:#ccc; +background:none; + + + Threshold (100 = 1) + + + + + + + + 100 0 @@ -1742,28 +2049,31 @@ background:none; background:none; - Rotation Neutral Zone (degr.) + Sensitivity (100 = x1) + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 30 + 20 + + + + - - - - Qt::Horizontal - - - - 13 - 20 - - - - @@ -1991,11 +2301,11 @@ background:none; setValue(int) - 401 + 391 442 - 457 + 447 446 @@ -2007,11 +2317,11 @@ background:none; setValue(int) - 457 + 447 446 - 401 + 391 442 @@ -2023,11 +2333,11 @@ background:none; setValue(int) - 401 + 391 473 - 457 + 447 476 @@ -2039,11 +2349,11 @@ background:none; setValue(int) - 457 + 447 476 - 401 + 391 473 @@ -2055,11 +2365,11 @@ background:none; setValue(int) - 401 + 391 499 - 457 + 447 502 @@ -2071,11 +2381,11 @@ background:none; setValue(int) - 457 + 447 502 - 401 + 391 499 @@ -2087,11 +2397,11 @@ background:none; setValue(int) - 578 + 698 442 - 634 + 754 445 @@ -2103,11 +2413,11 @@ background:none; setValue(int) - 634 + 754 445 - 578 + 698 442 @@ -2119,11 +2429,11 @@ background:none; setValue(int) - 578 + 698 473 - 634 + 754 472 @@ -2135,11 +2445,11 @@ background:none; setValue(int) - 634 + 754 472 - 578 + 698 473 @@ -2151,11 +2461,11 @@ background:none; setValue(int) - 578 + 698 499 - 634 + 754 502 @@ -2167,11 +2477,11 @@ background:none; setValue(int) - 634 + 754 502 - 578 + 698 499 @@ -2183,12 +2493,12 @@ background:none; setValue(int) - 803 - 497 + 813 + 238 - 859 - 499 + 869 + 240 @@ -2199,12 +2509,12 @@ background:none; setValue(int) - 859 - 499 + 869 + 240 - 803 - 497 + 813 + 238 @@ -2215,12 +2525,12 @@ background:none; setValue(int) - 730 - 431 + 813 + 176 - 827 - 432 + 869 + 178 @@ -2231,12 +2541,204 @@ background:none; setValue(int) - 846 - 441 + 869 + 178 + + + 813 + 176 + + + + + thresYaw + valueChanged(int) + spinThresYaw + setValue(int) + + + 492 + 431 + + + 543 + 432 + + + + + spinThresYaw + valueChanged(int) + thresYaw + setValue(int) + + + 532 + 433 + + + 481 + 433 + + + + + thresPitch + valueChanged(int) + spinThresPitch + setValue(int) + + + 486 + 462 + + + 540 + 469 + + + + + spinThresPitch + valueChanged(int) + thresPitch + setValue(int) + + + 533 + 458 + + + 501 + 460 + + + + + thresRoll + valueChanged(int) + spinThresRoll + setValue(int) + + + 498 + 487 + + + 542 + 492 + + + + + spinThresRoll + valueChanged(int) + thresRoll + setValue(int) + + + 537 + 495 + + + 504 + 490 + + + + + thresX + valueChanged(int) + spinThresX + setValue(int) + + + 803 + 432 + + + 847 + 439 + + + + + spinThresX + valueChanged(int) + thresX + setValue(int) + + + 844 + 429 + + + 800 + 428 + + + + + thresY + valueChanged(int) + spinThresY + setValue(int) + + + 785 + 461 + + + 851 + 465 + + + + + spinThresY + valueChanged(int) + thresY + setValue(int) + + + 845 + 463 + + + 792 + 464 + + + + + thresZ + valueChanged(int) + spinThresZ + setValue(int) + + + 794 + 483 + + + 845 + 486 + + + + + spinThresZ + valueChanged(int) + thresZ + setValue(int) + + + 843 + 499 - 691 - 436 + 805 + 493 diff --git a/FaceTrackNoIR/GeneratedFiles/ui_FaceTrackNoIR.h b/FaceTrackNoIR/GeneratedFiles/ui_FaceTrackNoIR.h index 6f2f8b8b..4a3a78b1 100644 --- a/FaceTrackNoIR/GeneratedFiles/ui_FaceTrackNoIR.h +++ b/FaceTrackNoIR/GeneratedFiles/ui_FaceTrackNoIR.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'FaceTrackNoIR.ui' ** -** Created: Fri 21. May 22:25:10 2010 +** Created: Fri 28. May 20:44:32 2010 ** by: Qt User Interface Compiler version 4.6.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! @@ -87,6 +87,13 @@ public: QPushButton *btnStopTracker; QGroupBox *groupGameProtocol; QComboBox *iconcomboBox; + QGridLayout *gridLayout_2; + QLabel *lblSensYaw_3; + QSlider *slideSmoothing; + QSpinBox *spinSmoothing; + QSlider *slideNeutralZone; + QSpinBox *spinNeutralZone; + QLabel *lblSensYaw_4; QSpacerItem *horizontalSpacer_3; QSpacerItem *verticalSpacer; QHBoxLayout *horizontalLayout_11; @@ -94,7 +101,6 @@ public: QWidget *bubbleSmallWidget_2; QVBoxLayout *verticalLayout_6; QLabel *cameraName; - QSpacerItem *horizontalSpacer_10; QHBoxLayout *horizontalLayout_8; QSpacerItem *horizontalSpacer_17; QWidget *bubbleBigWidget; @@ -127,14 +133,21 @@ public: QLabel *lblInvert1_2; QCheckBox *chkInvertY; QCheckBox *chkInvertZ; - QGridLayout *gridLayout_2; - QLabel *lblSensYaw_3; - QSlider *slideSmoothing; - QSpinBox *spinSmoothing; - QSlider *slideNeutralZone; - QSpinBox *spinNeutralZone; - QSpacerItem *horizontalSpacer_14; - QLabel *lblSensYaw_4; + QSlider *thresYaw; + QSlider *thresPitch; + QSlider *thresRoll; + QSpinBox *spinThresYaw; + QSpinBox *spinThresPitch; + QSpinBox *spinThresRoll; + QLabel *lblSensitivity_2; + QSlider *thresX; + QSlider *thresY; + QSlider *thresZ; + QSpinBox *spinThresX; + QSpinBox *spinThresY; + QSpinBox *spinThresZ; + QLabel *lblSensitivity_3; + QLabel *lblSensitivity_4; QSpacerItem *horizontalSpacer_13; QMenuBar *menuBar; QMenu *menuFile; @@ -509,6 +522,70 @@ public: horizontalLayout_3->addWidget(groupGameProtocol); + gridLayout_2 = new QGridLayout(); + gridLayout_2->setSpacing(6); + gridLayout_2->setObjectName(QString::fromUtf8("gridLayout_2")); + lblSensYaw_3 = new QLabel(widget); + lblSensYaw_3->setObjectName(QString::fromUtf8("lblSensYaw_3")); + lblSensYaw_3->setMinimumSize(QSize(25, 0)); + lblSensYaw_3->setMaximumSize(QSize(150, 16777215)); + lblSensYaw_3->setStyleSheet(QString::fromUtf8("color:#ccc;\n" +"background:none;")); + + gridLayout_2->addWidget(lblSensYaw_3, 0, 0, 1, 2); + + slideSmoothing = new QSlider(widget); + slideSmoothing->setObjectName(QString::fromUtf8("slideSmoothing")); + slideSmoothing->setMinimumSize(QSize(50, 15)); + slideSmoothing->setMinimum(1); + slideSmoothing->setMaximum(120); + slideSmoothing->setPageStep(10); + slideSmoothing->setValue(10); + slideSmoothing->setOrientation(Qt::Horizontal); + slideSmoothing->setTickPosition(QSlider::NoTicks); + + gridLayout_2->addWidget(slideSmoothing, 1, 0, 1, 1); + + spinSmoothing = new QSpinBox(widget); + spinSmoothing->setObjectName(QString::fromUtf8("spinSmoothing")); + spinSmoothing->setMinimumSize(QSize(50, 22)); + spinSmoothing->setMaximum(120); + spinSmoothing->setValue(10); + + gridLayout_2->addWidget(spinSmoothing, 1, 1, 1, 1); + + slideNeutralZone = new QSlider(widget); + slideNeutralZone->setObjectName(QString::fromUtf8("slideNeutralZone")); + slideNeutralZone->setMinimumSize(QSize(50, 15)); + slideNeutralZone->setMinimum(0); + slideNeutralZone->setMaximum(45); + slideNeutralZone->setPageStep(2); + slideNeutralZone->setValue(5); + slideNeutralZone->setOrientation(Qt::Horizontal); + slideNeutralZone->setTickPosition(QSlider::NoTicks); + + gridLayout_2->addWidget(slideNeutralZone, 4, 0, 1, 1); + + spinNeutralZone = new QSpinBox(widget); + spinNeutralZone->setObjectName(QString::fromUtf8("spinNeutralZone")); + spinNeutralZone->setMinimumSize(QSize(50, 22)); + spinNeutralZone->setMaximum(45); + spinNeutralZone->setValue(5); + + gridLayout_2->addWidget(spinNeutralZone, 4, 1, 1, 1); + + lblSensYaw_4 = new QLabel(widget); + lblSensYaw_4->setObjectName(QString::fromUtf8("lblSensYaw_4")); + lblSensYaw_4->setMinimumSize(QSize(25, 0)); + lblSensYaw_4->setMaximumSize(QSize(150, 16777215)); + lblSensYaw_4->setStyleSheet(QString::fromUtf8("color:#ccc;\n" +"background:none;")); + + gridLayout_2->addWidget(lblSensYaw_4, 2, 0, 1, 1); + + + horizontalLayout_3->addLayout(gridLayout_2); + horizontalSpacer_3 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); horizontalLayout_3->addItem(horizontalSpacer_3); @@ -551,10 +628,6 @@ public: horizontalLayout_11->addWidget(bubbleSmallWidget_2); - horizontalSpacer_10 = new QSpacerItem(0, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); - - horizontalLayout_11->addItem(horizontalSpacer_10); - verticalLayout_4->addLayout(horizontalLayout_11); @@ -624,7 +697,7 @@ public: lblSensX->setStyleSheet(QString::fromUtf8("color:#ccc;\n" "background:none;")); - gridLayout->addWidget(lblSensX, 1, 4, 1, 1); + gridLayout->addWidget(lblSensX, 1, 6, 1, 1); sensX = new QSlider(bubbleBigWidget); sensX->setObjectName(QString::fromUtf8("sensX")); @@ -635,7 +708,7 @@ public: sensX->setOrientation(Qt::Horizontal); sensX->setTickPosition(QSlider::NoTicks); - gridLayout->addWidget(sensX, 1, 5, 1, 1); + gridLayout->addWidget(sensX, 1, 7, 1, 1); spinSensX = new QSpinBox(bubbleBigWidget); spinSensX->setObjectName(QString::fromUtf8("spinSensX")); @@ -644,7 +717,7 @@ public: spinSensX->setSingleStep(10); spinSensX->setValue(100); - gridLayout->addWidget(spinSensX, 1, 6, 1, 1); + gridLayout->addWidget(spinSensX, 1, 8, 1, 1); spinSensY = new QSpinBox(bubbleBigWidget); spinSensY->setObjectName(QString::fromUtf8("spinSensY")); @@ -653,7 +726,7 @@ public: spinSensY->setSingleStep(10); spinSensY->setValue(100); - gridLayout->addWidget(spinSensY, 2, 6, 2, 1); + gridLayout->addWidget(spinSensY, 2, 8, 2, 1); lblSensPitch = new QLabel(bubbleBigWidget); lblSensPitch->setObjectName(QString::fromUtf8("lblSensPitch")); @@ -691,7 +764,7 @@ public: lblSensY->setStyleSheet(QString::fromUtf8("color:#ccc;\n" "background:none;")); - gridLayout->addWidget(lblSensY, 3, 4, 1, 1); + gridLayout->addWidget(lblSensY, 3, 6, 1, 1); sensY = new QSlider(bubbleBigWidget); sensY->setObjectName(QString::fromUtf8("sensY")); @@ -702,7 +775,7 @@ public: sensY->setOrientation(Qt::Horizontal); sensY->setTickPosition(QSlider::NoTicks); - gridLayout->addWidget(sensY, 3, 5, 1, 1); + gridLayout->addWidget(sensY, 3, 7, 1, 1); lblSensRoll = new QLabel(bubbleBigWidget); lblSensRoll->setObjectName(QString::fromUtf8("lblSensRoll")); @@ -740,7 +813,7 @@ public: lblSensZ->setStyleSheet(QString::fromUtf8("color:#ccc;\n" "background:none;")); - gridLayout->addWidget(lblSensZ, 4, 4, 1, 1); + gridLayout->addWidget(lblSensZ, 4, 6, 1, 1); sensZ = new QSlider(bubbleBigWidget); sensZ->setObjectName(QString::fromUtf8("sensZ")); @@ -751,7 +824,7 @@ public: sensZ->setOrientation(Qt::Horizontal); sensZ->setTickPosition(QSlider::NoTicks); - gridLayout->addWidget(sensZ, 4, 5, 1, 1); + gridLayout->addWidget(sensZ, 4, 7, 1, 1); spinSensZ = new QSpinBox(bubbleBigWidget); spinSensZ->setObjectName(QString::fromUtf8("spinSensZ")); @@ -760,12 +833,12 @@ public: spinSensZ->setSingleStep(10); spinSensZ->setValue(100); - gridLayout->addWidget(spinSensZ, 4, 6, 1, 1); + gridLayout->addWidget(spinSensZ, 4, 8, 1, 1); chkInvertYaw = new QCheckBox(bubbleBigWidget); chkInvertYaw->setObjectName(QString::fromUtf8("chkInvertYaw")); - gridLayout->addWidget(chkInvertYaw, 1, 3, 1, 1); + gridLayout->addWidget(chkInvertYaw, 1, 5, 1, 1); lblInvert1 = new QLabel(bubbleBigWidget); lblInvert1->setObjectName(QString::fromUtf8("lblInvert1")); @@ -774,22 +847,22 @@ public: lblInvert1->setStyleSheet(QString::fromUtf8("color:#ccc;\n" "background:none;")); - gridLayout->addWidget(lblInvert1, 0, 3, 1, 1); + gridLayout->addWidget(lblInvert1, 0, 5, 1, 1); chkInvertPitch = new QCheckBox(bubbleBigWidget); chkInvertPitch->setObjectName(QString::fromUtf8("chkInvertPitch")); - gridLayout->addWidget(chkInvertPitch, 3, 3, 1, 1); + gridLayout->addWidget(chkInvertPitch, 3, 5, 1, 1); chkInvertRoll = new QCheckBox(bubbleBigWidget); chkInvertRoll->setObjectName(QString::fromUtf8("chkInvertRoll")); - gridLayout->addWidget(chkInvertRoll, 4, 3, 1, 1); + gridLayout->addWidget(chkInvertRoll, 4, 5, 1, 1); chkInvertX = new QCheckBox(bubbleBigWidget); chkInvertX->setObjectName(QString::fromUtf8("chkInvertX")); - gridLayout->addWidget(chkInvertX, 1, 7, 1, 1); + gridLayout->addWidget(chkInvertX, 1, 11, 1, 1); lblInvert1_2 = new QLabel(bubbleBigWidget); lblInvert1_2->setObjectName(QString::fromUtf8("lblInvert1_2")); @@ -798,95 +871,174 @@ public: lblInvert1_2->setStyleSheet(QString::fromUtf8("color:#ccc;\n" "background:none;")); - gridLayout->addWidget(lblInvert1_2, 0, 7, 1, 1); + gridLayout->addWidget(lblInvert1_2, 0, 11, 1, 1); chkInvertY = new QCheckBox(bubbleBigWidget); chkInvertY->setObjectName(QString::fromUtf8("chkInvertY")); - gridLayout->addWidget(chkInvertY, 3, 7, 1, 1); + gridLayout->addWidget(chkInvertY, 3, 11, 1, 1); chkInvertZ = new QCheckBox(bubbleBigWidget); chkInvertZ->setObjectName(QString::fromUtf8("chkInvertZ")); - gridLayout->addWidget(chkInvertZ, 4, 7, 1, 1); - - - horizontalLayout_2->addLayout(gridLayout); - - gridLayout_2 = new QGridLayout(); - gridLayout_2->setSpacing(6); - gridLayout_2->setObjectName(QString::fromUtf8("gridLayout_2")); - lblSensYaw_3 = new QLabel(bubbleBigWidget); - lblSensYaw_3->setObjectName(QString::fromUtf8("lblSensYaw_3")); - lblSensYaw_3->setMinimumSize(QSize(25, 0)); - lblSensYaw_3->setMaximumSize(QSize(150, 16777215)); - lblSensYaw_3->setStyleSheet(QString::fromUtf8("color:#ccc;\n" + gridLayout->addWidget(chkInvertZ, 4, 11, 1, 1); + + thresYaw = new QSlider(bubbleBigWidget); + thresYaw->setObjectName(QString::fromUtf8("thresYaw")); + thresYaw->setMinimumSize(QSize(50, 15)); + thresYaw->setMaximum(500); + thresYaw->setPageStep(10); + thresYaw->setValue(100); + thresYaw->setOrientation(Qt::Horizontal); + thresYaw->setTickPosition(QSlider::NoTicks); + + gridLayout->addWidget(thresYaw, 1, 3, 1, 1); + + thresPitch = new QSlider(bubbleBigWidget); + thresPitch->setObjectName(QString::fromUtf8("thresPitch")); + thresPitch->setMinimumSize(QSize(50, 15)); + thresPitch->setMaximum(500); + thresPitch->setPageStep(10); + thresPitch->setValue(100); + thresPitch->setOrientation(Qt::Horizontal); + thresPitch->setTickPosition(QSlider::NoTicks); + + gridLayout->addWidget(thresPitch, 3, 3, 1, 1); + + thresRoll = new QSlider(bubbleBigWidget); + thresRoll->setObjectName(QString::fromUtf8("thresRoll")); + thresRoll->setMinimumSize(QSize(50, 15)); + thresRoll->setMaximum(500); + thresRoll->setPageStep(10); + thresRoll->setValue(100); + thresRoll->setOrientation(Qt::Horizontal); + thresRoll->setTickPosition(QSlider::NoTicks); + + gridLayout->addWidget(thresRoll, 4, 3, 1, 1); + + spinThresYaw = new QSpinBox(bubbleBigWidget); + spinThresYaw->setObjectName(QString::fromUtf8("spinThresYaw")); + spinThresYaw->setMinimumSize(QSize(50, 22)); + spinThresYaw->setMaximum(500); + spinThresYaw->setSingleStep(10); + spinThresYaw->setValue(100); + + gridLayout->addWidget(spinThresYaw, 1, 4, 1, 1); + + spinThresPitch = new QSpinBox(bubbleBigWidget); + spinThresPitch->setObjectName(QString::fromUtf8("spinThresPitch")); + spinThresPitch->setMinimumSize(QSize(50, 22)); + spinThresPitch->setMaximum(500); + spinThresPitch->setSingleStep(10); + spinThresPitch->setValue(100); + + gridLayout->addWidget(spinThresPitch, 3, 4, 1, 1); + + spinThresRoll = new QSpinBox(bubbleBigWidget); + spinThresRoll->setObjectName(QString::fromUtf8("spinThresRoll")); + spinThresRoll->setMinimumSize(QSize(50, 22)); + spinThresRoll->setMaximum(500); + spinThresRoll->setSingleStep(10); + spinThresRoll->setValue(100); + + gridLayout->addWidget(spinThresRoll, 4, 4, 1, 1); + + lblSensitivity_2 = new QLabel(bubbleBigWidget); + lblSensitivity_2->setObjectName(QString::fromUtf8("lblSensitivity_2")); + lblSensitivity_2->setMinimumSize(QSize(100, 0)); + lblSensitivity_2->setMaximumSize(QSize(150, 16777215)); + lblSensitivity_2->setStyleSheet(QString::fromUtf8("color:#ccc;\n" "background:none;")); - gridLayout_2->addWidget(lblSensYaw_3, 0, 0, 1, 2); - - slideSmoothing = new QSlider(bubbleBigWidget); - slideSmoothing->setObjectName(QString::fromUtf8("slideSmoothing")); - slideSmoothing->setMinimumSize(QSize(50, 15)); - slideSmoothing->setMinimum(1); - slideSmoothing->setMaximum(120); - slideSmoothing->setPageStep(10); - slideSmoothing->setValue(10); - slideSmoothing->setOrientation(Qt::Horizontal); - slideSmoothing->setTickPosition(QSlider::NoTicks); - - gridLayout_2->addWidget(slideSmoothing, 1, 0, 1, 1); - - spinSmoothing = new QSpinBox(bubbleBigWidget); - spinSmoothing->setObjectName(QString::fromUtf8("spinSmoothing")); - spinSmoothing->setMinimumSize(QSize(50, 22)); - spinSmoothing->setMaximum(120); - spinSmoothing->setValue(10); - - gridLayout_2->addWidget(spinSmoothing, 1, 1, 1, 1); - - slideNeutralZone = new QSlider(bubbleBigWidget); - slideNeutralZone->setObjectName(QString::fromUtf8("slideNeutralZone")); - slideNeutralZone->setMinimumSize(QSize(50, 15)); - slideNeutralZone->setMinimum(0); - slideNeutralZone->setMaximum(45); - slideNeutralZone->setPageStep(2); - slideNeutralZone->setValue(5); - slideNeutralZone->setOrientation(Qt::Horizontal); - slideNeutralZone->setTickPosition(QSlider::NoTicks); - - gridLayout_2->addWidget(slideNeutralZone, 4, 0, 1, 1); - - spinNeutralZone = new QSpinBox(bubbleBigWidget); - spinNeutralZone->setObjectName(QString::fromUtf8("spinNeutralZone")); - spinNeutralZone->setMinimumSize(QSize(50, 22)); - spinNeutralZone->setMaximum(45); - spinNeutralZone->setValue(5); - - gridLayout_2->addWidget(spinNeutralZone, 4, 1, 1, 1); - - horizontalSpacer_14 = new QSpacerItem(13, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + gridLayout->addWidget(lblSensitivity_2, 0, 3, 1, 1); + + thresX = new QSlider(bubbleBigWidget); + thresX->setObjectName(QString::fromUtf8("thresX")); + thresX->setMinimumSize(QSize(50, 15)); + thresX->setMaximum(500); + thresX->setPageStep(10); + thresX->setValue(100); + thresX->setOrientation(Qt::Horizontal); + thresX->setTickPosition(QSlider::NoTicks); + + gridLayout->addWidget(thresX, 1, 9, 1, 1); + + thresY = new QSlider(bubbleBigWidget); + thresY->setObjectName(QString::fromUtf8("thresY")); + thresY->setMinimumSize(QSize(50, 15)); + thresY->setMaximum(500); + thresY->setPageStep(10); + thresY->setValue(100); + thresY->setOrientation(Qt::Horizontal); + thresY->setTickPosition(QSlider::NoTicks); + + gridLayout->addWidget(thresY, 3, 9, 1, 1); + + thresZ = new QSlider(bubbleBigWidget); + thresZ->setObjectName(QString::fromUtf8("thresZ")); + thresZ->setMinimumSize(QSize(50, 15)); + thresZ->setMaximum(500); + thresZ->setPageStep(10); + thresZ->setValue(100); + thresZ->setOrientation(Qt::Horizontal); + thresZ->setTickPosition(QSlider::NoTicks); + + gridLayout->addWidget(thresZ, 4, 9, 1, 1); + + spinThresX = new QSpinBox(bubbleBigWidget); + spinThresX->setObjectName(QString::fromUtf8("spinThresX")); + spinThresX->setMinimumSize(QSize(50, 22)); + spinThresX->setMaximum(500); + spinThresX->setSingleStep(10); + spinThresX->setValue(100); + + gridLayout->addWidget(spinThresX, 1, 10, 1, 1); + + spinThresY = new QSpinBox(bubbleBigWidget); + spinThresY->setObjectName(QString::fromUtf8("spinThresY")); + spinThresY->setMinimumSize(QSize(50, 22)); + spinThresY->setMaximum(500); + spinThresY->setSingleStep(10); + spinThresY->setValue(100); + + gridLayout->addWidget(spinThresY, 3, 10, 1, 1); + + spinThresZ = new QSpinBox(bubbleBigWidget); + spinThresZ->setObjectName(QString::fromUtf8("spinThresZ")); + spinThresZ->setMinimumSize(QSize(50, 22)); + spinThresZ->setMaximum(500); + spinThresZ->setSingleStep(10); + spinThresZ->setValue(100); + + gridLayout->addWidget(spinThresZ, 4, 10, 1, 1); + + lblSensitivity_3 = new QLabel(bubbleBigWidget); + lblSensitivity_3->setObjectName(QString::fromUtf8("lblSensitivity_3")); + lblSensitivity_3->setMinimumSize(QSize(100, 0)); + lblSensitivity_3->setMaximumSize(QSize(150, 16777215)); + lblSensitivity_3->setStyleSheet(QString::fromUtf8("color:#ccc;\n" +"background:none;")); - gridLayout_2->addItem(horizontalSpacer_14, 2, 2, 1, 1); + gridLayout->addWidget(lblSensitivity_3, 0, 9, 1, 1); - lblSensYaw_4 = new QLabel(bubbleBigWidget); - lblSensYaw_4->setObjectName(QString::fromUtf8("lblSensYaw_4")); - lblSensYaw_4->setMinimumSize(QSize(25, 0)); - lblSensYaw_4->setMaximumSize(QSize(150, 16777215)); - lblSensYaw_4->setStyleSheet(QString::fromUtf8("color:#ccc;\n" + lblSensitivity_4 = new QLabel(bubbleBigWidget); + lblSensitivity_4->setObjectName(QString::fromUtf8("lblSensitivity_4")); + lblSensitivity_4->setMinimumSize(QSize(100, 0)); + lblSensitivity_4->setMaximumSize(QSize(150, 16777215)); + lblSensitivity_4->setStyleSheet(QString::fromUtf8("color:#ccc;\n" "background:none;")); - gridLayout_2->addWidget(lblSensYaw_4, 2, 0, 1, 1); + gridLayout->addWidget(lblSensitivity_4, 0, 7, 1, 1); - horizontalLayout_2->addLayout(gridLayout_2); + horizontalLayout_2->addLayout(gridLayout); + horizontalSpacer_13 = new QSpacerItem(30, 20, QSizePolicy::Minimum, QSizePolicy::Minimum); - horizontalLayout_8->addWidget(bubbleBigWidget); + horizontalLayout_2->addItem(horizontalSpacer_13); - horizontalSpacer_13 = new QSpacerItem(13, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); - horizontalLayout_8->addItem(horizontalSpacer_13); + horizontalLayout_8->addWidget(bubbleBigWidget); verticalLayout_4->addLayout(horizontalLayout_8); @@ -966,6 +1118,18 @@ public: QObject::connect(spinNeutralZone, SIGNAL(valueChanged(int)), slideNeutralZone, SLOT(setValue(int))); QObject::connect(slideSmoothing, SIGNAL(valueChanged(int)), spinSmoothing, SLOT(setValue(int))); QObject::connect(spinSmoothing, SIGNAL(valueChanged(int)), slideSmoothing, SLOT(setValue(int))); + QObject::connect(thresYaw, SIGNAL(valueChanged(int)), spinThresYaw, SLOT(setValue(int))); + QObject::connect(spinThresYaw, SIGNAL(valueChanged(int)), thresYaw, SLOT(setValue(int))); + QObject::connect(thresPitch, SIGNAL(valueChanged(int)), spinThresPitch, SLOT(setValue(int))); + QObject::connect(spinThresPitch, SIGNAL(valueChanged(int)), thresPitch, SLOT(setValue(int))); + QObject::connect(thresRoll, SIGNAL(valueChanged(int)), spinThresRoll, SLOT(setValue(int))); + QObject::connect(spinThresRoll, SIGNAL(valueChanged(int)), thresRoll, SLOT(setValue(int))); + QObject::connect(thresX, SIGNAL(valueChanged(int)), spinThresX, SLOT(setValue(int))); + QObject::connect(spinThresX, SIGNAL(valueChanged(int)), thresX, SLOT(setValue(int))); + QObject::connect(thresY, SIGNAL(valueChanged(int)), spinThresY, SLOT(setValue(int))); + QObject::connect(spinThresY, SIGNAL(valueChanged(int)), thresY, SLOT(setValue(int))); + QObject::connect(thresZ, SIGNAL(valueChanged(int)), spinThresZ, SLOT(setValue(int))); + QObject::connect(spinThresZ, SIGNAL(valueChanged(int)), thresZ, SLOT(setValue(int))); iconcomboTrackerSource->setCurrentIndex(-1); iconcomboBox->setCurrentIndex(-1); @@ -1029,8 +1193,10 @@ public: #endif // QT_NO_TOOLTIP btnStopTracker->setText(QApplication::translate("FaceTrackNoIRClass", "Stop", 0, QApplication::UnicodeUTF8)); groupGameProtocol->setTitle(QApplication::translate("FaceTrackNoIRClass", "Game protocol", 0, QApplication::UnicodeUTF8)); + lblSensYaw_3->setText(QApplication::translate("FaceTrackNoIRClass", "Smoothing (samples)", 0, QApplication::UnicodeUTF8)); + lblSensYaw_4->setText(QApplication::translate("FaceTrackNoIRClass", "Rotation Neutral Zone (degr.)", 0, QApplication::UnicodeUTF8)); cameraName->setText(QApplication::translate("FaceTrackNoIRClass", "Camera Name", 0, QApplication::UnicodeUTF8)); - lblSensitivity->setText(QApplication::translate("FaceTrackNoIRClass", "Sensitivity", 0, QApplication::UnicodeUTF8)); + lblSensitivity->setText(QApplication::translate("FaceTrackNoIRClass", "Sensitivity (100 = x1)", 0, QApplication::UnicodeUTF8)); lblSensYaw->setText(QApplication::translate("FaceTrackNoIRClass", "Yaw", 0, QApplication::UnicodeUTF8)); lblSensX->setText(QApplication::translate("FaceTrackNoIRClass", "X", 0, QApplication::UnicodeUTF8)); lblSensPitch->setText(QApplication::translate("FaceTrackNoIRClass", "Pitch", 0, QApplication::UnicodeUTF8)); @@ -1045,8 +1211,9 @@ public: lblInvert1_2->setText(QApplication::translate("FaceTrackNoIRClass", "Invert", 0, QApplication::UnicodeUTF8)); chkInvertY->setText(QString()); chkInvertZ->setText(QString()); - lblSensYaw_3->setText(QApplication::translate("FaceTrackNoIRClass", "Smoothing (samples)", 0, QApplication::UnicodeUTF8)); - lblSensYaw_4->setText(QApplication::translate("FaceTrackNoIRClass", "Rotation Neutral Zone (degr.)", 0, QApplication::UnicodeUTF8)); + lblSensitivity_2->setText(QApplication::translate("FaceTrackNoIRClass", "Threshold (100 = 1)", 0, QApplication::UnicodeUTF8)); + lblSensitivity_3->setText(QApplication::translate("FaceTrackNoIRClass", "Threshold (100 = 1)", 0, QApplication::UnicodeUTF8)); + lblSensitivity_4->setText(QApplication::translate("FaceTrackNoIRClass", "Sensitivity (100 = x1)", 0, QApplication::UnicodeUTF8)); menuFile->setTitle(QApplication::translate("FaceTrackNoIRClass", "File", 0, QApplication::UnicodeUTF8)); menuAbout->setTitle(QApplication::translate("FaceTrackNoIRClass", "About", 0, QApplication::UnicodeUTF8)); menuView->setTitle(QApplication::translate("FaceTrackNoIRClass", "View", 0, QApplication::UnicodeUTF8)); diff --git a/FaceTrackNoIR/Release/BuildLog.htm b/FaceTrackNoIR/Release/BuildLog.htm index 7c5e2ba4..0677d9b0 100644 Binary files a/FaceTrackNoIR/Release/BuildLog.htm and b/FaceTrackNoIR/Release/BuildLog.htm differ diff --git a/FaceTrackNoIR/Release/FaceApp.obj b/FaceTrackNoIR/Release/FaceApp.obj index e0f5d78c..ae7857c8 100644 Binary files a/FaceTrackNoIR/Release/FaceApp.obj and b/FaceTrackNoIR/Release/FaceApp.obj differ diff --git a/FaceTrackNoIR/Release/FaceTrackNoIR.obj b/FaceTrackNoIR/Release/FaceTrackNoIR.obj index d97e4961..9e35aada 100644 Binary files a/FaceTrackNoIR/Release/FaceTrackNoIR.obj and b/FaceTrackNoIR/Release/FaceTrackNoIR.obj differ diff --git a/FaceTrackNoIR/Release/main.obj b/FaceTrackNoIR/Release/main.obj index d4d8aadf..c9810785 100644 Binary files a/FaceTrackNoIR/Release/main.obj and b/FaceTrackNoIR/Release/main.obj differ diff --git a/FaceTrackNoIR/Release/moc_FaceApp.obj b/FaceTrackNoIR/Release/moc_FaceApp.obj index bce0a73c..34d6862d 100644 Binary files a/FaceTrackNoIR/Release/moc_FaceApp.obj and b/FaceTrackNoIR/Release/moc_FaceApp.obj differ diff --git a/FaceTrackNoIR/Release/moc_FaceTrackNoIR.obj b/FaceTrackNoIR/Release/moc_FaceTrackNoIR.obj index 62e8b021..718584f8 100644 Binary files a/FaceTrackNoIR/Release/moc_FaceTrackNoIR.obj and b/FaceTrackNoIR/Release/moc_FaceTrackNoIR.obj differ diff --git a/FaceTrackNoIR/Release/mt.dep b/FaceTrackNoIR/Release/mt.dep index b9972027..965c3d3a 100644 --- a/FaceTrackNoIR/Release/mt.dep +++ b/FaceTrackNoIR/Release/mt.dep @@ -1 +1 @@ -Manifest resource last updated at 15:44:36,86 on zo 23-05-2010 +Manifest resource last updated at 20:44:54,75 on vr 28-05-2010 diff --git a/FaceTrackNoIR/Release/tracker.obj b/FaceTrackNoIR/Release/tracker.obj index 892cf0a9..8ef0b52a 100644 Binary files a/FaceTrackNoIR/Release/tracker.obj and b/FaceTrackNoIR/Release/tracker.obj differ diff --git a/FaceTrackNoIR/Release/vc90.idb b/FaceTrackNoIR/Release/vc90.idb index 43267445..f645e021 100644 Binary files a/FaceTrackNoIR/Release/vc90.idb and b/FaceTrackNoIR/Release/vc90.idb differ diff --git a/FaceTrackNoIR/Release/vc90.pdb b/FaceTrackNoIR/Release/vc90.pdb index 59c07847..b729977b 100644 Binary files a/FaceTrackNoIR/Release/vc90.pdb and b/FaceTrackNoIR/Release/vc90.pdb differ diff --git a/FaceTrackNoIR/tracker.cpp b/FaceTrackNoIR/tracker.cpp index 09757217..327d9f49 100644 --- a/FaceTrackNoIR/tracker.cpp +++ b/FaceTrackNoIR/tracker.cpp @@ -1,12 +1,12 @@ /******************************************************************************** -* SweetSpotter This program is an research project of the Chair * -* of Communication Acoustics at TU Dresden, Germany. * +* FaceTrackNoIR This program is a private project of the some enthusiastic * +* gamers from Holland, who don't like to pay for * +* head-tracking. * * * -* Copyright (C) 2010 Lars Beier (Developing) * -* Sebastian Merchel (Researching) * -* Stephan Groth (Researching) * +* Copyright (C) 2010 Wim Vriend (Developing) * +* Ron Hendriks (Researching and Testing) * * * -* Homepage * +* Homepage * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU General Public License as published by the * @@ -240,7 +240,7 @@ void Tracker::run() { } } -/** registeres the faceapi headpose callback function **/ +/** registers the faceapi headpose callback function **/ void Tracker::registerHeadPoseCallback() { Q_ASSERT(_engine_handle); smReturnCode error = smHTRegisterHeadPoseCallback( _engine->handle(), 0, receiveHeadPose); diff --git a/bin/FaceTrackNoIR.exe b/bin/FaceTrackNoIR.exe index 40ed1c03..05ce7bba 100644 Binary files a/bin/FaceTrackNoIR.exe and b/bin/FaceTrackNoIR.exe differ -- cgit v1.2.3