small increment

git-svn-id: svn+ssh://thomaspietrzak.com/var/svn/rep@38 47cf9a05-e0a8-4ed5-9e9b-101a649bc004

diff --git a/Tactons Experiment.suo b/Tactons Experiment.suo
index 3e7a78110d13201880a35ba7a88bc766aea0dc3c..50cfefd0ad93432c6a3f05dd11cd8c59ae938f7d 100644 (file)
Binary files a/Tactons Experiment.suo and b/Tactons Experiment.suo differ

diff --git a/Tactons JND/answer3AFC.cpp b/Tactons JND/answer3AFC.cpp
index 88ec83acb0fb29bddeba3cc7732cfe226046cc58..13f7cda816717d7fd9a2bc14772e15881d682730 100644 (file)
--- a/Tactons JND/answer3AFC.cpp
+++ b/Tactons JND/answer3AFC.cpp
@@ -8,7 +8,7 @@
 \r
 Answer3AFC::Answer3AFC(QWidget *parent, Qt::WFlags flags)\r
 :QDialog(parent, flags),\r
-_logfile(NULL), _tactonPlayer("COM3"), _defaulttacton(0x0f, 100, 205, 100), \r
+_logfile(NULL), _tactonPlayer("COM3"), _defaulttacton(0x0f, 200, 250, 0xff), \r
 _currenttest(0.0), _goodanswer(-1), _block(0)\r
 {\r
        //init the window\r
@@ -121,6 +121,11 @@ void Answer3AFC::play()
        else if (_experiment == "Duration")\r
                t.setDuration(value);\r
        _tactonPlayer.play(t);\r
+       /*\r
+       char *debug = new char[512];\r
+       _tactonPlayer.debugRead(debug, 512);\r
+       qDebug() << debug;\r
+       delete []debug;*/\r
 \r
        _tplayed[tacton]++;\r
        toggleButtons();\r
@@ -277,5 +282,5 @@ void Answer3AFC::runTrial()
 \r
 unsigned int Answer3AFC::testValue(unsigned int value, double db) const\r
 {\r
-       return static_cast<unsigned int>(value / pow(10.0, db / 10.0));\r
+       return static_cast<unsigned int>(value / pow(10.0, db / 20.0));\r
 }
\ No newline at end of file