From c42d1244f590a761a17898347c17e74438ecd0d2 Mon Sep 17 00:00:00 2001 From: Thomas Pietrzak Date: Fri, 17 Jun 2011 21:51:40 +0000 Subject: [PATCH] small increment git-svn-id: svn+ssh://thomaspietrzak.com/var/svn/rep@38 47cf9a05-e0a8-4ed5-9e9b-101a649bc004 --- Tactons Experiment.suo | Bin 36864 -> 37888 bytes Tactons JND/answer3AFC.cpp | 9 +++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Tactons Experiment.suo b/Tactons Experiment.suo index 3e7a78110d13201880a35ba7a88bc766aea0dc3c..50cfefd0ad93432c6a3f05dd11cd8c59ae938f7d 100644 GIT binary patch delta 1977 zcmb7FeN0nV6uN-@r{IWIYV=i_(p z{oQlVxroD@_#QWMgX32dLf{ssiCcxrN|a)hT$IT`ATY^N!b+%IV;aoOTg2>q9Y;NI zS-y*xf>5d$h?bOgMDGsGV0RP~)DVGII!XrqrjvToL|!CzqCtBBu@Wa~z`rf%Sx5x* z{0$3%@XwTM(HDsVMpHWYBRupxb47kGSLUE^*0kRdBg&-h3H%=8=4uttK4*=LtdPP5 zrl;b9AvB~BK`aVFcyb!X(sG$GHjm@{VXQrVlBb)&HTN_u;8oyL^I%T;qwwF!>K`UM z)4`Z~o{Ms)64|}^7ic&|f`MeDFm)8oC0H?gnS1K&i~rAZp*&?j1~%tWSoZ@L@bsg= z4`7!(1~&IUutg77L0%B7#Wc-SF?P(s4y=`_b4m9}SYhgUj!M_r4UB$h<1>pDBs4AR`lwK&I2wqe`?w6ZWkYLZUevI|AhB?%6e zke5w`Y3n--Uq$&k1p5}h*FyUDq3;d+!k(o%*-gm-?=IbthLl=xGb@s636g3>a*clm z-g(wE`O4l)zb4dlpZ6U`VzKgOVngy^%=gJ~I4jASndWtY|KF~g_401i)i zIL*hs3PS9`?-}Qfl7VkA_+OpiqwYt#C-~Bk!Thi7$As#%pxs*;DK&r#1qWQO$$|r2 zP2h8BVYyQU(Zx!npoFoWH)$u5YKG(MpMXz#+ZdPb|1dZJ`H^aCm%PK8Re$}+U1hbA~{4=SV3p~ja)`sY%rg7Mb{uRTeo#()=- W=$`Y>t|gGNG8y{S!i*yDQGWrX{!1kQ delta 2110 zcmb_deN0nV6uyAQfLfXa+%H8~Xxv7KDI8>DoFhbfX~R zf{4)L{xe&}f0k@9hMUEh#n@?db0(8*U1roJ+hQ`eY>9s~*~cHSa|lzEruR?%gH$p-?LLai=s#|JJ8roJb*#m3CsyHgA;g7Y0!YvK- zXVj{wiceeZ#hE-Al#@eCu4@QU5wIC6n37o`2nR*hpEW1a5Cot4NcVkUZrX8iHvN1q ziJnu|(VYt+|6923zlXb+TnmwwC&mWX2dQu-oBg@rCQT)^7{o@zLOS}}aP4V%aCv;Z z4l6nSXT?@xmM#w=S=*JEWn?e!;PN)CM72D&)2)xq+=k3ukGFhz(kcI*0;HE5BJIS3 zauLFddLL#fW9iLoXZ{U=T{ZY9s0^2_XQ^|$gx7$r)Kyb%sgX_ga!Z*>mYtHxRwLU? zl4O${m6FTla+JLhvhM2gx4F8y+x^v{HkdN%Q@XoaeQsYc;?9Ke!eX!(Kcgy`H$M2E zJ=^IhQ?^*CgMaV?#70VS@70iUV!^viOvIj)%TSW>a$>3`Wbrv0N)lc+go9KP32f3% zc+{+e$($l)G3f;H=9BZ+AWzH&XNjJLNxrKJ-Bul>Tvj7`G5!XLF;7j@?)cyse8+|FMG-&$&) zAViPTr%;!n#HfO3QC8WprFZdp5+Nk@CU;w)*W=gM9PzgMx_a6@fjw@Izpvfb(d+BM zf@i0?unsQFs|+q@7DA{vEr)NHVSM{2g3H|VD3@7IMH!X2>1$N)Bfdf0;Ztb4i_d$D zGS`;|genW*_X^$Aei1HIHo{nO5lDtCP`1ZF**1~>jwXImd+gl6&vQ5BhC7$ei@YAI zcai7GZn6g((M#Icm8zk&5Zjiv0@+8}klKVByNv|c;BHFM`!L*ir2zE0T&6UJ#my2a zCVD&~Tk&3kNPf)N(LxM)*?_!>9QeT-X5kmYG{cIkdy_k%8c#zl=Ry9M2{!Ghhw)|$ zi@l@>;H#Bn(gXv~vW>1(x%&kCdK$+erz)W*CG@6Y}*^lTsS`bHr3 zVlKXzjxQ2s3+GdM2J$*=)Wql!rut7wHPNL!vLR^6g?&S6I*HD(5YMi`HFyWP^FbaC z?v0J?*WnBb-@R-G^H^u38|yq$peaX|4Uzma1V$R*nkYkJWLB)=M*NLI;#gdCEHM(J zaS?qlv?g(UoWiFOC&cP?Fgqo|rdl(sacOWd4Y*I7fG@`)5IJ=aV#CEMzVY6Ip}xLk y8I=hwX1-9Xtkh1N6A{m0EgO=W5jE^;M;CYw6`;TM@b1K`=*t7Mr3Pm3iu5mB$xDO) 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(value / pow(10.0, db / 10.0)); + return static_cast(value / pow(10.0, db / 20.0)); } \ No newline at end of file -- 2.30.2