Code Review
/
ealt-edge.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Updated pvcs model"
[ealt-edge.git]
/
example-apps
/
ROBO
/
aPaaS
/
Obj_Detection_service
/
detection
/
obj_detection_service.py
diff --git
a/example-apps/ROBO/aPaaS/Obj_Detection_service/detection/obj_detection_service.py
b/example-apps/ROBO/aPaaS/Obj_Detection_service/detection/obj_detection_service.py
index
055f864
..
52a6bab
100644
(file)
--- a/
example-apps/ROBO/aPaaS/Obj_Detection_service/detection/obj_detection_service.py
+++ b/
example-apps/ROBO/aPaaS/Obj_Detection_service/detection/obj_detection_service.py
@@
-203,7
+203,8
@@
def Detection(img):
cv2.destroyAllWindows()
# Detect_result = {'ImposedImage': 'frame', 'ObjCount': count,
# 'ObjType': type, 'Time': time}
cv2.destroyAllWindows()
# Detect_result = {'ImposedImage': 'frame', 'ObjCount': count,
# 'ObjType': type, 'Time': time}
- Detect_result = {'ImposedImage': "frame", 'ObjCount': count}
+ Detect_result = {'ImposedImage': "frame", 'ObjCount': count,
+ 'labels': label}
return Detect_result
return Detect_result
@@
-264,7
+265,6
@@
def Obj_Detection():
else:
app.logger.info('Allowed file types are txt, pdf, png, jpg, jpeg, gif')
return Response("failure")
else:
app.logger.info('Allowed file types are txt, pdf, png, jpg, jpeg, gif')
return Response("failure")
- # return jsonify({'Face number': num, 'Result': 'upload success'})
return jsonify(Detect_result)
return jsonify(Detect_result)