Skip to content

Commit

Permalink
Rotation Fix + Text fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@kennyhong
kennyhong committed Jul 24, 2018
1 parent 101d140 commit 01d789e
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 80 deletions.
16 changes: 5 additions & 11 deletions Study1/.sign/.manifest.tmp
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
.DS_Store__DEL__Y7dWAn2zAH0Vui8PG5//et0tqePIxUQWF5b8ANLcxDo=
RoundMenu.wgt__DEL__85UAc4pZlfbJn/sLuM3KpWIFleR6ArjfBsugYwzfq6M=
app.js__DEL__caGE88w8z2rU28bmgsmo6F7+04UNt9LgyZ1itJaampc=
.DS_Store__DEL__2Xh813EhHFWVVOYxbBqSzq8DMNBPT1q/Y67Hjxi6WTE=
app.js__DEL__dod9ZMd+Dk6HAOSgFylrUDcjfHOzXSkI8LDZuCDfJkQ=
circle-helper.js__DEL__cq0mHRR3FpR6yRgzTacHH5yAR27ztNnArNc2uQI3vqQ=
config.xml__DEL__mZQS12cMGmSoEmC1cZB+72ruz/mZOHO4SdZ+k24XWy4=
css/style.css__DEL__0kK37rCgk1QwfY+VMAD+s7Ea30UI+/mFog2fjqfXFYY=
icon.png__DEL__vPjxjOppORd6hn9Bw4sh06gqtDoJzoFbV/8e9FyIdvk=
icons/.DS_Store__DEL__2r9eDiYOa89G5xKk0FXZ8/PW12g2sFwkNmzcdA636zs=
icons/hierarchy.txt__DEL__f1xImraY3RBWYS8CnUayfIJbybmh3pXLRtHDK+aaqwU=
icons/images/.DS_Store__DEL__1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM=
icons/images/apple.png__DEL__z/CfcBcL2lLa12QWIdto4p1J6hgNGiHtB4wt+ue5T/s=
icons/images/artichoke.png__DEL__5DT9nlj8ju2wQB78KiABBv2D7ZhoGnQ9Ngv0z0fy5mE=
icons/images/banana.png__DEL__BOVHr9Yvn0v7oZo3SwEVMrXvCSfDRSXosAXHC9qaGMo=
Expand Down Expand Up @@ -367,16 +364,13 @@ lib/tau/wearable/theme/default/tau.min.template__DEL__pMbNqgPMw2Wi+7A6WpjsUttxF2
lib/tau/wearable/theme/default/tau.template__DEL__6G1+BW7cnojrMTmoZuo0V6ytOpdJfXfIOLJDBQh9x04=
lowBatteryCheck.js__DEL__+i5daekAbnIThj3rFOl0UxpMhcCvNBzIUCR5tkh0Flg=
test_files/.DS_Store__DEL__1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM=
test_files/Documents/participant1.csv__DEL__zt3HKDD1nIgyxitMzosjN9HK5LyKz6ljhepgsG8FEYg=
test_files/Documents/participant1_summary.csv__DEL__Gif1EjdVzziUbOPo6gocfyyFRe3d/SD0IiU6xluShTw=
test_files/Documents/participant1.csv__DEL__Xg4s5FTGxfRqssIafvHCyWJ4xIPuUv8l1oEd3kE/Lq0=
test_files/Documents/participant1_summary.csv__DEL__ZI/IhEO+rL+OqDm4iXDCAZZr4ea3h5GPlRrg9as++/A=
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/participant1.csv__DEL__P/Rx9t0sGqxJtif1U4Gbq0dM7sYKED7QaEdcl9X3Tp8=
test_files/participant1_summary.csv__DEL__M0xOfAfDO5v9X5LRm8HIgDXAak1BongCljVoUUob4oU=
test_files/participant2_summary.csv__DEL__rmm3lEVSHKeJUIEotDkeEQP27VgDGeT+DTUw4h3D2yk=
test_files/study.txt__DEL__Ub4rOjs/FtzfMNxnW8FUL75MS00P7WOWhEs8z1BxrG8=
test_files/studyP1.csv__DEL__QR3Wh+rWjtoAh6NohUvzcFZeNJLXnFbT7h8IP6TuRYk=
test_files/studyP2.csv__DEL__DrGUJdwlgIA0u+iv+XJcWwlltKygDdBZdHhavaOs8/A=
test_files/untitled.sh__DEL__RVh24+j/by+hHNNsIt1coDVQYQU2/7us+uT08b3cti0=
author-signature.xml__DEL__NfFDcOqtvMybdpiSMUxRjVjX1LUSXl2HlTQepqpV3uA=
author-signature.xml__DEL__LBse4O1MOQvlB0vEfi8zkP8oHxmKSLH33gTChoy/Mis=
42 changes: 9 additions & 33 deletions Study1/.sign/author-signature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,11 @@
<SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"></SignatureMethod>
<Reference URI=".DS_Store">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>Y7dWAn2zAH0Vui8PG5//et0tqePIxUQWF5b8ANLcxDo=</DigestValue>
</Reference>
<Reference URI="RoundMenu.wgt">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>85UAc4pZlfbJn/sLuM3KpWIFleR6ArjfBsugYwzfq6M=</DigestValue>
<DigestValue>2Xh813EhHFWVVOYxbBqSzq8DMNBPT1q/Y67Hjxi6WTE=</DigestValue>
</Reference>
<Reference URI="app.js">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>caGE88w8z2rU28bmgsmo6F7+04UNt9LgyZ1itJaampc=</DigestValue>
<DigestValue>dod9ZMd+Dk6HAOSgFylrUDcjfHOzXSkI8LDZuCDfJkQ=</DigestValue>
</Reference>
<Reference URI="circle-helper.js">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
Expand All @@ -30,18 +26,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>vPjxjOppORd6hn9Bw4sh06gqtDoJzoFbV/8e9FyIdvk=</DigestValue>
</Reference>
<Reference URI="icons%2F.DS_Store">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>2r9eDiYOa89G5xKk0FXZ8/PW12g2sFwkNmzcdA636zs=</DigestValue>
</Reference>
<Reference URI="icons%2Fhierarchy.txt">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>f1xImraY3RBWYS8CnUayfIJbybmh3pXLRtHDK+aaqwU=</DigestValue>
</Reference>
<Reference URI="icons%2Fimages%2F.DS_Store">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM=</DigestValue>
</Reference>
<Reference URI="icons%2Fimages%2Fapple.png">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>z/CfcBcL2lLa12QWIdto4p1J6hgNGiHtB4wt+ue5T/s=</DigestValue>
Expand Down Expand Up @@ -1480,11 +1468,11 @@
</Reference>
<Reference URI="test_files%2FDocuments%2Fparticipant1.csv">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>zt3HKDD1nIgyxitMzosjN9HK5LyKz6ljhepgsG8FEYg=</DigestValue>
<DigestValue>Xg4s5FTGxfRqssIafvHCyWJ4xIPuUv8l1oEd3kE/Lq0=</DigestValue>
</Reference>
<Reference URI="test_files%2FDocuments%2Fparticipant1_summary.csv">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>Gif1EjdVzziUbOPo6gocfyyFRe3d/SD0IiU6xluShTw=</DigestValue>
<DigestValue>ZI/IhEO+rL+OqDm4iXDCAZZr4ea3h5GPlRrg9as++/A=</DigestValue>
</Reference>
<Reference URI="test_files%2FDocuments%2Fstudy.txt">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
Expand All @@ -1498,18 +1486,6 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>DrGUJdwlgIA0u+iv+XJcWwlltKygDdBZdHhavaOs8/A=</DigestValue>
</Reference>
<Reference URI="test_files%2Fparticipant1.csv">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>P/Rx9t0sGqxJtif1U4Gbq0dM7sYKED7QaEdcl9X3Tp8=</DigestValue>
</Reference>
<Reference URI="test_files%2Fparticipant1_summary.csv">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>M0xOfAfDO5v9X5LRm8HIgDXAak1BongCljVoUUob4oU=</DigestValue>
</Reference>
<Reference URI="test_files%2Fparticipant2_summary.csv">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>rmm3lEVSHKeJUIEotDkeEQP27VgDGeT+DTUw4h3D2yk=</DigestValue>
</Reference>
<Reference URI="test_files%2Fstudy.txt">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>Ub4rOjs/FtzfMNxnW8FUL75MS00P7WOWhEs8z1BxrG8=</DigestValue>
Expand All @@ -1535,11 +1511,11 @@
</Reference>
</SignedInfo>
<SignatureValue>
ChoOlp1Tj+PZ8exW4Lds/Z+6UB5fWRAcr38Xi6KGe7yoMW7qtmPqjlk69aqYYat+M5C2pRfWkA+G
By0MlyL2ixbosDq7y81O4I/JQ/uYeagIfG+PFrW+5Gkt+15kqZAkYiN86nuUw1cZMyC4TnZvGtex
6Y4hcP4F1Axavz/Ja5DJegDgyw1USSgbzR9wBNYbdfLaat8T1tRCuUH4QLVJh/xXOYCgZOSK13Bz
/HRwMkGoMqoU7M+WAZXo/+WYoiKP+rk0QqjpOhm3LRpYPoCb+EoVDV7MY24DvJlbSFU0ucrJ1eYm
oiPtbfU0i/EBofNPSPlLcEUPHmg7y/L9vB4EMw==
Cs0lNutRyt3kfIDUvvfG74MIya3QBbinfDWv7V8jSFyzAyAnDd3Kv9vYqm68Cxjfz2yTbLRMhq87
477lCDxoEGErhu8ETEQNL49mCMdWoi0bjkB12Gq6YhCSISoOJrTrjpTco2rdYQgLyXj3vUCuwl65
n6xzJPqSLeEmc1bKgY7HpX4B+CzzF0h5UuIsMfVrqdPsJnM2cvXVaZvt+mQq7s0hQ1vxkoNg7H0V
IR1jJVWph3VLlRjT03CPvB2aSIXjbvWrECeqvMIggLzDw8YE2uGSAu5uo6j5VoaJuw5w+11GzyXr
XJpHnEtI/oitbrvIsAxi7Gx+lWkNzk7XPQuBbw==
</SignatureValue>
<KeyInfo>
<X509Data>
Expand Down
44 changes: 10 additions & 34 deletions Study1/.sign/signature1.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,15 @@
<SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"></SignatureMethod>
<Reference URI=".DS_Store">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>Y7dWAn2zAH0Vui8PG5//et0tqePIxUQWF5b8ANLcxDo=</DigestValue>
</Reference>
<Reference URI="RoundMenu.wgt">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>85UAc4pZlfbJn/sLuM3KpWIFleR6ArjfBsugYwzfq6M=</DigestValue>
<DigestValue>2Xh813EhHFWVVOYxbBqSzq8DMNBPT1q/Y67Hjxi6WTE=</DigestValue>
</Reference>
<Reference URI="app.js">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>caGE88w8z2rU28bmgsmo6F7+04UNt9LgyZ1itJaampc=</DigestValue>
<DigestValue>dod9ZMd+Dk6HAOSgFylrUDcjfHOzXSkI8LDZuCDfJkQ=</DigestValue>
</Reference>
<Reference URI="author-signature.xml">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>NfFDcOqtvMybdpiSMUxRjVjX1LUSXl2HlTQepqpV3uA=</DigestValue>
<DigestValue>LBse4O1MOQvlB0vEfi8zkP8oHxmKSLH33gTChoy/Mis=</DigestValue>
</Reference>
<Reference URI="circle-helper.js">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
Expand All @@ -34,18 +30,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>vPjxjOppORd6hn9Bw4sh06gqtDoJzoFbV/8e9FyIdvk=</DigestValue>
</Reference>
<Reference URI="icons%2F.DS_Store">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>2r9eDiYOa89G5xKk0FXZ8/PW12g2sFwkNmzcdA636zs=</DigestValue>
</Reference>
<Reference URI="icons%2Fhierarchy.txt">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>f1xImraY3RBWYS8CnUayfIJbybmh3pXLRtHDK+aaqwU=</DigestValue>
</Reference>
<Reference URI="icons%2Fimages%2F.DS_Store">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM=</DigestValue>
</Reference>
<Reference URI="icons%2Fimages%2Fapple.png">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>z/CfcBcL2lLa12QWIdto4p1J6hgNGiHtB4wt+ue5T/s=</DigestValue>
Expand Down Expand Up @@ -1484,11 +1472,11 @@
</Reference>
<Reference URI="test_files%2FDocuments%2Fparticipant1.csv">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>zt3HKDD1nIgyxitMzosjN9HK5LyKz6ljhepgsG8FEYg=</DigestValue>
<DigestValue>Xg4s5FTGxfRqssIafvHCyWJ4xIPuUv8l1oEd3kE/Lq0=</DigestValue>
</Reference>
<Reference URI="test_files%2FDocuments%2Fparticipant1_summary.csv">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>Gif1EjdVzziUbOPo6gocfyyFRe3d/SD0IiU6xluShTw=</DigestValue>
<DigestValue>ZI/IhEO+rL+OqDm4iXDCAZZr4ea3h5GPlRrg9as++/A=</DigestValue>
</Reference>
<Reference URI="test_files%2FDocuments%2Fstudy.txt">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
Expand All @@ -1502,18 +1490,6 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>DrGUJdwlgIA0u+iv+XJcWwlltKygDdBZdHhavaOs8/A=</DigestValue>
</Reference>
<Reference URI="test_files%2Fparticipant1.csv">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>P/Rx9t0sGqxJtif1U4Gbq0dM7sYKED7QaEdcl9X3Tp8=</DigestValue>
</Reference>
<Reference URI="test_files%2Fparticipant1_summary.csv">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>M0xOfAfDO5v9X5LRm8HIgDXAak1BongCljVoUUob4oU=</DigestValue>
</Reference>
<Reference URI="test_files%2Fparticipant2_summary.csv">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>rmm3lEVSHKeJUIEotDkeEQP27VgDGeT+DTUw4h3D2yk=</DigestValue>
</Reference>
<Reference URI="test_files%2Fstudy.txt">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
<DigestValue>Ub4rOjs/FtzfMNxnW8FUL75MS00P7WOWhEs8z1BxrG8=</DigestValue>
Expand All @@ -1539,11 +1515,11 @@
</Reference>
</SignedInfo>
<SignatureValue>
OdZe/G7HabkxsNPbq92Cwj4qqdZCVoCbVoYgeLCGByinpI3hVLXh0SJvF61faP1GIL31RffEHWY9
M5tNtAxi8Mj4iQDfFgl5itQEEsY3OTRZzh89LAOqn+F74hODBavHzW1cMyryQTRakh8J0FCRSlAU
b9T00Mw6Ak7olAP7QwUjVHbxES1XQhvTVv8q/03JfDWIQ/60KwhGBJFzY+hleWnlLQGYuNZNXpyi
Y+2kSj471yl0JgONvJNrVWhBF2n32I4Wdg19+2g59CmVodt0tgXfsCAcjvnYUxc9OCyUNyCIAAvj
q1CP1tzQmpa99GwNQMsigvzrueFmXUCw5CxCNQ==
NyfzcH+JxEkxAiSm/pBVS7jspYL0FwBnkwr9w2Yoa0SopyZ3V6/g+NS12MhzmperocClBhhyjhsR
RN4OTuIItLSoVFd+isXsNo+u5dA/STjsX6DommNJxKZWleZkPkbOjF9eXtR90WhBlovaPv0Ofl7B
TDqk0hJ+1SamGW7Qk7j/XciqnvNhMF+bMHmnbZxHKOrS1eZU/emOclp/tkw7EPTcgEqpu6yAWa2c
62FZQpyvMP+qyznDatqidyYwhwi7+TfGasZCLkFqzfpENnMcgeCRAwdjnG1RcDQEfki0S4KPNmuc
w1XKP6g33hBVLJDddMjPE7XNOWWbNewm6Q7leA==
</SignatureValue>
<KeyInfo>
<X509Data>
Expand Down
Binary file added Study1/Study1.wgt
View file
Binary file not shown.
6 changes: 4 additions & 2 deletions Study1/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ function setupStudy() {
conditions[i] = condition;
}
console.log(conditions);
currCondition.innerHTML = "Motor: " + conditions[1].motorCondition + " tick(s)";
currCondition.innerHTML = "Motor: " + conditions[1].motorCondition + " tick(s) | E-F: " + conditions[trialSet].eyesFreeCondition;
});
}

Expand Down Expand Up @@ -288,6 +288,7 @@ function toggleTrial() {
loadTarget();
motorRotationCount = 0;
document.querySelector("#ss_menu").style.visibility = "visible";
highLight(rotationCount, ss_menus);
if (conditions[trialSet].eyesFreeCondition === "true") {
$('#ss_menu').hide();
timeoutHandler = setTimeout(function () {$('#ss_menu').show()}, 1000);
Expand All @@ -298,7 +299,7 @@ function toggleTrial() {
if (trialSet < conditions.length - 1) {
state.innerHTML = "Start";
trialSet++;
currCondition.innerHTML = "Motor: " + conditions[trialSet].motorCondition;
currCondition.innerHTML = "Motor: " + conditions[trialSet].motorCondition + " tick(s) | E-F: " + conditions[trialSet].eyesFreeCondition;
document.querySelector("#target-img").style.visibility = "hidden";
hideMenu();
} else {
Expand Down Expand Up @@ -498,6 +499,7 @@ function iterateTarget() {
}
removeHighlight();
rotationCount = 0;
highLight(rotationCount, ss_menus);
}

function shuffleTargets() {
Expand Down

0 comments on commit 01d789e

Please sign in to comment.