From f6a165f65233e534f0e591a230310573c8556e5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Efe=20Ayd=C4=B1n?= <3feaydin@gmail.com> Date: Wed, 10 Jul 2019 13:35:04 +0300 Subject: [PATCH] Auto stash before merge of "efe" and "origin/yigit" --- .../compile/default-compile/inputFiles.lst | 6 ++--- robot/robot.py | 14 ++++++++++++ .../.idea/codeStyles/codeStyleConfig.xml | 5 +++++ server_side/.idea/encodings.xml | 4 ++++ server_side/.idea/misc.xml | 6 +++++ server_side/.idea/modules.xml | 9 ++++++++ server_side/.idea/vcs.xml | 6 +++++ server_side/api/app.py | 2 +- server_side/api/modules/SpotSelector.py | 6 ++--- server_side/api/modules/c.jpeg | Bin 42857 -> 121011 bytes .../api/modules/databases/locations.json | 21 ++++++++++++++++++ server_side/api/modules/smart_park.py | 9 +++----- .../data/mscoco_label_map.pbtxt | 2 +- 13 files changed, 76 insertions(+), 14 deletions(-) create mode 100644 robot/robot.py create mode 100644 server_side/.idea/codeStyles/codeStyleConfig.xml create mode 100644 server_side/.idea/encodings.xml create mode 100644 server_side/.idea/misc.xml create mode 100644 server_side/.idea/modules.xml create mode 100644 server_side/.idea/vcs.xml diff --git a/master_app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/master_app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 5252ff8..5ef5a6e 100644 --- a/master_app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/master_app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,3 +1,3 @@ -/home/yigit/projects/MyCity/master_app/src/main/java/me/yigitcolakoglu/master_app/Main.java -/home/yigit/projects/MyCity/master_app/src/main/java/me/yigitcolakoglu/master_app/managementForm.java -/home/yigit/projects/MyCity/master_app/src/main/java/me/yigitcolakoglu/master_app/cameraForm.java +/home/efeaydin/Masaüstü/MyCity/master_app/src/main/java/me/yigitcolakoglu/master_app/managementForm.java +/home/efeaydin/Masaüstü/MyCity/master_app/src/main/java/me/yigitcolakoglu/master_app/cameraForm.java +/home/efeaydin/Masaüstü/MyCity/master_app/src/main/java/me/yigitcolakoglu/master_app/Main.java diff --git a/robot/robot.py b/robot/robot.py new file mode 100644 index 0000000..1f1a13c --- /dev/null +++ b/robot/robot.py @@ -0,0 +1,14 @@ +import os + +path = '/home/robot/image/' + +prev_files = [] +files = [] +# r=root, d=directories, f = files +for r, d, f in os.walk(path): + for file in f: + if '.jpg' in file: + files.append(os.path.join(r, file)) + +for f in files: + print(f) diff --git a/server_side/.idea/codeStyles/codeStyleConfig.xml b/server_side/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..a55e7a1 --- /dev/null +++ b/server_side/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/server_side/.idea/encodings.xml b/server_side/.idea/encodings.xml new file mode 100644 index 0000000..15a15b2 --- /dev/null +++ b/server_side/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/server_side/.idea/misc.xml b/server_side/.idea/misc.xml new file mode 100644 index 0000000..fd2f27a --- /dev/null +++ b/server_side/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/server_side/.idea/modules.xml b/server_side/.idea/modules.xml new file mode 100644 index 0000000..b8f31b4 --- /dev/null +++ b/server_side/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/server_side/.idea/vcs.xml b/server_side/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/server_side/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/server_side/api/app.py b/server_side/api/app.py index e13659e..c727f77 100644 --- a/server_side/api/app.py +++ b/server_side/api/app.py @@ -2,7 +2,7 @@ from flask import Flask, send_from_directory from flask_restful import Api from flask_cors import CORS, cross_origin -from modules import user_info, voting_system, rating_system, denunciation, navigation, bus_stops, announcements, complaint, car_crash,smart_park +from modules import user_info, voting_system, rating_system, denunciation, navigation, bus_stops, announcements, complaint, car_crash, smart_park from modules import utility from modules import user_set diff --git a/server_side/api/modules/SpotSelector.py b/server_side/api/modules/SpotSelector.py index 2a96d08..04efefd 100644 --- a/server_side/api/modules/SpotSelector.py +++ b/server_side/api/modules/SpotSelector.py @@ -4,9 +4,9 @@ import json rects = [] -cam = cv2.VideoCapture(2) -ret,im = cam.read() -cam.release() +#cam = cv2.VideoCapture("http://192.168.43.246:4747/mjpegfeed") +#ret,im = cam.read() +im = cv2.imread("lot.jpg") if __name__ == '__main__' : while(True): diff --git a/server_side/api/modules/c.jpeg b/server_side/api/modules/c.jpeg index 8a02ec8d00213139536bb0190d88fe6354d9f5de..efa8b101a978ec5b1071d394cc57334b37fef7a3 100644 GIT binary patch literal 121011 zcmbTdbx>PT`z{*Xp|sHAUMxV1yGse~5~Nsx;8NV7NK@PjL5l|n9-J1J;z5g*;!<3S zbNIgBnR90DU-#Z8voqN;E9+VN^>^>b`NvhjGZiI}5&#Vi08oDV03JI5q_|iBj7|(R zCIC7q8U`uaV=sUn06@b+`!4|h8))blm{{02xOn&kPZuDc0npJfFwikEu&^*OpRNvi zIuF1k#d^-jD~tU?+Y*P#os2Im=^HMyTx}P*&g3x*zm-Qg9{$T$6qHo2S=rb*I0XcS zghfQfiVdzWEO?Gyul`(0cm*A7cLxUZhXF&@nMFFme9F3k}`pX~Q7J#A4*delDwxW9j~a zi7yP7OfKnLZ5JLhzs@namB%FhOBR7YuTTC%?Z3?a-w_M{|HbV85c|Kp76I}Atp5TJ z3k#1B4-b!!l<*0pB|BU)tEQKu8)~`^sm;)Dy@WHnvNmqajWaRk6wAs1h&5c*^;P#@q`Ktra9ZqvCb&QM z+UkD!hxq}xU(%Q;{dKyyb|$e2svc*-i}DlXcc{1)*Ab6)m9qFdi3@3!UsDS>pI9t_ zZ}#mqOqTnGZ1`-NP-%|;(wAPb1Rn=doH%8iQDI&T(@Cpvy_85mk2P#Fxg(mPriXOI z1$l=%+LDB&U)|rI(VLaC*Zd9q-S;|3ourGN_}#;Izq}KSYy4l)e_n;JF|-qI-bc!-!D^f?BK?FLMHKrZz$PRv z=&fps61616lc~}dlOE$6&5}9qCBUGU9!r1>V-%)z=lJWoXn@S~ZSB^xK$hcdi3X8|VxZ?k4x+Af%EeXo)wfS<_l`gYob67UmNw{%gm z_JvF*Mw6L#=?%h|lv_319RxEVAG|}NM?OhvKa}fj_hk`-milXPfICQ8ofQ%TR#BUP zgzCJ2@vE~Y62P1(i$>q#t8nnkpp|TeLt2V(9w$zyIK)xYR9`eobm1{zu!^=!AK78* z0vG_+vLB@f%e+wmtB`a6*h_UG_7r6u?cUGl6!X z$o=~1m$nQRndeG+*yqloQm>-Ud|40_EV)Cmp#8KU%<;w|3br@s_RoG219fO$ftw!z z+8^8=0m_SaKrji$)%OisZoc&swGas{Nezuy!vgu^>i)Cyx?c~sWe><|*JJDc=Z^q{ z(24)%(1ToP?Z!tGaK-ZKRfX_f;QQ{pL%8%GFy#0ptEqaqi1c42X?UrH)Q7gVs3m7< z{!8#yX?Dw*3q=6Q12QPi`BuVLgSmC?S+tWsAM(8XL zdwN3XAx}|r2q$BxCcsM&VOLc2zP+V~cjtTB4Z(-w(m!Llp3cRxc?QGu)3BY@;~$X- z-w4e{Q-3At?iAP#P1)T)sHn{v%M<62G@ZQeg?$aSDW@uW_uC3;ugkR`D(ek3p;pu% z-xq}G!tuIGq|zjIyx(nq&s&wIUMU}@OY=ZHpbo~jp@)B^UilvWkxB3E4Kn_E=XgNE zr!jnu+8ozn_f&f>rO|Z7ySD4TmBD;5Yn5WQ+%Y@;G2-(V#!E4ZN(3yl`3)>f> zr>6)+k!dU2qd^)PGV{@)YLha3MMa}zfQD2Z+fXuX^`cP>dgUikUzQ;*$ZSn)D#oCN zxj>4hJY}BS#!lgt9OmPsfMAvaD0_-E$bZxXhRGq2Su`pD!v?|R93-YZ)fAp~`I%y& z0B;Dt8jG$EzKpa$X329be*c>(bf+o2vRJ72wCxt-Oc}=G$UrOSD&CUIqy$_vC=bnSZ9t}$@ zWnbe+rjyD`cp;T;I@BCuzx&PsTf`srku0+h^Jd~D?K=S;&^oMzJnruX*E0~K^s