From 3e28b0d1f087204a4924f096f8b0bda1a92e1ed7 Mon Sep 17 00:00:00 2001 From: bigJIU <1572204178@qq.com> Date: Thu, 3 Nov 2022 20:03:04 +0800 Subject: [PATCH] update csv --- .idea/workspace.xml | 9 +++---- IDManager.py | 4 ++++ __pycache__/IDManager.cpython-39.pyc | Bin 0 -> 448 bytes __pycache__/main.cpython-39.pyc | Bin 2548 -> 2678 bytes data/questionare.csv | 7 ++++++ data/questionare.xlsx | Bin 4933 -> 4979 bytes main.py | 34 ++++++++++++++++----------- templates/GameAnnotation.html | 2 +- templates/GamePlay.html | 8 ++++--- templates/data.js | 16 ++++++++++++- 10 files changed, 57 insertions(+), 23 deletions(-) create mode 100644 IDManager.py create mode 100644 __pycache__/IDManager.cpython-39.pyc create mode 100644 data/questionare.csv diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 78ec5ac..b9f8f82 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,11 +2,12 @@ + + - + - @@ -124,6 +125,6 @@ - + \ No newline at end of file diff --git a/IDManager.py b/IDManager.py new file mode 100644 index 0000000..6ad892d --- /dev/null +++ b/IDManager.py @@ -0,0 +1,4 @@ +class idManager(): + + def getLevels(self,ip): + return ["test1","test2"] diff --git a/__pycache__/IDManager.cpython-39.pyc b/__pycache__/IDManager.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..414d365413e5b329a599cb029224a79f0a62ba94 GIT binary patch literal 448 zcmY*UO-lnY5KXeJY>U09XYsn1f*wV*P(cK{2vUS45Yo-KuIzSeva9IT{+a%zT>S~& zJUPkQS_j^nkK{3LBDgonroU&2|LXj1XoI>53?#=o0b45~A20iGmd8|AJvR zLYM<2APH3@VTvlYBuStG)O2hwR}(px8R*n~Ux%w5#t0K4Ia%h{#7VaXQy;hKWJMxo zI|hme%kqVGB2V8J<5NC0pbb}ze60AbuAU&R4S$81$!j<&Weqx)h2aya^XeXE{QC0O z%y98$dl}R>@B)Q#ryFmNzVB}g4>#{I9uf*Mmn8^c`$CkJY6@5H3h~^?qJ7ajYjb}# hb=S=(l7n9oGT+A$^?B>BKh6nkc-F2scd9Q0`2oJ`U?Bhi literal 0 HcmV?d00001 diff --git a/__pycache__/main.cpython-39.pyc b/__pycache__/main.cpython-39.pyc index 1a933382e1c743ec64f7721d5c6aa1a1c4423948..f9deae6a0dc34fb1292791862626ef74f6339d8b 100644 GIT binary patch delta 1369 zcmZ8g&2Jk;6rY*>@b3B}PW+kL4Q@$8tO`S=LXlE&fCz*{Lj_3CRi$Xi4DheW^X|aK?ZE51D^CbD!h42t{Q01}Dr2&B*et$oB0h=jS5FcOut!Ig^(3 zzyxb9{Jb<~%rAiL7a`}D!0}gPeo+Q@$-#sCb2j7ts>~mip#ViF4Fs&r1(adBs$FY3 zcnyOqP}N99BQ-?o(9lR#BTYos;hIKjI$;Zn1FqAx;kw4_8sE6WUxALs8*l?|K4*Rt zUWHAZ*QK`uw~obkT(x0K=J&7R5v?V|&hkes*n-#Q92wxBvF`Q@qHV9sGj|9Nf>AJ# zDt*8o)v6FA!5d$l$~YO0M}d;Peteex!hhrC^qJV13f$)4cppdn7)`>CIPhbkzQmQd zpl{=XCuU+z_=GKN5X;Ni_;)s!d|=K5XG!j*e}-ixPT~UY0edcHSRybiGq?Rjr!-Afn{e7`A)*%T;(ye>nRJT%#LJoIEKtT7^_GX338vPVIudj zpKRqn4L%H#!^{}SB(qM`aFi$;gH?`liOg0qJ`Iyh3{O-Eq4X28(Wv1fE}&t;<2JX& zrdQ%>Bb}Sa#V+}XBqmfRwXBY2%*1caSREG$TOcD#jw}h_*s+)k?A6$NTKo`Od5Ep_ z4wERvpW{()p*)je+%+;|2oX{tlaDo`C~H?Jszlu&Lls_{6l zaZ@XOY+bkL^4v{V?XSfPGyTzSx2QhVLX+8NL5M2IoH#g>9}Gj8{%+r^?Vu~xR}Ql| z+~ZZQw$pa*S^jFL+Drqhk^Y)1Rdy+w)Iw)tw4u7`AGx1-Fa5!JcX|u)J&Mrz_!_~f@Kgl1yQaE>2{VIKVQYb?%(nju^o%V?C^g8QC}p- delta 1225 zcmYjQ&u<$=6rP#=HM{n%lQ@Z!;?R~fDQ=_|kf2Z`1S-EIXjB0bVlUR>H+9|YI?3#$ z#K@5=B?qJ`QqhPThxiB*oVjq~FW`puKkyxK;=r3xiL$GC`{vs>-@Ny|nSU1lZYEhA zM+BcAPkOy}_4ZWP7A-Vy zp(R|t3@wW+SY!o}Rk&o4rX_p<;y$%>ZCJDTqQzf4$1lSbi!Z@dcM8Y@AZ8nSM?>n=>QOc86Bs2Zue8f4M7nbdP?uyabubZtWk4 zQVn*8nG`n<^YT#tN&ldU{(-$cadBOM<1UW!S2T(|qCj_;{24uVWaiEhRj%@m=@A>V zGk=PTx5$yBg0XXq86d{T4zMwuI_EQIOwLg6=|#-5n12zQKwv?B4o0TJ|Ecl&oW^XV zYN`(57+ZD9jCE@qCMKac_y81_apQ*GsBeNk}} zw3mn3NY)VS#CqRZnMgxWH7@9NKT{8pQK);_;b*(wRNkH(3{@JGLfsX4UOD)y;$`+& zd^pI3^l`m3dUo8(m!dq#RmBE-l_yMF(u>TW4u(P|Cf=F`dipOXzTQNqY@;D8qCWK* zr*+C{LKp4JtuNR0zs^p)X<|*zgvkx9+$*<@3#*%_8tt|?S(wev;tIx@C&H%OZAnP`s2l#9`h z+|o~i-{>p)E&k5ChV&B?Vfp9+z6mng%_`pQ7TI9f?S6p=-vjaWLBF#qZ((>E?2YV2 z(BFlxfBdpR>H_n8A8&){s5JUkp4>f9LK>Cix-lEZ7!{=1PTnxa2x7OBcXT7#dgC>m jV@Ft<)tO6O<~o?PJ4d4h^Tpxe@G(h_BjnulkkkJF#e5FW diff --git a/data/questionare.csv b/data/questionare.csv new file mode 100644 index 0000000..5c9e176 --- /dev/null +++ b/data/questionare.csv @@ -0,0 +1,7 @@ +127.0.0.1,D,A,D +127.0.0.1,A,B,D +127.0.0.1,A,B,D +127.0.0.1,D,A,A +127.0.0.1,A,A,B +127.0.0.1,C,A,A +127.0.0.1,D,A,B diff --git a/data/questionare.xlsx b/data/questionare.xlsx index 4641c76cbf2eea5c13f67c71ef1df6e4c2bc0564..592d27fae2720d8dab53262a9f4b92dc16adca97 100644 GIT binary patch delta 750 zcmX@A_F0W5z?+#xgn@y9gCTnAM4q)w(Nj0>c4h=po0z!R_@bvKho)cjbKA_wz~Ih0 zS%O2Ze(sdS{MiNqZU4C*u^(yKP`ZjivnA|yyJzg;()n`>SXP^*eM`;xUzffLgnPDJ%3f>{l;wBEkFDbQ z>?tXg)Apu!bsMhrj;}T-U3p&PCLNX1FANPYgug7Stq%Xex4uHi;Pz?@$GRKMEy_;M-K}>tUpt@oQFyA+ z^NZYfJpA^{Z(!D3{iV+N+`iwwF*{}y%)S0Gb$4~WT*~(Yx^K4pQL~a+^~HHs$%W6G zkGR{`w}>B0n!5k@>s|FvPrSbL!qV_uN~~P$2G!k5L>F6cx0PDOeTygCa4OHqrqee* zy52oV3yz5Y1;bdZPFuw%HQ)R#~&2o_W39_BO+KpO)byKz_3ud$tf}1{H(3s z{GFDa7uAHSq$aJ+yL9Bw&N+5&wm&=aUOFmgm7Zj)dU0S!&$&(4rKTU*D{%UDaWPrFV8Q^PRh^E)~m?P3GilQ5@CQP(d1C$*N=Ct1uFgxG(ZYP^Sj9x bg)~97{Q+8fnSb&@e$mPL!UAmaf*@r8K&UVk delta 710 zcmeyYc2tcgz?+#xgn@y9gW+1oM4q)w*E%-tc4h=po0z!R_^x#%haTfuEZxe;z_6Bi zvIK`*ed*-eeuoWs+TxdzH)!oG=NvJpEFH?u4M-&)02K=(?~()c?_s zY1xX|)0Qv%mh$Aku0gVOhU(Ke>@m)+hZGXJ<0z`S%% z^zsQ(S?a#Bks8Kk(*EI|FF20OZn+kFM6l~Eo5&l1t_@qvx0^nDU~dfNa1zcy3(b-nAem*?1xCwZ?~^LJH7anzdq~Rp6S+-8S?6r1AYAG&;J>4dDHnn0yeKd+p(Pgeda^= z|CjDR0&nbH6T4)=64yr;TU@`DvpDrE;}kr5=$e95?K!PoehIa1i^HXwMPeU4->`e( zPk!Wx+x(StE)y`$CQspc4x~2M@>YYQaPlv{#~|)~ejhMbSI`C|nk{GxqE-poqsQ-e zK?{(Kp^yyY?#X^aG9XTlkW76P4+BGdQEE=Hz8;7S@MdHZVSuHYz1(hZCU_`sUu fizc%RD}tP&B`m|Vlz;Mje$mOX!UAj`1whIH0aqLM diff --git a/main.py b/main.py index d21248c..15d3a82 100644 --- a/main.py +++ b/main.py @@ -1,14 +1,16 @@ import os -from pyExcel import ExcelWork +import csv +from IDManager import idManager from flask import Flask, render_template, request, redirect, url_for app = Flask(__name__, static_folder='') +idm = idManager() replayDataPath = "reps/" evalDataPath = "evals/" -questionarePath = "data/questionare.xlsx" +questionarePath = "data/questionare.csv" @app.route('/annotation') @@ -22,15 +24,16 @@ def gamepreplay(): result = request.form ip = request.remote_addr # Save the result to questionare - excel = ExcelWork(questionarePath) - questionareLine = excel.getMaxRow()+1 - print(questionareLine) - excel.setCell(questionareLine,1,ip) - excel.setCell(questionareLine, 2, result.get("gamestyle")) - excel.setCell(questionareLine, 3, result.get("frequency")) - excel.setCell(questionareLine, 4, result.get("age")) - excel.saveFile() - print(questionareLine) + write_csv(questionarePath,[ip,result.get("gamestyle"),result.get("frequency"),result.get("age")]) + # excel = ExcelWork(questionarePath) + # questionareLine = excel.getMaxRow()+1 + # print(questionareLine) + # excel.setCell(questionareLine,1,ip) + # excel.setCell(questionareLine, 2, result.get("gamestyle")) + # excel.setCell(questionareLine, 3, result.get("frequency")) + # excel.setCell(questionareLine, 4, result.get("age")) + # excel.saveFile() + # print(questionareLine) print(result.get("gamestyle")) return redirect(url_for('gameplay', id=ip)) @@ -42,8 +45,8 @@ def gamequestion(): @app.route('/gameplay/') def gameplay(id): - print(id) - return render_template('GamePlay.html') + gamelevels = idm.getLevels(id) + return render_template('GamePlay.html',gamelevels = gamelevels) @app.route('/annotation/') @@ -78,7 +81,10 @@ def saveFile(path, filename, content): f = open(file_path, "w", encoding="utf8") f.write(content) f.close() - +def write_csv(path, data): + with open(path,'a+') as f: + csv_write = csv.writer(f) + csv_write.writerow(data) if __name__ == '__main__': app.debug = True diff --git a/templates/GameAnnotation.html b/templates/GameAnnotation.html index 1415fde..6c65df7 100644 --- a/templates/GameAnnotation.html +++ b/templates/GameAnnotation.html @@ -234,7 +234,7 @@
-

Level A Review

+

Level B Review

Drag Picture To Move

diff --git a/templates/GamePlay.html b/templates/GamePlay.html index e0415ca..93e9218 100644 --- a/templates/GamePlay.html +++ b/templates/GamePlay.html @@ -207,13 +207,15 @@ return element; }*/ var divElement = document.getElementById("GameWindow"); + var level1 = "test1"; + var level2 = "test2"; cheerpjCreateDisplay(500,500,divElement); cheerpjRunMain("Play", "/app/Mario-AI-Interface.jar", "0", "f_l"); console.log("Cheerpj Initialize Succeed!"); - - PlayLevel("test1", "test1") + + PlayLevel(level1, level1) .then(function (){alert("Game Over!")}) - .then(PlayLevel("test2", "test2") + .then(PlayLevel(level2, level2) .then(function (){ alert("Go to Evaluation Window") window.location.href = "/annotation" diff --git a/templates/data.js b/templates/data.js index d9edaa5..e1f1a47 100644 --- a/templates/data.js +++ b/templates/data.js @@ -63,4 +63,18 @@ function PlayLevel(group, level){ // var addressID = $("input[name='sex']:checked").val(); // alert(addressID) -} \ No newline at end of file + } + + function getLevels(){ + var gameLevelstr = "{{gamelevels}}"; + var levels = gameLevelstr.split(",") + levels.replace("'","") + gameLevels.replace("[","") + gameLevels.replace("]","") + + console.log(levels); + console.log(levels[0]); + var level1 = "test1"; + var level2 = "test2"; + return 0; + } \ No newline at end of file