Merge pull request #2 from software-students-spring2024/janet

camera integration and updated requirements
software-students-spring2024 · Apr 25, 2024 · 86ed18c · 86ed18c
2 parents 0637c39 + 3e01f4a
commit 86ed18c
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 3 deletions.
diff --git a/web-app/app.py b/web-app/app.py
@@ -8,6 +8,7 @@
 import tempfile
 import threading
 import time
+import cv2
 
 # import traceback
 from datetime import datetime
@@ -83,6 +84,31 @@ def processing(image_id):
     except bson.errors.InvalidId:
         app.logger.error("Invalid image_id provided.")
         return jsonify({"error": "Invalid image ID"}), 400
+
+# capturing the photo
+@app.route('/capture_photo', methods=['GET'])
+def capture_photo():
+    camera = cv2.VideoCapture(0)  # initialize camera
+
+    try:
+        # capture camera frame
+        success, frame = camera.read()  
+        if success:
+            # specify directory path
+            save_directory = './shots/'
+            filename = f'captured_photo_{int(time.time())}.jpg' 
+
+            # save
+            cv2.imwrite(os.path.join(save_directory, filename), frame)
+
+            # stop camera
+            camera.release()
+
+            return jsonify({'message': 'Photo captured and saved successfully', 'filename': filename}), 200
+        else:
+            return jsonify({'error': 'Failed to capture photo'}), 500
+    except Exception as e:
+        return jsonify({'error': f'Error capturing photo: {str(e)}'}), 500
 
 def allowed_file(filename):
     """

diff --git a/web-app/requirements.txt b/web-app/requirements.txt
@@ -4,4 +4,5 @@ pymongo
 requests
 python-dotenv
 pylint
-black
+black
+opencv-python
diff --git a/web-app/templates/results.html b/web-app/templates/results.html
@@ -32,13 +32,13 @@ <h1>Results</h1>
                 datasets: [{
                     label: 'Predicted Age',
                     data: {{ predicted_ages | tojson | safe }},
-                    borderColor: 'rgba(255, 99, 132, 1)',
+                    borderColor: 'rgba(54, 162, 235, 1)',
                     fill: false
                 },
                 {
                     label: 'Actual Age',
                     data: {{ actual_ages | tojson | safe }},
-                    borderColor: 'rgba(54, 162, 235, 1)',
+                    borderColor: 'rgba(255, 99, 132, 1)',
                     fill: false
                 }]
             },

diff --git a/web-app/templates/upload.html b/web-app/templates/upload.html
@@ -30,9 +30,31 @@
                 alert('Error starting task: ' + error.message);
             });
         }
+
+        function capturePhoto() {
+            fetch('/capture_photo')
+                .then(response => {
+                    if (response.ok) {
+                        return response.json();
+                    } else {
+                        throw new Error('Failed to capture photo');
+                    }
+                })
+                .then(data => {
+                    alert(`Photo captured and saved successfully: ${data.filename}`);
+                })
+                .catch(error => {
+                    console.error('Error capturing photo:', error);
+                    alert('Error capturing photo');
+                });
+        }
     </script>
 </head>
 <body>
+    <div class="container">
+        <h1>Capture Photo</h1>
+        <button onclick="capturePhoto()">Capture Photo</button>
+    </div>
     <div class="container">
     <h1>Upload Image for Age Estimation</h1>
     <form id="uploadForm" onsubmit="event.preventDefault(); startTask();">