Quick edits

kennyhong · Jul 24, 2018 · e6db0c6 · e6db0c6
1 parent 01d789e
commit e6db0c6
Show file tree

Hide file tree

Showing 8 changed files with 583 additions and 21 deletions.
diff --git a/Study1/.sign/.manifest.tmp b/Study1/.sign/.manifest.tmp
@@ -1,5 +1,5 @@
 .DS_Store__DEL__2Xh813EhHFWVVOYxbBqSzq8DMNBPT1q/Y67Hjxi6WTE=
-app.js__DEL__dod9ZMd+Dk6HAOSgFylrUDcjfHOzXSkI8LDZuCDfJkQ=
+app.js__DEL__K56FrEXk2XRCHA8252TMAq6NDG8STiFSTobWxKlh6Xk=
 circle-helper.js__DEL__cq0mHRR3FpR6yRgzTacHH5yAR27ztNnArNc2uQI3vqQ=
 config.xml__DEL__mZQS12cMGmSoEmC1cZB+72ruz/mZOHO4SdZ+k24XWy4=
 css/style.css__DEL__0kK37rCgk1QwfY+VMAD+s7Ea30UI+/mFog2fjqfXFYY=
@@ -370,7 +370,7 @@ test_files/Documents/study.txt__DEL__Y6QUhicslxbOXw1/y3ME5uTrQThuCzzx3S70lyn+eQo
 test_files/Documents/studyP1.csv__DEL__QR3Wh+rWjtoAh6NohUvzcFZeNJLXnFbT7h8IP6TuRYk=
 test_files/Documents/studyP2.csv__DEL__DrGUJdwlgIA0u+iv+XJcWwlltKygDdBZdHhavaOs8/A=
 test_files/study.txt__DEL__Ub4rOjs/FtzfMNxnW8FUL75MS00P7WOWhEs8z1BxrG8=
-test_files/studyP1.csv__DEL__QR3Wh+rWjtoAh6NohUvzcFZeNJLXnFbT7h8IP6TuRYk=
+test_files/studyP1.csv__DEL__P9xfYx9wKMEf0B9WbqkxwZcJS3injV20Y8Z7365b+Kc=
 test_files/studyP2.csv__DEL__DrGUJdwlgIA0u+iv+XJcWwlltKygDdBZdHhavaOs8/A=
 test_files/untitled.sh__DEL__RVh24+j/by+hHNNsIt1coDVQYQU2/7us+uT08b3cti0=
-author-signature.xml__DEL__LBse4O1MOQvlB0vEfi8zkP8oHxmKSLH33gTChoy/Mis=
+author-signature.xml__DEL__tNvB42YzKSAJzJhlumTZCp9dAJi75Mb7liZC3WeQtcs=
diff --git a/Study1/.sign/author-signature.xml b/Study1/.sign/author-signature.xml
@@ -8,7 +8,7 @@
 </Reference>
 <Reference URI="app.js">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>dod9ZMd+Dk6HAOSgFylrUDcjfHOzXSkI8LDZuCDfJkQ=</DigestValue>
+<DigestValue>K56FrEXk2XRCHA8252TMAq6NDG8STiFSTobWxKlh6Xk=</DigestValue>
 </Reference>
 <Reference URI="circle-helper.js">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
@@ -1492,7 +1492,7 @@
 </Reference>
 <Reference URI="test_files%2FstudyP1.csv">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>QR3Wh+rWjtoAh6NohUvzcFZeNJLXnFbT7h8IP6TuRYk=</DigestValue>
+<DigestValue>P9xfYx9wKMEf0B9WbqkxwZcJS3injV20Y8Z7365b+Kc=</DigestValue>
 </Reference>
 <Reference URI="test_files%2FstudyP2.csv">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
@@ -1511,11 +1511,11 @@
 </Reference>
 </SignedInfo>
 <SignatureValue>
-Cs0lNutRyt3kfIDUvvfG74MIya3QBbinfDWv7V8jSFyzAyAnDd3Kv9vYqm68Cxjfz2yTbLRMhq87
-477lCDxoEGErhu8ETEQNL49mCMdWoi0bjkB12Gq6YhCSISoOJrTrjpTco2rdYQgLyXj3vUCuwl65
-n6xzJPqSLeEmc1bKgY7HpX4B+CzzF0h5UuIsMfVrqdPsJnM2cvXVaZvt+mQq7s0hQ1vxkoNg7H0V
-IR1jJVWph3VLlRjT03CPvB2aSIXjbvWrECeqvMIggLzDw8YE2uGSAu5uo6j5VoaJuw5w+11GzyXr
-XJpHnEtI/oitbrvIsAxi7Gx+lWkNzk7XPQuBbw==
+dzIQfkSbPopcp3iYcQBK7p7y1MRG7fYwk1aDWEyPGQBK1PSWdjipyH80e2o+N3MH4rLBF7MEaqkx
+/89tgGPyCcocpJ+vDStHocMMgWHCvnfQ8jgzasmz7thnZcc50HUrOgm4eEPRUE7deUlMmJnppmY6
++h7dbDf8HoVuXIP8czdrTXJOe8Oi5p0X8Zbbljnt5opIU10OkOaio50fXRZqVhOPFPdCfKnx8tpq
+HPyc3XwMzeTZJTN0oubu/bjsPp7XocuIUBqqtWf2kjUWp2xtRKvxKR95USqpfgdikY0DyPUFyDFN
+rMW8IngEipPrRhULrBKgYZTCYieynWqtUMdisA==
 </SignatureValue>
 <KeyInfo>
 <X509Data>

diff --git a/Study1/.sign/signature1.xml b/Study1/.sign/signature1.xml
@@ -8,11 +8,11 @@
 </Reference>
 <Reference URI="app.js">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>dod9ZMd+Dk6HAOSgFylrUDcjfHOzXSkI8LDZuCDfJkQ=</DigestValue>
+<DigestValue>K56FrEXk2XRCHA8252TMAq6NDG8STiFSTobWxKlh6Xk=</DigestValue>
 </Reference>
 <Reference URI="author-signature.xml">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>LBse4O1MOQvlB0vEfi8zkP8oHxmKSLH33gTChoy/Mis=</DigestValue>
+<DigestValue>tNvB42YzKSAJzJhlumTZCp9dAJi75Mb7liZC3WeQtcs=</DigestValue>
 </Reference>
 <Reference URI="circle-helper.js">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
@@ -1496,7 +1496,7 @@
 </Reference>
 <Reference URI="test_files%2FstudyP1.csv">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>QR3Wh+rWjtoAh6NohUvzcFZeNJLXnFbT7h8IP6TuRYk=</DigestValue>
+<DigestValue>P9xfYx9wKMEf0B9WbqkxwZcJS3injV20Y8Z7365b+Kc=</DigestValue>
 </Reference>
 <Reference URI="test_files%2FstudyP2.csv">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
@@ -1515,11 +1515,11 @@
 </Reference>
 </SignedInfo>
 <SignatureValue>
-NyfzcH+JxEkxAiSm/pBVS7jspYL0FwBnkwr9w2Yoa0SopyZ3V6/g+NS12MhzmperocClBhhyjhsR
-RN4OTuIItLSoVFd+isXsNo+u5dA/STjsX6DommNJxKZWleZkPkbOjF9eXtR90WhBlovaPv0Ofl7B
-TDqk0hJ+1SamGW7Qk7j/XciqnvNhMF+bMHmnbZxHKOrS1eZU/emOclp/tkw7EPTcgEqpu6yAWa2c
-62FZQpyvMP+qyznDatqidyYwhwi7+TfGasZCLkFqzfpENnMcgeCRAwdjnG1RcDQEfki0S4KPNmuc
-w1XKP6g33hBVLJDddMjPE7XNOWWbNewm6Q7leA==
+NWt3x4AFHjXN6A+/pm/0JLK+1Byqrr3tDLsvEG69K0WcWDIbx66f3hU0g1c9zX/LhW8I6xBRrFHP
+XLIqSUPeEpkPiLu72RB89I8XUF2IDSDnS4av73GH5fco9yZ6oTF1PgXD7E8T08XQcBoSVwODIKMv
+/sa160n4evTXwfsvljVr7pMQQe/8nkGC0jDe4Kvs/xmUvH2oEakjhWex7W8cR8GEobx+KwPkXQ8m
+T7xssWE3hXh+3UtTqFR4RkjWye5O+DIkxjH1oSc11Tq9IEoSb5fZcWMZtOD2lWddWgCTXUDxMzon
+LIT+ZOM1unddrzgMSvG3hTDARA0BeC3zZiIObQ==
 </SignatureValue>
 <KeyInfo>
 <X509Data>

diff --git a/Study1/Study1.wgt b/Study1/Study1.wgt
diff --git a/Study1/app.js b/Study1/app.js
@@ -104,7 +104,7 @@ function setupStudy() {
 							conditions[i] = condition;
 						}
 						console.log(conditions);
-						currCondition.innerHTML = "Motor: " + conditions[1].motorCondition + " tick(s) | E-F: " + conditions[trialSet].eyesFreeCondition;
+						currCondition.innerHTML = "Motor: " + conditions[1].motorCondition + " ticks | E-F: " + conditions[trialSet].eyesFreeCondition;
 					});
 				}
 
@@ -299,7 +299,7 @@ function toggleTrial() {
 		if (trialSet < conditions.length - 1) {
 			state.innerHTML = "Start";
 			trialSet++;
-			currCondition.innerHTML = "Motor: " + conditions[trialSet].motorCondition + " tick(s) | E-F: " + conditions[trialSet].eyesFreeCondition;
+			currCondition.innerHTML = "Motor: " + conditions[trialSet].motorCondition + " ticks | E-F: " + conditions[trialSet].eyesFreeCondition;
 			document.querySelector("#target-img").style.visibility = "hidden";
 			hideMenu();
 		} else {