From: Thomas Pietrzak Date: Wed, 1 Aug 2012 15:37:57 +0000 (+0000) Subject: Push buttons demo X-Git-Url: https://git.thomaspietrzak.com/?a=commitdiff_plain;h=a55e4f46ba39fd4f4289e5b23d32e827913c5ea4;p=dwell.git Push buttons demo git-svn-id: svn+ssh://thomaspietrzak.com/var/svn/rep@84 47cf9a05-e0a8-4ed5-9e9b-101a649bc004 --- diff --git a/DwellCursor/DwellCursor.vcxproj b/DwellCursor/DwellCursor.vcxproj index b4d3a4d..ec90726 100644 --- a/DwellCursor/DwellCursor.vcxproj +++ b/DwellCursor/DwellCursor.vcxproj @@ -44,7 +44,7 @@ - UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_CORE_LIB;QT_GUI_LIB;%(PreprocessorDefinitions) + UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_CORE_LIB;QT_GUI_LIB;QT_DLL;%(PreprocessorDefinitions) $(KINECTSDK10_DIR)\inc;.\GeneratedFiles;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\qtmain;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;.\;%(AdditionalIncludeDirectories) Disabled ProgramDatabase @@ -61,7 +61,7 @@ - UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;%(PreprocessorDefinitions) + UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_DLL;%(PreprocessorDefinitions) $(KINECTSDK10_DIR)\inc;.\GeneratedFiles;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\qtmain;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;.\;%(AdditionalIncludeDirectories) @@ -139,11 +139,11 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB "-I." "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I." "dwellcursor.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -DQT_DLL "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB "-I." "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I." "dwellcursor.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_DLL "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." @@ -165,62 +165,62 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB "-I." "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I." "ExperimentSetup.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -DQT_DLL "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB "-I." "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I." "ExperimentSetup.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_DLL "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing %(Identity)... + $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing MainView.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB "-I." "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I." "MainView.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing %(Identity)... + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -DQT_DLL "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." + $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing MainView.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB "-I." "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I." "MainView.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_DLL "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB "-I." "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I." "DwellWidget.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -DQT_DLL "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB "-I." "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I." "DwellWidget.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_DLL "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing %(Identity)... + $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing DwellButton.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB "-I." "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I." "DwellButton.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing %(Identity)... + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -DQT_DLL "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." + $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing DwellButton.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB "-I." "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I." "DwellButton.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_DLL "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing %(Identity)... + $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing KinectInput.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB "-I." "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I." "KinectInput.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing %(Identity)... + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -DQT_DLL "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." + $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing KinectInput.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB "-I." "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I." "KinectInput.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_DLL "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing %(Identity)... + $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing MainScene.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB "-I." "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I." "MainScene.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing %(Identity)... + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -DQT_DLL "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." + $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing MainScene.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB "-I." "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I." "MainScene.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_DLL "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." @@ -254,7 +254,7 @@ - + \ No newline at end of file diff --git a/DwellCursor/DwellWidget.cpp b/DwellCursor/DwellWidget.cpp index 16dcb37..1408921 100644 --- a/DwellCursor/DwellWidget.cpp +++ b/DwellCursor/DwellWidget.cpp @@ -87,14 +87,17 @@ DwellWidget::DwellWidget(QGraphicsItem * parent) DwellWidget::~DwellWidget() { if (_tactonplayer) + { _tactonplayer->stop(); + delete _tactonplayer; + } } void DwellWidget::init() { try { - _tactonplayer = new TactonPlayer("COM4"); + _tactonplayer = new TactonPlayer("COM6"); } catch (...) { @@ -105,11 +108,11 @@ void DwellWidget::init() //hover tacton if (_tactonplayer) { - _tactonplayer->regist(Tacton(0x0f, _hoverduration / 2, 100, 255)); + _tactonplayer->regist(Tacton(0x0f, _hoverduration, 50, 255)); //activation tacton _tactonplayer->regist(Tacton(0x0f, _activationduration / 2, 250, 255)); //progression tacton - unsigned char animpatterns[8] = {POS2_UP, 0x00, POS2_RIGHT, 0x00, POS2_DOWN, 0x00, POS2_LEFT, 0x00}; + unsigned char animpatterns[8] = {POS2_UP, 0x00, POS2_UP | POS2_RIGHT, 0x00, POS2_UP | POS2_RIGHT | POS2_DOWN, 0x00, POS2_UP | POS2_RIGHT | POS2_DOWN | POS2_LEFT, 0x00}; unsigned int animdurations[8] = {_dwellduration / 8, _dwellduration / 8, _dwellduration / 8, _dwellduration / 8, _dwellduration / 8, _dwellduration / 8, _dwellduration / 8, _dwellduration / 8}; unsigned int animfrequencies[8] = {250, 250, 250, 250, 250, 250, 250, 250}; @@ -188,4 +191,4 @@ void DwellWidget::reset() _center.setBrush(QBrush(_colornormal)); _progress.setSpanAngle(0); this->update(); -} \ No newline at end of file +} diff --git a/DwellCursor/DwellWidget.h b/DwellCursor/DwellWidget.h index 07bb1a4..af5ab64 100644 --- a/DwellCursor/DwellWidget.h +++ b/DwellCursor/DwellWidget.h @@ -56,4 +56,4 @@ class DwellWidget: public QObject, public QGraphicsItemGroup void progress(int v); }; -#endif \ No newline at end of file +#endif diff --git a/DwellCursor/GeneratedFiles/qrc_dwellcursor.cpp b/DwellCursor/GeneratedFiles/qrc_dwellcursor.cpp index 14226e5..913cbe3 100644 --- a/DwellCursor/GeneratedFiles/qrc_dwellcursor.cpp +++ b/DwellCursor/GeneratedFiles/qrc_dwellcursor.cpp @@ -1,8 +1,8 @@ /**************************************************************************** ** Resource object code ** -** Created: Wed 7. Mar 11:50:38 2012 -** by: The Resource Compiler for Qt version 4.7.3 +** Created: Wed 1. Aug 17:16:43 2012 +** by: The Resource Compiler for Qt version 4.8.2 ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ diff --git a/DwellCursor/GeneratedFiles/ui_ExperimentSetup.h b/DwellCursor/GeneratedFiles/ui_ExperimentSetup.h index 20434de..8513b83 100644 --- a/DwellCursor/GeneratedFiles/ui_ExperimentSetup.h +++ b/DwellCursor/GeneratedFiles/ui_ExperimentSetup.h @@ -1,8 +1,8 @@ /******************************************************************************** ** Form generated from reading UI file 'ExperimentSetup.ui' ** -** Created: Wed 7. Mar 11:50:38 2012 -** by: Qt User Interface Compiler version 4.7.3 +** Created: Wed 1. Aug 17:16:43 2012 +** by: Qt User Interface Compiler version 4.8.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ diff --git a/DwellCursor/GeneratedFiles/ui_dwellcursor.h b/DwellCursor/GeneratedFiles/ui_dwellcursor.h index fe63b60..5f9f9ff 100644 --- a/DwellCursor/GeneratedFiles/ui_dwellcursor.h +++ b/DwellCursor/GeneratedFiles/ui_dwellcursor.h @@ -1,8 +1,8 @@ /******************************************************************************** ** Form generated from reading UI file 'dwellcursor.ui' ** -** Created: Wed 7. Mar 11:50:37 2012 -** by: Qt User Interface Compiler version 4.7.3 +** Created: Wed 1. Aug 17:16:42 2012 +** by: Qt User Interface Compiler version 4.8.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ diff --git a/DwellCursor/MainScene.h b/DwellCursor/MainScene.h index 41c640c..b48b065 100644 --- a/DwellCursor/MainScene.h +++ b/DwellCursor/MainScene.h @@ -55,4 +55,4 @@ class MainScene: public QGraphicsScene void buttonClicked(int n); }; -#endif \ No newline at end of file +#endif diff --git a/DwellCursor/dwellcursor.h b/DwellCursor/dwellcursor.h index 5fe27fd..5cc7a19 100644 --- a/DwellCursor/dwellcursor.h +++ b/DwellCursor/dwellcursor.h @@ -30,7 +30,6 @@ private: int _nbx, _nby; float _bsx, _bsy; float _spacex, _spacey; - }; #endif // DWELLCURSOR_H diff --git a/DwellCursor/main.cpp b/DwellCursor/main.cpp index 5eaf6de..02238e8 100644 --- a/DwellCursor/main.cpp +++ b/DwellCursor/main.cpp @@ -6,5 +6,6 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); ExperimentSetup w; w.show(); + w.raise(); return a.exec(); } \ No newline at end of file diff --git a/PushButtons/ExperimentSetup.cpp b/PushButtons/ExperimentSetup.cpp new file mode 100644 index 0000000..1959a9e --- /dev/null +++ b/PushButtons/ExperimentSetup.cpp @@ -0,0 +1,26 @@ +#include "ExperimentSetup.h" + +ExperimentSetup::ExperimentSetup(QWidget *parent, Qt::WFlags flags) + : QMainWindow(parent, flags) +{ + setupUi(this); + + this->layout()->setSizeConstraint(QLayout::SetFixedSize); + + QObject::connect(buttonstart, SIGNAL(clicked()), this, SLOT(runBlock())); +} + +ExperimentSetup::~ExperimentSetup() +{ + +} + +void ExperimentSetup::runBlock(void) +{ + this->hide(); + w.init(username->text(), condition->currentText(), repetitions->value(), + nbx->value(), nby->value(), + buttonssizex->value(), buttonssizey->value(), + spacex->value(), spacey->value()); + w.show(); +} diff --git a/PushButtons/ExperimentSetup.h b/PushButtons/ExperimentSetup.h new file mode 100644 index 0000000..766c0af --- /dev/null +++ b/PushButtons/ExperimentSetup.h @@ -0,0 +1,23 @@ +#ifndef EXPERIMENTSETUP_H +#define EXPERIMENTSETUP_H + +#include +#include "ui_experimentsetup.h" + +#include "pushbuttons.h" +class ExperimentSetup : public QMainWindow, Ui::ExperimentSetupClass +{ + Q_OBJECT + +public: + ExperimentSetup(QWidget *parent = 0, Qt::WFlags flags = 0); + ~ExperimentSetup(); + +private: + PushButtons w; + +private slots: + void runBlock(); +}; + +#endif diff --git a/PushButtons/ExperimentSetup.ui b/PushButtons/ExperimentSetup.ui new file mode 100644 index 0000000..fcec084 --- /dev/null +++ b/PushButtons/ExperimentSetup.ui @@ -0,0 +1,235 @@ + + + ExperimentSetupClass + + + Qt::NonModal + + + + 0 + 0 + 324 + 277 + + + + Dwell Widgets + + + + + + + + + + + + User: + + + + + + + + + + Repetitions: + + + + + + + 1 + + + 100 + + + 1 + + + + + + + Space x: + + + + + + + Condition: + + + + + + + Nb x: + + + + + + + Nb y: + + + + + + + BtSize x: + + + + + + + BtSize y: + + + + + + + Space y: + + + + + + + 1 + + + 10 + + + 4 + + + + + + + 1 + + + 10 + + + 4 + + + + + + + + Visual only + + + + + Tactile + visual + + + + + + + + 1 + + + 0.100000000000000 + + + 1.600000000000000 + + + 0.100000000000000 + + + 0.200000000000000 + + + + + + + 1 + + + 0.100000000000000 + + + 1.000000000000000 + + + 0.100000000000000 + + + 0.100000000000000 + + + + + + + 1 + + + 10.000000000000000 + + + 0.100000000000000 + + + 1.600000000000000 + + + + + + + 1 + + + 10.000000000000000 + + + 0.100000000000000 + + + 1.000000000000000 + + + + + + + + + + + + Start experiment + + + + + + + + + + + + diff --git a/PushButtons/KinectInput.cpp b/PushButtons/KinectInput.cpp new file mode 100644 index 0000000..15bcd9d --- /dev/null +++ b/PushButtons/KinectInput.cpp @@ -0,0 +1,99 @@ +#include "KinectInput.h" + +#include + +#define TIMEOUT 100 + +KinectInput::KinectInput() +:_running(false), _skeletonid(-1) +{ + //creates the kinect sensor (id 0) + if(FAILED(NuiCreateSensorByIndex(0, &_kinect))) + { + qDebug() << "Cannot find a KINECT sensor" << endl; + //I should do something else, sucha as an exception + return; + } + + if (_kinect->NuiInitialize(NUI_INITIALIZE_FLAG_USES_DEPTH_AND_PLAYER_INDEX | NUI_INITIALIZE_FLAG_USES_SKELETON) == E_NUI_SKELETAL_ENGINE_BUSY) + { + qDebug() << "Cannot initialize the KINECT sensor" << endl; + return; + } + + //initialize the skeleton tracking + _skeletonEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + if(!HasSkeletalEngine(_kinect) || FAILED(_kinect->NuiSkeletonTrackingEnable(_skeletonEvent, 0))) + { + qDebug() << "Cannot Initialize skeleton tracking" << endl; + return; + } +} + +KinectInput::~KinectInput() +{ + NuiShutdown(); + if( _skeletonEvent && ( _skeletonEvent != INVALID_HANDLE_VALUE ) ) + CloseHandle( _skeletonEvent ); +} + +//thread that manages the kinect events +void KinectInput::run() +{ + _running = true; + while(_running) + { + //wait for an event + if (WaitForSingleObject(_skeletonEvent, TIMEOUT) != 0) + continue; + + //get skeleton values + NUI_SKELETON_FRAME SkeletonFrame; + HRESULT hr = _kinect->NuiSkeletonGetNextFrame( 0, &SkeletonFrame ); +// qDebug() << "Kinect frame " << SkeletonFrame.dwFrameNumber; + + //if no skeleton already identified or not tracked anymore, search for one + if (_skeletonid < 0 || SkeletonFrame.SkeletonData[_skeletonid].eTrackingState != NUI_SKELETON_TRACKED) + { + for( int i = 0 ; i < NUI_SKELETON_COUNT ; i++ ) + { + if(SkeletonFrame.SkeletonData[i].eTrackingState == NUI_SKELETON_TRACKED) + { + _skeletonid = i; + break; + } + } + } + + //no skeleton found + if (_skeletonid < 0) + continue; + + //retrieve information on the skeleton + NUI_SKELETON_DATA &data = SkeletonFrame.SkeletonData[_skeletonid]; + + //checking if we have a skeleton +/* if (data.eTrackingState != NUI_SKELETON_TRACKED) + continue;*/ + + //smooth out the skeleton data + _kinect->NuiTransformSmooth(&SkeletonFrame, NULL); + + + if (data.eSkeletonPositionTrackingState[NUI_SKELETON_POSITION_HAND_RIGHT] == NUI_SKELETON_NOT_TRACKED) + continue; //right hand not detected + else + { +/* float posx, posy; + NuiTransformSkeletonToDepthImageF(data.SkeletonPositions[NUI_SKELETON_POSITION_HAND_RIGHT], &posx, &posy); + emit rightHandMove(posx, posy,0);*/ + Vector4 &skelpos = data.SkeletonPositions[NUI_SKELETON_POSITION_HAND_RIGHT]; + emit rightHandMove(skelpos.x, skelpos.y, skelpos.z); + } + } +} + +void KinectInput::stop() +{ + _running = false; +} diff --git a/PushButtons/KinectInput.h b/PushButtons/KinectInput.h new file mode 100644 index 0000000..b4bf077 --- /dev/null +++ b/PushButtons/KinectInput.h @@ -0,0 +1,29 @@ +#ifndef __KINECTINPUT__ +#define __KINECTINPUT__ + +#include +#include +#include +#include + +class KinectInput: public QThread +{ + Q_OBJECT + public: + KinectInput(); + ~KinectInput(); + + void run(); + void stop(); + + private: + INuiSensor* _kinect; + HANDLE _skeletonEvent; + bool _running; + int _skeletonid; + + signals: + void rightHandMove(float x, float y, float z); +}; + +#endif diff --git a/PushButtons/MainScene.cpp b/PushButtons/MainScene.cpp new file mode 100644 index 0000000..08ecd6a Binary files /dev/null and b/PushButtons/MainScene.cpp differ diff --git a/PushButtons/MainScene.h b/PushButtons/MainScene.h new file mode 100644 index 0000000..fa98e6a --- /dev/null +++ b/PushButtons/MainScene.h @@ -0,0 +1,69 @@ +#ifndef __MAINSCENE__ +#define __MAINSCENE__ + +#include +#include +#include +#include +#include +#include + +#include + +#include "KinectInput.h" +#include "PushButton.h" + +#include + +class MainScene: public QGraphicsScene +{ + Q_OBJECT + + public: + MainScene(QObject * parent = 0); + ~MainScene(); + + void init(QString user, QString condition, int repetitions); + + void mouseMoveEvent(QGraphicsSceneMouseEvent * mouseEvent); + void mousePressEvent(QGraphicsSceneMouseEvent * mouseEvent); + + void setButtonArray(int x, int y, float sx, float sy, float bsx, float bsy); + + void log(const QString &event, int button, int answer); + int indexOfButton(PushButton *b) const; + + public slots: + // feedback when the cursor gets on the button + void enterFeedback(); + // feedback according to the hand's position, between 0.0 and 1.0 + void progressFeedback(float pos); + // feedback when the button is pressed + void pressFeedback(); + // feedback when the cursor leaves the button + void leaveFeedback(); + + private: + KinectInput _kinectsensor; + TactonPlayer *_tactonplayer; + + QGraphicsEllipseItem _cursor; + + PushButton *_lastitemover; + PushButton **_buttons; + int _nbbuttonsx, _nbbuttonsy; + QSignalMapper _signalmapper; + + //experiment stuff + FILE *_logfile; + QTime _start; + QList _trials; + int _currenttrial; + + + private slots: + void displayHandPosition(float x, float y, float z); + void buttonClicked(int n); +}; + +#endif diff --git a/PushButtons/MainView.cpp b/PushButtons/MainView.cpp new file mode 100644 index 0000000..2e8c15a --- /dev/null +++ b/PushButtons/MainView.cpp @@ -0,0 +1,18 @@ +#include "MainView.h" + +MainView::MainView(float sx, float sy, MainScene * scene, QWidget *parent) +:QGraphicsView(scene, parent), _width(sx), _height(sy) +{ + setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform); + setMouseTracking(true); + setSceneRect(-sx / 2.0, -sy / 2.0, sx, sy); +} + +MainView::~MainView() +{ +} + +void MainView::resizeEvent(QResizeEvent * event) +{ + fitInView(-_width / 2.0, -_height / 2.0, _width, _height, Qt::KeepAspectRatio); +} diff --git a/PushButtons/MainView.h b/PushButtons/MainView.h new file mode 100644 index 0000000..0c6aaaa --- /dev/null +++ b/PushButtons/MainView.h @@ -0,0 +1,22 @@ +#ifndef __MAINVIEW__ +#define __MAINVIEW__ + +#include + +#include "MainScene.h" + +class MainView: public QGraphicsView +{ + Q_OBJECT + + public: + MainView(float sx, float sy, MainScene * scene, QWidget * parent=0); + ~MainView(); + + private: + void resizeEvent(QResizeEvent * event); + + float _width, _height; +}; + +#endif diff --git a/PushButtons/PushButton.cpp b/PushButtons/PushButton.cpp new file mode 100644 index 0000000..1dd7051 --- /dev/null +++ b/PushButtons/PushButton.cpp @@ -0,0 +1,79 @@ +#include "PushButton.h" + +#include + +QColor PushButton::_bgcolor = Qt::gray; +QColor PushButton::_hovercolor = Qt::lightGray; +QColor PushButton::_validatedcolor = Qt::red; +QColor PushButton::_targetcolor = Qt::green; +QColor PushButton::_targethovercolor = Qt::yellow; + +const float PushButton::_pushdistance = 0.1; + + +PushButton::PushButton(QGraphicsItem *parent) +:QGraphicsRectItem(parent), _active(false), _pressed(false) +{ + setBrush(QBrush(_bgcolor)); + setZValue(0); +} + +PushButton::PushButton(float posx, float posy, float width, float height, QGraphicsItem *parent) +:QGraphicsRectItem(posx, posy, width, height, parent), _active(false) +{ + setBrush(QBrush(_bgcolor)); + setZValue(0); +} + +PushButton::PushButton(QRect pos, QGraphicsItem *parent) +:QGraphicsRectItem(pos, parent), _active(false) +{ + setBrush(QBrush(_bgcolor)); + setZValue(0); +} + +void PushButton::setActive() +{ + _active = true; + setBrush(QBrush(_targetcolor)); +} + +void PushButton::enter(float z) +{ + if (_active) + setBrush(QBrush(_targethovercolor)); + else + setBrush(QBrush(_hovercolor)); + _enteredposition = z; + emit entered(); +} + +void PushButton::hover(float z) +{ + if (_enteredposition - z >= _pushdistance) + { + _pressed = true; + press(); + } + else + emit progress((_enteredposition - z) / _pushdistance); +} + +void PushButton::press() +{ + setBrush(QBrush(_validatedcolor)); + emit clicked(); + _active = false; + _pressed = true; + //disconnect(this); +} + +void PushButton::leave() +{ + if (_active) + setBrush(QBrush(_targetcolor)); + else + setBrush(QBrush(_bgcolor)); + _pressed = false; + emit(left()); +} diff --git a/PushButtons/PushButton.h b/PushButtons/PushButton.h new file mode 100644 index 0000000..f9517fb --- /dev/null +++ b/PushButtons/PushButton.h @@ -0,0 +1,46 @@ +#ifndef __PUSHBUTTON__ +#define __PUSHBUTTON__ + +#include +#include + +class PushButton: public QObject, public QGraphicsRectItem +{ + Q_OBJECT + + public: + PushButton(QGraphicsItem *parent = 0); + PushButton(float posx, float posy, float width, float height, QGraphicsItem *parent = 0); + PushButton(QRect pos, QGraphicsItem *parent = 0); + + void setActive(); + + bool isPressed() { return _pressed; } + + private: + static QColor _bgcolor, _hovercolor, _validatedcolor, _targetcolor, _targethovercolor; + bool _active, _pressed; + float _enteredposition; + + const static float _pushdistance; + + public slots: + void enter(float z); + void hover(float z); + void press(); + void leave(); + + private slots: + + signals: + // the cursor entered this button + void entered(); + // preogress of the push, between 0.0 and 1.0 + void progress(float pos); + // the button has been clicked + void clicked(); + // the cursor left the button + void left(); +}; + +#endif diff --git a/PushButtons/PushButtons.vcxproj b/PushButtons/PushButtons.vcxproj new file mode 100644 index 0000000..cf336bd --- /dev/null +++ b/PushButtons/PushButtons.vcxproj @@ -0,0 +1,243 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {19428315-091A-4F1A-B5FE-D9327FBB715E} + Qt4VSv1.0 + + + + Application + + + Application + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + AllRules.ruleset + + + AllRules.ruleset + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + + + + UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;%(PreprocessorDefinitions) + $(KINECTSDK10_DIR)\inc;.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;%(AdditionalIncludeDirectories) + Disabled + ProgramDatabase + MultiThreadedDebugDLL + false + + + Windows + $(OutDir)\$(ProjectName).exe + $(KINECTSDK10_DIR)\lib\x86;$(QTDIR)\lib;%(AdditionalLibraryDirectories) + true + TactonPlayerd.lib;Kinect10.lib;qtmaind.lib;QtCored4.lib;QtGuid4.lib;%(AdditionalDependencies) + + + + + UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;%(PreprocessorDefinitions) + $(KINECTSDK10_DIR)\inc;.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;%(AdditionalIncludeDirectories) + + + MultiThreadedDLL + false + + + Windows + $(OutDir)\$(ProjectName).exe + $(KINECTSDK10_DIR)\lib;$(QTDIR)\lib;%(AdditionalLibraryDirectories) + false + TactonPlayer.lib;Kinect10.lib;qtmain.lib;QtCore4.lib;QtGui4.lib;%(AdditionalDependencies) + + + + + true + + + true + + + true + + + true + + + + + true + + + true + + + true + + + true + + + + + + + + + true + + + true + + + true + + + true + + + + + + + + + + $(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing pushbuttons.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" + $(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing pushbuttons.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" + + + + + Document + $(QTDIR)\bin\uic.exe;%(AdditionalInputs) + Uic%27ing %(Identity)... + .\GeneratedFiles\ui_%(Filename).h;%(Outputs) + "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" + $(QTDIR)\bin\uic.exe;%(AdditionalInputs) + Uic%27ing %(Identity)... + .\GeneratedFiles\ui_%(Filename).h;%(Outputs) + "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" + + + + + $(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing PushButton.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" + $(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing PushButton.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" + + + $(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing MainScene.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" + $(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing MainScene.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" + + + $(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing KinectInput.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" + $(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing KinectInput.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" + + + $(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing MainView.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" + $(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing MainView.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" + + + $(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing ExperimentSetup.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" + $(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing ExperimentSetup.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB "-I$(KINECTSDK10_DIR)\inc" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" + + + + + + + Document + %(FullPath);%(AdditionalInputs) + Rcc%27ing %(Identity)... + .\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs) + "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp + %(FullPath);%(AdditionalInputs) + Rcc%27ing %(Identity)... + .\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs) + "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp + + + + + Document + $(QTDIR)\bin\uic.exe;%(AdditionalInputs) + Uic%27ing %(Identity)... + .\GeneratedFiles\ui_%(Filename).h;%(Outputs) + "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" + $(QTDIR)\bin\uic.exe;%(AdditionalInputs) + Uic%27ing %(Identity)... + .\GeneratedFiles\ui_%(Filename).h;%(Outputs) + "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" + + + + + + + + + + + \ No newline at end of file diff --git a/PushButtons/main.cpp b/PushButtons/main.cpp new file mode 100644 index 0000000..02238e8 --- /dev/null +++ b/PushButtons/main.cpp @@ -0,0 +1,11 @@ +#include "ExperimentSetup.h" +#include + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + ExperimentSetup w; + w.show(); + w.raise(); + return a.exec(); +} \ No newline at end of file diff --git a/PushButtons/pushbuttons.cpp b/PushButtons/pushbuttons.cpp new file mode 100644 index 0000000..3836bcc --- /dev/null +++ b/PushButtons/pushbuttons.cpp @@ -0,0 +1,35 @@ +#include "pushbuttons.h" + +PushButtons::PushButtons(QWidget *parent, Qt::WFlags flags) + : QMainWindow(parent, flags) +{ + setupUi(this); +} + +PushButtons::~PushButtons() +{ + +} + +void PushButtons::init(QString user, QString condition, int repetitions, int nbx, int nby, float bsx, float bsy,float spacex, float spacey) +{ + _user = user; + _condition = condition; + _repetitions = repetitions; + _nbx = nbx; + _nby = nby; + _bsx = bsx; + _bsy = bsy; + _spacex = spacex; + _spacey = spacey; + + /*if (_sound) + _sound->play();*/ + + _scene = new MainScene(); + _scene->setButtonArray(nbx, nby, spacex, spacey, bsx, bsy); + _scene->init(user, condition, repetitions); + + _view = new MainView(spacex, spacey, _scene); + setCentralWidget(_view); +} diff --git a/PushButtons/pushbuttons.h b/PushButtons/pushbuttons.h new file mode 100644 index 0000000..a22e3c3 --- /dev/null +++ b/PushButtons/pushbuttons.h @@ -0,0 +1,34 @@ +#ifndef PUSHBUTTONS_H +#define PUSHBUTTONS_H + +#include +#include "ui_pushbuttons.h" +//#include +#include "MainScene.h" +#include "MainView.h" + + +class PushButtons : public QMainWindow, Ui::PushButtonsClass +{ + Q_OBJECT + + public: + PushButtons(QWidget *parent = 0, Qt::WFlags flags = 0); + ~PushButtons(); + + void init(QString user, QString condition, int repetitions, int nbx, int nby, float bsx, float bsy,float spacex, float spacey); + void log(QString answer); + + private: + MainScene *_scene; + QGraphicsView *_view; + // QSound *_sound; + + QString _user, _condition; + int _repetitions; + int _nbx, _nby; + float _bsx, _bsy; + float _spacex, _spacey; +}; + +#endif // PUSHBUTTONS_H diff --git a/PushButtons/pushbuttons.qrc b/PushButtons/pushbuttons.qrc new file mode 100644 index 0000000..d44530f --- /dev/null +++ b/PushButtons/pushbuttons.qrc @@ -0,0 +1,4 @@ + + + + diff --git a/PushButtons/pushbuttons.ui b/PushButtons/pushbuttons.ui new file mode 100644 index 0000000..3e02c90 --- /dev/null +++ b/PushButtons/pushbuttons.ui @@ -0,0 +1,23 @@ + + + PushButtonsClass + + + + 0 + 0 + 600 + 400 + + + + PushButtons + + + + + + + + + diff --git a/TactileButtons.sln b/TactileButtons.sln new file mode 100644 index 0000000..c7b7611 --- /dev/null +++ b/TactileButtons.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PushButtons", "PushButtons\PushButtons.vcxproj", "{19428315-091A-4F1A-B5FE-D9327FBB715E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DwellCursor", "DwellCursor\DwellCursor.vcxproj", "{2928B2FC-98F8-427E-B0D2-2CEA2DA1FFC9}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {19428315-091A-4F1A-B5FE-D9327FBB715E}.Debug|Win32.ActiveCfg = Debug|Win32 + {19428315-091A-4F1A-B5FE-D9327FBB715E}.Debug|Win32.Build.0 = Debug|Win32 + {19428315-091A-4F1A-B5FE-D9327FBB715E}.Release|Win32.ActiveCfg = Release|Win32 + {19428315-091A-4F1A-B5FE-D9327FBB715E}.Release|Win32.Build.0 = Release|Win32 + {2928B2FC-98F8-427E-B0D2-2CEA2DA1FFC9}.Debug|Win32.ActiveCfg = Debug|Win32 + {2928B2FC-98F8-427E-B0D2-2CEA2DA1FFC9}.Debug|Win32.Build.0 = Debug|Win32 + {2928B2FC-98F8-427E-B0D2-2CEA2DA1FFC9}.Release|Win32.ActiveCfg = Release|Win32 + {2928B2FC-98F8-427E-B0D2-2CEA2DA1FFC9}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/TactileButtons.suo b/TactileButtons.suo new file mode 100644 index 0000000..a914ffb Binary files /dev/null and b/TactileButtons.suo differ