diff --git a/black-dashboard-django-master/apps/home/urls.py b/black-dashboard-django-master/apps/home/urls.py index a7e27cf..c33a4a9 100644 --- a/black-dashboard-django-master/apps/home/urls.py +++ b/black-dashboard-django-master/apps/home/urls.py @@ -25,7 +25,10 @@ url(r'^front_down_feed', views.front_down_feed, name='front_down_feed'), url(r'^rear_left_feed', views.rear_left_feed, name='rear_left_feed'), url(r'^rear_right_feed', views.rear_right_feed, name='rear_right_feed'), - + url(r'^bio_cam1_feed',views.bio_cam1_feed,name='bio_cam1_feed'), + url(r'^bio_cam2_feed',views.bio_cam2_feed,name='bio_cam2_feed'), + url(r'^bio_cam3_feed',views.bio_cam3_feed,name='bio_cam3_feed'), + url(r'^bio_cam4_feed',views.bio_cam4_feed,name='bio_cam4_feed'), # Matches any html file re_path(r'^.*\.*', views.pages, name='pages'), diff --git a/black-dashboard-django-master/apps/home/views.py b/black-dashboard-django-master/apps/home/views.py index 8fa1e60..50b7f92 100644 --- a/black-dashboard-django-master/apps/home/views.py +++ b/black-dashboard-django-master/apps/home/views.py @@ -31,6 +31,10 @@ front_down_ip = "http://192.168.2.89:8080/shot.jpg?1"#"http://192.168.2.9:8080/video" rear_right_topic = "/mrt/camera1/image_compressed" rear_left_topic = "/mrt/camera2/image_compressed" +bio_cam1='' +bio_cam2='' +bio_cam3='' +bio_cam4='' panorama_ips = ['192.168.2.60:8080/shot.jpg?1','192.168.2.61:8080/shot.jpg?1'] @@ -513,3 +517,19 @@ def rear_left_feed(request): global rear_left_topic return StreamingHttpResponse(gen(CompressedRosCamera(rear_left_topic)), content_type='multipart/x-mixed-replace; boundary=frame') +def bio_cam1_feed(request): + global bio_cam1 + return StreamingHttpResponse(gen(IPWebCam(bio_cam1)), + content_type='multipart/x-mixed-replace; boundary=frame') +def bio_cam2_feed(request): + global bio_cam2 + return StreamingHttpResponse(gen(IPWebCam(bio_cam2)), + content_type='multipart/x-mixed-replace; boundary=frame') +def bio_cam3_feed(request): + global bio_cam3 + return StreamingHttpResponse(gen(IPWebCam(bio_cam3)), + content_type='multipart/x-mixed-replace; boundary=frame') +def bio_cam4_feed(request): + global bio_cam4 + return StreamingHttpResponse(gen(IPWebCam(bio_cam4)), + content_type='multipart/x-mixed-replace; boundary=frame') \ No newline at end of file diff --git a/black-dashboard-django-master/apps/templates/home/camera-bio.html b/black-dashboard-django-master/apps/templates/home/camera-bio.html new file mode 100644 index 0000000..71ed2cd --- /dev/null +++ b/black-dashboard-django-master/apps/templates/home/camera-bio.html @@ -0,0 +1,70 @@ +{% extends "layouts/base.html" %} + +{% block title %} Maps {% endblock %} + + +{% block stylesheets %}{% endblock stylesheets %} + +{% block content %} + +
+
+
+
+ Camera-Feed +
+
+
+
+
+
Bio Cam 1
+
+
+
+
+
+
+
+
+
+
Bio Cam 2
+
+
+
+
+
+
+
+
+
+
+
+
Bio Cam 3
+
+
+
+
+
+
+
+
+
+
Bio Cam 4
+
+
+
+
+
+
+
+
+
+
+ +{% endblock content %} + + +{% block javascripts %} + + +{% endblock javascripts %}