From: Thomas Pietrzak <thomas.pietrzak@gmail.com>
Date: Fri, 17 Jun 2011 21:51:40 +0000 (+0000)
Subject: small increment
X-Git-Url: https://git.thomaspietrzak.com/?a=commitdiff_plain;h=c42d1244f590a761a17898347c17e74438ecd0d2;p=tactonexperiment.git

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