Initial import ANGULARPOSITION, complete DeltaTimeJND
authorThomas Pietrzak <thomas.pietrzak@gmail.com>
Sat, 8 Sep 2012 15:08:51 +0000 (15:08 +0000)
committerThomas Pietrzak <thomas.pietrzak@gmail.com>
Sat, 8 Sep 2012 15:08:51 +0000 (15:08 +0000)
git-svn-id: svn+ssh://thomaspietrzak.com/var/svn/rep@95 47cf9a05-e0a8-4ed5-9e9b-101a649bc004

25 files changed:
AngularPosition/AngularPosition.cpp [new file with mode: 0644]
AngularPosition/AngularPosition.h [new file with mode: 0644]
AngularPosition/AngularPosition.qrc [new file with mode: 0644]
AngularPosition/AngularPosition.ui [new file with mode: 0644]
AngularPosition/AngularPosition.vcxproj [new file with mode: 0644]
AngularPosition/AngularPosition.vcxproj.filters [new file with mode: 0644]
AngularPosition/AnswerAngularPosition.ui [new file with mode: 0644]
AngularPosition/AnswerPosition.cpp [new file with mode: 0644]
AngularPosition/AnswerPosition.h [new file with mode: 0644]
AngularPosition/main.cpp [new file with mode: 0644]
DeltaTimeJND/AnswerDeltaTime.cpp [new file with mode: 0644]
DeltaTimeJND/AnswerDeltaTime.h [new file with mode: 0644]
DeltaTimeJND/AnswerDeltaTime.ui [new file with mode: 0644]
DeltaTimeJND/DeltaTimeJND.cpp
DeltaTimeJND/DeltaTimeJND.h
DeltaTimeJND/DeltaTimeJND.vcxproj
DeltaTimeJND/deltatimejnd.ui
LocationsJND/AnswerLocationJND.cpp
LocationsJND/locationsjnd.ui
Tactons Detection/Tactons Detection.vcxproj
Tactons Experiment.sdf
Tactons Experiment.sln
Tactons Experiment.suo
Tactons Experiment/Tactons Experiment.vcxproj
Tactons patterns/Tactons patterns.vcxproj

diff --git a/AngularPosition/AngularPosition.cpp b/AngularPosition/AngularPosition.cpp
new file mode 100644 (file)
index 0000000..dd0af13
--- /dev/null
@@ -0,0 +1,21 @@
+#include "AngularPosition.h"\r
+\r
+AngularPosition::AngularPosition(QWidget *parent, Qt::WFlags flags)\r
+: QMainWindow(parent, flags)\r
+{\r
+       setupUi(this);\r
+\r
+       connect(_start, SIGNAL(pressed()), this, SLOT(start()));\r
+}\r
+\r
+AngularPosition::~AngularPosition()\r
+{\r
+\r
+}\r
+\r
+void AngularPosition::start()\r
+{\r
+       w.init(_user->text(), _repetitions->value(), _nbdirections->value(), _frequency->value(), _duration->value());\r
+       w.show();\r
+       hide();\r
+}
\ No newline at end of file
diff --git a/AngularPosition/AngularPosition.h b/AngularPosition/AngularPosition.h
new file mode 100644 (file)
index 0000000..c7ae1f3
--- /dev/null
@@ -0,0 +1,23 @@
+#ifndef ANGULARPOSITION_H\r
+#define ANGULARPOSITION_H\r
+\r
+#include <QtGui/QMainWindow>\r
+#include "ui_AngularPosition.h"\r
+#include "AnswerPosition.h"\r
+\r
+class AngularPosition : public QMainWindow, Ui::AngularPositionClass\r
+{\r
+       Q_OBJECT\r
+\r
+       public:\r
+               AngularPosition(QWidget *parent = 0, Qt::WFlags flags = 0);\r
+               ~AngularPosition();\r
+\r
+       public slots:\r
+               void start();\r
+\r
+       private:\r
+               AnswerPosition w;\r
+};\r
+\r
+#endif // ANGULARPOSITION_H\r
diff --git a/AngularPosition/AngularPosition.qrc b/AngularPosition/AngularPosition.qrc
new file mode 100644 (file)
index 0000000..77401d4
--- /dev/null
@@ -0,0 +1,4 @@
+<RCC>\r
+    <qresource prefix="AngularPosition">\r
+    </qresource>\r
+</RCC>\r
diff --git a/AngularPosition/AngularPosition.ui b/AngularPosition/AngularPosition.ui
new file mode 100644 (file)
index 0000000..6836a69
--- /dev/null
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<ui version="4.0">\r
+ <class>AngularPositionClass</class>\r
+ <widget class="QMainWindow" name="AngularPositionClass">\r
+  <property name="geometry">\r
+   <rect>\r
+    <x>0</x>\r
+    <y>0</y>\r
+    <width>209</width>\r
+    <height>173</height>\r
+   </rect>\r
+  </property>\r
+  <property name="windowTitle">\r
+   <string>AngularPosition</string>\r
+  </property>\r
+  <widget class="QWidget" name="centralWidget">\r
+   <layout class="QVBoxLayout" name="verticalLayout">\r
+    <item>\r
+     <layout class="QFormLayout" name="formLayout">\r
+      <item row="0" column="0">\r
+       <widget class="QLabel" name="userLabel">\r
+        <property name="text">\r
+         <string>User</string>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="0" column="1">\r
+       <widget class="QLineEdit" name="_user"/>\r
+      </item>\r
+      <item row="1" column="0">\r
+       <widget class="QLabel" name="repetitionsLabel">\r
+        <property name="text">\r
+         <string>Repetitions</string>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="1" column="1">\r
+       <widget class="QSpinBox" name="_repetitions">\r
+        <property name="minimum">\r
+         <number>1</number>\r
+        </property>\r
+        <property name="maximum">\r
+         <number>100</number>\r
+        </property>\r
+        <property name="value">\r
+         <number>5</number>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="2" column="0">\r
+       <widget class="QLabel" name="directionsLabel">\r
+        <property name="text">\r
+         <string>Nb direction</string>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="2" column="1">\r
+       <widget class="QSpinBox" name="_nbdirections">\r
+        <property name="minimum">\r
+         <number>1</number>\r
+        </property>\r
+        <property name="maximum">\r
+         <number>100</number>\r
+        </property>\r
+        <property name="value">\r
+         <number>1</number>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="3" column="0">\r
+       <widget class="QLabel" name="frequencyLabel">\r
+        <property name="text">\r
+         <string>Frequency</string>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="3" column="1">\r
+       <widget class="QSpinBox" name="_frequency">\r
+        <property name="minimum">\r
+         <number>1</number>\r
+        </property>\r
+        <property name="maximum">\r
+         <number>500</number>\r
+        </property>\r
+        <property name="singleStep">\r
+         <number>50</number>\r
+        </property>\r
+        <property name="value">\r
+         <number>300</number>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="4" column="0">\r
+       <widget class="QLabel" name="durationLabel">\r
+        <property name="text">\r
+         <string>Duration</string>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="4" column="1">\r
+       <widget class="QSpinBox" name="_duration">\r
+        <property name="maximum">\r
+         <number>10000</number>\r
+        </property>\r
+        <property name="singleStep">\r
+         <number>100</number>\r
+        </property>\r
+        <property name="value">\r
+         <number>500</number>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+     </layout>\r
+    </item>\r
+    <item>\r
+     <widget class="QPushButton" name="_start">\r
+      <property name="text">\r
+       <string>Start</string>\r
+      </property>\r
+     </widget>\r
+    </item>\r
+   </layout>\r
+  </widget>\r
+ </widget>\r
+ <layoutdefault spacing="6" margin="11"/>\r
+ <resources>\r
+  <include location="AngularPosition.qrc"/>\r
+ </resources>\r
+ <connections/>\r
+</ui>\r
diff --git a/AngularPosition/AngularPosition.vcxproj b/AngularPosition/AngularPosition.vcxproj
new file mode 100644 (file)
index 0000000..918be85
--- /dev/null
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{002CBB10-B3C0-490E-BB15-02827293648A}</ProjectGuid>\r
+    <Keyword>Qt4VSv1.0</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup>\r
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />\r
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />\r
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />\r
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <ClCompile>\r
+      <PreprocessorDefinitions>_USE_MATH_DEFINES;UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <Optimization>Disabled</Optimization>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Windows</SubSystem>\r
+      <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>\r
+      <AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <AdditionalDependencies>TactonPlayerd.lib;qtmaind.lib;QtCored4.lib;QtGuid4.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <ClCompile>\r
+      <PreprocessorDefinitions>_USE_MATH_DEFINES;UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <DebugInformationFormat>\r
+      </DebugInformationFormat>\r
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Windows</SubSystem>\r
+      <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>\r
+      <AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <AdditionalDependencies>TactonPlayer.lib;qtmain.lib;QtCore4.lib;QtGui4.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="AngularPosition.cpp" />\r
+    <ClCompile Include="AnswerPosition.cpp" />\r
+    <ClCompile Include="GeneratedFiles\Debug\moc_AngularPosition.cpp">\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
+    </ClCompile>\r
+    <ClCompile Include="GeneratedFiles\Debug\moc_AnswerPosition.cpp">\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
+    </ClCompile>\r
+    <ClCompile Include="GeneratedFiles\qrc_AngularPosition.cpp">\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+      </PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+      </PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="GeneratedFiles\Release\moc_AngularPosition.cpp">\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
+    </ClCompile>\r
+    <ClCompile Include="GeneratedFiles\Release\moc_AnswerPosition.cpp">\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
+    </ClCompile>\r
+    <ClCompile Include="main.cpp" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <CustomBuild Include="AngularPosition.h">\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>\r
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Moc%27ing AngularPosition.h...</Message>\r
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_USE_MATH_DEFINES -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui"</Command>\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>\r
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Moc%27ing AngularPosition.h...</Message>\r
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_USE_MATH_DEFINES -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui"</Command>\r
+    </CustomBuild>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <CustomBuild Include="AngularPosition.ui">\r
+      <FileType>Document</FileType>\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>\r
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Uic%27ing %(Identity)...</Message>\r
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>\r
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Uic%27ing %(Identity)...</Message>\r
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>\r
+    </CustomBuild>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <CustomBuild Include="AnswerPosition.h">\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>\r
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Moc%27ing AnswerPosition.h...</Message>\r
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_USE_MATH_DEFINES -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui"</Command>\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>\r
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Moc%27ing AnswerPosition.h...</Message>\r
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_USE_MATH_DEFINES -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui"</Command>\r
+    </CustomBuild>\r
+    <ClInclude Include="GeneratedFiles\ui_AngularPosition.h" />\r
+    <ClInclude Include="GeneratedFiles\ui_AnswerAngularPosition.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <CustomBuild Include="AngularPosition.qrc">\r
+      <FileType>Document</FileType>\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FullPath);%(AdditionalInputs)</AdditionalInputs>\r
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Rcc%27ing %(Identity)...</Message>\r
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)</Outputs>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp</Command>\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FullPath);%(AdditionalInputs)</AdditionalInputs>\r
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Rcc%27ing %(Identity)...</Message>\r
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)</Outputs>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp</Command>\r
+    </CustomBuild>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <CustomBuild Include="AnswerAngularPosition.ui">\r
+      <FileType>Document</FileType>\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>\r
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Uic%27ing %(Identity)...</Message>\r
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>\r
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Uic%27ing %(Identity)...</Message>\r
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>\r
+    </CustomBuild>\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+  <ProjectExtensions>\r
+    <VisualStudio>\r
+      <UserProperties UicDir=".\GeneratedFiles" MocDir=".\GeneratedFiles\$(ConfigurationName)" MocOptions="" RccDir=".\GeneratedFiles" lupdateOnBuild="0" lupdateOptions="" lreleaseOptions="" QtVersion_x0020_Win32="4.8.2" />\r
+    </VisualStudio>\r
+  </ProjectExtensions>\r
+</Project>
\ No newline at end of file
diff --git a/AngularPosition/AngularPosition.vcxproj.filters b/AngularPosition/AngularPosition.vcxproj.filters
new file mode 100644 (file)
index 0000000..ac6ec03
--- /dev/null
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;cxx;c;def</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h</Extensions>\r
+    </Filter>\r
+    <Filter Include="Form Files">\r
+      <UniqueIdentifier>{99349809-55BA-4b9d-BF79-8FDBB0286EB3}</UniqueIdentifier>\r
+      <Extensions>ui</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E}</UniqueIdentifier>\r
+      <Extensions>qrc;*</Extensions>\r
+      <ParseFiles>false</ParseFiles>\r
+    </Filter>\r
+    <Filter Include="Generated Files">\r
+      <UniqueIdentifier>{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}</UniqueIdentifier>\r
+      <Extensions>moc;h;cpp</Extensions>\r
+      <SourceControlFiles>False</SourceControlFiles>\r
+    </Filter>\r
+    <Filter Include="Generated Files\Debug">\r
+      <UniqueIdentifier>{5110b38d-56b8-45cc-841c-3475460ae78d}</UniqueIdentifier>\r
+      <Extensions>cpp;moc</Extensions>\r
+      <SourceControlFiles>False</SourceControlFiles>\r
+    </Filter>\r
+    <Filter Include="Generated Files\Release">\r
+      <UniqueIdentifier>{f2f7d241-3950-4152-9f50-b5e9a2da41d4}</UniqueIdentifier>\r
+      <Extensions>cpp;moc</Extensions>\r
+      <SourceControlFiles>False</SourceControlFiles>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="main.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="AngularPosition.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="GeneratedFiles\Debug\moc_AngularPosition.cpp">\r
+      <Filter>Generated Files\Debug</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="GeneratedFiles\Release\moc_AngularPosition.cpp">\r
+      <Filter>Generated Files\Release</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="GeneratedFiles\qrc_AngularPosition.cpp">\r
+      <Filter>Generated Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="AnswerPosition.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="GeneratedFiles\Debug\moc_AnswerPosition.cpp">\r
+      <Filter>Generated Files\Debug</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="GeneratedFiles\Release\moc_AnswerPosition.cpp">\r
+      <Filter>Generated Files\Release</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <CustomBuild Include="AngularPosition.h">\r
+      <Filter>Header Files</Filter>\r
+    </CustomBuild>\r
+    <CustomBuild Include="AngularPosition.ui">\r
+      <Filter>Form Files</Filter>\r
+    </CustomBuild>\r
+    <CustomBuild Include="AngularPosition.qrc">\r
+      <Filter>Resource Files</Filter>\r
+    </CustomBuild>\r
+    <CustomBuild Include="AnswerAngularPosition.ui">\r
+      <Filter>Form Files</Filter>\r
+    </CustomBuild>\r
+    <CustomBuild Include="AnswerPosition.h">\r
+      <Filter>Header Files</Filter>\r
+    </CustomBuild>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="GeneratedFiles\ui_AngularPosition.h">\r
+      <Filter>Generated Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="GeneratedFiles\ui_AnswerAngularPosition.h">\r
+      <Filter>Generated Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/AngularPosition/AnswerAngularPosition.ui b/AngularPosition/AnswerAngularPosition.ui
new file mode 100644 (file)
index 0000000..1e1a80d
--- /dev/null
@@ -0,0 +1,1198 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<ui version="4.0">\r
+ <class>AnswerPosition</class>\r
+ <widget class="QMainWindow" name="AnswerPosition">\r
+  <property name="geometry">\r
+   <rect>\r
+    <x>0</x>\r
+    <y>0</y>\r
+    <width>800</width>\r
+    <height>296</height>\r
+   </rect>\r
+  </property>\r
+  <property name="windowTitle">\r
+   <string>MainWindow</string>\r
+  </property>\r
+  <widget class="QWidget" name="centralwidget">\r
+   <property name="minimumSize">\r
+    <size>\r
+     <width>800</width>\r
+     <height>0</height>\r
+    </size>\r
+   </property>\r
+   <layout class="QVBoxLayout" name="verticalLayout">\r
+    <item>\r
+     <layout class="QGridLayout" name="_grid" rowstretch="0,0,0,0,0,0,0" columnstretch="0,0,0,0,0,0,0" rowminimumheight="0,0,0,0,0,0,0" columnminimumwidth="0,0,0,0,0,0,0">\r
+      <property name="sizeConstraint">\r
+       <enum>QLayout::SetDefaultConstraint</enum>\r
+      </property>\r
+      <property name="spacing">\r
+       <number>1</number>\r
+      </property>\r
+      <item row="2" column="0">\r
+       <widget class="QRadioButton" name="_a7">\r
+        <property name="minimumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="maximumSize">\r
+         <size>\r
+          <width>2</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="text">\r
+         <string/>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="3" column="0">\r
+       <widget class="QRadioButton" name="_a8">\r
+        <property name="minimumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="maximumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="text">\r
+         <string/>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="0" column="2">\r
+       <widget class="QRadioButton" name="_a5">\r
+        <property name="minimumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="maximumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="text">\r
+         <string/>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="1" column="1">\r
+       <widget class="QRadioButton" name="_a6">\r
+        <property name="minimumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="maximumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="text">\r
+         <string/>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="1" column="5">\r
+       <widget class="QRadioButton" name="_a2">\r
+        <property name="minimumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="maximumSize">\r
+         <size>\r
+          <width>15</width>\r
+          <height>16777215</height>\r
+         </size>\r
+        </property>\r
+        <property name="text">\r
+         <string/>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="0" column="4">\r
+       <widget class="QRadioButton" name="_a3">\r
+        <property name="minimumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="maximumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="text">\r
+         <string/>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="0" column="3">\r
+       <widget class="QRadioButton" name="_a4">\r
+        <property name="minimumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="maximumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="palette">\r
+         <palette>\r
+          <active>\r
+           <colorrole role="WindowText">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>0</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Button">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Light">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>127</green>\r
+              <blue>127</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Midlight">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>63</green>\r
+              <blue>63</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Dark">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>127</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Mid">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>170</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Text">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>0</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="BrightText">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>255</green>\r
+              <blue>255</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="ButtonText">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>0</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Base">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>255</green>\r
+              <blue>255</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Window">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Shadow">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>0</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="AlternateBase">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>127</green>\r
+              <blue>127</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="ToolTipBase">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>255</green>\r
+              <blue>220</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="ToolTipText">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>0</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+          </active>\r
+          <inactive>\r
+           <colorrole role="WindowText">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>0</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Button">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Light">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>127</green>\r
+              <blue>127</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Midlight">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>63</green>\r
+              <blue>63</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Dark">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>127</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Mid">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>170</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Text">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>0</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="BrightText">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>255</green>\r
+              <blue>255</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="ButtonText">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>0</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Base">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>255</green>\r
+              <blue>255</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Window">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Shadow">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>0</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="AlternateBase">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>127</green>\r
+              <blue>127</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="ToolTipBase">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>255</green>\r
+              <blue>220</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="ToolTipText">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>0</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+          </inactive>\r
+          <disabled>\r
+           <colorrole role="WindowText">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>127</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Button">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Light">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>127</green>\r
+              <blue>127</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Midlight">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>63</green>\r
+              <blue>63</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Dark">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>127</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Mid">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>170</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Text">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>127</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="BrightText">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>255</green>\r
+              <blue>255</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="ButtonText">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>127</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Base">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Window">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Shadow">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>0</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="AlternateBase">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="ToolTipBase">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>255</green>\r
+              <blue>220</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="ToolTipText">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>0</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+          </disabled>\r
+         </palette>\r
+        </property>\r
+        <property name="text">\r
+         <string/>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="4" column="0">\r
+       <widget class="QRadioButton" name="_a9">\r
+        <property name="minimumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="maximumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="text">\r
+         <string/>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="5" column="1">\r
+       <widget class="QRadioButton" name="_a10">\r
+        <property name="minimumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="maximumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="text">\r
+         <string/>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="6" column="2">\r
+       <widget class="QRadioButton" name="_a11">\r
+        <property name="minimumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="maximumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="text">\r
+         <string/>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="6" column="3">\r
+       <widget class="QRadioButton" name="_a12">\r
+        <property name="minimumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="maximumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="palette">\r
+         <palette>\r
+          <active>\r
+           <colorrole role="WindowText">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>0</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Button">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Light">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>127</green>\r
+              <blue>127</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Midlight">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>63</green>\r
+              <blue>63</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Dark">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>127</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Mid">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>170</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Text">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>0</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="BrightText">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>255</green>\r
+              <blue>255</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="ButtonText">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>0</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Base">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>255</green>\r
+              <blue>255</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Window">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Shadow">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>0</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="AlternateBase">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>127</green>\r
+              <blue>127</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="ToolTipBase">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>255</green>\r
+              <blue>220</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="ToolTipText">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>0</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+          </active>\r
+          <inactive>\r
+           <colorrole role="WindowText">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>0</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Button">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Light">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>127</green>\r
+              <blue>127</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Midlight">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>63</green>\r
+              <blue>63</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Dark">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>127</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Mid">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>170</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Text">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>0</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="BrightText">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>255</green>\r
+              <blue>255</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="ButtonText">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>0</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Base">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>255</green>\r
+              <blue>255</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Window">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Shadow">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>0</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="AlternateBase">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>127</green>\r
+              <blue>127</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="ToolTipBase">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>255</green>\r
+              <blue>220</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="ToolTipText">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>0</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+          </inactive>\r
+          <disabled>\r
+           <colorrole role="WindowText">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>127</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Button">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Light">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>127</green>\r
+              <blue>127</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Midlight">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>63</green>\r
+              <blue>63</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Dark">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>127</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Mid">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>170</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Text">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>127</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="BrightText">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>255</green>\r
+              <blue>255</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="ButtonText">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>127</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Base">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Window">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="Shadow">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>0</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="AlternateBase">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="ToolTipBase">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>255</red>\r
+              <green>255</green>\r
+              <blue>220</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+           <colorrole role="ToolTipText">\r
+            <brush brushstyle="SolidPattern">\r
+             <color alpha="255">\r
+              <red>0</red>\r
+              <green>0</green>\r
+              <blue>0</blue>\r
+             </color>\r
+            </brush>\r
+           </colorrole>\r
+          </disabled>\r
+         </palette>\r
+        </property>\r
+        <property name="text">\r
+         <string/>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="6" column="4">\r
+       <widget class="QRadioButton" name="_a13">\r
+        <property name="minimumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="maximumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="text">\r
+         <string/>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="3" column="6">\r
+       <widget class="QRadioButton" name="_a0">\r
+        <property name="minimumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="maximumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="text">\r
+         <string/>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="2" column="6">\r
+       <widget class="QRadioButton" name="_a1">\r
+        <property name="minimumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="maximumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="text">\r
+         <string/>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="4" column="6">\r
+       <widget class="QRadioButton" name="_a15">\r
+        <property name="minimumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="maximumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="text">\r
+         <string/>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="5" column="5">\r
+       <widget class="QRadioButton" name="_a14">\r
+        <property name="minimumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="maximumSize">\r
+         <size>\r
+          <width>20</width>\r
+          <height>20</height>\r
+         </size>\r
+        </property>\r
+        <property name="text">\r
+         <string/>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+     </layout>\r
+    </item>\r
+    <item>\r
+     <widget class="QPushButton" name="_ok">\r
+      <property name="minimumSize">\r
+       <size>\r
+        <width>0</width>\r
+        <height>100</height>\r
+       </size>\r
+      </property>\r
+      <property name="font">\r
+       <font>\r
+        <pointsize>20</pointsize>\r
+       </font>\r
+      </property>\r
+      <property name="text">\r
+       <string>OK</string>\r
+      </property>\r
+     </widget>\r
+    </item>\r
+    <item>\r
+     <widget class="QProgressBar" name="_progress">\r
+      <property name="value">\r
+       <number>0</number>\r
+      </property>\r
+     </widget>\r
+    </item>\r
+   </layout>\r
+  </widget>\r
+ </widget>\r
+ <resources/>\r
+ <connections/>\r
+</ui>\r
diff --git a/AngularPosition/AnswerPosition.cpp b/AngularPosition/AnswerPosition.cpp
new file mode 100644 (file)
index 0000000..091592c
--- /dev/null
@@ -0,0 +1,178 @@
+#include "AnswerPosition.h"\r
+\r
+#include <QDate>\r
+#include <QDebug>\r
+#include <cmath>\r
+#include <QTimer>\r
+#include <QString>\r
+\r
+AnswerPosition::AnswerPosition(QWidget *parent, Qt::WFlags flags)\r
+:QMainWindow(parent, flags), _currentdirection(-1), _currenttrial(0)\r
+{\r
+       try\r
+       {\r
+               _player = new TactonPlayer("COM4");\r
+       }\r
+       catch (...)\r
+       {\r
+               _player = NULL;\r
+               qDebug() << "No wristband found";\r
+       }\r
+\r
+       setupUi(this);\r
+\r
+       _grid->setSpacing(0);\r
+\r
+       _a0->setStyleSheet("background-color: red;");\r
+       _a1->setStyleSheet("background-color: lightgrey;");\r
+       _a2->setStyleSheet("background-color: green;");\r
+       _a3->setStyleSheet("background-color: lightgrey;");\r
+    _a4->setStyleSheet("background-color: red;");\r
+       _a5->setStyleSheet("background-color: lightgrey;");\r
+       _a6->setStyleSheet("background-color: green;");\r
+       _a7->setStyleSheet("background-color: lightgrey;");\r
+    _a8->setStyleSheet("background-color: red;");\r
+       _a9->setStyleSheet("background-color: lightgrey;");\r
+       _a10->setStyleSheet("background-color: green;");\r
+       _a11->setStyleSheet("background-color: lightgrey;");\r
+    _a12->setStyleSheet("background-color: red;");\r
+       _a13->setStyleSheet("background-color: lightgrey;");\r
+       _a14->setStyleSheet("background-color: green;");\r
+       _a15->setStyleSheet("background-color: lightgrey;");\r
+\r
+       _group.addButton(_a0, 0);\r
+       _group.addButton(_a1, 1);\r
+       _group.addButton(_a2, 2);\r
+       _group.addButton(_a3, 3);\r
+       _group.addButton(_a4, 4);\r
+       _group.addButton(_a5, 5);\r
+       _group.addButton(_a6, 6);\r
+       _group.addButton(_a7, 7);\r
+       _group.addButton(_a8, 8);\r
+       _group.addButton(_a9, 9);\r
+       _group.addButton(_a10, 10);\r
+       _group.addButton(_a11, 11);\r
+       _group.addButton(_a12, 12);\r
+       _group.addButton(_a13, 13);\r
+       _group.addButton(_a14, 14);\r
+       _group.addButton(_a15, 15);\r
+\r
+       _ok->setEnabled(false);\r
+       QObject::connect(_ok, SIGNAL(pressed()), this, SLOT(answer()));  \r
+       QObject::connect(&_group, SIGNAL(buttonClicked(int)), this, SLOT(selectDirection(int)));  \r
+}\r
+\r
+\r
+AnswerPosition::~AnswerPosition()\r
+{\r
+       if (_logfile)\r
+               fclose(_logfile);\r
+\r
+       if (_player)\r
+               delete _player;\r
+}\r
+\r
+void AnswerPosition::init(QString user, int repetitions, int nbdirections, int frequency, int duration)\r
+{\r
+       _duration = duration;\r
+\r
+       //create log file\r
+       QString date = QDate::currentDate().toString("yyyy-MM-dd") + "-" + QTime::currentTime().toString("HH-mm-ss");\r
+       QString logfilename = user + "-" + QString::number(repetitions) + "-" + QString::number(nbdirections) + "-" + date + ".csv";\r
+       _logfile = fopen(logfilename.toStdString().c_str(), "w");\r
+       qDebug() << "log: " << logfilename;\r
+       if (_logfile)\r
+               fprintf(_logfile, "Degrees,Direction,Answer,Error\n");\r
+\r
+       _player->setFrequency(frequency);\r
+\r
+       //generate the block\r
+       // /!\ currently we only manage 1 direction\r
+       for (int i = 0 ; i < repetitions ; i++)\r
+       {\r
+               QList<int> temp;\r
+               //generate the block\r
+               for (int j = 0 ; j < 16 ; j++)\r
+                       temp.push_back(j);\r
+               //shuffle\r
+               for (int j = 0; j < temp.count(); j++)\r
+                       temp.swap(j, (rand() % (temp.count() - j)) + j);\r
+               //add the block to the trial\r
+               _trials.append(temp);\r
+       }\r
+       _progress->setMaximum(_trials.size());\r
+\r
+       runTrial();\r
+}\r
+\r
+void AnswerPosition::selectDirection(int buttonId)\r
+{\r
+       _ok->setEnabled(true);\r
+       _currentdirection = buttonId;\r
+}\r
+\r
+void AnswerPosition::runTrial()\r
+{\r
+       setAngle((_trials.at(_currenttrial) * 90) / 4);\r
+       QTimer::singleShot(_duration, this, SLOT(stop()));\r
+}\r
+\r
+void AnswerPosition::answer()\r
+{\r
+       if (_logfile)\r
+               fprintf(_logfile, "%d,%d,%d\n", (_trials.at(_currenttrial) * 90) / 4, _trials.at(_currenttrial), _currentdirection, _trials.at(_currenttrial) == _currentdirection);\r
+\r
+       QAbstractButton* checked = _group.checkedButton();\r
+       if (checked)\r
+       {\r
+               _group.setExclusive(false);\r
+               checked->setChecked(false);\r
+               _group.setExclusive(true);\r
+       }\r
+       _ok->setEnabled(false);\r
+\r
+       _currenttrial++;\r
+       _progress->setValue(_currenttrial);\r
+\r
+       if (_currenttrial >= _trials.size())\r
+       {\r
+               for (int i = 0 ; i < 16 ; i++)\r
+                       _group.button(i)->setEnabled(false);\r
+               if (_logfile)\r
+               {\r
+                       fclose(_logfile);\r
+                       _logfile = NULL;\r
+               }\r
+               return;\r
+       }\r
+\r
+       runTrial();\r
+}\r
+\r
+\r
+void AnswerPosition::setAngle(int angle)\r
+{\r
+       unsigned char amplitudes[4];\r
+       memset(amplitudes, 0, 4);\r
+\r
+//     angle = 90;\r
+\r
+       //vertical\r
+       if (angle < 180)\r
+               amplitudes[1] = 255 * sin(angle * M_PI / 180.0);\r
+       else\r
+               amplitudes[3] = - 255 * sin(angle * M_PI / 180.0);\r
+\r
+       //horizontal\r
+       if (angle < 90 ||angle > 270)\r
+               amplitudes[0] = 255 * cos(angle * M_PI / 180.0);\r
+       else\r
+               amplitudes[2] = - 255 * cos(angle * M_PI / 180.0);\r
+\r
+       _player->setAmplitudes(4, amplitudes);\r
+}\r
+\r
+void AnswerPosition::stop()\r
+{\r
+       _player->stop();\r
+}
\ No newline at end of file
diff --git a/AngularPosition/AnswerPosition.h b/AngularPosition/AnswerPosition.h
new file mode 100644 (file)
index 0000000..2d8e93f
--- /dev/null
@@ -0,0 +1,43 @@
+#ifndef __ANSWERPOSITION__\r
+#define __ANSWERPOSITION__\r
+\r
+#include <QtGui/QMainWindow>\r
+#include "ui_AnswerAngularPosition.h"\r
+#include <QButtonGroup>\r
+\r
+#include <TactonPlayer\TactonPlayer.hpp>\r
+\r
+class AnswerPosition : public QMainWindow, public Ui::AnswerPosition\r
+{\r
+       Q_OBJECT\r
+\r
+       public:\r
+               AnswerPosition(QWidget *parent = 0, Qt::WFlags flags = 0);\r
+               ~AnswerPosition();\r
+\r
+               void init(QString user, int repetitions, int nbdirections, int frequency, int duration); \r
+\r
+       public slots:\r
+               void selectDirection(int buttonId);\r
+               void stop();\r
+               void answer();\r
+\r
+       protected:\r
+\r
+               void runTrial();\r
+               void setAngle(int angle);\r
+\r
+               int _duration;\r
+\r
+               int _currentdirection;\r
+               QButtonGroup _group;\r
+\r
+               FILE *_logfile;\r
+\r
+               QList<int> _trials;\r
+               int _currenttrial;\r
+\r
+               TactonPlayer *_player;\r
+};\r
+\r
+#endif\r
diff --git a/AngularPosition/main.cpp b/AngularPosition/main.cpp
new file mode 100644 (file)
index 0000000..70a6b9a
--- /dev/null
@@ -0,0 +1,10 @@
+#include "AngularPosition.h"\r
+#include <QtGui/QApplication>\r
+\r
+int main(int argc, char *argv[])\r
+{\r
+       QApplication a(argc, argv);\r
+       AngularPosition w;\r
+       w.show();\r
+       return a.exec();\r
+}\r
diff --git a/DeltaTimeJND/AnswerDeltaTime.cpp b/DeltaTimeJND/AnswerDeltaTime.cpp
new file mode 100644 (file)
index 0000000..f00afa5
--- /dev/null
@@ -0,0 +1,286 @@
+#include "AnswerDeltaTime.h"\r
+\r
+#include <QDate>\r
+#include <cmath>\r
+\r
+#include <QTimer>\r
+#include <QDebug>\r
+\r
+AnswerDeltaTime::AnswerDeltaTime(QWidget *parent)\r
+: QMainWindow(parent), _logfile(NULL), _goodanswer(-1), _currentconfig(0)\r
+{\r
+       try\r
+       {\r
+               _tactonPlayer = new TactonPlayer("COM4");\r
+       }\r
+       catch (...)\r
+       {\r
+               qDebug() << "No wristband found";\r
+       }\r
+\r
+       //init the window\r
+       setupUi(this);\r
+//     this->layout()->setSizeConstraint(QLayout::SetFixedSize);\r
+\r
+       for (int i = 0 ; i < 4 ; i++)\r
+       {\r
+               _currenttest[i] = 1.0;\r
+               _jnd[i] = 0.0;\r
+       }\r
+\r
+       //init buttons\r
+       QObject::connect(_first, SIGNAL(clicked()), this, SLOT(answer()));\r
+       QObject::connect(_second, SIGNAL(clicked()), this, SLOT(answer()));\r
+       QObject::connect(_third, SIGNAL(clicked()), this, SLOT(answer()));\r
+}\r
+\r
+AnswerDeltaTime::~AnswerDeltaTime()\r
+{\r
+       if (_logfile)\r
+               fclose(_logfile);\r
+       if (_logfile2)\r
+               fclose(_logfile2);\r
+       //reset the wristband\r
+       delete _tactonPlayer;\r
+\r
+       //delete _animation;\r
+}\r
+\r
+void AnswerDeltaTime::init(QString user, int frequency, int timegap, int duration, double delta, int reversals)\r
+{\r
+       //two vibrators alone\r
+       _configurations[0][0] = 0;\r
+       _configurations[0][1] = 90;\r
+       //between the same vibrators\r
+       _configurations[1][0] = 30;\r
+       _configurations[1][1] = 60;\r
+       //using two different vibrators each\r
+       _configurations[2][0] = 45;\r
+       _configurations[2][1] = 225;\r
+       //using two vibrators each, with one in common\r
+       _configurations[3][0] = 45;\r
+       _configurations[3][1] = 315;\r
+\r
+       _reversals = reversals;\r
+       _frequency = frequency;\r
+       _delta = delta;\r
+\r
+       _animation = new QTimeLine(duration, this);\r
+       _animation->setFrameRange(0, duration/timegap);\r
+//     _animation->setUpdateInterval(timegap);\r
+       connect(_animation, SIGNAL(frameChanged(int)), this, SLOT(playTest(int)));\r
+       connect(_animation, SIGNAL(finished()), this, SLOT(stop()));\r
+\r
+       //create log file\r
+       QString date = QDate::currentDate().toString("yyyy-MM-dd") + "-" + QTime::currentTime().toString("HH-mm-ss");\r
+       QString logfilename = user + "-" + date + "-answers";\r
+       if (_logfile = fopen(logfilename.toStdString().c_str(), "w"))\r
+               fprintf(_logfile, "Angle1,Angle2,Duration,Interval,GoodAnswer,UserAnswer,Error\n");\r
+       logfilename = user + "-" + date + "-jnd";\r
+       if (_logfile2 = fopen(logfilename.toStdString().c_str(), "w"))\r
+               fprintf(_logfile2, "A1,A2,JND\n");\r
+\r
+       for (int i = 0 ; i < 4 ; i++)\r
+       {\r
+               _currenttest[i] = 1.0;\r
+               _configfinished[i] = false;\r
+       }\r
+\r
+       unsigned char amp[] = {0, 0, 0, 0};\r
+       _tactonPlayer->setAmplitudes(4, amp);\r
+       _tactonPlayer->setFrequency(frequency);\r
+\r
+       runTrial();\r
+}\r
+\r
+void AnswerDeltaTime::setAngle(int angle)\r
+{\r
+       unsigned char amplitudes[4];\r
+       memset(amplitudes, 0, 4);\r
+\r
+       //vertical\r
+       if (angle < 180)\r
+               amplitudes[1] = 255 * sin(angle * M_PI / 180.0);\r
+       else\r
+               amplitudes[3] = - 255 * sin(angle * M_PI / 180.0);\r
+\r
+       //horizontal\r
+       if (angle < 90 || angle > 270)\r
+               amplitudes[0] = 255 * cos(angle * M_PI / 180.0);\r
+       else\r
+               amplitudes[2] = - 255 * cos(angle * M_PI / 180.0);\r
+\r
+       _tactonPlayer->setAmplitudes(4, amplitudes);\r
+}\r
+\r
+void AnswerDeltaTime::playTest(int frame)\r
+{\r
+       qDebug() << "f" << frame << "\n";\r
+       setAngle(_configurations[_currentconfig][frame % 2]);\r
+}\r
+\r
+void AnswerDeltaTime::playOther()\r
+{\r
+       unsigned char amplitudes[4] = {0, 0, 0, 0};\r
+\r
+       switch(_currentconfig)\r
+       {\r
+               case 0 : case 1:\r
+                       amplitudes[0] = amplitudes[1] = 255;\r
+                       break;\r
+               case 2:\r
+                       amplitudes[0] = amplitudes[1] = amplitudes[2] = amplitudes[3] = 255;\r
+                       break;\r
+               case 3:\r
+                       amplitudes[0] = amplitudes[1] = amplitudes[3] = 255;\r
+                       break;\r
+       }\r
+\r
+       _tactonPlayer->setAmplitudes(4, amplitudes);\r
+\r
+       QTimer::singleShot(_animation->duration(), this, SLOT(stop()));\r
+}\r
+\r
+void AnswerDeltaTime::stop()\r
+{\r
+       unsigned char amp[] = {0, 0, 0, 0};\r
+       _tactonPlayer->setAmplitudes(4, amp);\r
+}\r
+\r
+void AnswerDeltaTime::answer()\r
+{\r
+       QPushButton *button = (QPushButton *)sender();\r
+       int rep;\r
+       if (button->objectName() == "_first")\r
+               rep = 0;\r
+       else if (button->objectName() == "_second")\r
+               rep = 1;\r
+       else if (button->objectName() == "_third")\r
+               rep = 2;\r
+\r
+       log(rep);\r
+\r
+       static int rev[4] = {0, 0, 0, 0};\r
+\r
+       static bool newblock[4] = {true, true, true, true};\r
+       static bool lastval[4];\r
+       bool val = rep == _goodanswer;\r
+\r
+       //reversal\r
+       if (!newblock[_currentconfig] && val != lastval[_currentconfig])\r
+       {\r
+               rev[_currentconfig]++;\r
+               _jnd[_currentconfig] += _currenttest[_currentconfig] / _reversals;\r
+               \r
+               //if enough reversals the side is done\r
+               if (rev[_currentconfig] >= _reversals)\r
+               {\r
+                       log2();\r
+                       _configfinished[_currentconfig] = true;\r
+               }\r
+               //new reversal, but side not finished\r
+               else\r
+               {\r
+                       //good answer: reduce the gap\r
+                       if (val)\r
+                       {\r
+                               _currenttest[_currentconfig] -= _delta;\r
+                               if (_currenttest[_currentconfig] < 0.0)\r
+                                       _currenttest[_currentconfig] = 0.0;\r
+                       }\r
+                       //wrong answer: increase the gap\r
+                       else\r
+                       {\r
+                               _currenttest[_currentconfig] += _delta;\r
+                               if (_currenttest[_currentconfig] > 1.0)\r
+                                       _currenttest[_currentconfig] = 1.0;\r
+                       }\r
+               }\r
+       }\r
+       //no reversal\r
+       else\r
+       {\r
+               newblock[_currentconfig] = false;\r
+               //good answer: reduce the gap\r
+               if (val)\r
+               {\r
+                       _currenttest[_currentconfig] -= _delta;\r
+                       if (_currenttest[_currentconfig] < 0.0)\r
+                               _currenttest[_currentconfig] = 0.0;\r
+               }\r
+               //wrong answer: increase the gap\r
+               else\r
+               {\r
+                       _currenttest[_currentconfig] += _delta;\r
+                       if (_currenttest[_currentconfig] > 1.0)\r
+                               _currenttest[_currentconfig] = 1.0;\r
+               }\r
+       }\r
+       lastval[_currentconfig] = val;\r
+\r
+       bool finished = true;\r
+       //search for the next side\r
+       for (int i = 0 ; i < 4 ; i++)\r
+       {\r
+               _currentconfig = (_currentconfig + 1) % 4;\r
+               if (!_configfinished[_currentconfig])\r
+               {\r
+                       finished = false;\r
+                       break;\r
+               }\r
+       }\r
+\r
+       if (finished)\r
+       {\r
+               _first->setEnabled(false);\r
+               _second->setEnabled(false);\r
+               _third->setEnabled(false);\r
+               _label->setText("Finished!");\r
+               return;\r
+       }\r
+\r
+       runTrial();\r
+}\r
+\r
+void AnswerDeltaTime::log(int answer) const\r
+{\r
+       if (_logfile == NULL)\r
+               return;\r
+       fprintf(_logfile, "%d,%d,%0.2f,%d,%d,%d,%d\n", \r
+               _configurations[_currentconfig][0], _configurations[_currentconfig][1], _animation->duration(), _currenttest[_currentconfig], _goodanswer, answer, _goodanswer == answer);\r
+}\r
+\r
+void AnswerDeltaTime::log2() const\r
+{\r
+       if (_logfile2 == NULL)\r
+               return;\r
+       fprintf(_logfile2, "%d,%d,%0.2f\n", _configurations[_currentconfig][0], _configurations[_currentconfig][1], _jnd[_currentconfig]);\r
+}\r
+\r
+void AnswerDeltaTime::runTrial()\r
+{\r
+       _goodanswer = rand() % 3;\r
+\r
+       qDebug() << "good: " << _goodanswer << "\n";\r
+       _animation->setFrameRange(0, _animation->duration()/_currenttest[_currentconfig]);\r
+\r
+\r
+       switch(_goodanswer)\r
+       {\r
+               case 0:\r
+                       QTimer::singleShot(500, _animation, SLOT(start()));\r
+                       QTimer::singleShot(1500 + _animation->duration(), this, SLOT(playOther()));\r
+                       QTimer::singleShot(2500 + 2 * _animation->duration(), this, SLOT(playOther()));\r
+                       break;\r
+               case 1:\r
+                       QTimer::singleShot(500, this, SLOT(playOther()));\r
+                       QTimer::singleShot(1500 + _animation->duration(), _animation, SLOT(start()));\r
+                       QTimer::singleShot(2500 + 2 * _animation->duration(), this, SLOT(playOther()));\r
+                       break;\r
+               case 2:\r
+                       QTimer::singleShot(500, this, SLOT(playOther()));\r
+                       QTimer::singleShot(1500 + _animation->duration(), this, SLOT(playOther()));\r
+                       QTimer::singleShot(2500 + 2 * _animation->duration(), _animation, SLOT(start()));\r
+                       break;\r
+       }\r
+}\r
diff --git a/DeltaTimeJND/AnswerDeltaTime.h b/DeltaTimeJND/AnswerDeltaTime.h
new file mode 100644 (file)
index 0000000..5bf220b
--- /dev/null
@@ -0,0 +1,64 @@
+#ifndef ANSWERDELTATIME_H\r
+#define ANSWERDELTATIME_H\r
+\r
+#include <QMainWindow>\r
+#include <QTimeline>\r
+#include "ui_AnswerDeltaTime.h"\r
+\r
+#include <TactonPlayer\TactonPlayer.hpp>\r
+\r
+class AnswerDeltaTime : public QMainWindow, Ui::AnswerWindow\r
+{\r
+       Q_OBJECT\r
+\r
+       public:\r
+               AnswerDeltaTime(QWidget *parent);\r
+               ~AnswerDeltaTime();\r
+\r
+               void init(QString user, int frequency, int timegap, int duration, double delta, int reversals);\r
+\r
+       private:\r
+               //log the answers\r
+               void log(int answer) const;\r
+               //log the JND values\r
+               void log2() const;\r
+\r
+               void runTrial();\r
+               void setAngle(int angle);\r
+\r
+               FILE *_logfile, *_logfile2;\r
+               TactonPlayer *_tactonPlayer;\r
+\r
+               //parameters\r
+               int _configurations[4][2]; //4 configurations of 2 angles\r
+               int _frequency;\r
+               int _reversals;\r
+               double _delta;\r
+\r
+               //exp status\r
+               int _goodanswer;\r
+               //current value for each configuration\r
+               int _currenttest[4];\r
+               //which configs are finished?\r
+               bool _configfinished[4];\r
+               //id of the config currently being tested\r
+               int _currentconfig;\r
+\r
+               //results\r
+               double _jnd[4];\r
+\r
+               //manage alternation between 2 vibrations\r
+               QTimeLine *_animation;\r
+\r
+       private slots:\r
+               //play 2 vibrations\r
+               void playTest(int frame);\r
+               //play 1 vibration\r
+               void playOther();\r
+               //stop vibrations\r
+               void stop();\r
+               //click on answer button\r
+               void answer();\r
+};\r
+\r
+#endif // ANSWERDELTATIME_H\r
diff --git a/DeltaTimeJND/AnswerDeltaTime.ui b/DeltaTimeJND/AnswerDeltaTime.ui
new file mode 100644 (file)
index 0000000..056831b
--- /dev/null
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<ui version="4.0">\r
+ <class>AnswerWindow</class>\r
+ <widget class="QMainWindow" name="AnswerWindow">\r
+  <property name="geometry">\r
+   <rect>\r
+    <x>0</x>\r
+    <y>0</y>\r
+    <width>505</width>\r
+    <height>159</height>\r
+   </rect>\r
+  </property>\r
+  <property name="windowTitle">\r
+   <string>Experiment</string>\r
+  </property>\r
+  <widget class="QWidget" name="centralwidget">\r
+   <layout class="QVBoxLayout" name="verticalLayout">\r
+    <item>\r
+     <widget class="QLabel" name="_label">\r
+      <property name="font">\r
+       <font>\r
+        <pointsize>20</pointsize>\r
+       </font>\r
+      </property>\r
+      <property name="text">\r
+       <string>Quelle vibration est la plus forte ?</string>\r
+      </property>\r
+      <property name="alignment">\r
+       <set>Qt::AlignCenter</set>\r
+      </property>\r
+     </widget>\r
+    </item>\r
+    <item>\r
+     <layout class="QHBoxLayout" name="horizontalLayout">\r
+      <item>\r
+       <widget class="QPushButton" name="_first">\r
+        <property name="minimumSize">\r
+         <size>\r
+          <width>0</width>\r
+          <height>100</height>\r
+         </size>\r
+        </property>\r
+        <property name="font">\r
+         <font>\r
+          <pointsize>20</pointsize>\r
+         </font>\r
+        </property>\r
+        <property name="text">\r
+         <string>Première</string>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item>\r
+       <widget class="QPushButton" name="_second">\r
+        <property name="minimumSize">\r
+         <size>\r
+          <width>0</width>\r
+          <height>100</height>\r
+         </size>\r
+        </property>\r
+        <property name="font">\r
+         <font>\r
+          <pointsize>20</pointsize>\r
+         </font>\r
+        </property>\r
+        <property name="text">\r
+         <string>Deuxième</string>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item>\r
+       <widget class="QPushButton" name="_third">\r
+        <property name="minimumSize">\r
+         <size>\r
+          <width>0</width>\r
+          <height>100</height>\r
+         </size>\r
+        </property>\r
+        <property name="font">\r
+         <font>\r
+          <pointsize>20</pointsize>\r
+         </font>\r
+        </property>\r
+        <property name="text">\r
+         <string>Troisième</string>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+     </layout>\r
+    </item>\r
+   </layout>\r
+  </widget>\r
+ </widget>\r
+ <resources/>\r
+ <connections/>\r
+</ui>\r
index 703e619acf70424b0f3017aef201bd92e3db7f2c..01a099ef655564f3343489c79ea86be171799df4 100644 (file)
@@ -1,12 +1,21 @@
 #include "DeltaTimeJND.h"\r
 \r
 DeltaTimeJND::DeltaTimeJND(QWidget *parent, Qt::WFlags flags)\r
-       : QMainWindow(parent, flags)\r
+: QMainWindow(parent, flags), w(this)\r
 {\r
-       ui.setupUi(this);\r
+       setupUi(this);\r
+\r
+       connect(_start, SIGNAL(pressed()), SLOT(startExperiment()));\r
 }\r
 \r
 DeltaTimeJND::~DeltaTimeJND()\r
 {\r
 \r
 }\r
+\r
+void DeltaTimeJND::startExperiment()\r
+{\r
+       w.init(_user->text(), _frequency->value(), _starttimegap->value(), _duration->value(), _delta->value(), _reversals->value());\r
+       w.show();\r
+       this->hide();\r
+}\r
index 9ca72483d0c728a151eb17a0b9e7f52bebe13c75..6ec8e739902dbcab2a8b19fc945c4f62c74e79f4 100644 (file)
@@ -4,16 +4,21 @@
 #include <QtGui/QMainWindow>\r
 #include "ui_deltatimejnd.h"\r
 \r
-class DeltaTimeJND : public QMainWindow\r
+#include "AnswerDeltaTime.h"\r
+\r
+class DeltaTimeJND : public QMainWindow, Ui::DeltaTimeJNDClass\r
 {\r
        Q_OBJECT\r
 \r
-public:\r
-       DeltaTimeJND(QWidget *parent = 0, Qt::WFlags flags = 0);\r
-       ~DeltaTimeJND();\r
+       public:\r
+               DeltaTimeJND(QWidget *parent = 0, Qt::WFlags flags = 0);\r
+               ~DeltaTimeJND();\r
+\r
+       private:\r
+               AnswerDeltaTime w;\r
 \r
-private:\r
-       Ui::DeltaTimeJNDClass ui;\r
+       private slots:\r
+       void startExperiment();\r
 };\r
 \r
 #endif // DELTATIMEJND_H\r
index 4830aeb6d32d0a58ab788d2d1eab365850426dab..fc2dc66ef0e77cf7ee2a88facceaf9eaa68b9cd8 100644 (file)
@@ -12,7 +12,7 @@
   </ItemGroup>\r
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{2AEA0C75-E45A-4992-9DB3-20CA8169F47F}</ProjectGuid>\r
-    <Keyword>Qt4VS</Keyword>\r
+    <Keyword>Qt4VSv1.0</Keyword>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />\r
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
   </PropertyGroup>\r
-  <ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <ClCompile>\r
+      <PreprocessorDefinitions>_USE_MATH_DEFINES;UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <Optimization>Disabled</Optimization>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Windows</SubSystem>\r
+      <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>\r
+      <AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <AdditionalDependencies>TactonPlayerd.lib;qtmaind.lib;QtCored4.lib;QtGuid4.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
   </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <ClCompile>\r
+      <PreprocessorDefinitions>_USE_MATH_DEFINES;UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <DebugInformationFormat>\r
+      </DebugInformationFormat>\r
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>Windows</SubSystem>\r
+      <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>\r
+      <AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>false</GenerateDebugInformation>\r
+      <AdditionalDependencies>TactonPlayer.lib;qtmain.lib;QtCore4.lib;QtGui4.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="AnswerDeltaTime.cpp" />\r
+    <ClCompile Include="DeltaTimeJND.cpp" />\r
+    <ClCompile Include="GeneratedFiles\Debug\moc_AnswerDeltaTime.cpp">\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
+    </ClCompile>\r
+    <ClCompile Include="GeneratedFiles\Debug\moc_DeltaTimeJND.cpp">\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
+    </ClCompile>\r
+    <ClCompile Include="GeneratedFiles\qrc_deltatimejnd.cpp">\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+      </PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+      </PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="GeneratedFiles\Release\moc_AnswerDeltaTime.cpp">\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
+    </ClCompile>\r
+    <ClCompile Include="GeneratedFiles\Release\moc_DeltaTimeJND.cpp">\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
+    </ClCompile>\r
+    <ClCompile Include="main.cpp" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <CustomBuild Include="DeltaTimeJND.h">\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>\r
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Moc%27ing DeltaTimeJND.h...</Message>\r
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_USE_MATH_DEFINES -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui"</Command>\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>\r
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Moc%27ing DeltaTimeJND.h...</Message>\r
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_USE_MATH_DEFINES -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui"</Command>\r
+    </CustomBuild>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <CustomBuild Include="deltatimejnd.ui">\r
+      <FileType>Document</FileType>\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>\r
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Uic%27ing %(Identity)...</Message>\r
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>\r
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Uic%27ing %(Identity)...</Message>\r
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>\r
+    </CustomBuild>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <CustomBuild Include="AnswerDeltaTime.h">\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>\r
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Moc%27ing AnswerDeltaTime.h...</Message>\r
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_USE_MATH_DEFINES -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui"</Command>\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>\r
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Moc%27ing AnswerDeltaTime.h...</Message>\r
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_USE_MATH_DEFINES -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB  "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui"</Command>\r
+    </CustomBuild>\r
+    <ClInclude Include="GeneratedFiles\ui_AnswerDeltaTime.h" />\r
+    <ClInclude Include="GeneratedFiles\ui_deltatimejnd.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <CustomBuild Include="deltatimejnd.qrc">\r
+      <FileType>Document</FileType>\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FullPath);%(AdditionalInputs)</AdditionalInputs>\r
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Rcc%27ing %(Identity)...</Message>\r
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)</Outputs>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp</Command>\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FullPath);%(AdditionalInputs)</AdditionalInputs>\r
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Rcc%27ing %(Identity)...</Message>\r
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)</Outputs>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp</Command>\r
+    </CustomBuild>\r
+  </ItemGroup>\r
   <ItemGroup>\r
+    <CustomBuild Include="AnswerDeltaTime.ui">\r
+      <FileType>Document</FileType>\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>\r
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Uic%27ing %(Identity)...</Message>\r
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>\r
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>\r
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Uic%27ing %(Identity)...</Message>\r
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command>\r
+    </CustomBuild>\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
+  <ProjectExtensions>\r
+    <VisualStudio>\r
+      <UserProperties UicDir=".\GeneratedFiles" MocDir=".\GeneratedFiles\$(ConfigurationName)" MocOptions="" RccDir=".\GeneratedFiles" lupdateOnBuild="0" lupdateOptions="" lreleaseOptions="" QtVersion_x0020_Win32="4.8.2" />\r
+    </VisualStudio>\r
+  </ProjectExtensions>\r
 </Project>
\ No newline at end of file
index 4cfb199ae0352536005bb6398f443650dd745ef2..b6f909a5efad481a4eea2f3f3d5aca084fe00650 100644 (file)
-<UI version="4.0" >\r
+<?xml version="1.0" encoding="UTF-8"?>\r
+<ui version="4.0">\r
  <class>DeltaTimeJNDClass</class>\r
- <widget class="QMainWindow" name="DeltaTimeJNDClass" >\r
-  <property name="objectName" >\r
-   <string notr="true">DeltaTimeJNDClass</string>\r
-  </property>\r
-  <property name="geometry" >\r
+ <widget class="QMainWindow" name="DeltaTimeJNDClass">\r
+  <property name="geometry">\r
    <rect>\r
-       <x>0</x>\r
-       <y>0</y>\r
-       <width>600</width>\r
-       <height>400</height>\r
+    <x>0</x>\r
+    <y>0</y>\r
+    <width>235</width>\r
+    <height>199</height>\r
    </rect>\r
   </property>\r
-  <property name="windowTitle" >\r
+  <property name="windowTitle">\r
    <string>DeltaTimeJND</string>\r
   </property>\r
-  <widget class="QMenuBar" name="menuBar" />\r
-  <widget class="QToolBar" name="mainToolBar" />\r
-  <widget class="QWidget" name="centralWidget" />\r
-  <widget class="QStatusBar" name="statusBar" />\r
+  <widget class="QWidget" name="centralWidget">\r
+   <layout class="QVBoxLayout" name="verticalLayout">\r
+    <item>\r
+     <layout class="QFormLayout" name="formLayout">\r
+      <item row="0" column="0">\r
+       <widget class="QLabel" name="userLabel">\r
+        <property name="text">\r
+         <string>User</string>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="0" column="1">\r
+       <widget class="QLineEdit" name="_user"/>\r
+      </item>\r
+      <item row="1" column="0">\r
+       <widget class="QLabel" name="frequencyLabel">\r
+        <property name="text">\r
+         <string>Frequency</string>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="1" column="1">\r
+       <widget class="QSpinBox" name="_frequency">\r
+        <property name="minimum">\r
+         <number>1</number>\r
+        </property>\r
+        <property name="maximum">\r
+         <number>500</number>\r
+        </property>\r
+        <property name="singleStep">\r
+         <number>50</number>\r
+        </property>\r
+        <property name="value">\r
+         <number>300</number>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="2" column="0">\r
+       <widget class="QLabel" name="startTimeGapLabel">\r
+        <property name="text">\r
+         <string>Start time gap</string>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="2" column="1">\r
+       <widget class="QSpinBox" name="_starttimegap">\r
+        <property name="maximum">\r
+         <number>10000</number>\r
+        </property>\r
+        <property name="singleStep">\r
+         <number>100</number>\r
+        </property>\r
+        <property name="value">\r
+         <number>200</number>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="3" column="0">\r
+       <widget class="QLabel" name="deltaLabel">\r
+        <property name="text">\r
+         <string>Delta</string>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="3" column="1">\r
+       <widget class="QDoubleSpinBox" name="_delta">\r
+        <property name="maximum">\r
+         <double>1.000000000000000</double>\r
+        </property>\r
+        <property name="singleStep">\r
+         <double>0.010000000000000</double>\r
+        </property>\r
+        <property name="value">\r
+         <double>0.100000000000000</double>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="4" column="0">\r
+       <widget class="QLabel" name="reversalsLabel">\r
+        <property name="text">\r
+         <string>Reversals</string>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="4" column="1">\r
+       <widget class="QSpinBox" name="_reversals">\r
+        <property name="minimum">\r
+         <number>1</number>\r
+        </property>\r
+        <property name="maximum">\r
+         <number>100</number>\r
+        </property>\r
+        <property name="value">\r
+         <number>10</number>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="5" column="0">\r
+       <widget class="QLabel" name="durationLabel">\r
+        <property name="text">\r
+         <string>Duration</string>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+      <item row="5" column="1">\r
+       <widget class="QSpinBox" name="_duration">\r
+        <property name="maximum">\r
+         <number>5000</number>\r
+        </property>\r
+        <property name="singleStep">\r
+         <number>100</number>\r
+        </property>\r
+        <property name="value">\r
+         <number>1000</number>\r
+        </property>\r
+       </widget>\r
+      </item>\r
+     </layout>\r
+    </item>\r
+    <item>\r
+     <widget class="QPushButton" name="_start">\r
+      <property name="text">\r
+       <string>Start</string>\r
+      </property>\r
+     </widget>\r
+    </item>\r
+   </layout>\r
+  </widget>\r
  </widget>\r
- <layoutDefault spacing="6" margin="11" />\r
- <pixmapfunction></pixmapfunction>\r
+ <layoutdefault spacing="6" margin="11"/>\r
  <resources>\r
-   <include location="deltatimejnd.qrc"/>\r
+  <include location="deltatimejnd.qrc"/>\r
  </resources>\r
  <connections/>\r
-</UI>\r
+</ui>\r
index 1d46c186466f6e47eee848a8454819a7cf1d4fb2..81432895d9a5ac9ea921c8ad8d6201e8802684b2 100644 (file)
@@ -7,8 +7,7 @@
 #include <cmath>\r
 \r
 AnswerLocationJND::AnswerLocationJND(QWidget *parent, Qt::WFlags flags)\r
-:QMainWindow(parent, flags),\r
-_logfile(NULL), _tactonPlayer("COM4"), _goodanswer(-1)\r
+:QMainWindow(parent, flags), _logfile(NULL), _tactonPlayer("COM4"), _goodanswer(-1)\r
 {\r
        //init the window\r
        setupUi(this);\r
@@ -29,6 +28,8 @@ AnswerLocationJND::~AnswerLocationJND()
 {\r
        if (_logfile)\r
                fclose(_logfile);\r
+       if (_logfile2)\r
+               fclose(_logfile2);\r
        //reset the wristband\r
        _tactonPlayer.stop();\r
 }\r
@@ -227,4 +228,4 @@ void AnswerLocationJND::runTrial()
 unsigned int AnswerLocationJND::testValue(unsigned int value, double db) const\r
 {\r
        return static_cast<unsigned int>(value / pow(10.0, db / 20.0));\r
-}
\ No newline at end of file
+}\r
index 560b55064c28bda0dfa214a00fbdf0a071b8e854..4bc7b035fa1163eb3fe051c44207bdd7d1a1b368 100644 (file)
          <double>0.010000000000000</double>\r
         </property>\r
         <property name="value">\r
-         <double>0.050000000000000</double>\r
+         <double>0.020000000000000</double>\r
         </property>\r
        </widget>\r
       </item>\r
index fb7a8084a13d60c38af6e621d64fdc0f6b62c752..f206d4adad5a351bb9a574faf0011d4b5dedf23d 100644 (file)
@@ -44,7 +44,7 @@
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
-      <PreprocessorDefinitions>UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_CORE_LIB;QT_GUI_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_CORE_LIB;QT_GUI_LIB;QT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <AdditionalIncludeDirectories>.\GeneratedFiles;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\qtmain;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <Optimization>Disabled</Optimization>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -61,7 +61,7 @@
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
-      <PreprocessorDefinitions>UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <AdditionalIncludeDirectories>.\GeneratedFiles;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\qtmain;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <DebugInformationFormat>\r
       </DebugInformationFormat>\r
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>\r
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Moc%27ing %(Identity)...</Message>\r
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>\r
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe"   -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB  "-I." "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I." "tactonsdetection.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"</Command>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(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.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I."</Command>\r
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>\r
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Moc%27ing %(Identity)...</Message>\r
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>\r
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\moc.exe"   -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB  "-I." "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I." "tactonsdetection.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"</Command>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(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.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I."</Command>\r
     </CustomBuild>\r
   </ItemGroup>\r
   <ItemGroup>\r
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>\r
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Moc%27ing %(Identity)...</Message>\r
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>\r
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB "-I." "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I."</Command>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(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.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I."</Command>\r
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>\r
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Moc%27ing %(Identity)...</Message>\r
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>\r
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(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 "-I." "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I."</Command>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(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.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I."</Command>\r
     </CustomBuild>\r
     <ClInclude Include="GeneratedFiles\ui_AnswerDetection.h" />\r
     <ClInclude Include="GeneratedFiles\ui_tactonsdetection.h" />\r
   </ImportGroup>\r
   <ProjectExtensions>\r
     <VisualStudio>\r
-      <UserProperties UicDir=".\GeneratedFiles" MocDir=".\GeneratedFiles\$(ConfigurationName)" MocOptions="" RccDir=".\GeneratedFiles" lupdateOnBuild="0" lupdateOptions="" lreleaseOptions="" QtVersion_x0020_Win32="4.7.3" />\r
+      <UserProperties UicDir=".\GeneratedFiles" MocDir=".\GeneratedFiles\$(ConfigurationName)" MocOptions="" RccDir=".\GeneratedFiles" lupdateOnBuild="0" lupdateOptions="" lreleaseOptions="" QtVersion_x0020_Win32="$(DefaultQtVersion)" />\r
     </VisualStudio>\r
   </ProjectExtensions>\r
 </Project>
\ No newline at end of file
index 1bd03a995dff8e53ba6026ba01a8357fed789b08..3dc0c7d67008faad72ce763969e5d492894000c7 100644 (file)
Binary files a/Tactons Experiment.sdf and b/Tactons Experiment.sdf differ
index ce529ed812e5dc97c4c61f1c60e7d6e3a40aa561..728a917a65b7dc51e3b5bdf8a8ba15ef84534976 100644 (file)
@@ -11,6 +11,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tactons Detection", "Tacton
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LocationsJND", "LocationsJND\LocationsJND.vcxproj", "{9B8D15C2-0F04-4BCE-A3A4-211FCAB1C503}"\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DeltaTimeJND", "DeltaTimeJND\DeltaTimeJND.vcxproj", "{2AEA0C75-E45A-4992-9DB3-20CA8169F47F}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AngularPosition", "AngularPosition\AngularPosition.vcxproj", "{002CBB10-B3C0-490E-BB15-02827293648A}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
@@ -37,6 +41,14 @@ Global
                {9B8D15C2-0F04-4BCE-A3A4-211FCAB1C503}.Debug|Win32.Build.0 = Debug|Win32\r
                {9B8D15C2-0F04-4BCE-A3A4-211FCAB1C503}.Release|Win32.ActiveCfg = Release|Win32\r
                {9B8D15C2-0F04-4BCE-A3A4-211FCAB1C503}.Release|Win32.Build.0 = Release|Win32\r
+               {2AEA0C75-E45A-4992-9DB3-20CA8169F47F}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {2AEA0C75-E45A-4992-9DB3-20CA8169F47F}.Debug|Win32.Build.0 = Debug|Win32\r
+               {2AEA0C75-E45A-4992-9DB3-20CA8169F47F}.Release|Win32.ActiveCfg = Release|Win32\r
+               {2AEA0C75-E45A-4992-9DB3-20CA8169F47F}.Release|Win32.Build.0 = Release|Win32\r
+               {002CBB10-B3C0-490E-BB15-02827293648A}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {002CBB10-B3C0-490E-BB15-02827293648A}.Debug|Win32.Build.0 = Debug|Win32\r
+               {002CBB10-B3C0-490E-BB15-02827293648A}.Release|Win32.ActiveCfg = Release|Win32\r
+               {002CBB10-B3C0-490E-BB15-02827293648A}.Release|Win32.Build.0 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
index 4086475ac6ca0d9a77394f761c6c88bf9c7a322b..25b1c948e10dba5f2c7fd0edec538b9f68d472f0 100644 (file)
Binary files a/Tactons Experiment.suo and b/Tactons Experiment.suo differ
index e26b635520552e0305d5fd3d1d02057d8f6ee053..ccde704e9713cc1471052a98e7488b2ccf88972a 100644 (file)
@@ -48,7 +48,7 @@
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
-      <PreprocessorDefinitions>UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_CORE_LIB;QT_GUI_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_CORE_LIB;QT_GUI_LIB;QT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <AdditionalIncludeDirectories>.\GeneratedFiles;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\qtmain;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <Optimization>Disabled</Optimization>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -65,7 +65,7 @@
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
-      <PreprocessorDefinitions>UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <AdditionalIncludeDirectories>.\GeneratedFiles;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\qtmain;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <DebugInformationFormat>\r
       </DebugInformationFormat>\r
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs)</AdditionalInputs>\r
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Moc%27ing %(Identity)...</Message>\r
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>\r
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB "-I." "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I."</Command>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(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.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I."</Command>\r
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath);%(AdditionalInputs)</AdditionalInputs>\r
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Moc%27ing %(Identity)...</Message>\r
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>\r
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(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 "-I." "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I."</Command>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(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.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I."</Command>\r
     </CustomBuild>\r
   </ItemGroup>\r
   <ItemGroup>\r
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>\r
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Moc%27ing %(Identity)...</Message>\r
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>\r
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB "-I." "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I."</Command>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(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.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I."</Command>\r
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>\r
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Moc%27ing %(Identity)...</Message>\r
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>\r
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(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 "-I." "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I."</Command>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(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.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I."</Command>\r
     </CustomBuild>\r
     <ClInclude Include="GeneratedFiles\ui_answerform.h" />\r
   </ItemGroup>\r
   </ImportGroup>\r
   <ProjectExtensions>\r
     <VisualStudio>\r
-      <UserProperties UicDir=".\GeneratedFiles" MocDir=".\GeneratedFiles\$(ConfigurationName)" MocOptions="" RccDir=".\GeneratedFiles" lupdateOnBuild="0" lupdateOptions="" lreleaseOptions="" QtVersion_x0020_Win32="4.7.3" />\r
+      <UserProperties UicDir=".\GeneratedFiles" MocDir=".\GeneratedFiles\$(ConfigurationName)" MocOptions="" RccDir=".\GeneratedFiles" lupdateOnBuild="0" lupdateOptions="" lreleaseOptions="" QtVersion_x0020_Win32="4.8.2" />\r
     </VisualStudio>\r
   </ProjectExtensions>\r
 </Project>
\ No newline at end of file
index f379766c94a83a43b626a3476cc05fb1d299fd17..a1a0709cbba4663ccefde63d3f8e567532894f87 100644 (file)
@@ -44,7 +44,7 @@
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
-      <PreprocessorDefinitions>UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_CORE_LIB;QT_GUI_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_CORE_LIB;QT_GUI_LIB;QT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <AdditionalIncludeDirectories>.\GeneratedFiles;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\qtmain;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <Optimization>Disabled</Optimization>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -61,7 +61,7 @@
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
-      <PreprocessorDefinitions>UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <AdditionalIncludeDirectories>.\GeneratedFiles;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\qtmain;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <DebugInformationFormat>\r
       </DebugInformationFormat>\r
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>\r
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Moc%27ing %(Identity)...</Message>\r
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>\r
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe"   -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB  "-I." "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I." "tactonspatterns.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"</Command>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(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.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I."</Command>\r
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>\r
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Moc%27ing %(Identity)...</Message>\r
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>\r
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\moc.exe"   -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB  "-I." "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I." "tactonspatterns.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"</Command>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(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.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I."</Command>\r
     </CustomBuild>\r
   </ItemGroup>\r
   <ItemGroup>\r
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>\r
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Moc%27ing %(Identity)...</Message>\r
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>\r
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB "-I." "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I."</Command>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(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.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I."</Command>\r
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>\r
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Moc%27ing %(Identity)...</Message>\r
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>\r
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(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 "-I." "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I." "-I." "-I." "-I."</Command>\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(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.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I."</Command>\r
     </CustomBuild>\r
     <ClInclude Include="GeneratedFiles\ui_AnswerPattern.h" />\r
     <ClInclude Include="GeneratedFiles\ui_tactonspatterns.h" />\r
   </ImportGroup>\r
   <ProjectExtensions>\r
     <VisualStudio>\r
-      <UserProperties UicDir=".\GeneratedFiles" MocDir=".\GeneratedFiles\$(ConfigurationName)" MocOptions="" RccDir=".\GeneratedFiles" lupdateOnBuild="0" lupdateOptions="" lreleaseOptions="" QtVersion_x0020_Win32="4.7.3" />\r
+      <UserProperties UicDir=".\GeneratedFiles" MocDir=".\GeneratedFiles\$(ConfigurationName)" MocOptions="" RccDir=".\GeneratedFiles" lupdateOnBuild="0" lupdateOptions="" lreleaseOptions="" QtVersion_x0020_Win32="4.8.2" />\r
     </VisualStudio>\r
   </ProjectExtensions>\r
 </Project>
\ No newline at end of file